Swap out eof check to isIdentifierChar since it is used in several pl…

…aces and this matches MRI's logic
jruby · Apr 6, 2015 · 71d91ca · 71d91ca
1 parent 84d9a8b
commit 71d91ca
Showing 1 changed file with 2 additions and 2 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
@@ -813,7 +813,7 @@ private int getIntegerToken(String value, int radix, int suffix) {
      * mri: is_identchar
      */
     public boolean isIdentifierChar(int c) {
-        return Character.isLetterOrDigit(c) || c == '_' || isMultiByteChar(c);
+        return !eofp && (Character.isLetterOrDigit(c) || c == '_' || isMultiByteChar(c));
     }
 
     public boolean isASCII(int c) {
@@ -1886,7 +1886,7 @@ private int identifier(int c, boolean commandState) throws IOException {
         do {
             if (!tokadd_mbchar(c)) return EOF;
             c = nextc();
-        } while (c != EOF && isIdentifierChar(c));
+        } while (isIdentifierChar(c));
 
         boolean lastBangOrPredicate = false;