fix #441

b3b00 · Apr 26, 2024 · 85123de · 85123de
1 parent ca8eae2
commit 85123de
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/src/sly/lexer/fsm/FSMLexer.cs b/src/sly/lexer/fsm/FSMLexer.cs
@@ -452,7 +452,7 @@ private List<Token<N>> ConsumeIgnored(ReadOnlyMemory<char> source, LexerPosition
                     var currentCharacter = source.At<char>(position.Index);
                     if (WhiteSpaces.Contains(currentCharacter))
                     {
-                        var whiteToken = new Token<N>(default(N), source.Slice(position.Index, 1), position, 
+                        var whiteToken = new Token<N>(default(N), source.Slice(position.Index, 1), position,
                             CommentType.No,
                             Channels.WhiteSpaces, isWhiteSpace: true, decimalSeparator: DecimalSeparator);
                         ignoredTokens.Add(whiteToken);
@@ -472,12 +472,18 @@ private List<Token<N>> ConsumeIgnored(ReadOnlyMemory<char> source, LexerPosition
                         position.Column = 0;
                         position.Line++;
                         eolReached = true;
+                        while (position.Index < source.Length && eol != EolType.No)
+                        {
+                            eol = EOLManager.IsEndOfLine(source, position.Index);
+                            if (eol != EolType.No)
+                            {
+                                position.Index += eol == EolType.Windows ? 2 : 1;
+                                position.Column = 0;
+                                position.Line++;
+                            } 
+                        }
                         continue;
                     }
-                    else
-                    {
-                        break;
-                    }
                 }
 
                 break;

diff --git a/tests/ParserTests/samples/IndentedWhileTests.cs b/tests/ParserTests/samples/IndentedWhileTests.cs
@@ -326,5 +326,22 @@ public void TestIndentationError()
             Check.That(error.Line).IsEqualTo(4);
             Check.That(error.ErrorMessage).Contains("Indentation error");
         }
+
+        [Fact]
+        public void TestEmptyLines()
+        {
+            var buildResult = buildParser();
+            var parser = buildResult.Result;
+            var program = @"
+# infinite loop
+i:= 2
+
+while true do
+
+    skip
+";
+            var result = parser.Parse(program);
+            Check.That(result).IsOkParsing();
+        }
     }
 }