fix: Fixed line continuation, added test

alinalihassan · Mar 14, 2022 · 9f70bb2 · 9f70bb2
1 parent 7c908f0
commit 9f70bb2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Frontend/Lexer.cpp b/src/Frontend/Lexer.cpp
@@ -120,8 +120,9 @@ Token Lexer::ScanOne(bool continuation) {
             if (c != '\n')
                 Error(fmt::format("Newline expected after line continuation, found {}", c));
 
-            // Newline should be parsed next
-            Fallback();
+            loc.Line++;
+            loc.Col = 1;
+
             return ScanOne(continuation);
         case ' ':
         case '\r':
@@ -166,10 +167,12 @@ bool Lexer::HandleIndentation(bool continuation) {
     int col = 0, alt_col = 0;
     char c = 0;
     int changes = 0;
+    bool advanced = false;
     for (;;) {
         if (IsAtEnd())
             break;
         c = Advance();
+        advanced = true;
         if (c == ' ') {
             ++col;
             ++alt_col;
@@ -180,7 +183,7 @@ bool Lexer::HandleIndentation(bool continuation) {
             break;
         }
     }
-    if (!IsAtEnd())
+    if (!IsAtEnd() || advanced)
         Fallback();
 
     if (continuation || level_ != 0 || c == '#' || c == '\n' || c == '\r') {

diff --git a/tests/lesma/line_continuation.les b/tests/lesma/line_continuation.les
@@ -0,0 +1,10 @@
+#ret=101
+def extern exit(x: int)
+
+let x = \       # Hello world
+100 + \
+1
+
+exit(
+x
+)