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

enebo · enebo · commit 2eafcdb36f5d · 2017-12-06T14:54:58.000-06:00
seemed to just break yard but not mri tests) from last fix.  Still one more
regression to go.
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 {

Original file line number	Diff line number	Diff line change
`@@ -3779,6 +3779,7 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {`
`3779`	`3779`	`};`
`3780`	`3780`	`states[447] = new RipperParserState() {`
`3781`	`3781`	`@Override public Object execute(RipperParser p, Object yyVal, Object[] yyVals, int yyTop) {`
	`3782`	`+ yyVal = null;`
`3782`	`3783`	`return yyVal;`
`3783`	`3784`	`}`
`3784`	`3785`	`};`
`@@ -4798,6 +4799,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {`
`4798`	`4799`	`}`
`4799`	`4800`	`};`
`4800`	`4801`	`}`
`4801`		`- // line 2154 "RipperParser.y"`
	`4802`	`+ // line 2155 "RipperParser.y"`
`4802`	`4803`	`}`
`4803`		`- // line 9485 "-"`
	`4804`	`+ // line 9486 "-"`
Original file line number	Diff line number	Diff line change
`@@ -1501,6 +1501,7 @@ opt_rescue : kRESCUE exc_list exc_var then compstmt opt_rescue {`
`1501`	`1501`	`$$ = p.dispatch("on_rescue", $2, $3, $5, $6);`
`1502`	`1502`	`}`
`1503`	`1503`	`\| {`
	`1504`	`+ $$ = null;`
`1504`	`1505`	`}`
`1505`	`1506`
`1506`	`1507`	`exc_list : arg_value {`