Fixes #5062. Regression or bad merge in string interpolation.

Changes to peekVariableName regressed a heredoc fix that was only on master. I will follow up and fix this on jruby-9.1 branch as well.
jruby · Feb 24, 2018 · d532366 · d532366
1 parent 7924a80
commit d532366
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/yacc/HeredocTerm.java b/core/src/main/java/org/jruby/lexer/yacc/HeredocTerm.java
@@ -150,12 +150,9 @@ public int parseString(RubyLexer lexer) throws java.io.IOException {
             if (c == '#') {
                 int token = lexer.peekVariableName(RubyParser.tSTRING_DVAR, RubyParser.tSTRING_DBEG);
 
-                if (token != 0) {
-                    return token;
-                } else {
-                    tok.append(c);
-                    c = lexer.nextc();
-                }
+                if (token != 0) return token;
+
+                tok.append('#');
             }
 
             // MRI has extra pointer which makes our code look a little bit more strange in comparison