Fixed reversed receiver & value in Match3Node.

jruby · Jun 5, 2015 · f07a4b7 · f07a4b7
1 parent 4437923
commit f07a4b7
Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/ast/Match3Node.java b/core/src/main/java/org/jruby/ast/Match3Node.java
@@ -36,6 +36,9 @@
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
 
+/**
+ * Used when a Regexp literal is the RHS of a match call.  E.g., "abc" =~ /.+/
+ */
 public class Match3Node extends Node {
     private final Node receiverNode;
     private final Node valueNode;

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -2720,9 +2720,8 @@ private String getVarNameFromScopeTree(IRScope scope, int depth, int offset) {
     }
 
     public Operand buildMatch3(Match3Node matchNode) {
-        // This reversal is intentional
-        Operand receiver = build(matchNode.getValueNode());
-        Operand value = build(matchNode.getReceiverNode());
+        Operand receiver = build(matchNode.getReceiverNode());
+        Operand value = build(matchNode.getValueNode());
 
         return addResultInstr(new MatchInstr(createTemporaryVariable(), receiver, value));
     }

diff --git a/core/src/main/java/org/jruby/parser/ParserSupport.java b/core/src/main/java/org/jruby/parser/ParserSupport.java
@@ -261,7 +261,7 @@ public Node getMatchNode(Node firstNode, Node secondNode) {
                 return new Match2Node(firstNode.getPosition(), firstNode, secondNode);
             }
         } else if (secondNode instanceof DRegexpNode || secondNode instanceof RegexpNode) {
-            return new Match3Node(firstNode.getPosition(), secondNode, firstNode);
+            return new Match3Node(firstNode.getPosition(), firstNode, secondNode);
         }
 
         return getOperatorCallNode(firstNode, "=~", secondNode);

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -1864,10 +1864,8 @@ public RubyNode visitMatch2Node(org.jruby.ast.Match2Node node) {
     public RubyNode visitMatch3Node(org.jruby.ast.Match3Node node) {
         // Triggered when a Regexp literal is the RHS of an expression.
 
-        // This looks weird, but the receiver and value nodes are reversed by the time they get to us, so we need to
-        // reverse them back in the CallNode.
-        final org.jruby.ast.Node argsNode = buildArrayNode(node.getPosition(), node.getReceiverNode());
-        final org.jruby.ast.Node callNode = new CallNode(node.getPosition(), node.getValueNode(), "=~", argsNode, null);
+        final org.jruby.ast.Node argsNode = buildArrayNode(node.getPosition(), node.getValueNode());
+        final org.jruby.ast.Node callNode = new CallNode(node.getPosition(), node.getReceiverNode(), "=~", argsNode, null);
         return callNode.accept(this);
     }