Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 36ec4eb9d4ad
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba40fa2f0e55
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 23, 2015

  1. [Truffle] Junk.

    chrisseaton committed Sep 23, 2015
    Copy the full SHA
    83eafc7 View commit details
  2. [Truffle] Repeated code.

    chrisseaton committed Sep 23, 2015
    Copy the full SHA
    43d89b4 View commit details
  3. Copy the full SHA
    ba40fa2 View commit details
Original file line number Diff line number Diff line change
@@ -33,8 +33,6 @@ public ReturnNode(RubyContext context, SourceSection sourceSection, ReturnID ret

@Override
public Object execute(VirtualFrame frame) {
//ruby(frame, "Truffle::Primitive.debug_print 'HERE!!'; Truffle::Primitive.print_interleaved_backtrace");
//System.err.println(getEncapsulatingSourceSection().getShortDescription());
throw new ReturnException(returnID, value.execute(frame));
}

Original file line number Diff line number Diff line change
@@ -636,8 +636,6 @@ private void initializeConstants() {
Layouts.MODULE.getFields(encodingConverterClass).setConstant(node, "XML_ATTR_CONTENT_DECORATOR", EConvFlags.XML_ATTR_CONTENT_DECORATOR);
Layouts.MODULE.getFields(encodingConverterClass).setConstant(node, "XML_ATTR_QUOTE_DECORATOR", EConvFlags.XML_ATTR_QUOTE_DECORATOR);

Layouts.MODULE.getFields(objectClass).setConstant(node, "RUBY_REVISION", Constants.RUBY_REVISION);

Layouts.MODULE.getFields(psychParserClass).setConstant(node, "ANY", PsychParserNodes.ANY_ENCODING);
Layouts.MODULE.getFields(psychParserClass).setConstant(node, "UTF8", PsychParserNodes.UTF8_ENCODING);
Layouts.MODULE.getFields(psychParserClass).setConstant(node, "UTF16LE", PsychParserNodes.UTF16LE_ENCODING);
Original file line number Diff line number Diff line change
@@ -1135,7 +1135,7 @@ public RubyNode visitDefsNode(org.jruby.ast.DefsNode node) {
}

protected RubyNode translateMethodDefinition(SourceSection sourceSection, RubyNode classNode, String methodName, org.jruby.ast.Node parseTree, org.jruby.ast.ArgsNode argsNode, org.jruby.ast.Node bodyNode) {
//
// Psych calls method names generated from class hierarchies. We have Truffle::Psych, so we need to adapt

if (methodName.startsWith("visit_Psych_Nodes_")) {
methodName = "visit_Truffle_Psych_Nodes_" + methodName.substring("visit_Psych_Nodes_".length());