Gvar returning random identifier instead of the gvar

jruby · May 23, 2017 · 64a132d · 64a132d
1 parent ebc4675
commit 64a132d
Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -1385,7 +1385,8 @@ private int dollar() throws IOException {
                 pushback('-');
                 return '$';
             }
-            yaccValue = createTokenString().intern();
+            createTokenString().intern();
+            yaccValue = getIdentifier();
             /* xxx shouldn't check if valid option variable */
             return Tokens.tGVAR;
 

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.java b/core/src/main/java/org/jruby/parser/RubyParser.java
@@ -4801,7 +4801,7 @@ public Object yyparse (RubyLexer yyLex) throws java.io.IOException {
 };
 states[501] = new ParserState() {
   @Override public Object execute(ParserSupport support, RubyLexer lexer, Object yyVal, Object[] yyVals, int yyTop) {
-                    yyVal = lexer.getIdentifier();
+                    yyVal = ((ByteList)yyVals[0+yyTop]);
     return yyVal;
   }
 };

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -2181,7 +2181,7 @@ sym             : fname
                     $$ = lexer.getIdentifier();
                 }
                 | tGVAR {
-                    $$ = lexer.getIdentifier();
+                    $$ = $1;
                 }
                 | tCVAR {
                     $$ = lexer.getIdentifier();