Fix one regression (caused massive duplication in reported elements -…

…- which seemed to just break yard but not mri tests) from last fix. Still one more regression to go.
jruby · Dec 6, 2017 · 2eafcdb · 2eafcdb
1 parent 0ecc2c3
commit 2eafcdb
Showing 2 changed files with 4 additions and 2 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
@@ -3779,6 +3779,7 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {
 };
 states[447] = new RipperParserState() {
   @Override public Object execute(RipperParser p, Object yyVal, Object[] yyVals, int yyTop) {
+                    yyVal = null;
     return yyVal;
   }
 };
@@ -4798,6 +4799,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {
   }
 };
 }
-					// line 2154 "RipperParser.y"
+					// line 2155 "RipperParser.y"
 }
-					// line 9485 "-"
+					// line 9486 "-"
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.y b/core/src/main/java/org/jruby/ext/ripper/RipperParser.y
@@ -1501,6 +1501,7 @@ opt_rescue      : kRESCUE exc_list exc_var then compstmt opt_rescue {
                     $$ = p.dispatch("on_rescue", $2, $3, $5, $6);
                 }
                 | {
+                    $$ = null;
                 }
 
 exc_list        : arg_value {