Merge pull request #514 from b3b00/bugfix/513

Bugfix/513

Author: b3b00

src/sly/parser/parser/llparser/bnf/RecursiveDescentSyntaxParser.cs

@@ -64,7 +64,8 @@ public SyntaxParseResult<IN> SafeParse(IList<Token<IN>> tokens, SyntaxParsingCon
             if (rs.Count > 0)
             {
                 result = rs.Find(r => r.IsEnded && !r.IsError);
-
+                
+                
                 if (result == null)
                 {
                     int lastPosition = -1;
@@ -91,6 +92,19 @@ public SyntaxParseResult<IN> SafeParse(IList<Token<IN>> tokens, SyntaxParsingCon
                         errors.Add(new UnexpectedTokenSyntaxError<IN>(tokens[lastPosition], LexemeLabels, null));
                     }
                 }
+                else
+                {
+                    if (result.EndingPosition < tokens.Count-1)
+                    {
+                        SyntaxParseResult<IN> r = new SyntaxParseResult<IN>()
+                        {
+                            IsError = true,
+                            IsEnded = false
+                        };
+                        r.AddErrors(result.GetErrors().ToArray());
+                        return r;
+                    }
+                }
             }
 
             if (result == null)

tests/ParserTests/samples/IndentedWhileTests.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using csly.indentedWhileLang.compiler;
 using csly.indentedWhileLang.parser;
 using csly.whileLang.interpreter;
@@ -9,6 +8,7 @@
 using sly.lexer;
 using sly.parser;
 using sly.parser.generator;
+using sly.parser.generator.visitor;
 using Xunit;
 
 namespace ParserTests.samples
@@ -414,9 +414,36 @@ public void TestMissingUIndents()
         if false then
             x := 28";
             var result = parser.Parse(program);
+            var root = result.Result;
+            Check.That(root).IsInstanceOf<SequenceStatement>();
+            var seq = result.Result as SequenceStatement;
+            var dump = seq.Dump("  ");
+            Check.That(seq.Statements).CountIs(1);
+            Check.That(seq.Statements[0]).IsInstanceOf<IfStatement>();
             Check.That(result).IsOkParsing();
         }
 
+        [Fact]
+        public void TestIssue413_incompleteProgram()
+        {
+            var buildResult = buildParser();
+            var parser = buildResult.Result;
+            var program = @"
+if 
+";
+            var result = parser.Parse(program);
+            Check.That(result).Not.IsOkParsing();
+            Check.That(result.Errors).CountIs(1);
+            var error = result.Errors.First();
+            Check.That(error.ErrorType).IsEqualTo(ErrorType.UnexpectedEOS);
+            var unexpectedEosError = error as UnexpectedTokenSyntaxError<IndentedWhileTokenGeneric>;
+            Check.That(unexpectedEosError).IsNotNull();
+            Check.That(unexpectedEosError.ExpectedTokens.Extracting(x => x.TokenId)).IsEquivalentTo(
+                IndentedWhileTokenGeneric.MINUS,IndentedWhileTokenGeneric.NOT, IndentedWhileTokenGeneric.QUESTION,
+                IndentedWhileTokenGeneric.OPEN_PAREN,IndentedWhileTokenGeneric.OPEN_FSTRING,IndentedWhileTokenGeneric.TRUE,
+                IndentedWhileTokenGeneric.INT,IndentedWhileTokenGeneric.FALSE,IndentedWhileTokenGeneric.IDENTIFIER);
+        }
+        
         [Fact]
         public void TestIndentationError_emptyIndentLine()
         {