Update ripper parser for same fix as in #4663. JRuby raises 'syntax e…

…rror, unexpected kDO_BLOCK' where MRI does not.
jruby · Jun 12, 2017 · daf1a3c · daf1a3c
1 parent 577c7a5
commit daf1a3c
Showing 3 changed files with 4,308 additions and 4,439 deletions.
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.java b/core/src/main/java/org/jruby/ext/ripper/RipperParser.java
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.y b/core/src/main/java/org/jruby/ext/ripper/RipperParser.y
@@ -1393,10 +1393,14 @@ lambda          : /* none */  {
                     p.pushBlockScope();
                     $$ = p.getLeftParenBegin();
                     p.setLeftParenBegin(p.incrementParenNest());
+                } {
+                    $$ = p.getCmdArgumentState().getStack();
+                    p.getCmdArgumentState().reset();
                 } f_larglist lambda_body {
-                    $$ = p.dispatch("on_lambda", $2, $3);
+                    $$ = p.dispatch("on_lambda", $3, $4);
                     p.popCurrentScope();
                     p.setLeftParenBegin($<Integer>1);
+                    p.getCmdArgumentState().reset($<Long>2.longValue());
                 }
 
 f_larglist      : tLPAREN2 f_args opt_bv_decl tRPAREN {

diff --git a/core/src/main/java/org/jruby/ext/ripper/YyTables.java b/core/src/main/java/org/jruby/ext/ripper/YyTables.java