Fixes #3567. Parser does not recognize lonely operator after do...end

jruby · Dec 28, 2015 · baecd42 · baecd42
1 parent d32ec82
commit baecd42
Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/core/src/main/java/org/jruby/parser/RubyParser.java b/core/src/main/java/org/jruby/parser/RubyParser.java
@@ -2039,7 +2039,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 };
 states[56] = new ParserState() {
   @Override public Object execute(ParserSupport support, RubyLexer lexer, Object yyVal, Object[] yyVals, int yyTop) {
-                    yyVal = support.new_call(((Node)yyVals[-3+yyTop]), ((String)yyVals[-1+yyTop]), ((Node)yyVals[0+yyTop]), null);
+                    yyVal = support.new_call(((Node)yyVals[-3+yyTop]), ((String)yyVals[-2+yyTop]), ((String)yyVals[-1+yyTop]), ((Node)yyVals[0+yyTop]), null);
     return yyVal;
   }
 };
@@ -4107,19 +4107,19 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 };
 states[425] = new ParserState() {
   @Override public Object execute(ParserSupport support, RubyLexer lexer, Object yyVal, Object[] yyVals, int yyTop) {
-                    yyVal = support.new_call(((Node)yyVals[-3+yyTop]), ((String)yyVals[-1+yyTop]), ((Node)yyVals[0+yyTop]), null);
+                    yyVal = support.new_call(((Node)yyVals[-3+yyTop]), ((String)yyVals[-2+yyTop]), ((String)yyVals[-1+yyTop]), ((Node)yyVals[0+yyTop]), null);
     return yyVal;
   }
 };
 states[426] = new ParserState() {
   @Override public Object execute(ParserSupport support, RubyLexer lexer, Object yyVal, Object[] yyVals, int yyTop) {
-                    yyVal = support.new_call(((Node)yyVals[-4+yyTop]), ((String)yyVals[-2+yyTop]), ((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop]));
+                    yyVal = support.new_call(((Node)yyVals[-4+yyTop]), ((String)yyVals[-3+yyTop]), ((String)yyVals[-2+yyTop]), ((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop]));
     return yyVal;
   }
 };
 states[427] = new ParserState() {
   @Override public Object execute(ParserSupport support, RubyLexer lexer, Object yyVal, Object[] yyVals, int yyTop) {
-                    yyVal = support.new_call(((Node)yyVals[-4+yyTop]), ((String)yyVals[-2+yyTop]), ((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop]));
+                    yyVal = support.new_call(((Node)yyVals[-4+yyTop]), ((String)yyVals[-3+yyTop]), ((String)yyVals[-2+yyTop]), ((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop]));
     return yyVal;
   }
 };
@@ -5323,7 +5323,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
   }
 };
 }
-					// line 2544 "RubyParser.y"
+					// line 2543 "RubyParser.y"
 
     /** The parse method use an lexer stream and parse it to an AST node 
      * structure

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -534,7 +534,7 @@ command_call    : command
 // Node:block_command - A call with a block (foo.bar {...}, foo::bar {...}, bar {...}) [!null]
 block_command   : block_call
                 | block_call call_op2 operation2 command_args {
-                    $$ = support.new_call($1, $3, $4, null);
+                    $$ = support.new_call($1, $2, $3, $4, null);
                 }
 
 // :brace_block - [!null]
@@ -1758,13 +1758,13 @@ block_call      : command do_block {
                     $<Node>$.setPosition($1.getPosition());
                 }
                 | block_call call_op2 operation2 opt_paren_args {
-                    $$ = support.new_call($1, $3, $4, null);
+                    $$ = support.new_call($1, $2, $3, $4, null);
                 }
                 | block_call call_op2 operation2 opt_paren_args brace_block {
-                    $$ = support.new_call($1, $3, $4, $5);
+                    $$ = support.new_call($1, $2, $3, $4, $5);
                 }
                 | block_call call_op2 operation2 command_args do_block {
-                    $$ = support.new_call($1, $3, $4, $5);
+                    $$ = support.new_call($1, $2, $3, $4, $5);
                 }
 
 // [!null]

diff --git a/test/mri/excludes/TestExcludes.rb b/test/mri/excludes/TestExcludes.rb