Fix controlflow and one passing test

apl-cornell · Oct 30, 2023 · 5f6750b · 5f6750b
1 parent 7fdb8c9
commit 5f6750b
Show file tree

Hide file tree

Showing 4 changed files with 204 additions and 170 deletions.
diff --git a/compiler/src/main/cup/io/github/aplcornell/viaduct/syntax/circuit/CircuitParser.cup b/compiler/src/main/cup/io/github/aplcornell/viaduct/syntax/circuit/CircuitParser.cup
@@ -144,7 +144,7 @@ terminal COLONCOLON;
 
 terminal PERIOD;
 
-terminal IF, ELSE, WHILE, LOOP, BREAK;
+terminal IF, ELSE, LOOP, BREAK;
 terminal INPUT, FROM, OUTPUT, TO;
 
 terminal REDUCE;

diff --git a/compiler/src/main/jflex/io/github/aplcornell/viaduct/syntax/circuit/CircuitLexer.jflex b/compiler/src/main/jflex/io/github/aplcornell/viaduct/syntax/circuit/CircuitLexer.jflex
@@ -110,6 +110,11 @@ NUM         = ((-)?[1-9][0-9]*) | 0
   "input"         { return symbol(sym.INPUT); }
   "output"        { return symbol(sym.OUTPUT); }
 
+  "if"         { return symbol(sym.IF); }
+  "else"         { return symbol(sym.ELSE); }
+  "loop"        { return symbol(sym.LOOP); }
+  "break"        { return symbol(sym.BREAK); }
+
   /* Expressions */
   "."             { return symbol(sym.PERIOD); }