Leverage bytelist indexof instead of re-impling in lexersource

jruby · May 11, 2015 · 88b0942 · 88b0942
1 parent 962deb0
commit 88b0942
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/core/src/main/java/org/jruby/lexer/ByteListLexerSource.java b/core/src/main/java/org/jruby/lexer/ByteListLexerSource.java
@@ -43,20 +43,12 @@ public void setEncoding(Encoding encoding) {
     @Override
     public ByteList gets() {
         int length = completeSource.length();
-        if (offset == length) return null; // At end of source/eof
+        if (offset >= length) return null; // At end of source/eof
 
-        int end = offset;
-
-        while (end < length) {
-            if (completeSource.get(end) == '\n') {
-                end++; // include newline
-                break;
-            }
-            end++;
-        }
+        int end = completeSource.indexOf('\n', offset) + 1;
+        if (end == 0) end = length;
 
         ByteList line = completeSource.makeShared(offset, end - offset);
-
         offset = end;
 
         if (scriptLines != null) scriptLines.append(RubyString.newString(scriptLines.getRuntime(), line));