Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/Lua/CodeAnalysis/Syntax/Parser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -309,22 +309,20 @@ IfStatementNode ParseIfStatement(ref SyntaxTokenEnumerator enumerator)
MoveNextWithValidation(ref enumerator);
enumerator.SkipEoL();

// skip 'then' keyword
CheckCurrentAndSkip(ref enumerator, SyntaxTokenType.Then, out _);
enumerator.SkipEoL();
// check 'then' keyword
CheckCurrent(ref enumerator, SyntaxTokenType.Then);

// set elseif state
state = 1;

continue;
}
else if (tokenType is SyntaxTokenType.Else)
{
// skip 'else' keywords
MoveNextWithValidation(ref enumerator);

enumerator.SkipEoL();

// set else state
state = 2;

continue;
}
else if (tokenType is SyntaxTokenType.End)
{
Expand Down
29 changes: 29 additions & 0 deletions tests/Lua.Tests/ParserTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using Lua.CodeAnalysis.Syntax;
using Lua.CodeAnalysis.Syntax.Nodes;

namespace Lua.Tests
{
// TODO: add more tests

public class ParserTests
{
[Test]
public void Test_If_ElseIf_Else_Empty()
{
var source =
@"if true then
elseif true then
else
end";
var actual = LuaSyntaxTree.Parse(source).Nodes[0];
var expected = new IfStatementNode(
new() { ConditionNode = new BooleanLiteralNode(true, new(1, 3)), ThenNodes = [] },
[new() { ConditionNode = new BooleanLiteralNode(true, new(2, 7)), ThenNodes = [] }],
[],
new(1, 0));

Assert.That(actual, Is.TypeOf<IfStatementNode>());
Assert.That(actual.ToString(), Is.EqualTo(expected.ToString()));
}
}
}