Merge pull request #1688 from Mr-Rm/v2/fix-1685

fix #1685: обработка ошибок в теле модуля

Author: EvilBeaver

src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs

@@ -516,7 +516,7 @@ private bool BuildDefaultParameterValue(NonTerminalNode param, NodeKind nodeKind
 
         private void BuildModuleBody()
         {
-            if (!_lexer.Iterator.MoveToContent())
+           if (_lastExtractedLexem.Token == Token.EndOfText)
                 return;
 
             var moduleBody = new NonTerminalNode(NodeKind.ModuleBody, _lastExtractedLexem);
@@ -746,7 +746,11 @@ private void BuildComplexStructureStatement()
                     }
                     else
                     {
-                        AddError(LocalizedErrors.TokenExpected(_tokenStack.Peek()));
+                        var expected = _tokenStack.Peek();
+                        if (expected.Length == 1 && expected[0] == Token.EndOfText)
+                            AddError(LocalizedErrors.UnexpectedKeyword(_lastExtractedLexem.Token));
+                        else
+                            AddError(LocalizedErrors.TokenExpected(expected));
                     }
                     break;
             }
@@ -1552,7 +1556,9 @@ private void SkipToNextStatement(Token[] additionalStops = null)
         private void AddError(CodeError err, bool doFastForward = true)
         {
             err.Position = _lexer.GetErrorPosition();
-            err.Position.ColumnNumber -= _lastExtractedLexem.Content?.Length ?? 1;
+            var adjustColumn = _lastExtractedLexem.Content?.Length ?? 1;
+            if (err.Position.ColumnNumber >= adjustColumn)
+                err.Position.ColumnNumber -= adjustColumn;
             ErrorSink.AddError(err);
 
             if (doFastForward)

src/OneScript.Language/SyntaxAnalysis/LocalizedErrors.cs

@@ -80,6 +80,10 @@ public static CodeError AwaitMustBeInAsyncMethod() => Create(
 
         public static CodeError NumberExpected() => Create("Ожидается числовая константа", "Numeric constant expected");
 
+        public static CodeError UnexpectedKeyword(Token unexpected) => Create(
+            $"Неожиданное ключевое слово: {LanguageDef.GetTokenName(unexpected)}",
+            $"Unexpected keyword: {LanguageDef.GetTokenAlias(unexpected)}");
+
         public static CodeError UnexpectedEof() =>
             Create("Неожиданный конец модуля", "Unexpected end of text");
 

src/Tests/OneScript.Language.Tests/ParserTests.cs

@@ -1609,8 +1609,24 @@ public void Async_And_Await_Are_Ordinary_Identifiers_In_NonAsync_Scope()
             var asyncNode = validator.NextChild().Is(NodeKind.Assignment)
                 .NextChildIs(NodeKind.Identifier)
                 .ChildItself().Value.Should().Be("Асинх");
+        }
+
+        [Fact]
+        public void Throws_When_Error_In_Module_Body()
+        {
+            var code = @"Function F()
+                            Return 0
+                        EndFunction
+                        EndFunction";
+
+            var parser = PrepareParser(code);
+            parser.ParseStatefulModule();
+
+            parser.Errors.Should().NotBeEmpty("Expression syntax error");
+            parser.Errors.First().ErrorId.Should().Be("UnexpectedKeyword");
         }
 
+
         private static void CatchParsingError(string code)
         {
             var parser = PrepareParser(code);