Fix bug mirah/mirah-parser#25 for DStrings.

felixvf · Jul 21, 2015 · a900c10 · a900c10
1 parent a13ebdf
commit a900c10
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/mirahparser/impl/MirahLexer.java b/src/mirahparser/impl/MirahLexer.java
@@ -254,8 +254,12 @@ public Tokens lex(MirahLexer l, Input i) {
             return Tokens.tStrEvBegin;
           }
           i.backup(1);
+        break;
+        case '\n':
+          l.noteNewline();
+        break;
       }
-      readRestOfString(i);
+      readRestOfString(l, i);
       return Tokens.tStringContent;
     }
     public Tokens readEndOfString(Input i) {
@@ -290,7 +294,7 @@ private void readEscape(Input i) {
       }
     }
 
-    private void readRestOfString(Input i) {
+    private void readRestOfString(MirahLexer l, Input i) {
       int c = 0;
       for (c = i.read(); c != EOF; c = i.read()) {
         if (isEndOfString(c)) {
@@ -307,6 +311,8 @@ private void readRestOfString(Input i) {
         } else if (c == '\\') {
           i.backup(1);
           break;
+        } else if (c == '\n') {
+          l.noteNewline();
         }
       }
       if ( c == EOF ){