Fixes #1700. NPE in Ripper with $ special variables

jruby · Sep 11, 2014 · 8737eb5 · 8737eb5
1 parent 2281c70
commit 8737eb5
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/ext/ripper/src/main/java/org/jruby/ext/ripper/RipperLexer.java b/ext/ripper/src/main/java/org/jruby/ext/ripper/RipperLexer.java
@@ -1838,7 +1838,8 @@ private int dollar() throws IOException {
         case '<':       /* $<: reading filename */
         case '>':       /* $>: default output handle */
         case '\"':      /* $": already loaded files */
-            yaccValue = new Token("$" + (char) c, Tokens.tGVAR);
+            identValue = "$" + (char) c;
+            yaccValue = new Token(identValue, Tokens.tGVAR);
             return Tokens.tGVAR;
 
         case '-':
@@ -1851,7 +1852,8 @@ private int dollar() throws IOException {
             } else {
                 pushback(c);
             }
-            yaccValue = new Token(tokenBuffer.toString(), Tokens.tGVAR);
+            identValue = tokenBuffer.toString();
+            yaccValue = new Token(identValue, Tokens.tGVAR);
             /* xxx shouldn't check if valid option variable */
             return Tokens.tGVAR;
 
@@ -1860,7 +1862,8 @@ private int dollar() throws IOException {
         case '\'':      /* $': string after last match */
         case '+':       /* $+: string matches last paren. */
             // Explicit reference to these vars as symbols...
-            yaccValue = new Token("$" + (char) c);
+            identValue = "$" + (char) c;
+            yaccValue = new Token(identValue);
             if (last_state == LexState.EXPR_FNAME) return Tokens.tGVAR;
 
             return Tokens.tBACK_REF;
@@ -1874,11 +1877,13 @@ private int dollar() throws IOException {
             } while (Character.isDigit(c));
             pushback(c);
             if (last_state == LexState.EXPR_FNAME) {
-                yaccValue = new Token(tokenBuffer.toString(), Tokens.tGVAR);
+                identValue = tokenBuffer.toString();
+                yaccValue = new Token(identValue, Tokens.tGVAR);
                 return Tokens.tGVAR;
             }
-
-            yaccValue = new Token(tokenBuffer.toString());
+
+            identValue = tokenBuffer.toString();
+            yaccValue = new Token(identValue);
             return Tokens.tNTH_REF;
         case '0':
             setState(LexState.EXPR_END);
@@ -2009,7 +2014,8 @@ private int identifier(int c, boolean commandState) throws IOException {
             int c2 = nextc();
             if (c2 == ':' && !peek(':')) {
                 setState(LexState.EXPR_BEG);
-                yaccValue = new Token(tempVal + ':');
+                identValue = tempVal + ':';
+                yaccValue = new Token(identValue);
                 return Tokens.tLABEL;
             }
             pushback(c2);
@@ -2027,7 +2033,8 @@ private int identifier(int c, boolean commandState) throws IOException {
                     setState(keyword.state);
                 }
                 if (state == LexState.EXPR_FNAME) {
-                    yaccValue = new Token(keyword.name);
+                    identValue = keyword.name;
+                    yaccValue = new Token(identValue);
                 } else {
                     yaccValue = new Token(tempVal);
                     if (keyword.id0 == Tokens.kDO) return doKeyword(state);