Fix JRUBY-6538: 'obj !~ thing' is not the same as obj.send(:!~, thing)

Credit goes to headius.
dekellum · Aug 3, 2012 · 1ef14f1 · 1ef14f1
1 parent 202a45c
commit 1ef14f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/org/jruby/parser/Ruby19Parser.java b/src/org/jruby/parser/Ruby19Parser.java
@@ -3667,7 +3667,7 @@ public Object execute(ParserSupport support, RubyYaccLexer lexer, Object yyVal,
 };
 states[227] = new ParserState() {
   public Object execute(ParserSupport support, RubyYaccLexer lexer, Object yyVal, Object[] yyVals, int yyTop) {
-                    yyVal = new NotNode(support.getPosition(((Node)yyVals[-2+yyTop])), support.getMatchNode(((Node)yyVals[-2+yyTop]), ((Node)yyVals[0+yyTop])));
+                    yyVal = support.getOperatorCallNode(((Node)yyVals[-2+yyTop]), "!~", ((Node)yyVals[0+yyTop]), lexer.getPosition());
     return yyVal;
   }
 };

diff --git a/src/org/jruby/parser/Ruby19Parser.y b/src/org/jruby/parser/Ruby19Parser.y
@@ -899,7 +899,7 @@ arg             : lhs '=' arg {
                   */
                 }
                 | arg tNMATCH arg {
-                    $$ = new NotNode(support.getPosition($1), support.getMatchNode($1, $3));
+                    $$ = support.getOperatorCallNode($1, "!~", $3, lexer.getPosition());
                 }
                 | tBANG arg {
                     $$ = support.getOperatorCallNode(support.getConditionNode($2), "!");