Fixes another regression from fix of #4882. In this case we would look for

enebo · enebo · commit 5dc99c3560e4 · 2017-12-06T15:47:12.000-06:00
duplicated variables in higher level production f_opt and f_block_opt but now
that check is done at the actual variable itself.
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.java b/core/src/main/java/org/jruby/ext/ripper/RipperParser.java
@@ -4608,7 +4608,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {
 states[591] = new RipperParserState() {
   @Override public Object execute(RipperParser p, Object yyVal, Object[] yyVals, int yyTop) {
                     p.setCurrentArg(null);
-                    p.arg_var(p.formal_argument(((IRubyObject)yyVals[-2+yyTop])));
                     yyVal = p.new_assoc(p.assignable(((IRubyObject)yyVals[-2+yyTop])), ((IRubyObject)yyVals[0+yyTop]));
 
     return yyVal;
@@ -4617,7 +4616,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {
 states[592] = new RipperParserState() {
   @Override public Object execute(RipperParser p, Object yyVal, Object[] yyVals, int yyTop) {
                     p.setCurrentArg(null);
-                    p.arg_var(p.formal_argument(((IRubyObject)yyVals[-2+yyTop])));
                     yyVal = p.new_assoc(p.assignable(((IRubyObject)yyVals[-2+yyTop])), ((IRubyObject)yyVals[0+yyTop]));
     return yyVal;
   }
@@ -4799,6 +4797,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {
   }
 };
 }
-					// line 2155 "RipperParser.y"
+					// line 2153 "RipperParser.y"
 }
-					// line 9486 "-"
+					// line 9484 "-"
diff --git a/core/src/main/java/org/jruby/ext/ripper/RipperParser.y b/core/src/main/java/org/jruby/ext/ripper/RipperParser.y
@@ -2012,14 +2012,12 @@ f_kwrest        : kwrest_mark tIDENTIFIER {
 
 f_opt           : f_arg_asgn '=' arg_value {
                     p.setCurrentArg(null);
-                    p.arg_var(p.formal_argument($1));
                     $$ = p.new_assoc(p.assignable($1), $3);
 
                 }
 
 f_block_opt     : f_arg_asgn '=' primary_value {
                     p.setCurrentArg(null);
-                    p.arg_var(p.formal_argument($1));
                     $$ = p.new_assoc(p.assignable($1), $3);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -4608,7 +4608,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {`
`4608`	`4608`	`states[591] = new RipperParserState() {`
`4609`	`4609`	`@Override public Object execute(RipperParser p, Object yyVal, Object[] yyVals, int yyTop) {`
`4610`	`4610`	`p.setCurrentArg(null);`
`4611`		`- p.arg_var(p.formal_argument(((IRubyObject)yyVals[-2+yyTop])));`
`4612`	`4611`	`yyVal = p.new_assoc(p.assignable(((IRubyObject)yyVals[-2+yyTop])), ((IRubyObject)yyVals[0+yyTop]));`
`4613`	`4612`
`4614`	`4613`	`return yyVal;`
`@@ -4617,7 +4616,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {`
`4617`	`4616`	`states[592] = new RipperParserState() {`
`4618`	`4617`	`@Override public Object execute(RipperParser p, Object yyVal, Object[] yyVals, int yyTop) {`
`4619`	`4618`	`p.setCurrentArg(null);`
`4620`		`- p.arg_var(p.formal_argument(((IRubyObject)yyVals[-2+yyTop])));`
`4621`	`4619`	`yyVal = p.new_assoc(p.assignable(((IRubyObject)yyVals[-2+yyTop])), ((IRubyObject)yyVals[0+yyTop]));`
`4622`	`4620`	`return yyVal;`
`4623`	`4621`	`}`
`@@ -4799,6 +4797,6 @@ public Object yyparse (RipperLexer yyLex) throws java.io.IOException {`
`4799`	`4797`	`}`
`4800`	`4798`	`};`
`4801`	`4799`	`}`
`4802`		`- // line 2155 "RipperParser.y"`
	`4800`	`+ // line 2153 "RipperParser.y"`
`4803`	`4801`	`}`
`4804`		`- // line 9486 "-"`
	`4802`	`+ // line 9484 "-"`
Original file line number	Diff line number	Diff line change
`@@ -2012,14 +2012,12 @@ f_kwrest : kwrest_mark tIDENTIFIER {`
`2012`	`2012`
`2013`	`2013`	`f_opt : f_arg_asgn '=' arg_value {`
`2014`	`2014`	`p.setCurrentArg(null);`
`2015`		`- p.arg_var(p.formal_argument($1));`
`2016`	`2015`	`$$ = p.new_assoc(p.assignable($1), $3);`
`2017`	`2016`
`2018`	`2017`	`}`
`2019`	`2018`
`2020`	`2019`	`f_block_opt : f_arg_asgn '=' primary_value {`
`2021`	`2020`	`p.setCurrentArg(null);`
`2022`		`- p.arg_var(p.formal_argument($1));`
`2023`	`2021`	`$$ = p.new_assoc(p.assignable($1), $3);`
`2024`	`2022`	`}`
`2025`	`2023`