Skip to content

Commit 461e1b8

Browse files
committed
убран переход к следующему токену и возможное NRE
1 parent 5b79c11 commit 461e1b8

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,11 +1367,6 @@ private BslSyntaxNode BuildExpressionUpTo(NonTerminalNode parent, Token stopToke
13671367
else
13681368
{
13691369
AddError(LocalizedErrors.TokenExpected(stopToken), false);
1370-
SkipToNextStatement(new []{stopToken});
1371-
if (_lastExtractedLexem.Token == stopToken)
1372-
{
1373-
NextLexem();
1374-
}
13751370
}
13761371

13771372
node = default;
@@ -1640,7 +1635,7 @@ private void SkipToNextStatement(Token[] additionalStops = null)
16401635
private void AddError(CodeError err, bool doFastForward = true)
16411636
{
16421637
err.Position = _lexer.GetErrorPosition();
1643-
err.Position.ColumnNumber -= _lastExtractedLexem.Content.Length;
1638+
err.Position.ColumnNumber -= _lastExtractedLexem.Content?.Length ?? 1;
16441639
ErrorSink.AddError(err);
16451640

16461641
if (doFastForward)

0 commit comments

Comments
 (0)