Fixes another regression from fix of #4882. In this case we would loo…

…k for duplicated variables in higher level production f_opt and f_block_opt but now that check is done at the actual variable itself.
jruby · Dec 6, 2017 · 5dc99c3 · 5dc99c3
1 parent 2eafcdb
commit 5dc99c3
Showing 2 changed files with 2 additions and 6 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
@@ -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);
                 }