tlang
/
t
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made token movement for `parseIf` and `parseWhile` self-contained

expression_parsing.sync-conflict-20210316-090018-O3W7KWN
Tristan B. V. Kildaire 2021-03-05 11:40:06 +02:00
parent 847f76d7d2
commit 94f15af031
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/tlang/compiler/parser.d
View File

@ -63,6 +63,9 @@ public final class Parser
private void parseIf() private void parseIf()
{ {
/* Pop off the `if` */
nextToken();
/* Expect an opening brace `(` */ /* Expect an opening brace `(` */
expect(SymbolType.LBRACE, getCurrentToken()); expect(SymbolType.LBRACE, getCurrentToken());
nextToken(); nextToken();
@ -85,6 +88,9 @@ public final class Parser
private void parseWhile() private void parseWhile()
{ {
/* Pop off the `while` */
nextToken();
/* Expect an opening brace `(` */ /* Expect an opening brace `(` */
expect(SymbolType.LBRACE, getCurrentToken()); expect(SymbolType.LBRACE, getCurrentToken());
nextToken(); nextToken();
@ -141,13 +147,11 @@ public final class Parser
/* If it is a branch */ /* If it is a branch */
else if(symbol == SymbolType.IF) else if(symbol == SymbolType.IF)
{ {
nextToken();
parseIf(); parseIf();
} }
/* If it is a while loop */ /* If it is a while loop */
else if(symbol == SymbolType.WHILE) else if(symbol == SymbolType.WHILE)
{ {
nextToken();
parseWhile(); parseWhile();
} }
/* If it is a function call */ /* If it is a function call */