bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix IF parsing

Browse Source
This commit is contained in:
otya128
2016-12-24 16:53:49 +09:00
parent be9afb82ca
commit 0aff0e5821
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SMILEBASIC/parser.d
View File

@@ -1583,7 +1583,10 @@ class Parser
then = ifStatements(); then = ifStatements();
} }
token = lex.front(); token = lex.front();
if (multiline || token.type != TokenType.NewLine)
{
lex.popFront(); lex.popFront();
}
import std.typecons; import std.typecons;
Tuple!(Statements, Expression)[] elseif = new Tuple!(Statements, Expression)[0]; Tuple!(Statements, Expression)[] elseif = new Tuple!(Statements, Expression)[0];
while(token.type == TokenType.Elseif) while(token.type == TokenType.Elseif)
@@ -1643,8 +1646,11 @@ class Parser
{ {
else_ = ifStatements(); else_ = ifStatements();
} }
if (multiline || lex.front.type != TokenType.NewLine)
{
lex.popFront(); lex.popFront();
} }
}
auto if_ = new If(expr, then, else_, elseif, lex.location); auto if_ = new If(expr, then, else_, elseif, lex.location);
return if_; return if_;
} }