From 3a267180ba1149fa0e166c83c60609a147c6950e Mon Sep 17 00:00:00 2001
From: laurenz <i22032@hb.dhbw-stuttgart.de>
Date: Mon, 20 May 2024 16:26:20 +0200
Subject: [PATCH] Parser can do Else-if

---
 src/main/antlr/Decaf.g4                       |    8 +-
 .../java/de/maishai/StatementGenerator.java   |   21 +-
 src/main/java/de/maishai/antlr/Decaf.interp   |   12 +-
 src/main/java/de/maishai/antlr/Decaf.tokens   |   34 +-
 .../de/maishai/antlr/DecafBaseListener.java   |   24 +
 .../de/maishai/antlr/DecafBaseVisitor.java    |   14 +
 .../java/de/maishai/antlr/DecafLexer.interp   |   14 +-
 .../java/de/maishai/antlr/DecafLexer.java     |  214 ++--
 .../java/de/maishai/antlr/DecafLexer.tokens   |   34 +-
 .../java/de/maishai/antlr/DecafListener.java  |   20 +
 .../java/de/maishai/antlr/DecafParser.java    | 1027 ++++++++++-------
 .../java/de/maishai/antlr/DecafVisitor.java   |   12 +
 src/test/java/E2ETests.java                   |   23 +
 13 files changed, 854 insertions(+), 603 deletions(-)

diff --git a/src/main/antlr/Decaf.g4 b/src/main/antlr/Decaf.g4
index f1ba2ed..39509e1 100644
--- a/src/main/antlr/Decaf.g4
+++ b/src/main/antlr/Decaf.g4
@@ -22,7 +22,7 @@ return:     'return' expr ';'
 ;
 
 
-stmt : 'if' '(' expr ')' block ('else' block)?  #If
+stmt : ifCall  #If
     | 'for' '(' (assign | localVarWithInitialization) ';' expr ';' assign ')' block  #For
     | 'while' '(' expr ')' block                #While
     | 'do' block 'while' '(' expr ')' ';'?      #DoWhile
@@ -58,7 +58,8 @@ recipient : methName | id;
 methName : id '(' args? ')';
 args : expr (',' expr)*;
 
-
+ifCall: IF '(' expr ')' block (elseIf)* (ELSE block)? ;
+elseIf: ELSE IF '('expr')' block;
 
 literal : NUMBER | BOOLEANLITERAL | CHARLITERAL;
 
@@ -70,6 +71,9 @@ NEW : 'new';
 NULL : 'null';
 THIS : 'this';
 
+IF : 'if';
+ELSE: 'else';
+
 SUB : '-';
 ADD : '+';
 MUL : '*';
diff --git a/src/main/java/de/maishai/StatementGenerator.java b/src/main/java/de/maishai/StatementGenerator.java
index 1beac73..b850b11 100644
--- a/src/main/java/de/maishai/StatementGenerator.java
+++ b/src/main/java/de/maishai/StatementGenerator.java
@@ -27,13 +27,22 @@ import java.util.List;
 public class StatementGenerator extends DecafBaseVisitor<List<Statement>> {
     @Override
     public List<Statement> visitIf(DecafParser.IfContext ctx) {
-        Expression expr = new ExpressionGenerator().visit(ctx.expr());
-        Block ifBlock = new BlockGenerator().visit(ctx.block(0));
-        if (ctx.block().size() == 2) {
-            Block elseBlock = new BlockGenerator().visit(ctx.block(1));
-            return List.of(new IfElse(expr, ifBlock, elseBlock));
+        Expression expr = new ExpressionGenerator().visit(ctx.ifCall().expr());
+        Block ifBlock = new BlockGenerator().visit(ctx.ifCall().block(0));
+        Block elseBlock = null;
+        if (ctx.ifCall().block().size() == 2) {
+            elseBlock = new BlockGenerator().visit(ctx.ifCall().block(1));
         }
-        return List.of(new IfElse(expr, ifBlock, null));
+        if (ctx.ifCall().elseIf() != null){
+            for (int i = ctx.ifCall().elseIf().size()-1; i >= 0; i--) {
+                IfElse current = new IfElse(new ExpressionGenerator().visit(ctx.ifCall().elseIf(i).expr()),
+                        new BlockGenerator().visit(ctx.ifCall().elseIf(i).block()),
+                        elseBlock);
+                elseBlock = new Block(List.of(current));
+            }
+        }
+
+        return List.of(new IfElse(expr, ifBlock, elseBlock));
     }
 
     @Override
diff --git a/src/main/java/de/maishai/antlr/Decaf.interp b/src/main/java/de/maishai/antlr/Decaf.interp
index d5adbeb..9f50a6b 100644
--- a/src/main/java/de/maishai/antlr/Decaf.interp
+++ b/src/main/java/de/maishai/antlr/Decaf.interp
@@ -11,8 +11,6 @@ null
 'String[] args'
 ','
 'return'
-'if'
-'else'
 'for'
 'while'
 'do'
@@ -22,6 +20,8 @@ null
 'new'
 'null'
 'this'
+'if'
+'else'
 '-'
 '+'
 '*'
@@ -68,12 +68,12 @@ null
 null
 null
 null
-null
-null
 PUBLIC
 NEW
 NULL
 THIS
+IF
+ELSE
 SUB
 ADD
 MUL
@@ -129,9 +129,11 @@ newCall
 recipient
 methName
 args
+ifCall
+elseIf
 literal
 id
 
 
 atn:
-[4, 1, 49, 312, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 62, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 67, 8, 0, 10, 0, 12, 0, 70, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 75, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 3, 3, 85, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 91, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 98, 8, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 116, 8, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 5, 8, 124, 8, 8, 10, 8, 12, 8, 127, 9, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 5, 10, 134, 8, 10, 10, 10, 12, 10, 137, 9, 10, 1, 10, 3, 10, 140, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 158, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 167, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 173, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 195, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 211, 8, 14, 1, 15, 1, 15, 3, 15, 215, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 228, 8, 16, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 234, 8, 16, 10, 16, 12, 16, 237, 9, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 3, 19, 248, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 253, 8, 19, 10, 19, 12, 19, 256, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 3, 21, 269, 8, 21, 1, 21, 1, 21, 1, 21, 5, 21, 274, 8, 21, 10, 21, 12, 21, 277, 9, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 3, 22, 285, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 3, 23, 291, 8, 23, 1, 24, 1, 24, 1, 24, 3, 24, 296, 8, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 5, 25, 303, 8, 25, 10, 25, 12, 25, 306, 9, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 0, 1, 32, 28, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 325, 0, 56, 1, 0, 0, 0, 2, 74, 1, 0, 0, 0, 4, 80, 1, 0, 0, 0, 6, 84, 1, 0, 0, 0, 8, 90, 1, 0, 0, 0, 10, 92, 1, 0, 0, 0, 12, 102, 1, 0, 0, 0, 14, 111, 1, 0, 0, 0, 16, 120, 1, 0, 0, 0, 18, 128, 1, 0, 0, 0, 20, 131, 1, 0, 0, 0, 22, 143, 1, 0, 0, 0, 24, 146, 1, 0, 0, 0, 26, 157, 1, 0, 0, 0, 28, 210, 1, 0, 0, 0, 30, 214, 1, 0, 0, 0, 32, 227, 1, 0, 0, 0, 34, 238, 1, 0, 0, 0, 36, 240, 1, 0, 0, 0, 38, 247, 1, 0, 0, 0, 40, 259, 1, 0, 0, 0, 42, 268, 1, 0, 0, 0, 44, 280, 1, 0, 0, 0, 46, 290, 1, 0, 0, 0, 48, 292, 1, 0, 0, 0, 50, 299, 1, 0, 0, 0, 52, 307, 1, 0, 0, 0, 54, 309, 1, 0, 0, 0, 56, 57, 5, 19, 0, 0, 57, 58, 5, 1, 0, 0, 58, 59, 3, 54, 27, 0, 59, 61, 5, 2, 0, 0, 60, 62, 3, 12, 6, 0, 61, 60, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 68, 1, 0, 0, 0, 63, 67, 3, 2, 1, 0, 64, 67, 3, 10, 5, 0, 65, 67, 3, 14, 7, 0, 66, 63, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 66, 65, 1, 0, 0, 0, 67, 70, 1, 0, 0, 0, 68, 66, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 71, 1, 0, 0, 0, 70, 68, 1, 0, 0, 0, 71, 72, 5, 3, 0, 0, 72, 1, 1, 0, 0, 0, 73, 75, 5, 19, 0, 0, 74, 73, 1, 0, 0, 0, 74, 75, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 77, 3, 8, 4, 0, 77, 78, 3, 54, 27, 0, 78, 79, 5, 4, 0, 0, 79, 3, 1, 0, 0, 0, 80, 81, 7, 0, 0, 0, 81, 5, 1, 0, 0, 0, 82, 85, 3, 8, 4, 0, 83, 85, 5, 41, 0, 0, 84, 82, 1, 0, 0, 0, 84, 83, 1, 0, 0, 0, 85, 7, 1, 0, 0, 0, 86, 91, 5, 39, 0, 0, 87, 91, 5, 40, 0, 0, 88, 91, 5, 42, 0, 0, 89, 91, 3, 54, 27, 0, 90, 86, 1, 0, 0, 0, 90, 87, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 90, 89, 1, 0, 0, 0, 91, 9, 1, 0, 0, 0, 92, 93, 5, 19, 0, 0, 93, 94, 3, 6, 3, 0, 94, 95, 3, 54, 27, 0, 95, 97, 5, 5, 0, 0, 96, 98, 3, 16, 8, 0, 97, 96, 1, 0, 0, 0, 97, 98, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 100, 5, 6, 0, 0, 100, 101, 3, 20, 10, 0, 101, 11, 1, 0, 0, 0, 102, 103, 5, 19, 0, 0, 103, 104, 5, 7, 0, 0, 104, 105, 5, 41, 0, 0, 105, 106, 5, 8, 0, 0, 106, 107, 5, 5, 0, 0, 107, 108, 5, 9, 0, 0, 108, 109, 5, 6, 0, 0, 109, 110, 3, 20, 10, 0, 110, 13, 1, 0, 0, 0, 111, 112, 5, 19, 0, 0, 112, 113, 3, 54, 27, 0, 113, 115, 5, 5, 0, 0, 114, 116, 3, 16, 8, 0, 115, 114, 1, 0, 0, 0, 115, 116, 1, 0, 0, 0, 116, 117, 1, 0, 0, 0, 117, 118, 5, 6, 0, 0, 118, 119, 3, 20, 10, 0, 119, 15, 1, 0, 0, 0, 120, 125, 3, 18, 9, 0, 121, 122, 5, 10, 0, 0, 122, 124, 3, 18, 9, 0, 123, 121, 1, 0, 0, 0, 124, 127, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 17, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 128, 129, 3, 8, 4, 0, 129, 130, 3, 54, 27, 0, 130, 19, 1, 0, 0, 0, 131, 135, 5, 2, 0, 0, 132, 134, 3, 28, 14, 0, 133, 132, 1, 0, 0, 0, 134, 137, 1, 0, 0, 0, 135, 133, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 139, 1, 0, 0, 0, 137, 135, 1, 0, 0, 0, 138, 140, 3, 26, 13, 0, 139, 138, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 142, 5, 3, 0, 0, 142, 21, 1, 0, 0, 0, 143, 144, 3, 8, 4, 0, 144, 145, 3, 54, 27, 0, 145, 23, 1, 0, 0, 0, 146, 147, 3, 8, 4, 0, 147, 148, 3, 54, 27, 0, 148, 149, 5, 34, 0, 0, 149, 150, 3, 32, 16, 0, 150, 25, 1, 0, 0, 0, 151, 152, 5, 11, 0, 0, 152, 153, 3, 32, 16, 0, 153, 154, 5, 4, 0, 0, 154, 158, 1, 0, 0, 0, 155, 156, 5, 11, 0, 0, 156, 158, 5, 4, 0, 0, 157, 151, 1, 0, 0, 0, 157, 155, 1, 0, 0, 0, 158, 27, 1, 0, 0, 0, 159, 160, 5, 12, 0, 0, 160, 161, 5, 5, 0, 0, 161, 162, 3, 32, 16, 0, 162, 163, 5, 6, 0, 0, 163, 166, 3, 20, 10, 0, 164, 165, 5, 13, 0, 0, 165, 167, 3, 20, 10, 0, 166, 164, 1, 0, 0, 0, 166, 167, 1, 0, 0, 0, 167, 211, 1, 0, 0, 0, 168, 169, 5, 14, 0, 0, 169, 172, 5, 5, 0, 0, 170, 173, 3, 40, 20, 0, 171, 173, 3, 24, 12, 0, 172, 170, 1, 0, 0, 0, 172, 171, 1, 0, 0, 0, 173, 174, 1, 0, 0, 0, 174, 175, 5, 4, 0, 0, 175, 176, 3, 32, 16, 0, 176, 177, 5, 4, 0, 0, 177, 178, 3, 40, 20, 0, 178, 179, 5, 6, 0, 0, 179, 180, 3, 20, 10, 0, 180, 211, 1, 0, 0, 0, 181, 182, 5, 15, 0, 0, 182, 183, 5, 5, 0, 0, 183, 184, 3, 32, 16, 0, 184, 185, 5, 6, 0, 0, 185, 186, 3, 20, 10, 0, 186, 211, 1, 0, 0, 0, 187, 188, 5, 16, 0, 0, 188, 189, 3, 20, 10, 0, 189, 190, 5, 15, 0, 0, 190, 191, 5, 5, 0, 0, 191, 192, 3, 32, 16, 0, 192, 194, 5, 6, 0, 0, 193, 195, 5, 4, 0, 0, 194, 193, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 211, 1, 0, 0, 0, 196, 197, 5, 17, 0, 0, 197, 211, 5, 4, 0, 0, 198, 199, 3, 22, 11, 0, 199, 200, 5, 4, 0, 0, 200, 211, 1, 0, 0, 0, 201, 202, 3, 24, 12, 0, 202, 203, 5, 4, 0, 0, 203, 211, 1, 0, 0, 0, 204, 205, 3, 40, 20, 0, 205, 206, 5, 4, 0, 0, 206, 211, 1, 0, 0, 0, 207, 208, 3, 30, 15, 0, 208, 209, 5, 4, 0, 0, 209, 211, 1, 0, 0, 0, 210, 159, 1, 0, 0, 0, 210, 168, 1, 0, 0, 0, 210, 181, 1, 0, 0, 0, 210, 187, 1, 0, 0, 0, 210, 196, 1, 0, 0, 0, 210, 198, 1, 0, 0, 0, 210, 201, 1, 0, 0, 0, 210, 204, 1, 0, 0, 0, 210, 207, 1, 0, 0, 0, 211, 29, 1, 0, 0, 0, 212, 215, 3, 42, 21, 0, 213, 215, 3, 44, 22, 0, 214, 212, 1, 0, 0, 0, 214, 213, 1, 0, 0, 0, 215, 31, 1, 0, 0, 0, 216, 217, 6, 16, -1, 0, 217, 218, 3, 36, 18, 0, 218, 219, 3, 32, 16, 5, 219, 228, 1, 0, 0, 0, 220, 228, 3, 52, 26, 0, 221, 222, 5, 5, 0, 0, 222, 223, 3, 32, 16, 0, 223, 224, 5, 6, 0, 0, 224, 228, 1, 0, 0, 0, 225, 228, 3, 38, 19, 0, 226, 228, 3, 30, 15, 0, 227, 216, 1, 0, 0, 0, 227, 220, 1, 0, 0, 0, 227, 221, 1, 0, 0, 0, 227, 225, 1, 0, 0, 0, 227, 226, 1, 0, 0, 0, 228, 235, 1, 0, 0, 0, 229, 230, 10, 6, 0, 0, 230, 231, 3, 34, 17, 0, 231, 232, 3, 32, 16, 7, 232, 234, 1, 0, 0, 0, 233, 229, 1, 0, 0, 0, 234, 237, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 33, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0, 238, 239, 7, 1, 0, 0, 239, 35, 1, 0, 0, 0, 240, 241, 7, 2, 0, 0, 241, 37, 1, 0, 0, 0, 242, 243, 5, 22, 0, 0, 243, 248, 5, 18, 0, 0, 244, 245, 3, 44, 22, 0, 245, 246, 5, 18, 0, 0, 246, 248, 1, 0, 0, 0, 247, 242, 1, 0, 0, 0, 247, 244, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 254, 1, 0, 0, 0, 249, 250, 3, 46, 23, 0, 250, 251, 5, 18, 0, 0, 251, 253, 1, 0, 0, 0, 252, 249, 1, 0, 0, 0, 253, 256, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 257, 1, 0, 0, 0, 256, 254, 1, 0, 0, 0, 257, 258, 3, 54, 27, 0, 258, 39, 1, 0, 0, 0, 259, 260, 3, 38, 19, 0, 260, 261, 3, 4, 2, 0, 261, 262, 3, 32, 16, 0, 262, 41, 1, 0, 0, 0, 263, 264, 5, 22, 0, 0, 264, 269, 5, 18, 0, 0, 265, 266, 3, 44, 22, 0, 266, 267, 5, 18, 0, 0, 267, 269, 1, 0, 0, 0, 268, 263, 1, 0, 0, 0, 268, 265, 1, 0, 0, 0, 268, 269, 1, 0, 0, 0, 269, 275, 1, 0, 0, 0, 270, 271, 3, 46, 23, 0, 271, 272, 5, 18, 0, 0, 272, 274, 1, 0, 0, 0, 273, 270, 1, 0, 0, 0, 274, 277, 1, 0, 0, 0, 275, 273, 1, 0, 0, 0, 275, 276, 1, 0, 0, 0, 276, 278, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 278, 279, 3, 48, 24, 0, 279, 43, 1, 0, 0, 0, 280, 281, 5, 20, 0, 0, 281, 282, 3, 8, 4, 0, 282, 284, 5, 5, 0, 0, 283, 285, 3, 50, 25, 0, 284, 283, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 286, 1, 0, 0, 0, 286, 287, 5, 6, 0, 0, 287, 45, 1, 0, 0, 0, 288, 291, 3, 48, 24, 0, 289, 291, 3, 54, 27, 0, 290, 288, 1, 0, 0, 0, 290, 289, 1, 0, 0, 0, 291, 47, 1, 0, 0, 0, 292, 293, 3, 54, 27, 0, 293, 295, 5, 5, 0, 0, 294, 296, 3, 50, 25, 0, 295, 294, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 298, 5, 6, 0, 0, 298, 49, 1, 0, 0, 0, 299, 304, 3, 32, 16, 0, 300, 301, 5, 10, 0, 0, 301, 303, 3, 32, 16, 0, 302, 300, 1, 0, 0, 0, 303, 306, 1, 0, 0, 0, 304, 302, 1, 0, 0, 0, 304, 305, 1, 0, 0, 0, 305, 51, 1, 0, 0, 0, 306, 304, 1, 0, 0, 0, 307, 308, 7, 3, 0, 0, 308, 53, 1, 0, 0, 0, 309, 310, 5, 45, 0, 0, 310, 55, 1, 0, 0, 0, 27, 61, 66, 68, 74, 84, 90, 97, 115, 125, 135, 139, 157, 166, 172, 194, 210, 214, 227, 235, 247, 254, 268, 275, 284, 290, 295, 304]
\ No newline at end of file
+[4, 1, 49, 330, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 66, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 71, 8, 0, 10, 0, 12, 0, 74, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 79, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 3, 3, 89, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 95, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 102, 8, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 120, 8, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 5, 8, 128, 8, 8, 10, 8, 12, 8, 131, 9, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 5, 10, 138, 8, 10, 10, 10, 12, 10, 141, 9, 10, 1, 10, 3, 10, 144, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 162, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 169, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 191, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 207, 8, 14, 1, 15, 1, 15, 3, 15, 211, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 224, 8, 16, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 230, 8, 16, 10, 16, 12, 16, 233, 9, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 3, 19, 244, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 249, 8, 19, 10, 19, 12, 19, 252, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 3, 21, 265, 8, 21, 1, 21, 1, 21, 1, 21, 5, 21, 270, 8, 21, 10, 21, 12, 21, 273, 9, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 3, 22, 281, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 3, 23, 287, 8, 23, 1, 24, 1, 24, 1, 24, 3, 24, 292, 8, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 5, 25, 299, 8, 25, 10, 25, 12, 25, 302, 9, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 310, 8, 26, 10, 26, 12, 26, 313, 9, 26, 1, 26, 1, 26, 3, 26, 317, 8, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 0, 1, 32, 30, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 342, 0, 60, 1, 0, 0, 0, 2, 78, 1, 0, 0, 0, 4, 84, 1, 0, 0, 0, 6, 88, 1, 0, 0, 0, 8, 94, 1, 0, 0, 0, 10, 96, 1, 0, 0, 0, 12, 106, 1, 0, 0, 0, 14, 115, 1, 0, 0, 0, 16, 124, 1, 0, 0, 0, 18, 132, 1, 0, 0, 0, 20, 135, 1, 0, 0, 0, 22, 147, 1, 0, 0, 0, 24, 150, 1, 0, 0, 0, 26, 161, 1, 0, 0, 0, 28, 206, 1, 0, 0, 0, 30, 210, 1, 0, 0, 0, 32, 223, 1, 0, 0, 0, 34, 234, 1, 0, 0, 0, 36, 236, 1, 0, 0, 0, 38, 243, 1, 0, 0, 0, 40, 255, 1, 0, 0, 0, 42, 264, 1, 0, 0, 0, 44, 276, 1, 0, 0, 0, 46, 286, 1, 0, 0, 0, 48, 288, 1, 0, 0, 0, 50, 295, 1, 0, 0, 0, 52, 303, 1, 0, 0, 0, 54, 318, 1, 0, 0, 0, 56, 325, 1, 0, 0, 0, 58, 327, 1, 0, 0, 0, 60, 61, 5, 17, 0, 0, 61, 62, 5, 1, 0, 0, 62, 63, 3, 58, 29, 0, 63, 65, 5, 2, 0, 0, 64, 66, 3, 12, 6, 0, 65, 64, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 72, 1, 0, 0, 0, 67, 71, 3, 2, 1, 0, 68, 71, 3, 10, 5, 0, 69, 71, 3, 14, 7, 0, 70, 67, 1, 0, 0, 0, 70, 68, 1, 0, 0, 0, 70, 69, 1, 0, 0, 0, 71, 74, 1, 0, 0, 0, 72, 70, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 75, 1, 0, 0, 0, 74, 72, 1, 0, 0, 0, 75, 76, 5, 3, 0, 0, 76, 1, 1, 0, 0, 0, 77, 79, 5, 17, 0, 0, 78, 77, 1, 0, 0, 0, 78, 79, 1, 0, 0, 0, 79, 80, 1, 0, 0, 0, 80, 81, 3, 8, 4, 0, 81, 82, 3, 58, 29, 0, 82, 83, 5, 4, 0, 0, 83, 3, 1, 0, 0, 0, 84, 85, 7, 0, 0, 0, 85, 5, 1, 0, 0, 0, 86, 89, 3, 8, 4, 0, 87, 89, 5, 41, 0, 0, 88, 86, 1, 0, 0, 0, 88, 87, 1, 0, 0, 0, 89, 7, 1, 0, 0, 0, 90, 95, 5, 39, 0, 0, 91, 95, 5, 40, 0, 0, 92, 95, 5, 42, 0, 0, 93, 95, 3, 58, 29, 0, 94, 90, 1, 0, 0, 0, 94, 91, 1, 0, 0, 0, 94, 92, 1, 0, 0, 0, 94, 93, 1, 0, 0, 0, 95, 9, 1, 0, 0, 0, 96, 97, 5, 17, 0, 0, 97, 98, 3, 6, 3, 0, 98, 99, 3, 58, 29, 0, 99, 101, 5, 5, 0, 0, 100, 102, 3, 16, 8, 0, 101, 100, 1, 0, 0, 0, 101, 102, 1, 0, 0, 0, 102, 103, 1, 0, 0, 0, 103, 104, 5, 6, 0, 0, 104, 105, 3, 20, 10, 0, 105, 11, 1, 0, 0, 0, 106, 107, 5, 17, 0, 0, 107, 108, 5, 7, 0, 0, 108, 109, 5, 41, 0, 0, 109, 110, 5, 8, 0, 0, 110, 111, 5, 5, 0, 0, 111, 112, 5, 9, 0, 0, 112, 113, 5, 6, 0, 0, 113, 114, 3, 20, 10, 0, 114, 13, 1, 0, 0, 0, 115, 116, 5, 17, 0, 0, 116, 117, 3, 58, 29, 0, 117, 119, 5, 5, 0, 0, 118, 120, 3, 16, 8, 0, 119, 118, 1, 0, 0, 0, 119, 120, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 122, 5, 6, 0, 0, 122, 123, 3, 20, 10, 0, 123, 15, 1, 0, 0, 0, 124, 129, 3, 18, 9, 0, 125, 126, 5, 10, 0, 0, 126, 128, 3, 18, 9, 0, 127, 125, 1, 0, 0, 0, 128, 131, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 129, 130, 1, 0, 0, 0, 130, 17, 1, 0, 0, 0, 131, 129, 1, 0, 0, 0, 132, 133, 3, 8, 4, 0, 133, 134, 3, 58, 29, 0, 134, 19, 1, 0, 0, 0, 135, 139, 5, 2, 0, 0, 136, 138, 3, 28, 14, 0, 137, 136, 1, 0, 0, 0, 138, 141, 1, 0, 0, 0, 139, 137, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140, 143, 1, 0, 0, 0, 141, 139, 1, 0, 0, 0, 142, 144, 3, 26, 13, 0, 143, 142, 1, 0, 0, 0, 143, 144, 1, 0, 0, 0, 144, 145, 1, 0, 0, 0, 145, 146, 5, 3, 0, 0, 146, 21, 1, 0, 0, 0, 147, 148, 3, 8, 4, 0, 148, 149, 3, 58, 29, 0, 149, 23, 1, 0, 0, 0, 150, 151, 3, 8, 4, 0, 151, 152, 3, 58, 29, 0, 152, 153, 5, 34, 0, 0, 153, 154, 3, 32, 16, 0, 154, 25, 1, 0, 0, 0, 155, 156, 5, 11, 0, 0, 156, 157, 3, 32, 16, 0, 157, 158, 5, 4, 0, 0, 158, 162, 1, 0, 0, 0, 159, 160, 5, 11, 0, 0, 160, 162, 5, 4, 0, 0, 161, 155, 1, 0, 0, 0, 161, 159, 1, 0, 0, 0, 162, 27, 1, 0, 0, 0, 163, 207, 3, 52, 26, 0, 164, 165, 5, 12, 0, 0, 165, 168, 5, 5, 0, 0, 166, 169, 3, 40, 20, 0, 167, 169, 3, 24, 12, 0, 168, 166, 1, 0, 0, 0, 168, 167, 1, 0, 0, 0, 169, 170, 1, 0, 0, 0, 170, 171, 5, 4, 0, 0, 171, 172, 3, 32, 16, 0, 172, 173, 5, 4, 0, 0, 173, 174, 3, 40, 20, 0, 174, 175, 5, 6, 0, 0, 175, 176, 3, 20, 10, 0, 176, 207, 1, 0, 0, 0, 177, 178, 5, 13, 0, 0, 178, 179, 5, 5, 0, 0, 179, 180, 3, 32, 16, 0, 180, 181, 5, 6, 0, 0, 181, 182, 3, 20, 10, 0, 182, 207, 1, 0, 0, 0, 183, 184, 5, 14, 0, 0, 184, 185, 3, 20, 10, 0, 185, 186, 5, 13, 0, 0, 186, 187, 5, 5, 0, 0, 187, 188, 3, 32, 16, 0, 188, 190, 5, 6, 0, 0, 189, 191, 5, 4, 0, 0, 190, 189, 1, 0, 0, 0, 190, 191, 1, 0, 0, 0, 191, 207, 1, 0, 0, 0, 192, 193, 5, 15, 0, 0, 193, 207, 5, 4, 0, 0, 194, 195, 3, 22, 11, 0, 195, 196, 5, 4, 0, 0, 196, 207, 1, 0, 0, 0, 197, 198, 3, 24, 12, 0, 198, 199, 5, 4, 0, 0, 199, 207, 1, 0, 0, 0, 200, 201, 3, 40, 20, 0, 201, 202, 5, 4, 0, 0, 202, 207, 1, 0, 0, 0, 203, 204, 3, 30, 15, 0, 204, 205, 5, 4, 0, 0, 205, 207, 1, 0, 0, 0, 206, 163, 1, 0, 0, 0, 206, 164, 1, 0, 0, 0, 206, 177, 1, 0, 0, 0, 206, 183, 1, 0, 0, 0, 206, 192, 1, 0, 0, 0, 206, 194, 1, 0, 0, 0, 206, 197, 1, 0, 0, 0, 206, 200, 1, 0, 0, 0, 206, 203, 1, 0, 0, 0, 207, 29, 1, 0, 0, 0, 208, 211, 3, 42, 21, 0, 209, 211, 3, 44, 22, 0, 210, 208, 1, 0, 0, 0, 210, 209, 1, 0, 0, 0, 211, 31, 1, 0, 0, 0, 212, 213, 6, 16, -1, 0, 213, 214, 3, 36, 18, 0, 214, 215, 3, 32, 16, 5, 215, 224, 1, 0, 0, 0, 216, 224, 3, 56, 28, 0, 217, 218, 5, 5, 0, 0, 218, 219, 3, 32, 16, 0, 219, 220, 5, 6, 0, 0, 220, 224, 1, 0, 0, 0, 221, 224, 3, 38, 19, 0, 222, 224, 3, 30, 15, 0, 223, 212, 1, 0, 0, 0, 223, 216, 1, 0, 0, 0, 223, 217, 1, 0, 0, 0, 223, 221, 1, 0, 0, 0, 223, 222, 1, 0, 0, 0, 224, 231, 1, 0, 0, 0, 225, 226, 10, 6, 0, 0, 226, 227, 3, 34, 17, 0, 227, 228, 3, 32, 16, 7, 228, 230, 1, 0, 0, 0, 229, 225, 1, 0, 0, 0, 230, 233, 1, 0, 0, 0, 231, 229, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 33, 1, 0, 0, 0, 233, 231, 1, 0, 0, 0, 234, 235, 7, 1, 0, 0, 235, 35, 1, 0, 0, 0, 236, 237, 7, 2, 0, 0, 237, 37, 1, 0, 0, 0, 238, 239, 5, 20, 0, 0, 239, 244, 5, 16, 0, 0, 240, 241, 3, 44, 22, 0, 241, 242, 5, 16, 0, 0, 242, 244, 1, 0, 0, 0, 243, 238, 1, 0, 0, 0, 243, 240, 1, 0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 250, 1, 0, 0, 0, 245, 246, 3, 46, 23, 0, 246, 247, 5, 16, 0, 0, 247, 249, 1, 0, 0, 0, 248, 245, 1, 0, 0, 0, 249, 252, 1, 0, 0, 0, 250, 248, 1, 0, 0, 0, 250, 251, 1, 0, 0, 0, 251, 253, 1, 0, 0, 0, 252, 250, 1, 0, 0, 0, 253, 254, 3, 58, 29, 0, 254, 39, 1, 0, 0, 0, 255, 256, 3, 38, 19, 0, 256, 257, 3, 4, 2, 0, 257, 258, 3, 32, 16, 0, 258, 41, 1, 0, 0, 0, 259, 260, 5, 20, 0, 0, 260, 265, 5, 16, 0, 0, 261, 262, 3, 44, 22, 0, 262, 263, 5, 16, 0, 0, 263, 265, 1, 0, 0, 0, 264, 259, 1, 0, 0, 0, 264, 261, 1, 0, 0, 0, 264, 265, 1, 0, 0, 0, 265, 271, 1, 0, 0, 0, 266, 267, 3, 46, 23, 0, 267, 268, 5, 16, 0, 0, 268, 270, 1, 0, 0, 0, 269, 266, 1, 0, 0, 0, 270, 273, 1, 0, 0, 0, 271, 269, 1, 0, 0, 0, 271, 272, 1, 0, 0, 0, 272, 274, 1, 0, 0, 0, 273, 271, 1, 0, 0, 0, 274, 275, 3, 48, 24, 0, 275, 43, 1, 0, 0, 0, 276, 277, 5, 18, 0, 0, 277, 278, 3, 8, 4, 0, 278, 280, 5, 5, 0, 0, 279, 281, 3, 50, 25, 0, 280, 279, 1, 0, 0, 0, 280, 281, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 283, 5, 6, 0, 0, 283, 45, 1, 0, 0, 0, 284, 287, 3, 48, 24, 0, 285, 287, 3, 58, 29, 0, 286, 284, 1, 0, 0, 0, 286, 285, 1, 0, 0, 0, 287, 47, 1, 0, 0, 0, 288, 289, 3, 58, 29, 0, 289, 291, 5, 5, 0, 0, 290, 292, 3, 50, 25, 0, 291, 290, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 293, 1, 0, 0, 0, 293, 294, 5, 6, 0, 0, 294, 49, 1, 0, 0, 0, 295, 300, 3, 32, 16, 0, 296, 297, 5, 10, 0, 0, 297, 299, 3, 32, 16, 0, 298, 296, 1, 0, 0, 0, 299, 302, 1, 0, 0, 0, 300, 298, 1, 0, 0, 0, 300, 301, 1, 0, 0, 0, 301, 51, 1, 0, 0, 0, 302, 300, 1, 0, 0, 0, 303, 304, 5, 21, 0, 0, 304, 305, 5, 5, 0, 0, 305, 306, 3, 32, 16, 0, 306, 307, 5, 6, 0, 0, 307, 311, 3, 20, 10, 0, 308, 310, 3, 54, 27, 0, 309, 308, 1, 0, 0, 0, 310, 313, 1, 0, 0, 0, 311, 309, 1, 0, 0, 0, 311, 312, 1, 0, 0, 0, 312, 316, 1, 0, 0, 0, 313, 311, 1, 0, 0, 0, 314, 315, 5, 22, 0, 0, 315, 317, 3, 20, 10, 0, 316, 314, 1, 0, 0, 0, 316, 317, 1, 0, 0, 0, 317, 53, 1, 0, 0, 0, 318, 319, 5, 22, 0, 0, 319, 320, 5, 21, 0, 0, 320, 321, 5, 5, 0, 0, 321, 322, 3, 32, 16, 0, 322, 323, 5, 6, 0, 0, 323, 324, 3, 20, 10, 0, 324, 55, 1, 0, 0, 0, 325, 326, 7, 3, 0, 0, 326, 57, 1, 0, 0, 0, 327, 328, 5, 45, 0, 0, 328, 59, 1, 0, 0, 0, 28, 65, 70, 72, 78, 88, 94, 101, 119, 129, 139, 143, 161, 168, 190, 206, 210, 223, 231, 243, 250, 264, 271, 280, 286, 291, 300, 311, 316]
\ No newline at end of file
diff --git a/src/main/java/de/maishai/antlr/Decaf.tokens b/src/main/java/de/maishai/antlr/Decaf.tokens
index 2cd07b1..5b42434 100644
--- a/src/main/java/de/maishai/antlr/Decaf.tokens
+++ b/src/main/java/de/maishai/antlr/Decaf.tokens
@@ -14,12 +14,12 @@ T__12=13
 T__13=14
 T__14=15
 T__15=16
-T__16=17
-T__17=18
-PUBLIC=19
-NEW=20
-NULL=21
-THIS=22
+PUBLIC=17
+NEW=18
+NULL=19
+THIS=20
+IF=21
+ELSE=22
 SUB=23
 ADD=24
 MUL=25
@@ -58,17 +58,17 @@ LINE_COMMENT=49
 'String[] args'=9
 ','=10
 'return'=11
-'if'=12
-'else'=13
-'for'=14
-'while'=15
-'do'=16
-'break'=17
-'.'=18
-'public'=19
-'new'=20
-'null'=21
-'this'=22
+'for'=12
+'while'=13
+'do'=14
+'break'=15
+'.'=16
+'public'=17
+'new'=18
+'null'=19
+'this'=20
+'if'=21
+'else'=22
 '-'=23
 '+'=24
 '*'=25
diff --git a/src/main/java/de/maishai/antlr/DecafBaseListener.java b/src/main/java/de/maishai/antlr/DecafBaseListener.java
index f675d24..a287f31 100644
--- a/src/main/java/de/maishai/antlr/DecafBaseListener.java
+++ b/src/main/java/de/maishai/antlr/DecafBaseListener.java
@@ -492,6 +492,30 @@ public class DecafBaseListener implements DecafListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitArgs(DecafParser.ArgsContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIfCall(DecafParser.IfCallContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIfCall(DecafParser.IfCallContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterElseIf(DecafParser.ElseIfContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitElseIf(DecafParser.ElseIfContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
index f603dea..a162beb 100644
--- a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
+++ b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
@@ -292,6 +292,20 @@ public class DecafBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitArgs(DecafParser.ArgsContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitIfCall(DecafParser.IfCallContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitElseIf(DecafParser.ElseIfContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/src/main/java/de/maishai/antlr/DecafLexer.interp b/src/main/java/de/maishai/antlr/DecafLexer.interp
index 2649ac7..74b236d 100644
--- a/src/main/java/de/maishai/antlr/DecafLexer.interp
+++ b/src/main/java/de/maishai/antlr/DecafLexer.interp
@@ -11,8 +11,6 @@ null
 'String[] args'
 ','
 'return'
-'if'
-'else'
 'for'
 'while'
 'do'
@@ -22,6 +20,8 @@ null
 'new'
 'null'
 'this'
+'if'
+'else'
 '-'
 '+'
 '*'
@@ -68,12 +68,12 @@ null
 null
 null
 null
-null
-null
 PUBLIC
 NEW
 NULL
 THIS
+IF
+ELSE
 SUB
 ADD
 MUL
@@ -119,12 +119,12 @@ T__12
 T__13
 T__14
 T__15
-T__16
-T__17
 PUBLIC
 NEW
 NULL
 THIS
+IF
+ELSE
 SUB
 ADD
 MUL
@@ -161,4 +161,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[4, 0, 49, 327, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 3, 42, 273, 8, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 4, 44, 280, 8, 44, 11, 44, 12, 44, 281, 1, 44, 5, 44, 285, 8, 44, 10, 44, 12, 44, 288, 9, 44, 4, 44, 290, 8, 44, 11, 44, 12, 44, 291, 1, 45, 4, 45, 295, 8, 45, 11, 45, 12, 45, 296, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 5, 47, 307, 8, 47, 10, 47, 12, 47, 310, 9, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 5, 48, 321, 8, 48, 10, 48, 12, 48, 324, 9, 48, 1, 48, 1, 48, 1, 308, 0, 49, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 95, 48, 97, 49, 1, 0, 5, 1, 0, 39, 39, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 3, 0, 9, 10, 13, 13, 32, 32, 2, 0, 10, 10, 13, 13, 333, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 95, 1, 0, 0, 0, 0, 97, 1, 0, 0, 0, 1, 99, 1, 0, 0, 0, 3, 105, 1, 0, 0, 0, 5, 107, 1, 0, 0, 0, 7, 109, 1, 0, 0, 0, 9, 111, 1, 0, 0, 0, 11, 113, 1, 0, 0, 0, 13, 115, 1, 0, 0, 0, 15, 122, 1, 0, 0, 0, 17, 127, 1, 0, 0, 0, 19, 141, 1, 0, 0, 0, 21, 143, 1, 0, 0, 0, 23, 150, 1, 0, 0, 0, 25, 153, 1, 0, 0, 0, 27, 158, 1, 0, 0, 0, 29, 162, 1, 0, 0, 0, 31, 168, 1, 0, 0, 0, 33, 171, 1, 0, 0, 0, 35, 177, 1, 0, 0, 0, 37, 179, 1, 0, 0, 0, 39, 186, 1, 0, 0, 0, 41, 190, 1, 0, 0, 0, 43, 195, 1, 0, 0, 0, 45, 200, 1, 0, 0, 0, 47, 202, 1, 0, 0, 0, 49, 204, 1, 0, 0, 0, 51, 206, 1, 0, 0, 0, 53, 208, 1, 0, 0, 0, 55, 210, 1, 0, 0, 0, 57, 213, 1, 0, 0, 0, 59, 216, 1, 0, 0, 0, 61, 219, 1, 0, 0, 0, 63, 222, 1, 0, 0, 0, 65, 225, 1, 0, 0, 0, 67, 228, 1, 0, 0, 0, 69, 230, 1, 0, 0, 0, 71, 233, 1, 0, 0, 0, 73, 236, 1, 0, 0, 0, 75, 239, 1, 0, 0, 0, 77, 241, 1, 0, 0, 0, 79, 245, 1, 0, 0, 0, 81, 253, 1, 0, 0, 0, 83, 258, 1, 0, 0, 0, 85, 272, 1, 0, 0, 0, 87, 274, 1, 0, 0, 0, 89, 289, 1, 0, 0, 0, 91, 294, 1, 0, 0, 0, 93, 298, 1, 0, 0, 0, 95, 302, 1, 0, 0, 0, 97, 316, 1, 0, 0, 0, 99, 100, 5, 99, 0, 0, 100, 101, 5, 108, 0, 0, 101, 102, 5, 97, 0, 0, 102, 103, 5, 115, 0, 0, 103, 104, 5, 115, 0, 0, 104, 2, 1, 0, 0, 0, 105, 106, 5, 123, 0, 0, 106, 4, 1, 0, 0, 0, 107, 108, 5, 125, 0, 0, 108, 6, 1, 0, 0, 0, 109, 110, 5, 59, 0, 0, 110, 8, 1, 0, 0, 0, 111, 112, 5, 40, 0, 0, 112, 10, 1, 0, 0, 0, 113, 114, 5, 41, 0, 0, 114, 12, 1, 0, 0, 0, 115, 116, 5, 115, 0, 0, 116, 117, 5, 116, 0, 0, 117, 118, 5, 97, 0, 0, 118, 119, 5, 116, 0, 0, 119, 120, 5, 105, 0, 0, 120, 121, 5, 99, 0, 0, 121, 14, 1, 0, 0, 0, 122, 123, 5, 109, 0, 0, 123, 124, 5, 97, 0, 0, 124, 125, 5, 105, 0, 0, 125, 126, 5, 110, 0, 0, 126, 16, 1, 0, 0, 0, 127, 128, 5, 83, 0, 0, 128, 129, 5, 116, 0, 0, 129, 130, 5, 114, 0, 0, 130, 131, 5, 105, 0, 0, 131, 132, 5, 110, 0, 0, 132, 133, 5, 103, 0, 0, 133, 134, 5, 91, 0, 0, 134, 135, 5, 93, 0, 0, 135, 136, 5, 32, 0, 0, 136, 137, 5, 97, 0, 0, 137, 138, 5, 114, 0, 0, 138, 139, 5, 103, 0, 0, 139, 140, 5, 115, 0, 0, 140, 18, 1, 0, 0, 0, 141, 142, 5, 44, 0, 0, 142, 20, 1, 0, 0, 0, 143, 144, 5, 114, 0, 0, 144, 145, 5, 101, 0, 0, 145, 146, 5, 116, 0, 0, 146, 147, 5, 117, 0, 0, 147, 148, 5, 114, 0, 0, 148, 149, 5, 110, 0, 0, 149, 22, 1, 0, 0, 0, 150, 151, 5, 105, 0, 0, 151, 152, 5, 102, 0, 0, 152, 24, 1, 0, 0, 0, 153, 154, 5, 101, 0, 0, 154, 155, 5, 108, 0, 0, 155, 156, 5, 115, 0, 0, 156, 157, 5, 101, 0, 0, 157, 26, 1, 0, 0, 0, 158, 159, 5, 102, 0, 0, 159, 160, 5, 111, 0, 0, 160, 161, 5, 114, 0, 0, 161, 28, 1, 0, 0, 0, 162, 163, 5, 119, 0, 0, 163, 164, 5, 104, 0, 0, 164, 165, 5, 105, 0, 0, 165, 166, 5, 108, 0, 0, 166, 167, 5, 101, 0, 0, 167, 30, 1, 0, 0, 0, 168, 169, 5, 100, 0, 0, 169, 170, 5, 111, 0, 0, 170, 32, 1, 0, 0, 0, 171, 172, 5, 98, 0, 0, 172, 173, 5, 114, 0, 0, 173, 174, 5, 101, 0, 0, 174, 175, 5, 97, 0, 0, 175, 176, 5, 107, 0, 0, 176, 34, 1, 0, 0, 0, 177, 178, 5, 46, 0, 0, 178, 36, 1, 0, 0, 0, 179, 180, 5, 112, 0, 0, 180, 181, 5, 117, 0, 0, 181, 182, 5, 98, 0, 0, 182, 183, 5, 108, 0, 0, 183, 184, 5, 105, 0, 0, 184, 185, 5, 99, 0, 0, 185, 38, 1, 0, 0, 0, 186, 187, 5, 110, 0, 0, 187, 188, 5, 101, 0, 0, 188, 189, 5, 119, 0, 0, 189, 40, 1, 0, 0, 0, 190, 191, 5, 110, 0, 0, 191, 192, 5, 117, 0, 0, 192, 193, 5, 108, 0, 0, 193, 194, 5, 108, 0, 0, 194, 42, 1, 0, 0, 0, 195, 196, 5, 116, 0, 0, 196, 197, 5, 104, 0, 0, 197, 198, 5, 105, 0, 0, 198, 199, 5, 115, 0, 0, 199, 44, 1, 0, 0, 0, 200, 201, 5, 45, 0, 0, 201, 46, 1, 0, 0, 0, 202, 203, 5, 43, 0, 0, 203, 48, 1, 0, 0, 0, 204, 205, 5, 42, 0, 0, 205, 50, 1, 0, 0, 0, 206, 207, 5, 62, 0, 0, 207, 52, 1, 0, 0, 0, 208, 209, 5, 60, 0, 0, 209, 54, 1, 0, 0, 0, 210, 211, 5, 62, 0, 0, 211, 212, 5, 61, 0, 0, 212, 56, 1, 0, 0, 0, 213, 214, 5, 60, 0, 0, 214, 215, 5, 61, 0, 0, 215, 58, 1, 0, 0, 0, 216, 217, 5, 61, 0, 0, 217, 218, 5, 61, 0, 0, 218, 60, 1, 0, 0, 0, 219, 220, 5, 33, 0, 0, 220, 221, 5, 61, 0, 0, 221, 62, 1, 0, 0, 0, 222, 223, 5, 38, 0, 0, 223, 224, 5, 38, 0, 0, 224, 64, 1, 0, 0, 0, 225, 226, 5, 124, 0, 0, 226, 227, 5, 124, 0, 0, 227, 66, 1, 0, 0, 0, 228, 229, 5, 61, 0, 0, 229, 68, 1, 0, 0, 0, 230, 231, 5, 43, 0, 0, 231, 232, 5, 61, 0, 0, 232, 70, 1, 0, 0, 0, 233, 234, 5, 45, 0, 0, 234, 235, 5, 61, 0, 0, 235, 72, 1, 0, 0, 0, 236, 237, 5, 42, 0, 0, 237, 238, 5, 61, 0, 0, 238, 74, 1, 0, 0, 0, 239, 240, 5, 33, 0, 0, 240, 76, 1, 0, 0, 0, 241, 242, 5, 105, 0, 0, 242, 243, 5, 110, 0, 0, 243, 244, 5, 116, 0, 0, 244, 78, 1, 0, 0, 0, 245, 246, 5, 98, 0, 0, 246, 247, 5, 111, 0, 0, 247, 248, 5, 111, 0, 0, 248, 249, 5, 108, 0, 0, 249, 250, 5, 101, 0, 0, 250, 251, 5, 97, 0, 0, 251, 252, 5, 110, 0, 0, 252, 80, 1, 0, 0, 0, 253, 254, 5, 118, 0, 0, 254, 255, 5, 111, 0, 0, 255, 256, 5, 105, 0, 0, 256, 257, 5, 100, 0, 0, 257, 82, 1, 0, 0, 0, 258, 259, 5, 99, 0, 0, 259, 260, 5, 104, 0, 0, 260, 261, 5, 97, 0, 0, 261, 262, 5, 114, 0, 0, 262, 84, 1, 0, 0, 0, 263, 264, 5, 116, 0, 0, 264, 265, 5, 114, 0, 0, 265, 266, 5, 117, 0, 0, 266, 273, 5, 101, 0, 0, 267, 268, 5, 102, 0, 0, 268, 269, 5, 97, 0, 0, 269, 270, 5, 108, 0, 0, 270, 271, 5, 115, 0, 0, 271, 273, 5, 101, 0, 0, 272, 263, 1, 0, 0, 0, 272, 267, 1, 0, 0, 0, 273, 86, 1, 0, 0, 0, 274, 275, 7, 0, 0, 0, 275, 276, 7, 1, 0, 0, 276, 277, 7, 0, 0, 0, 277, 88, 1, 0, 0, 0, 278, 280, 7, 1, 0, 0, 279, 278, 1, 0, 0, 0, 280, 281, 1, 0, 0, 0, 281, 279, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 286, 1, 0, 0, 0, 283, 285, 7, 2, 0, 0, 284, 283, 1, 0, 0, 0, 285, 288, 1, 0, 0, 0, 286, 284, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 290, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 289, 279, 1, 0, 0, 0, 290, 291, 1, 0, 0, 0, 291, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 90, 1, 0, 0, 0, 293, 295, 7, 2, 0, 0, 294, 293, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 294, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 92, 1, 0, 0, 0, 298, 299, 7, 3, 0, 0, 299, 300, 1, 0, 0, 0, 300, 301, 6, 46, 0, 0, 301, 94, 1, 0, 0, 0, 302, 303, 5, 47, 0, 0, 303, 304, 5, 42, 0, 0, 304, 308, 1, 0, 0, 0, 305, 307, 9, 0, 0, 0, 306, 305, 1, 0, 0, 0, 307, 310, 1, 0, 0, 0, 308, 309, 1, 0, 0, 0, 308, 306, 1, 0, 0, 0, 309, 311, 1, 0, 0, 0, 310, 308, 1, 0, 0, 0, 311, 312, 5, 42, 0, 0, 312, 313, 5, 47, 0, 0, 313, 314, 1, 0, 0, 0, 314, 315, 6, 47, 0, 0, 315, 96, 1, 0, 0, 0, 316, 317, 5, 47, 0, 0, 317, 318, 5, 47, 0, 0, 318, 322, 1, 0, 0, 0, 319, 321, 8, 4, 0, 0, 320, 319, 1, 0, 0, 0, 321, 324, 1, 0, 0, 0, 322, 320, 1, 0, 0, 0, 322, 323, 1, 0, 0, 0, 323, 325, 1, 0, 0, 0, 324, 322, 1, 0, 0, 0, 325, 326, 6, 48, 0, 0, 326, 98, 1, 0, 0, 0, 8, 0, 272, 281, 286, 291, 296, 308, 322, 1, 6, 0, 0]
\ No newline at end of file
+[4, 0, 49, 327, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 3, 42, 273, 8, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 4, 44, 280, 8, 44, 11, 44, 12, 44, 281, 1, 44, 5, 44, 285, 8, 44, 10, 44, 12, 44, 288, 9, 44, 4, 44, 290, 8, 44, 11, 44, 12, 44, 291, 1, 45, 4, 45, 295, 8, 45, 11, 45, 12, 45, 296, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 5, 47, 307, 8, 47, 10, 47, 12, 47, 310, 9, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 5, 48, 321, 8, 48, 10, 48, 12, 48, 324, 9, 48, 1, 48, 1, 48, 1, 308, 0, 49, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 95, 48, 97, 49, 1, 0, 5, 1, 0, 39, 39, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 3, 0, 9, 10, 13, 13, 32, 32, 2, 0, 10, 10, 13, 13, 333, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 95, 1, 0, 0, 0, 0, 97, 1, 0, 0, 0, 1, 99, 1, 0, 0, 0, 3, 105, 1, 0, 0, 0, 5, 107, 1, 0, 0, 0, 7, 109, 1, 0, 0, 0, 9, 111, 1, 0, 0, 0, 11, 113, 1, 0, 0, 0, 13, 115, 1, 0, 0, 0, 15, 122, 1, 0, 0, 0, 17, 127, 1, 0, 0, 0, 19, 141, 1, 0, 0, 0, 21, 143, 1, 0, 0, 0, 23, 150, 1, 0, 0, 0, 25, 154, 1, 0, 0, 0, 27, 160, 1, 0, 0, 0, 29, 163, 1, 0, 0, 0, 31, 169, 1, 0, 0, 0, 33, 171, 1, 0, 0, 0, 35, 178, 1, 0, 0, 0, 37, 182, 1, 0, 0, 0, 39, 187, 1, 0, 0, 0, 41, 192, 1, 0, 0, 0, 43, 195, 1, 0, 0, 0, 45, 200, 1, 0, 0, 0, 47, 202, 1, 0, 0, 0, 49, 204, 1, 0, 0, 0, 51, 206, 1, 0, 0, 0, 53, 208, 1, 0, 0, 0, 55, 210, 1, 0, 0, 0, 57, 213, 1, 0, 0, 0, 59, 216, 1, 0, 0, 0, 61, 219, 1, 0, 0, 0, 63, 222, 1, 0, 0, 0, 65, 225, 1, 0, 0, 0, 67, 228, 1, 0, 0, 0, 69, 230, 1, 0, 0, 0, 71, 233, 1, 0, 0, 0, 73, 236, 1, 0, 0, 0, 75, 239, 1, 0, 0, 0, 77, 241, 1, 0, 0, 0, 79, 245, 1, 0, 0, 0, 81, 253, 1, 0, 0, 0, 83, 258, 1, 0, 0, 0, 85, 272, 1, 0, 0, 0, 87, 274, 1, 0, 0, 0, 89, 289, 1, 0, 0, 0, 91, 294, 1, 0, 0, 0, 93, 298, 1, 0, 0, 0, 95, 302, 1, 0, 0, 0, 97, 316, 1, 0, 0, 0, 99, 100, 5, 99, 0, 0, 100, 101, 5, 108, 0, 0, 101, 102, 5, 97, 0, 0, 102, 103, 5, 115, 0, 0, 103, 104, 5, 115, 0, 0, 104, 2, 1, 0, 0, 0, 105, 106, 5, 123, 0, 0, 106, 4, 1, 0, 0, 0, 107, 108, 5, 125, 0, 0, 108, 6, 1, 0, 0, 0, 109, 110, 5, 59, 0, 0, 110, 8, 1, 0, 0, 0, 111, 112, 5, 40, 0, 0, 112, 10, 1, 0, 0, 0, 113, 114, 5, 41, 0, 0, 114, 12, 1, 0, 0, 0, 115, 116, 5, 115, 0, 0, 116, 117, 5, 116, 0, 0, 117, 118, 5, 97, 0, 0, 118, 119, 5, 116, 0, 0, 119, 120, 5, 105, 0, 0, 120, 121, 5, 99, 0, 0, 121, 14, 1, 0, 0, 0, 122, 123, 5, 109, 0, 0, 123, 124, 5, 97, 0, 0, 124, 125, 5, 105, 0, 0, 125, 126, 5, 110, 0, 0, 126, 16, 1, 0, 0, 0, 127, 128, 5, 83, 0, 0, 128, 129, 5, 116, 0, 0, 129, 130, 5, 114, 0, 0, 130, 131, 5, 105, 0, 0, 131, 132, 5, 110, 0, 0, 132, 133, 5, 103, 0, 0, 133, 134, 5, 91, 0, 0, 134, 135, 5, 93, 0, 0, 135, 136, 5, 32, 0, 0, 136, 137, 5, 97, 0, 0, 137, 138, 5, 114, 0, 0, 138, 139, 5, 103, 0, 0, 139, 140, 5, 115, 0, 0, 140, 18, 1, 0, 0, 0, 141, 142, 5, 44, 0, 0, 142, 20, 1, 0, 0, 0, 143, 144, 5, 114, 0, 0, 144, 145, 5, 101, 0, 0, 145, 146, 5, 116, 0, 0, 146, 147, 5, 117, 0, 0, 147, 148, 5, 114, 0, 0, 148, 149, 5, 110, 0, 0, 149, 22, 1, 0, 0, 0, 150, 151, 5, 102, 0, 0, 151, 152, 5, 111, 0, 0, 152, 153, 5, 114, 0, 0, 153, 24, 1, 0, 0, 0, 154, 155, 5, 119, 0, 0, 155, 156, 5, 104, 0, 0, 156, 157, 5, 105, 0, 0, 157, 158, 5, 108, 0, 0, 158, 159, 5, 101, 0, 0, 159, 26, 1, 0, 0, 0, 160, 161, 5, 100, 0, 0, 161, 162, 5, 111, 0, 0, 162, 28, 1, 0, 0, 0, 163, 164, 5, 98, 0, 0, 164, 165, 5, 114, 0, 0, 165, 166, 5, 101, 0, 0, 166, 167, 5, 97, 0, 0, 167, 168, 5, 107, 0, 0, 168, 30, 1, 0, 0, 0, 169, 170, 5, 46, 0, 0, 170, 32, 1, 0, 0, 0, 171, 172, 5, 112, 0, 0, 172, 173, 5, 117, 0, 0, 173, 174, 5, 98, 0, 0, 174, 175, 5, 108, 0, 0, 175, 176, 5, 105, 0, 0, 176, 177, 5, 99, 0, 0, 177, 34, 1, 0, 0, 0, 178, 179, 5, 110, 0, 0, 179, 180, 5, 101, 0, 0, 180, 181, 5, 119, 0, 0, 181, 36, 1, 0, 0, 0, 182, 183, 5, 110, 0, 0, 183, 184, 5, 117, 0, 0, 184, 185, 5, 108, 0, 0, 185, 186, 5, 108, 0, 0, 186, 38, 1, 0, 0, 0, 187, 188, 5, 116, 0, 0, 188, 189, 5, 104, 0, 0, 189, 190, 5, 105, 0, 0, 190, 191, 5, 115, 0, 0, 191, 40, 1, 0, 0, 0, 192, 193, 5, 105, 0, 0, 193, 194, 5, 102, 0, 0, 194, 42, 1, 0, 0, 0, 195, 196, 5, 101, 0, 0, 196, 197, 5, 108, 0, 0, 197, 198, 5, 115, 0, 0, 198, 199, 5, 101, 0, 0, 199, 44, 1, 0, 0, 0, 200, 201, 5, 45, 0, 0, 201, 46, 1, 0, 0, 0, 202, 203, 5, 43, 0, 0, 203, 48, 1, 0, 0, 0, 204, 205, 5, 42, 0, 0, 205, 50, 1, 0, 0, 0, 206, 207, 5, 62, 0, 0, 207, 52, 1, 0, 0, 0, 208, 209, 5, 60, 0, 0, 209, 54, 1, 0, 0, 0, 210, 211, 5, 62, 0, 0, 211, 212, 5, 61, 0, 0, 212, 56, 1, 0, 0, 0, 213, 214, 5, 60, 0, 0, 214, 215, 5, 61, 0, 0, 215, 58, 1, 0, 0, 0, 216, 217, 5, 61, 0, 0, 217, 218, 5, 61, 0, 0, 218, 60, 1, 0, 0, 0, 219, 220, 5, 33, 0, 0, 220, 221, 5, 61, 0, 0, 221, 62, 1, 0, 0, 0, 222, 223, 5, 38, 0, 0, 223, 224, 5, 38, 0, 0, 224, 64, 1, 0, 0, 0, 225, 226, 5, 124, 0, 0, 226, 227, 5, 124, 0, 0, 227, 66, 1, 0, 0, 0, 228, 229, 5, 61, 0, 0, 229, 68, 1, 0, 0, 0, 230, 231, 5, 43, 0, 0, 231, 232, 5, 61, 0, 0, 232, 70, 1, 0, 0, 0, 233, 234, 5, 45, 0, 0, 234, 235, 5, 61, 0, 0, 235, 72, 1, 0, 0, 0, 236, 237, 5, 42, 0, 0, 237, 238, 5, 61, 0, 0, 238, 74, 1, 0, 0, 0, 239, 240, 5, 33, 0, 0, 240, 76, 1, 0, 0, 0, 241, 242, 5, 105, 0, 0, 242, 243, 5, 110, 0, 0, 243, 244, 5, 116, 0, 0, 244, 78, 1, 0, 0, 0, 245, 246, 5, 98, 0, 0, 246, 247, 5, 111, 0, 0, 247, 248, 5, 111, 0, 0, 248, 249, 5, 108, 0, 0, 249, 250, 5, 101, 0, 0, 250, 251, 5, 97, 0, 0, 251, 252, 5, 110, 0, 0, 252, 80, 1, 0, 0, 0, 253, 254, 5, 118, 0, 0, 254, 255, 5, 111, 0, 0, 255, 256, 5, 105, 0, 0, 256, 257, 5, 100, 0, 0, 257, 82, 1, 0, 0, 0, 258, 259, 5, 99, 0, 0, 259, 260, 5, 104, 0, 0, 260, 261, 5, 97, 0, 0, 261, 262, 5, 114, 0, 0, 262, 84, 1, 0, 0, 0, 263, 264, 5, 116, 0, 0, 264, 265, 5, 114, 0, 0, 265, 266, 5, 117, 0, 0, 266, 273, 5, 101, 0, 0, 267, 268, 5, 102, 0, 0, 268, 269, 5, 97, 0, 0, 269, 270, 5, 108, 0, 0, 270, 271, 5, 115, 0, 0, 271, 273, 5, 101, 0, 0, 272, 263, 1, 0, 0, 0, 272, 267, 1, 0, 0, 0, 273, 86, 1, 0, 0, 0, 274, 275, 7, 0, 0, 0, 275, 276, 7, 1, 0, 0, 276, 277, 7, 0, 0, 0, 277, 88, 1, 0, 0, 0, 278, 280, 7, 1, 0, 0, 279, 278, 1, 0, 0, 0, 280, 281, 1, 0, 0, 0, 281, 279, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 286, 1, 0, 0, 0, 283, 285, 7, 2, 0, 0, 284, 283, 1, 0, 0, 0, 285, 288, 1, 0, 0, 0, 286, 284, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 290, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 289, 279, 1, 0, 0, 0, 290, 291, 1, 0, 0, 0, 291, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 90, 1, 0, 0, 0, 293, 295, 7, 2, 0, 0, 294, 293, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 294, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 92, 1, 0, 0, 0, 298, 299, 7, 3, 0, 0, 299, 300, 1, 0, 0, 0, 300, 301, 6, 46, 0, 0, 301, 94, 1, 0, 0, 0, 302, 303, 5, 47, 0, 0, 303, 304, 5, 42, 0, 0, 304, 308, 1, 0, 0, 0, 305, 307, 9, 0, 0, 0, 306, 305, 1, 0, 0, 0, 307, 310, 1, 0, 0, 0, 308, 309, 1, 0, 0, 0, 308, 306, 1, 0, 0, 0, 309, 311, 1, 0, 0, 0, 310, 308, 1, 0, 0, 0, 311, 312, 5, 42, 0, 0, 312, 313, 5, 47, 0, 0, 313, 314, 1, 0, 0, 0, 314, 315, 6, 47, 0, 0, 315, 96, 1, 0, 0, 0, 316, 317, 5, 47, 0, 0, 317, 318, 5, 47, 0, 0, 318, 322, 1, 0, 0, 0, 319, 321, 8, 4, 0, 0, 320, 319, 1, 0, 0, 0, 321, 324, 1, 0, 0, 0, 322, 320, 1, 0, 0, 0, 322, 323, 1, 0, 0, 0, 323, 325, 1, 0, 0, 0, 324, 322, 1, 0, 0, 0, 325, 326, 6, 48, 0, 0, 326, 98, 1, 0, 0, 0, 8, 0, 272, 281, 286, 291, 296, 308, 322, 1, 6, 0, 0]
\ No newline at end of file
diff --git a/src/main/java/de/maishai/antlr/DecafLexer.java b/src/main/java/de/maishai/antlr/DecafLexer.java
index 772a592..b156dad 100644
--- a/src/main/java/de/maishai/antlr/DecafLexer.java
+++ b/src/main/java/de/maishai/antlr/DecafLexer.java
@@ -18,9 +18,9 @@ public class DecafLexer extends Lexer {
 		new PredictionContextCache();
 	public static final int
 		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
-		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, PUBLIC=19, NEW=20, NULL=21, THIS=22, SUB=23, ADD=24, MUL=25, 
-		GT=26, LT=27, GE=28, LE=29, EQ=30, NE=31, AND=32, OR=33, ASSIGN=34, ADD_ASSIGN=35, 
+		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, PUBLIC=17, 
+		NEW=18, NULL=19, THIS=20, IF=21, ELSE=22, SUB=23, ADD=24, MUL=25, GT=26, 
+		LT=27, GE=28, LE=29, EQ=30, NE=31, AND=32, OR=33, ASSIGN=34, ADD_ASSIGN=35, 
 		SUB_ASSIGN=36, MUL_ASSIGN=37, NOT=38, INT=39, BOOL=40, VOID=41, CHAR=42, 
 		BOOLEANLITERAL=43, CHARLITERAL=44, IDENTIFIER=45, NUMBER=46, WS=47, COMMENT=48, 
 		LINE_COMMENT=49;
@@ -35,9 +35,9 @@ public class DecafLexer extends Lexer {
 	private static String[] makeRuleNames() {
 		return new String[] {
 			"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", 
-			"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", 
-			"T__17", "PUBLIC", "NEW", "NULL", "THIS", "SUB", "ADD", "MUL", "GT", 
-			"LT", "GE", "LE", "EQ", "NE", "AND", "OR", "ASSIGN", "ADD_ASSIGN", "SUB_ASSIGN", 
+			"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "PUBLIC", 
+			"NEW", "NULL", "THIS", "IF", "ELSE", "SUB", "ADD", "MUL", "GT", "LT", 
+			"GE", "LE", "EQ", "NE", "AND", "OR", "ASSIGN", "ADD_ASSIGN", "SUB_ASSIGN", 
 			"MUL_ASSIGN", "NOT", "INT", "BOOL", "VOID", "CHAR", "BOOLEANLITERAL", 
 			"CHARLITERAL", "IDENTIFIER", "NUMBER", "WS", "COMMENT", "LINE_COMMENT"
 		};
@@ -47,8 +47,8 @@ public class DecafLexer extends Lexer {
 	private static String[] makeLiteralNames() {
 		return new String[] {
 			null, "'class'", "'{'", "'}'", "';'", "'('", "')'", "'static'", "'main'", 
-			"'String[] args'", "','", "'return'", "'if'", "'else'", "'for'", "'while'", 
-			"'do'", "'break'", "'.'", "'public'", "'new'", "'null'", "'this'", "'-'", 
+			"'String[] args'", "','", "'return'", "'for'", "'while'", "'do'", "'break'", 
+			"'.'", "'public'", "'new'", "'null'", "'this'", "'if'", "'else'", "'-'", 
 			"'+'", "'*'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'&&'", "'||'", 
 			"'='", "'+='", "'-='", "'*='", "'!'", "'int'", "'boolean'", "'void'", 
 			"'char'"
@@ -58,11 +58,11 @@ public class DecafLexer extends Lexer {
 	private static String[] makeSymbolicNames() {
 		return new String[] {
 			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, "PUBLIC", "NEW", "NULL", "THIS", 
-			"SUB", "ADD", "MUL", "GT", "LT", "GE", "LE", "EQ", "NE", "AND", "OR", 
-			"ASSIGN", "ADD_ASSIGN", "SUB_ASSIGN", "MUL_ASSIGN", "NOT", "INT", "BOOL", 
-			"VOID", "CHAR", "BOOLEANLITERAL", "CHARLITERAL", "IDENTIFIER", "NUMBER", 
-			"WS", "COMMENT", "LINE_COMMENT"
+			null, null, null, null, null, "PUBLIC", "NEW", "NULL", "THIS", "IF", 
+			"ELSE", "SUB", "ADD", "MUL", "GT", "LT", "GE", "LE", "EQ", "NE", "AND", 
+			"OR", "ASSIGN", "ADD_ASSIGN", "SUB_ASSIGN", "MUL_ASSIGN", "NOT", "INT", 
+			"BOOL", "VOID", "CHAR", "BOOLEANLITERAL", "CHARLITERAL", "IDENTIFIER", 
+			"NUMBER", "WS", "COMMENT", "LINE_COMMENT"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -145,13 +145,13 @@ public class DecafLexer extends Lexer {
 		"\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\b\u0001\b\u0001"+
 		"\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001\b\u0001"+
 		"\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001"+
-		"\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f"+
-		"\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\u000e\u0001"+
-		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001"+
+		"\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001"+
+		"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001\r\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+
 		"\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001"+
-		"\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001"+
-		"\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0013\u0001"+
-		"\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001"+
+		"\u0010\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0011\u0001"+
+		"\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001"+
+		"\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001"+
 		"\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001"+
 		"\u0015\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017\u0001\u0018\u0001"+
 		"\u0018\u0001\u0019\u0001\u0019\u0001\u001a\u0001\u001a\u0001\u001b\u0001"+
@@ -201,10 +201,10 @@ public class DecafLexer extends Lexer {
 		"\u0000\u0000\u0000\rs\u0001\u0000\u0000\u0000\u000fz\u0001\u0000\u0000"+
 		"\u0000\u0011\u007f\u0001\u0000\u0000\u0000\u0013\u008d\u0001\u0000\u0000"+
 		"\u0000\u0015\u008f\u0001\u0000\u0000\u0000\u0017\u0096\u0001\u0000\u0000"+
-		"\u0000\u0019\u0099\u0001\u0000\u0000\u0000\u001b\u009e\u0001\u0000\u0000"+
-		"\u0000\u001d\u00a2\u0001\u0000\u0000\u0000\u001f\u00a8\u0001\u0000\u0000"+
-		"\u0000!\u00ab\u0001\u0000\u0000\u0000#\u00b1\u0001\u0000\u0000\u0000%"+
-		"\u00b3\u0001\u0000\u0000\u0000\'\u00ba\u0001\u0000\u0000\u0000)\u00be"+
+		"\u0000\u0019\u009a\u0001\u0000\u0000\u0000\u001b\u00a0\u0001\u0000\u0000"+
+		"\u0000\u001d\u00a3\u0001\u0000\u0000\u0000\u001f\u00a9\u0001\u0000\u0000"+
+		"\u0000!\u00ab\u0001\u0000\u0000\u0000#\u00b2\u0001\u0000\u0000\u0000%"+
+		"\u00b6\u0001\u0000\u0000\u0000\'\u00bb\u0001\u0000\u0000\u0000)\u00c0"+
 		"\u0001\u0000\u0000\u0000+\u00c3\u0001\u0000\u0000\u0000-\u00c8\u0001\u0000"+
 		"\u0000\u0000/\u00ca\u0001\u0000\u0000\u00001\u00cc\u0001\u0000\u0000\u0000"+
 		"3\u00ce\u0001\u0000\u0000\u00005\u00d0\u0001\u0000\u0000\u00007\u00d2"+
@@ -236,90 +236,90 @@ public class DecafLexer extends Lexer {
 		"\u0014\u0001\u0000\u0000\u0000\u008f\u0090\u0005r\u0000\u0000\u0090\u0091"+
 		"\u0005e\u0000\u0000\u0091\u0092\u0005t\u0000\u0000\u0092\u0093\u0005u"+
 		"\u0000\u0000\u0093\u0094\u0005r\u0000\u0000\u0094\u0095\u0005n\u0000\u0000"+
-		"\u0095\u0016\u0001\u0000\u0000\u0000\u0096\u0097\u0005i\u0000\u0000\u0097"+
-		"\u0098\u0005f\u0000\u0000\u0098\u0018\u0001\u0000\u0000\u0000\u0099\u009a"+
-		"\u0005e\u0000\u0000\u009a\u009b\u0005l\u0000\u0000\u009b\u009c\u0005s"+
-		"\u0000\u0000\u009c\u009d\u0005e\u0000\u0000\u009d\u001a\u0001\u0000\u0000"+
-		"\u0000\u009e\u009f\u0005f\u0000\u0000\u009f\u00a0\u0005o\u0000\u0000\u00a0"+
-		"\u00a1\u0005r\u0000\u0000\u00a1\u001c\u0001\u0000\u0000\u0000\u00a2\u00a3"+
-		"\u0005w\u0000\u0000\u00a3\u00a4\u0005h\u0000\u0000\u00a4\u00a5\u0005i"+
-		"\u0000\u0000\u00a5\u00a6\u0005l\u0000\u0000\u00a6\u00a7\u0005e\u0000\u0000"+
-		"\u00a7\u001e\u0001\u0000\u0000\u0000\u00a8\u00a9\u0005d\u0000\u0000\u00a9"+
-		"\u00aa\u0005o\u0000\u0000\u00aa \u0001\u0000\u0000\u0000\u00ab\u00ac\u0005"+
-		"b\u0000\u0000\u00ac\u00ad\u0005r\u0000\u0000\u00ad\u00ae\u0005e\u0000"+
-		"\u0000\u00ae\u00af\u0005a\u0000\u0000\u00af\u00b0\u0005k\u0000\u0000\u00b0"+
-		"\"\u0001\u0000\u0000\u0000\u00b1\u00b2\u0005.\u0000\u0000\u00b2$\u0001"+
-		"\u0000\u0000\u0000\u00b3\u00b4\u0005p\u0000\u0000\u00b4\u00b5\u0005u\u0000"+
-		"\u0000\u00b5\u00b6\u0005b\u0000\u0000\u00b6\u00b7\u0005l\u0000\u0000\u00b7"+
-		"\u00b8\u0005i\u0000\u0000\u00b8\u00b9\u0005c\u0000\u0000\u00b9&\u0001"+
-		"\u0000\u0000\u0000\u00ba\u00bb\u0005n\u0000\u0000\u00bb\u00bc\u0005e\u0000"+
-		"\u0000\u00bc\u00bd\u0005w\u0000\u0000\u00bd(\u0001\u0000\u0000\u0000\u00be"+
-		"\u00bf\u0005n\u0000\u0000\u00bf\u00c0\u0005u\u0000\u0000\u00c0\u00c1\u0005"+
-		"l\u0000\u0000\u00c1\u00c2\u0005l\u0000\u0000\u00c2*\u0001\u0000\u0000"+
-		"\u0000\u00c3\u00c4\u0005t\u0000\u0000\u00c4\u00c5\u0005h\u0000\u0000\u00c5"+
-		"\u00c6\u0005i\u0000\u0000\u00c6\u00c7\u0005s\u0000\u0000\u00c7,\u0001"+
-		"\u0000\u0000\u0000\u00c8\u00c9\u0005-\u0000\u0000\u00c9.\u0001\u0000\u0000"+
-		"\u0000\u00ca\u00cb\u0005+\u0000\u0000\u00cb0\u0001\u0000\u0000\u0000\u00cc"+
-		"\u00cd\u0005*\u0000\u0000\u00cd2\u0001\u0000\u0000\u0000\u00ce\u00cf\u0005"+
-		">\u0000\u0000\u00cf4\u0001\u0000\u0000\u0000\u00d0\u00d1\u0005<\u0000"+
-		"\u0000\u00d16\u0001\u0000\u0000\u0000\u00d2\u00d3\u0005>\u0000\u0000\u00d3"+
-		"\u00d4\u0005=\u0000\u0000\u00d48\u0001\u0000\u0000\u0000\u00d5\u00d6\u0005"+
-		"<\u0000\u0000\u00d6\u00d7\u0005=\u0000\u0000\u00d7:\u0001\u0000\u0000"+
-		"\u0000\u00d8\u00d9\u0005=\u0000\u0000\u00d9\u00da\u0005=\u0000\u0000\u00da"+
-		"<\u0001\u0000\u0000\u0000\u00db\u00dc\u0005!\u0000\u0000\u00dc\u00dd\u0005"+
-		"=\u0000\u0000\u00dd>\u0001\u0000\u0000\u0000\u00de\u00df\u0005&\u0000"+
-		"\u0000\u00df\u00e0\u0005&\u0000\u0000\u00e0@\u0001\u0000\u0000\u0000\u00e1"+
-		"\u00e2\u0005|\u0000\u0000\u00e2\u00e3\u0005|\u0000\u0000\u00e3B\u0001"+
-		"\u0000\u0000\u0000\u00e4\u00e5\u0005=\u0000\u0000\u00e5D\u0001\u0000\u0000"+
-		"\u0000\u00e6\u00e7\u0005+\u0000\u0000\u00e7\u00e8\u0005=\u0000\u0000\u00e8"+
-		"F\u0001\u0000\u0000\u0000\u00e9\u00ea\u0005-\u0000\u0000\u00ea\u00eb\u0005"+
-		"=\u0000\u0000\u00ebH\u0001\u0000\u0000\u0000\u00ec\u00ed\u0005*\u0000"+
-		"\u0000\u00ed\u00ee\u0005=\u0000\u0000\u00eeJ\u0001\u0000\u0000\u0000\u00ef"+
-		"\u00f0\u0005!\u0000\u0000\u00f0L\u0001\u0000\u0000\u0000\u00f1\u00f2\u0005"+
-		"i\u0000\u0000\u00f2\u00f3\u0005n\u0000\u0000\u00f3\u00f4\u0005t\u0000"+
-		"\u0000\u00f4N\u0001\u0000\u0000\u0000\u00f5\u00f6\u0005b\u0000\u0000\u00f6"+
-		"\u00f7\u0005o\u0000\u0000\u00f7\u00f8\u0005o\u0000\u0000\u00f8\u00f9\u0005"+
-		"l\u0000\u0000\u00f9\u00fa\u0005e\u0000\u0000\u00fa\u00fb\u0005a\u0000"+
-		"\u0000\u00fb\u00fc\u0005n\u0000\u0000\u00fcP\u0001\u0000\u0000\u0000\u00fd"+
-		"\u00fe\u0005v\u0000\u0000\u00fe\u00ff\u0005o\u0000\u0000\u00ff\u0100\u0005"+
-		"i\u0000\u0000\u0100\u0101\u0005d\u0000\u0000\u0101R\u0001\u0000\u0000"+
-		"\u0000\u0102\u0103\u0005c\u0000\u0000\u0103\u0104\u0005h\u0000\u0000\u0104"+
-		"\u0105\u0005a\u0000\u0000\u0105\u0106\u0005r\u0000\u0000\u0106T\u0001"+
-		"\u0000\u0000\u0000\u0107\u0108\u0005t\u0000\u0000\u0108\u0109\u0005r\u0000"+
-		"\u0000\u0109\u010a\u0005u\u0000\u0000\u010a\u0111\u0005e\u0000\u0000\u010b"+
-		"\u010c\u0005f\u0000\u0000\u010c\u010d\u0005a\u0000\u0000\u010d\u010e\u0005"+
-		"l\u0000\u0000\u010e\u010f\u0005s\u0000\u0000\u010f\u0111\u0005e\u0000"+
-		"\u0000\u0110\u0107\u0001\u0000\u0000\u0000\u0110\u010b\u0001\u0000\u0000"+
-		"\u0000\u0111V\u0001\u0000\u0000\u0000\u0112\u0113\u0007\u0000\u0000\u0000"+
-		"\u0113\u0114\u0007\u0001\u0000\u0000\u0114\u0115\u0007\u0000\u0000\u0000"+
-		"\u0115X\u0001\u0000\u0000\u0000\u0116\u0118\u0007\u0001\u0000\u0000\u0117"+
-		"\u0116\u0001\u0000\u0000\u0000\u0118\u0119\u0001\u0000\u0000\u0000\u0119"+
-		"\u0117\u0001\u0000\u0000\u0000\u0119\u011a\u0001\u0000\u0000\u0000\u011a"+
-		"\u011e\u0001\u0000\u0000\u0000\u011b\u011d\u0007\u0002\u0000\u0000\u011c"+
-		"\u011b\u0001\u0000\u0000\u0000\u011d\u0120\u0001\u0000\u0000\u0000\u011e"+
-		"\u011c\u0001\u0000\u0000\u0000\u011e\u011f\u0001\u0000\u0000\u0000\u011f"+
-		"\u0122\u0001\u0000\u0000\u0000\u0120\u011e\u0001\u0000\u0000\u0000\u0121"+
-		"\u0117\u0001\u0000\u0000\u0000\u0122\u0123\u0001\u0000\u0000\u0000\u0123"+
-		"\u0121\u0001\u0000\u0000\u0000\u0123\u0124\u0001\u0000\u0000\u0000\u0124"+
-		"Z\u0001\u0000\u0000\u0000\u0125\u0127\u0007\u0002\u0000\u0000\u0126\u0125"+
-		"\u0001\u0000\u0000\u0000\u0127\u0128\u0001\u0000\u0000\u0000\u0128\u0126"+
-		"\u0001\u0000\u0000\u0000\u0128\u0129\u0001\u0000\u0000\u0000\u0129\\\u0001"+
-		"\u0000\u0000\u0000\u012a\u012b\u0007\u0003\u0000\u0000\u012b\u012c\u0001"+
-		"\u0000\u0000\u0000\u012c\u012d\u0006.\u0000\u0000\u012d^\u0001\u0000\u0000"+
-		"\u0000\u012e\u012f\u0005/\u0000\u0000\u012f\u0130\u0005*\u0000\u0000\u0130"+
-		"\u0134\u0001\u0000\u0000\u0000\u0131\u0133\t\u0000\u0000\u0000\u0132\u0131"+
-		"\u0001\u0000\u0000\u0000\u0133\u0136\u0001\u0000\u0000\u0000\u0134\u0135"+
-		"\u0001\u0000\u0000\u0000\u0134\u0132\u0001\u0000\u0000\u0000\u0135\u0137"+
-		"\u0001\u0000\u0000\u0000\u0136\u0134\u0001\u0000\u0000\u0000\u0137\u0138"+
-		"\u0005*\u0000\u0000\u0138\u0139\u0005/\u0000\u0000\u0139\u013a\u0001\u0000"+
-		"\u0000\u0000\u013a\u013b\u0006/\u0000\u0000\u013b`\u0001\u0000\u0000\u0000"+
-		"\u013c\u013d\u0005/\u0000\u0000\u013d\u013e\u0005/\u0000\u0000\u013e\u0142"+
-		"\u0001\u0000\u0000\u0000\u013f\u0141\b\u0004\u0000\u0000\u0140\u013f\u0001"+
-		"\u0000\u0000\u0000\u0141\u0144\u0001\u0000\u0000\u0000\u0142\u0140\u0001"+
-		"\u0000\u0000\u0000\u0142\u0143\u0001\u0000\u0000\u0000\u0143\u0145\u0001"+
-		"\u0000\u0000\u0000\u0144\u0142\u0001\u0000\u0000\u0000\u0145\u0146\u0006"+
-		"0\u0000\u0000\u0146b\u0001\u0000\u0000\u0000\b\u0000\u0110\u0119\u011e"+
-		"\u0123\u0128\u0134\u0142\u0001\u0006\u0000\u0000";
+		"\u0095\u0016\u0001\u0000\u0000\u0000\u0096\u0097\u0005f\u0000\u0000\u0097"+
+		"\u0098\u0005o\u0000\u0000\u0098\u0099\u0005r\u0000\u0000\u0099\u0018\u0001"+
+		"\u0000\u0000\u0000\u009a\u009b\u0005w\u0000\u0000\u009b\u009c\u0005h\u0000"+
+		"\u0000\u009c\u009d\u0005i\u0000\u0000\u009d\u009e\u0005l\u0000\u0000\u009e"+
+		"\u009f\u0005e\u0000\u0000\u009f\u001a\u0001\u0000\u0000\u0000\u00a0\u00a1"+
+		"\u0005d\u0000\u0000\u00a1\u00a2\u0005o\u0000\u0000\u00a2\u001c\u0001\u0000"+
+		"\u0000\u0000\u00a3\u00a4\u0005b\u0000\u0000\u00a4\u00a5\u0005r\u0000\u0000"+
+		"\u00a5\u00a6\u0005e\u0000\u0000\u00a6\u00a7\u0005a\u0000\u0000\u00a7\u00a8"+
+		"\u0005k\u0000\u0000\u00a8\u001e\u0001\u0000\u0000\u0000\u00a9\u00aa\u0005"+
+		".\u0000\u0000\u00aa \u0001\u0000\u0000\u0000\u00ab\u00ac\u0005p\u0000"+
+		"\u0000\u00ac\u00ad\u0005u\u0000\u0000\u00ad\u00ae\u0005b\u0000\u0000\u00ae"+
+		"\u00af\u0005l\u0000\u0000\u00af\u00b0\u0005i\u0000\u0000\u00b0\u00b1\u0005"+
+		"c\u0000\u0000\u00b1\"\u0001\u0000\u0000\u0000\u00b2\u00b3\u0005n\u0000"+
+		"\u0000\u00b3\u00b4\u0005e\u0000\u0000\u00b4\u00b5\u0005w\u0000\u0000\u00b5"+
+		"$\u0001\u0000\u0000\u0000\u00b6\u00b7\u0005n\u0000\u0000\u00b7\u00b8\u0005"+
+		"u\u0000\u0000\u00b8\u00b9\u0005l\u0000\u0000\u00b9\u00ba\u0005l\u0000"+
+		"\u0000\u00ba&\u0001\u0000\u0000\u0000\u00bb\u00bc\u0005t\u0000\u0000\u00bc"+
+		"\u00bd\u0005h\u0000\u0000\u00bd\u00be\u0005i\u0000\u0000\u00be\u00bf\u0005"+
+		"s\u0000\u0000\u00bf(\u0001\u0000\u0000\u0000\u00c0\u00c1\u0005i\u0000"+
+		"\u0000\u00c1\u00c2\u0005f\u0000\u0000\u00c2*\u0001\u0000\u0000\u0000\u00c3"+
+		"\u00c4\u0005e\u0000\u0000\u00c4\u00c5\u0005l\u0000\u0000\u00c5\u00c6\u0005"+
+		"s\u0000\u0000\u00c6\u00c7\u0005e\u0000\u0000\u00c7,\u0001\u0000\u0000"+
+		"\u0000\u00c8\u00c9\u0005-\u0000\u0000\u00c9.\u0001\u0000\u0000\u0000\u00ca"+
+		"\u00cb\u0005+\u0000\u0000\u00cb0\u0001\u0000\u0000\u0000\u00cc\u00cd\u0005"+
+		"*\u0000\u0000\u00cd2\u0001\u0000\u0000\u0000\u00ce\u00cf\u0005>\u0000"+
+		"\u0000\u00cf4\u0001\u0000\u0000\u0000\u00d0\u00d1\u0005<\u0000\u0000\u00d1"+
+		"6\u0001\u0000\u0000\u0000\u00d2\u00d3\u0005>\u0000\u0000\u00d3\u00d4\u0005"+
+		"=\u0000\u0000\u00d48\u0001\u0000\u0000\u0000\u00d5\u00d6\u0005<\u0000"+
+		"\u0000\u00d6\u00d7\u0005=\u0000\u0000\u00d7:\u0001\u0000\u0000\u0000\u00d8"+
+		"\u00d9\u0005=\u0000\u0000\u00d9\u00da\u0005=\u0000\u0000\u00da<\u0001"+
+		"\u0000\u0000\u0000\u00db\u00dc\u0005!\u0000\u0000\u00dc\u00dd\u0005=\u0000"+
+		"\u0000\u00dd>\u0001\u0000\u0000\u0000\u00de\u00df\u0005&\u0000\u0000\u00df"+
+		"\u00e0\u0005&\u0000\u0000\u00e0@\u0001\u0000\u0000\u0000\u00e1\u00e2\u0005"+
+		"|\u0000\u0000\u00e2\u00e3\u0005|\u0000\u0000\u00e3B\u0001\u0000\u0000"+
+		"\u0000\u00e4\u00e5\u0005=\u0000\u0000\u00e5D\u0001\u0000\u0000\u0000\u00e6"+
+		"\u00e7\u0005+\u0000\u0000\u00e7\u00e8\u0005=\u0000\u0000\u00e8F\u0001"+
+		"\u0000\u0000\u0000\u00e9\u00ea\u0005-\u0000\u0000\u00ea\u00eb\u0005=\u0000"+
+		"\u0000\u00ebH\u0001\u0000\u0000\u0000\u00ec\u00ed\u0005*\u0000\u0000\u00ed"+
+		"\u00ee\u0005=\u0000\u0000\u00eeJ\u0001\u0000\u0000\u0000\u00ef\u00f0\u0005"+
+		"!\u0000\u0000\u00f0L\u0001\u0000\u0000\u0000\u00f1\u00f2\u0005i\u0000"+
+		"\u0000\u00f2\u00f3\u0005n\u0000\u0000\u00f3\u00f4\u0005t\u0000\u0000\u00f4"+
+		"N\u0001\u0000\u0000\u0000\u00f5\u00f6\u0005b\u0000\u0000\u00f6\u00f7\u0005"+
+		"o\u0000\u0000\u00f7\u00f8\u0005o\u0000\u0000\u00f8\u00f9\u0005l\u0000"+
+		"\u0000\u00f9\u00fa\u0005e\u0000\u0000\u00fa\u00fb\u0005a\u0000\u0000\u00fb"+
+		"\u00fc\u0005n\u0000\u0000\u00fcP\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005"+
+		"v\u0000\u0000\u00fe\u00ff\u0005o\u0000\u0000\u00ff\u0100\u0005i\u0000"+
+		"\u0000\u0100\u0101\u0005d\u0000\u0000\u0101R\u0001\u0000\u0000\u0000\u0102"+
+		"\u0103\u0005c\u0000\u0000\u0103\u0104\u0005h\u0000\u0000\u0104\u0105\u0005"+
+		"a\u0000\u0000\u0105\u0106\u0005r\u0000\u0000\u0106T\u0001\u0000\u0000"+
+		"\u0000\u0107\u0108\u0005t\u0000\u0000\u0108\u0109\u0005r\u0000\u0000\u0109"+
+		"\u010a\u0005u\u0000\u0000\u010a\u0111\u0005e\u0000\u0000\u010b\u010c\u0005"+
+		"f\u0000\u0000\u010c\u010d\u0005a\u0000\u0000\u010d\u010e\u0005l\u0000"+
+		"\u0000\u010e\u010f\u0005s\u0000\u0000\u010f\u0111\u0005e\u0000\u0000\u0110"+
+		"\u0107\u0001\u0000\u0000\u0000\u0110\u010b\u0001\u0000\u0000\u0000\u0111"+
+		"V\u0001\u0000\u0000\u0000\u0112\u0113\u0007\u0000\u0000\u0000\u0113\u0114"+
+		"\u0007\u0001\u0000\u0000\u0114\u0115\u0007\u0000\u0000\u0000\u0115X\u0001"+
+		"\u0000\u0000\u0000\u0116\u0118\u0007\u0001\u0000\u0000\u0117\u0116\u0001"+
+		"\u0000\u0000\u0000\u0118\u0119\u0001\u0000\u0000\u0000\u0119\u0117\u0001"+
+		"\u0000\u0000\u0000\u0119\u011a\u0001\u0000\u0000\u0000\u011a\u011e\u0001"+
+		"\u0000\u0000\u0000\u011b\u011d\u0007\u0002\u0000\u0000\u011c\u011b\u0001"+
+		"\u0000\u0000\u0000\u011d\u0120\u0001\u0000\u0000\u0000\u011e\u011c\u0001"+
+		"\u0000\u0000\u0000\u011e\u011f\u0001\u0000\u0000\u0000\u011f\u0122\u0001"+
+		"\u0000\u0000\u0000\u0120\u011e\u0001\u0000\u0000\u0000\u0121\u0117\u0001"+
+		"\u0000\u0000\u0000\u0122\u0123\u0001\u0000\u0000\u0000\u0123\u0121\u0001"+
+		"\u0000\u0000\u0000\u0123\u0124\u0001\u0000\u0000\u0000\u0124Z\u0001\u0000"+
+		"\u0000\u0000\u0125\u0127\u0007\u0002\u0000\u0000\u0126\u0125\u0001\u0000"+
+		"\u0000\u0000\u0127\u0128\u0001\u0000\u0000\u0000\u0128\u0126\u0001\u0000"+
+		"\u0000\u0000\u0128\u0129\u0001\u0000\u0000\u0000\u0129\\\u0001\u0000\u0000"+
+		"\u0000\u012a\u012b\u0007\u0003\u0000\u0000\u012b\u012c\u0001\u0000\u0000"+
+		"\u0000\u012c\u012d\u0006.\u0000\u0000\u012d^\u0001\u0000\u0000\u0000\u012e"+
+		"\u012f\u0005/\u0000\u0000\u012f\u0130\u0005*\u0000\u0000\u0130\u0134\u0001"+
+		"\u0000\u0000\u0000\u0131\u0133\t\u0000\u0000\u0000\u0132\u0131\u0001\u0000"+
+		"\u0000\u0000\u0133\u0136\u0001\u0000\u0000\u0000\u0134\u0135\u0001\u0000"+
+		"\u0000\u0000\u0134\u0132\u0001\u0000\u0000\u0000\u0135\u0137\u0001\u0000"+
+		"\u0000\u0000\u0136\u0134\u0001\u0000\u0000\u0000\u0137\u0138\u0005*\u0000"+
+		"\u0000\u0138\u0139\u0005/\u0000\u0000\u0139\u013a\u0001\u0000\u0000\u0000"+
+		"\u013a\u013b\u0006/\u0000\u0000\u013b`\u0001\u0000\u0000\u0000\u013c\u013d"+
+		"\u0005/\u0000\u0000\u013d\u013e\u0005/\u0000\u0000\u013e\u0142\u0001\u0000"+
+		"\u0000\u0000\u013f\u0141\b\u0004\u0000\u0000\u0140\u013f\u0001\u0000\u0000"+
+		"\u0000\u0141\u0144\u0001\u0000\u0000\u0000\u0142\u0140\u0001\u0000\u0000"+
+		"\u0000\u0142\u0143\u0001\u0000\u0000\u0000\u0143\u0145\u0001\u0000\u0000"+
+		"\u0000\u0144\u0142\u0001\u0000\u0000\u0000\u0145\u0146\u00060\u0000\u0000"+
+		"\u0146b\u0001\u0000\u0000\u0000\b\u0000\u0110\u0119\u011e\u0123\u0128"+
+		"\u0134\u0142\u0001\u0006\u0000\u0000";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/de/maishai/antlr/DecafLexer.tokens b/src/main/java/de/maishai/antlr/DecafLexer.tokens
index 2cd07b1..5b42434 100644
--- a/src/main/java/de/maishai/antlr/DecafLexer.tokens
+++ b/src/main/java/de/maishai/antlr/DecafLexer.tokens
@@ -14,12 +14,12 @@ T__12=13
 T__13=14
 T__14=15
 T__15=16
-T__16=17
-T__17=18
-PUBLIC=19
-NEW=20
-NULL=21
-THIS=22
+PUBLIC=17
+NEW=18
+NULL=19
+THIS=20
+IF=21
+ELSE=22
 SUB=23
 ADD=24
 MUL=25
@@ -58,17 +58,17 @@ LINE_COMMENT=49
 'String[] args'=9
 ','=10
 'return'=11
-'if'=12
-'else'=13
-'for'=14
-'while'=15
-'do'=16
-'break'=17
-'.'=18
-'public'=19
-'new'=20
-'null'=21
-'this'=22
+'for'=12
+'while'=13
+'do'=14
+'break'=15
+'.'=16
+'public'=17
+'new'=18
+'null'=19
+'this'=20
+'if'=21
+'else'=22
 '-'=23
 '+'=24
 '*'=25
diff --git a/src/main/java/de/maishai/antlr/DecafListener.java b/src/main/java/de/maishai/antlr/DecafListener.java
index a0e836d..13cc60b 100644
--- a/src/main/java/de/maishai/antlr/DecafListener.java
+++ b/src/main/java/de/maishai/antlr/DecafListener.java
@@ -441,6 +441,26 @@ public interface DecafListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitArgs(DecafParser.ArgsContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link DecafParser#ifCall}.
+	 * @param ctx the parse tree
+	 */
+	void enterIfCall(DecafParser.IfCallContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link DecafParser#ifCall}.
+	 * @param ctx the parse tree
+	 */
+	void exitIfCall(DecafParser.IfCallContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link DecafParser#elseIf}.
+	 * @param ctx the parse tree
+	 */
+	void enterElseIf(DecafParser.ElseIfContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link DecafParser#elseIf}.
+	 * @param ctx the parse tree
+	 */
+	void exitElseIf(DecafParser.ElseIfContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link DecafParser#literal}.
 	 * @param ctx the parse tree
diff --git a/src/main/java/de/maishai/antlr/DecafParser.java b/src/main/java/de/maishai/antlr/DecafParser.java
index 6c40886..5bc9db1 100644
--- a/src/main/java/de/maishai/antlr/DecafParser.java
+++ b/src/main/java/de/maishai/antlr/DecafParser.java
@@ -18,9 +18,9 @@ public class DecafParser extends Parser {
 		new PredictionContextCache();
 	public static final int
 		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
-		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, PUBLIC=19, NEW=20, NULL=21, THIS=22, SUB=23, ADD=24, MUL=25, 
-		GT=26, LT=27, GE=28, LE=29, EQ=30, NE=31, AND=32, OR=33, ASSIGN=34, ADD_ASSIGN=35, 
+		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, PUBLIC=17, 
+		NEW=18, NULL=19, THIS=20, IF=21, ELSE=22, SUB=23, ADD=24, MUL=25, GT=26, 
+		LT=27, GE=28, LE=29, EQ=30, NE=31, AND=32, OR=33, ASSIGN=34, ADD_ASSIGN=35, 
 		SUB_ASSIGN=36, MUL_ASSIGN=37, NOT=38, INT=39, BOOL=40, VOID=41, CHAR=42, 
 		BOOLEANLITERAL=43, CHARLITERAL=44, IDENTIFIER=45, NUMBER=46, WS=47, COMMENT=48, 
 		LINE_COMMENT=49;
@@ -31,15 +31,15 @@ public class DecafParser extends Parser {
 		RULE_localVarWithInitialization = 12, RULE_return = 13, RULE_stmt = 14, 
 		RULE_stmtexpr = 15, RULE_expr = 16, RULE_binaryOp = 17, RULE_unaryOp = 18, 
 		RULE_fieldVarAccess = 19, RULE_assign = 20, RULE_methCall = 21, RULE_newCall = 22, 
-		RULE_recipient = 23, RULE_methName = 24, RULE_args = 25, RULE_literal = 26, 
-		RULE_id = 27;
+		RULE_recipient = 23, RULE_methName = 24, RULE_args = 25, RULE_ifCall = 26, 
+		RULE_elseIf = 27, RULE_literal = 28, RULE_id = 29;
 	private static String[] makeRuleNames() {
 		return new String[] {
 			"class", "field", "assignSign", "returntype", "type", "meth", "mainmeth", 
 			"constructor", "params", "param", "block", "localVar", "localVarWithInitialization", 
 			"return", "stmt", "stmtexpr", "expr", "binaryOp", "unaryOp", "fieldVarAccess", 
-			"assign", "methCall", "newCall", "recipient", "methName", "args", "literal", 
-			"id"
+			"assign", "methCall", "newCall", "recipient", "methName", "args", "ifCall", 
+			"elseIf", "literal", "id"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
@@ -47,8 +47,8 @@ public class DecafParser extends Parser {
 	private static String[] makeLiteralNames() {
 		return new String[] {
 			null, "'class'", "'{'", "'}'", "';'", "'('", "')'", "'static'", "'main'", 
-			"'String[] args'", "','", "'return'", "'if'", "'else'", "'for'", "'while'", 
-			"'do'", "'break'", "'.'", "'public'", "'new'", "'null'", "'this'", "'-'", 
+			"'String[] args'", "','", "'return'", "'for'", "'while'", "'do'", "'break'", 
+			"'.'", "'public'", "'new'", "'null'", "'this'", "'if'", "'else'", "'-'", 
 			"'+'", "'*'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'&&'", "'||'", 
 			"'='", "'+='", "'-='", "'*='", "'!'", "'int'", "'boolean'", "'void'", 
 			"'char'"
@@ -58,11 +58,11 @@ public class DecafParser extends Parser {
 	private static String[] makeSymbolicNames() {
 		return new String[] {
 			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, "PUBLIC", "NEW", "NULL", "THIS", 
-			"SUB", "ADD", "MUL", "GT", "LT", "GE", "LE", "EQ", "NE", "AND", "OR", 
-			"ASSIGN", "ADD_ASSIGN", "SUB_ASSIGN", "MUL_ASSIGN", "NOT", "INT", "BOOL", 
-			"VOID", "CHAR", "BOOLEANLITERAL", "CHARLITERAL", "IDENTIFIER", "NUMBER", 
-			"WS", "COMMENT", "LINE_COMMENT"
+			null, null, null, null, null, "PUBLIC", "NEW", "NULL", "THIS", "IF", 
+			"ELSE", "SUB", "ADD", "MUL", "GT", "LT", "GE", "LE", "EQ", "NE", "AND", 
+			"OR", "ASSIGN", "ADD_ASSIGN", "SUB_ASSIGN", "MUL_ASSIGN", "NOT", "INT", 
+			"BOOL", "VOID", "CHAR", "BOOLEANLITERAL", "CHARLITERAL", "IDENTIFIER", 
+			"NUMBER", "WS", "COMMENT", "LINE_COMMENT"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -169,57 +169,57 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(56);
+			setState(60);
 			match(PUBLIC);
-			setState(57);
-			match(T__0);
-			setState(58);
-			id();
-			setState(59);
-			match(T__1);
 			setState(61);
+			match(T__0);
+			setState(62);
+			id();
+			setState(63);
+			match(T__1);
+			setState(65);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) {
 			case 1:
 				{
-				setState(60);
+				setState(64);
 				mainmeth();
 				}
 				break;
 			}
-			setState(68);
+			setState(72);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686565888L) != 0)) {
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686172672L) != 0)) {
 				{
-				setState(66);
+				setState(70);
 				_errHandler.sync(this);
 				switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
 				case 1:
 					{
-					setState(63);
+					setState(67);
 					field();
 					}
 					break;
 				case 2:
 					{
-					setState(64);
+					setState(68);
 					meth();
 					}
 					break;
 				case 3:
 					{
-					setState(65);
+					setState(69);
 					constructor();
 					}
 					break;
 				}
 				}
-				setState(70);
+				setState(74);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(71);
+			setState(75);
 			match(T__2);
 			}
 		}
@@ -269,21 +269,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(74);
+			setState(78);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==PUBLIC) {
 				{
-				setState(73);
+				setState(77);
 				match(PUBLIC);
 				}
 			}
 
-			setState(76);
+			setState(80);
 			type();
-			setState(77);
+			setState(81);
 			id();
-			setState(78);
+			setState(82);
 			match(T__3);
 			}
 		}
@@ -330,7 +330,7 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(80);
+			setState(84);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 257698037760L) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -382,7 +382,7 @@ public class DecafParser extends Parser {
 		ReturntypeContext _localctx = new ReturntypeContext(_ctx, getState());
 		enterRule(_localctx, 6, RULE_returntype);
 		try {
-			setState(84);
+			setState(88);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INT:
@@ -391,14 +391,14 @@ public class DecafParser extends Parser {
 			case IDENTIFIER:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(82);
+				setState(86);
 				type();
 				}
 				break;
 			case VOID:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(83);
+				setState(87);
 				match(VOID);
 				}
 				break;
@@ -448,34 +448,34 @@ public class DecafParser extends Parser {
 		TypeContext _localctx = new TypeContext(_ctx, getState());
 		enterRule(_localctx, 8, RULE_type);
 		try {
-			setState(90);
+			setState(94);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INT:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(86);
+				setState(90);
 				match(INT);
 				}
 				break;
 			case BOOL:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(87);
+				setState(91);
 				match(BOOL);
 				}
 				break;
 			case CHAR:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(88);
+				setState(92);
 				match(CHAR);
 				}
 				break;
 			case IDENTIFIER:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(89);
+				setState(93);
 				id();
 				}
 				break;
@@ -535,27 +535,27 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(92);
+			setState(96);
 			match(PUBLIC);
-			setState(93);
-			returntype();
-			setState(94);
-			id();
-			setState(95);
-			match(T__4);
 			setState(97);
+			returntype();
+			setState(98);
+			id();
+			setState(99);
+			match(T__4);
+			setState(101);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686041600L) != 0)) {
 				{
-				setState(96);
+				setState(100);
 				params();
 				}
 			}
 
-			setState(99);
+			setState(103);
 			match(T__5);
-			setState(100);
+			setState(104);
 			block();
 			}
 		}
@@ -602,21 +602,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(102);
-			match(PUBLIC);
-			setState(103);
-			match(T__6);
-			setState(104);
-			match(VOID);
-			setState(105);
-			match(T__7);
 			setState(106);
-			match(T__4);
+			match(PUBLIC);
 			setState(107);
-			match(T__8);
+			match(T__6);
 			setState(108);
-			match(T__5);
+			match(VOID);
 			setState(109);
+			match(T__7);
+			setState(110);
+			match(T__4);
+			setState(111);
+			match(T__8);
+			setState(112);
+			match(T__5);
+			setState(113);
 			block();
 			}
 		}
@@ -669,25 +669,25 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(111);
-			match(PUBLIC);
-			setState(112);
-			id();
-			setState(113);
-			match(T__4);
 			setState(115);
+			match(PUBLIC);
+			setState(116);
+			id();
+			setState(117);
+			match(T__4);
+			setState(119);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686041600L) != 0)) {
 				{
-				setState(114);
+				setState(118);
 				params();
 				}
 			}
 
-			setState(117);
+			setState(121);
 			match(T__5);
-			setState(118);
+			setState(122);
 			block();
 			}
 		}
@@ -736,21 +736,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(120);
+			setState(124);
 			param();
-			setState(125);
+			setState(129);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__9) {
 				{
 				{
-				setState(121);
+				setState(125);
 				match(T__9);
-				setState(122);
+				setState(126);
 				param();
 				}
 				}
-				setState(127);
+				setState(131);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -800,9 +800,9 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(128);
+			setState(132);
 			type();
-			setState(129);
+			setState(133);
 			id();
 			}
 		}
@@ -854,33 +854,33 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(131);
-			match(T__1);
 			setState(135);
+			match(T__1);
+			setState(139);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231691534336L) != 0)) {
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231689510912L) != 0)) {
 				{
 				{
-				setState(132);
+				setState(136);
 				stmt();
 				}
 				}
-				setState(137);
+				setState(141);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(139);
+			setState(143);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==T__10) {
 				{
-				setState(138);
+				setState(142);
 				return_();
 				}
 			}
 
-			setState(141);
+			setState(145);
 			match(T__2);
 			}
 		}
@@ -928,9 +928,9 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(143);
+			setState(147);
 			type();
-			setState(144);
+			setState(148);
 			id();
 			}
 		}
@@ -982,13 +982,13 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(146);
+			setState(150);
 			type();
-			setState(147);
+			setState(151);
 			id();
-			setState(148);
+			setState(152);
 			match(ASSIGN);
-			setState(149);
+			setState(153);
 			expr(0);
 			}
 		}
@@ -1031,26 +1031,26 @@ public class DecafParser extends Parser {
 		ReturnContext _localctx = new ReturnContext(_ctx, getState());
 		enterRule(_localctx, 26, RULE_return);
 		try {
-			setState(157);
+			setState(161);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(151);
+				setState(155);
 				match(T__10);
-				setState(152);
+				setState(156);
 				expr(0);
-				setState(153);
+				setState(157);
 				match(T__3);
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(155);
+				setState(159);
 				match(T__10);
-				setState(156);
+				setState(160);
 				match(T__3);
 				}
 				break;
@@ -1256,14 +1256,8 @@ public class DecafParser extends Parser {
 	}
 	@SuppressWarnings("CheckReturnValue")
 	public static class IfContext extends StmtContext {
-		public ExprContext expr() {
-			return getRuleContext(ExprContext.class,0);
-		}
-		public List<BlockContext> block() {
-			return getRuleContexts(BlockContext.class);
-		}
-		public BlockContext block(int i) {
-			return getRuleContext(BlockContext.class,i);
+		public IfCallContext ifCall() {
+			return getRuleContext(IfCallContext.class,0);
 		}
 		public IfContext(StmtContext ctx) { copyFrom(ctx); }
 		@Override
@@ -1286,72 +1280,52 @@ public class DecafParser extends Parser {
 		enterRule(_localctx, 28, RULE_stmt);
 		int _la;
 		try {
-			setState(210);
+			setState(206);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
 			case 1:
 				_localctx = new IfContext(_localctx);
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(159);
-				match(T__11);
-				setState(160);
-				match(T__4);
-				setState(161);
-				expr(0);
-				setState(162);
-				match(T__5);
 				setState(163);
-				block();
-				setState(166);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				if (_la==T__12) {
-					{
-					setState(164);
-					match(T__12);
-					setState(165);
-					block();
-					}
-				}
-
+				ifCall();
 				}
 				break;
 			case 2:
 				_localctx = new ForContext(_localctx);
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(168);
-				match(T__13);
-				setState(169);
+				setState(164);
+				match(T__11);
+				setState(165);
 				match(T__4);
-				setState(172);
+				setState(168);
 				_errHandler.sync(this);
-				switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) {
+				switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) {
 				case 1:
 					{
-					setState(170);
+					setState(166);
 					assign();
 					}
 					break;
 				case 2:
 					{
-					setState(171);
+					setState(167);
 					localVarWithInitialization();
 					}
 					break;
 				}
-				setState(174);
+				setState(170);
 				match(T__3);
-				setState(175);
+				setState(171);
 				expr(0);
-				setState(176);
+				setState(172);
 				match(T__3);
-				setState(177);
+				setState(173);
 				assign();
-				setState(178);
+				setState(174);
 				match(T__5);
-				setState(179);
+				setState(175);
 				block();
 				}
 				break;
@@ -1359,15 +1333,15 @@ public class DecafParser extends Parser {
 				_localctx = new WhileContext(_localctx);
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(181);
-				match(T__14);
-				setState(182);
+				setState(177);
+				match(T__12);
+				setState(178);
 				match(T__4);
-				setState(183);
+				setState(179);
 				expr(0);
-				setState(184);
+				setState(180);
 				match(T__5);
-				setState(185);
+				setState(181);
 				block();
 				}
 				break;
@@ -1375,24 +1349,24 @@ public class DecafParser extends Parser {
 				_localctx = new DoWhileContext(_localctx);
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(187);
-				match(T__15);
-				setState(188);
+				setState(183);
+				match(T__13);
+				setState(184);
 				block();
-				setState(189);
-				match(T__14);
-				setState(190);
+				setState(185);
+				match(T__12);
+				setState(186);
 				match(T__4);
-				setState(191);
+				setState(187);
 				expr(0);
-				setState(192);
+				setState(188);
 				match(T__5);
-				setState(194);
+				setState(190);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 				if (_la==T__3) {
 					{
-					setState(193);
+					setState(189);
 					match(T__3);
 					}
 				}
@@ -1403,9 +1377,9 @@ public class DecafParser extends Parser {
 				_localctx = new BreakContext(_localctx);
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(196);
-				match(T__16);
-				setState(197);
+				setState(192);
+				match(T__14);
+				setState(193);
 				match(T__3);
 				}
 				break;
@@ -1413,9 +1387,9 @@ public class DecafParser extends Parser {
 				_localctx = new LocalVarDecContext(_localctx);
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(198);
+				setState(194);
 				localVar();
-				setState(199);
+				setState(195);
 				match(T__3);
 				}
 				break;
@@ -1423,9 +1397,9 @@ public class DecafParser extends Parser {
 				_localctx = new LocalVarDecWithInitializationContext(_localctx);
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(201);
+				setState(197);
 				localVarWithInitialization();
-				setState(202);
+				setState(198);
 				match(T__3);
 				}
 				break;
@@ -1433,9 +1407,9 @@ public class DecafParser extends Parser {
 				_localctx = new AssignmentContext(_localctx);
 				enterOuterAlt(_localctx, 8);
 				{
-				setState(204);
+				setState(200);
 				assign();
-				setState(205);
+				setState(201);
 				match(T__3);
 				}
 				break;
@@ -1443,9 +1417,9 @@ public class DecafParser extends Parser {
 				_localctx = new StatementExpressionstmtContext(_localctx);
 				enterOuterAlt(_localctx, 9);
 				{
-				setState(207);
+				setState(203);
 				stmtexpr();
-				setState(208);
+				setState(204);
 				match(T__3);
 				}
 				break;
@@ -1519,14 +1493,14 @@ public class DecafParser extends Parser {
 		StmtexprContext _localctx = new StmtexprContext(_ctx, getState());
 		enterRule(_localctx, 30, RULE_stmtexpr);
 		try {
-			setState(214);
+			setState(210);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
 			case 1:
 				_localctx = new MethodCallContext(_localctx);
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(212);
+				setState(208);
 				methCall();
 				}
 				break;
@@ -1534,7 +1508,7 @@ public class DecafParser extends Parser {
 				_localctx = new NewContext(_localctx);
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(213);
+				setState(209);
 				newCall();
 				}
 				break;
@@ -1708,18 +1682,18 @@ public class DecafParser extends Parser {
 			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(227);
+			setState(223);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,17,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
 			case 1:
 				{
 				_localctx = new UnaryOperationContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
 
-				setState(217);
+				setState(213);
 				unaryOp();
-				setState(218);
+				setState(214);
 				expr(5);
 				}
 				break;
@@ -1728,7 +1702,7 @@ public class DecafParser extends Parser {
 				_localctx = new ConstantContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(220);
+				setState(216);
 				literal();
 				}
 				break;
@@ -1737,11 +1711,11 @@ public class DecafParser extends Parser {
 				_localctx = new ExpressionContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(221);
+				setState(217);
 				match(T__4);
-				setState(222);
+				setState(218);
 				expr(0);
-				setState(223);
+				setState(219);
 				match(T__5);
 				}
 				break;
@@ -1750,7 +1724,7 @@ public class DecafParser extends Parser {
 				_localctx = new IdentifierContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(225);
+				setState(221);
 				fieldVarAccess();
 				}
 				break;
@@ -1759,15 +1733,15 @@ public class DecafParser extends Parser {
 				_localctx = new StatementExpressionexprContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(226);
+				setState(222);
 				stmtexpr();
 				}
 				break;
 			}
 			_ctx.stop = _input.LT(-1);
-			setState(235);
+			setState(231);
 			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,18,_ctx);
+			_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
 			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
 				if ( _alt==1 ) {
 					if ( _parseListeners!=null ) triggerExitRuleEvent();
@@ -1776,18 +1750,18 @@ public class DecafParser extends Parser {
 					{
 					_localctx = new BinaryOperationContext(new ExprContext(_parentctx, _parentState));
 					pushNewRecursionContext(_localctx, _startState, RULE_expr);
-					setState(229);
+					setState(225);
 					if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
-					setState(230);
+					setState(226);
 					binaryOp();
-					setState(231);
+					setState(227);
 					expr(7);
 					}
 					} 
 				}
-				setState(237);
+				setState(233);
 				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,18,_ctx);
+				_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
 			}
 			}
 		}
@@ -1841,7 +1815,7 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(238);
+			setState(234);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 17171480576L) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -1894,7 +1868,7 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(240);
+			setState(236);
 			_la = _input.LA(1);
 			if ( !(_la==SUB || _la==NOT) ) {
 			_errHandler.recoverInline(this);
@@ -1958,26 +1932,26 @@ public class DecafParser extends Parser {
 			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(247);
+			setState(243);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case THIS:
 				{
 				{
-				setState(242);
+				setState(238);
 				match(THIS);
-				setState(243);
-				match(T__17);
+				setState(239);
+				match(T__15);
 				}
 				}
 				break;
 			case NEW:
 				{
 				{
-				setState(244);
+				setState(240);
 				newCall();
-				setState(245);
-				match(T__17);
+				setState(241);
+				match(T__15);
 				}
 				}
 				break;
@@ -1986,25 +1960,25 @@ public class DecafParser extends Parser {
 			default:
 				break;
 			}
-			setState(254);
+			setState(250);
 			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,20,_ctx);
+			_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
 			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
 				if ( _alt==1 ) {
 					{
 					{
-					setState(249);
+					setState(245);
 					recipient();
-					setState(250);
-					match(T__17);
+					setState(246);
+					match(T__15);
 					}
 					} 
 				}
-				setState(256);
+				setState(252);
 				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,20,_ctx);
+				_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
 			}
-			setState(257);
+			setState(253);
 			id();
 			}
 		}
@@ -2055,11 +2029,11 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(259);
+			setState(255);
 			fieldVarAccess();
-			setState(260);
+			setState(256);
 			assignSign();
-			setState(261);
+			setState(257);
 			expr(0);
 			}
 		}
@@ -2115,26 +2089,26 @@ public class DecafParser extends Parser {
 			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(268);
+			setState(264);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case THIS:
 				{
 				{
-				setState(263);
+				setState(259);
 				match(THIS);
-				setState(264);
-				match(T__17);
+				setState(260);
+				match(T__15);
 				}
 				}
 				break;
 			case NEW:
 				{
 				{
-				setState(265);
+				setState(261);
 				newCall();
-				setState(266);
-				match(T__17);
+				setState(262);
+				match(T__15);
 				}
 				}
 				break;
@@ -2143,25 +2117,25 @@ public class DecafParser extends Parser {
 			default:
 				break;
 			}
-			setState(275);
+			setState(271);
 			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,22,_ctx);
+			_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
 			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
 				if ( _alt==1 ) {
 					{
 					{
-					setState(270);
+					setState(266);
 					recipient();
-					setState(271);
-					match(T__17);
+					setState(267);
+					match(T__15);
 					}
 					} 
 				}
-				setState(277);
+				setState(273);
 				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,22,_ctx);
+				_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
 			}
-			setState(278);
+			setState(274);
 			methName();
 			}
 		}
@@ -2211,23 +2185,23 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(280);
+			setState(276);
 			match(NEW);
-			setState(281);
+			setState(277);
 			type();
-			setState(282);
+			setState(278);
 			match(T__4);
-			setState(284);
+			setState(280);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216286871584L) != 0)) {
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216282939424L) != 0)) {
 				{
-				setState(283);
+				setState(279);
 				args();
 				}
 			}
 
-			setState(286);
+			setState(282);
 			match(T__5);
 			}
 		}
@@ -2273,20 +2247,20 @@ public class DecafParser extends Parser {
 		RecipientContext _localctx = new RecipientContext(_ctx, getState());
 		enterRule(_localctx, 46, RULE_recipient);
 		try {
-			setState(290);
+			setState(286);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(288);
+				setState(284);
 				methName();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(289);
+				setState(285);
 				id();
 				}
 				break;
@@ -2337,21 +2311,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(292);
+			setState(288);
 			id();
-			setState(293);
+			setState(289);
 			match(T__4);
-			setState(295);
+			setState(291);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216286871584L) != 0)) {
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216282939424L) != 0)) {
 				{
-				setState(294);
+				setState(290);
 				args();
 				}
 			}
 
-			setState(297);
+			setState(293);
 			match(T__5);
 			}
 		}
@@ -2400,21 +2374,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(299);
+			setState(295);
 			expr(0);
-			setState(304);
+			setState(300);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__9) {
 				{
 				{
-				setState(300);
+				setState(296);
 				match(T__9);
-				setState(301);
+				setState(297);
 				expr(0);
 				}
 				}
-				setState(306);
+				setState(302);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -2431,6 +2405,163 @@ public class DecafParser extends Parser {
 		return _localctx;
 	}
 
+	@SuppressWarnings("CheckReturnValue")
+	public static class IfCallContext extends ParserRuleContext {
+		public TerminalNode IF() { return getToken(DecafParser.IF, 0); }
+		public ExprContext expr() {
+			return getRuleContext(ExprContext.class,0);
+		}
+		public List<BlockContext> block() {
+			return getRuleContexts(BlockContext.class);
+		}
+		public BlockContext block(int i) {
+			return getRuleContext(BlockContext.class,i);
+		}
+		public List<ElseIfContext> elseIf() {
+			return getRuleContexts(ElseIfContext.class);
+		}
+		public ElseIfContext elseIf(int i) {
+			return getRuleContext(ElseIfContext.class,i);
+		}
+		public TerminalNode ELSE() { return getToken(DecafParser.ELSE, 0); }
+		public IfCallContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_ifCall; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof DecafListener ) ((DecafListener)listener).enterIfCall(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof DecafListener ) ((DecafListener)listener).exitIfCall(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof DecafVisitor ) return ((DecafVisitor<? extends T>)visitor).visitIfCall(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final IfCallContext ifCall() throws RecognitionException {
+		IfCallContext _localctx = new IfCallContext(_ctx, getState());
+		enterRule(_localctx, 52, RULE_ifCall);
+		int _la;
+		try {
+			int _alt;
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(303);
+			match(IF);
+			setState(304);
+			match(T__4);
+			setState(305);
+			expr(0);
+			setState(306);
+			match(T__5);
+			setState(307);
+			block();
+			setState(311);
+			_errHandler.sync(this);
+			_alt = getInterpreter().adaptivePredict(_input,26,_ctx);
+			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
+				if ( _alt==1 ) {
+					{
+					{
+					setState(308);
+					elseIf();
+					}
+					} 
+				}
+				setState(313);
+				_errHandler.sync(this);
+				_alt = getInterpreter().adaptivePredict(_input,26,_ctx);
+			}
+			setState(316);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==ELSE) {
+				{
+				setState(314);
+				match(ELSE);
+				setState(315);
+				block();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class ElseIfContext extends ParserRuleContext {
+		public TerminalNode ELSE() { return getToken(DecafParser.ELSE, 0); }
+		public TerminalNode IF() { return getToken(DecafParser.IF, 0); }
+		public ExprContext expr() {
+			return getRuleContext(ExprContext.class,0);
+		}
+		public BlockContext block() {
+			return getRuleContext(BlockContext.class,0);
+		}
+		public ElseIfContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_elseIf; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof DecafListener ) ((DecafListener)listener).enterElseIf(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof DecafListener ) ((DecafListener)listener).exitElseIf(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof DecafVisitor ) return ((DecafVisitor<? extends T>)visitor).visitElseIf(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final ElseIfContext elseIf() throws RecognitionException {
+		ElseIfContext _localctx = new ElseIfContext(_ctx, getState());
+		enterRule(_localctx, 54, RULE_elseIf);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(318);
+			match(ELSE);
+			setState(319);
+			match(IF);
+			setState(320);
+			match(T__4);
+			setState(321);
+			expr(0);
+			setState(322);
+			match(T__5);
+			setState(323);
+			block();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	@SuppressWarnings("CheckReturnValue")
 	public static class LiteralContext extends ParserRuleContext {
 		public TerminalNode NUMBER() { return getToken(DecafParser.NUMBER, 0); }
@@ -2457,12 +2588,12 @@ public class DecafParser extends Parser {
 
 	public final LiteralContext literal() throws RecognitionException {
 		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 52, RULE_literal);
+		enterRule(_localctx, 56, RULE_literal);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(307);
+			setState(325);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 96757023244288L) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -2509,11 +2640,11 @@ public class DecafParser extends Parser {
 
 	public final IdContext id() throws RecognitionException {
 		IdContext _localctx = new IdContext(_ctx, getState());
-		enterRule(_localctx, 54, RULE_id);
+		enterRule(_localctx, 58, RULE_id);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(309);
+			setState(327);
 			match(IDENTIFIER);
 			}
 		}
@@ -2544,7 +2675,7 @@ public class DecafParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\u0004\u00011\u0138\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
+		"\u0004\u00011\u014a\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
 		"\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+
 		"\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+
 		"\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b\u0007\u000b\u0002"+
@@ -2553,195 +2684,207 @@ public class DecafParser extends Parser {
 		"\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002\u0015\u0007\u0015"+
 		"\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002\u0018\u0007\u0018"+
 		"\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002\u001b\u0007\u001b"+
-		"\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0003\u0000"+
-		">\b\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0005\u0000C\b\u0000\n\u0000"+
-		"\f\u0000F\t\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0003\u0001K\b\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002"+
-		"\u0001\u0003\u0001\u0003\u0003\u0003U\b\u0003\u0001\u0004\u0001\u0004"+
-		"\u0001\u0004\u0001\u0004\u0003\u0004[\b\u0004\u0001\u0005\u0001\u0005"+
-		"\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005b\b\u0005\u0001\u0005"+
-		"\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
-		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007"+
-		"\u0001\u0007\u0001\u0007\u0001\u0007\u0003\u0007t\b\u0007\u0001\u0007"+
-		"\u0001\u0007\u0001\u0007\u0001\b\u0001\b\u0001\b\u0005\b|\b\b\n\b\f\b"+
-		"\u007f\t\b\u0001\t\u0001\t\u0001\t\u0001\n\u0001\n\u0005\n\u0086\b\n\n"+
-		"\n\f\n\u0089\t\n\u0001\n\u0003\n\u008c\b\n\u0001\n\u0001\n\u0001\u000b"+
-		"\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+
-		"\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003\r\u009e\b\r\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0003\u000e\u00a7\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0003\u000e\u00ad\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00c3\b\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0003\u000e\u00d3\b\u000e\u0001\u000f\u0001\u000f"+
-		"\u0003\u000f\u00d7\b\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+
+		"\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0001\u0000\u0001\u0000"+
+		"\u0001\u0000\u0001\u0000\u0001\u0000\u0003\u0000B\b\u0000\u0001\u0000"+
+		"\u0001\u0000\u0001\u0000\u0005\u0000G\b\u0000\n\u0000\f\u0000J\t\u0000"+
+		"\u0001\u0000\u0001\u0000\u0001\u0001\u0003\u0001O\b\u0001\u0001\u0001"+
+		"\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001\u0003"+
+		"\u0001\u0003\u0003\u0003Y\b\u0003\u0001\u0004\u0001\u0004\u0001\u0004"+
+		"\u0001\u0004\u0003\u0004_\b\u0004\u0001\u0005\u0001\u0005\u0001\u0005"+
+		"\u0001\u0005\u0001\u0005\u0003\u0005f\b\u0005\u0001\u0005\u0001\u0005"+
+		"\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007"+
+		"\u0001\u0007\u0001\u0007\u0003\u0007x\b\u0007\u0001\u0007\u0001\u0007"+
+		"\u0001\u0007\u0001\b\u0001\b\u0001\b\u0005\b\u0080\b\b\n\b\f\b\u0083\t"+
+		"\b\u0001\t\u0001\t\u0001\t\u0001\n\u0001\n\u0005\n\u008a\b\n\n\n\f\n\u008d"+
+		"\t\n\u0001\n\u0003\n\u0090\b\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b"+
+		"\u0001\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001"+
+		"\r\u0001\r\u0001\r\u0001\r\u0003\r\u00a2\b\r\u0001\u000e\u0001\u000e\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00a9\b\u000e\u0001\u000e\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+
+		"\u000e\u0003\u000e\u00bf\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00cf"+
+		"\b\u000e\u0001\u000f\u0001\u000f\u0003\u000f\u00d3\b\u000f\u0001\u0010"+
 		"\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+
-		"\u0001\u0010\u0003\u0010\u00e4\b\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+
-		"\u0001\u0010\u0005\u0010\u00ea\b\u0010\n\u0010\f\u0010\u00ed\t\u0010\u0001"+
-		"\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0001"+
-		"\u0013\u0001\u0013\u0001\u0013\u0003\u0013\u00f8\b\u0013\u0001\u0013\u0001"+
-		"\u0013\u0001\u0013\u0005\u0013\u00fd\b\u0013\n\u0013\f\u0013\u0100\t\u0013"+
-		"\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014"+
-		"\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0003\u0015"+
-		"\u010d\b\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0005\u0015\u0112\b"+
-		"\u0015\n\u0015\f\u0015\u0115\t\u0015\u0001\u0015\u0001\u0015\u0001\u0016"+
-		"\u0001\u0016\u0001\u0016\u0001\u0016\u0003\u0016\u011d\b\u0016\u0001\u0016"+
-		"\u0001\u0016\u0001\u0017\u0001\u0017\u0003\u0017\u0123\b\u0017\u0001\u0018"+
-		"\u0001\u0018\u0001\u0018\u0003\u0018\u0128\b\u0018\u0001\u0018\u0001\u0018"+
-		"\u0001\u0019\u0001\u0019\u0001\u0019\u0005\u0019\u012f\b\u0019\n\u0019"+
-		"\f\u0019\u0132\t\u0019\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b"+
-		"\u0001\u001b\u0000\u0001 \u001c\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010"+
-		"\u0012\u0014\u0016\u0018\u001a\u001c\u001e \"$&(*,.0246\u0000\u0004\u0001"+
+		"\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0003\u0010\u00e0\b\u0010"+
+		"\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0005\u0010\u00e6\b\u0010"+
+		"\n\u0010\f\u0010\u00e9\t\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001"+
+		"\u0012\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0003"+
+		"\u0013\u00f4\b\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0005\u0013\u00f9"+
+		"\b\u0013\n\u0013\f\u0013\u00fc\t\u0013\u0001\u0013\u0001\u0013\u0001\u0014"+
+		"\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0015"+
+		"\u0001\u0015\u0001\u0015\u0003\u0015\u0109\b\u0015\u0001\u0015\u0001\u0015"+
+		"\u0001\u0015\u0005\u0015\u010e\b\u0015\n\u0015\f\u0015\u0111\t\u0015\u0001"+
+		"\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0003"+
+		"\u0016\u0119\b\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017\u0003"+
+		"\u0017\u011f\b\u0017\u0001\u0018\u0001\u0018\u0001\u0018\u0003\u0018\u0124"+
+		"\b\u0018\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019\u0005"+
+		"\u0019\u012b\b\u0019\n\u0019\f\u0019\u012e\t\u0019\u0001\u001a\u0001\u001a"+
+		"\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0005\u001a\u0136\b\u001a"+
+		"\n\u001a\f\u001a\u0139\t\u001a\u0001\u001a\u0001\u001a\u0003\u001a\u013d"+
+		"\b\u001a\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001"+
+		"\u001b\u0001\u001b\u0001\u001c\u0001\u001c\u0001\u001d\u0001\u001d\u0001"+
+		"\u001d\u0000\u0001 \u001e\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010\u0012"+
+		"\u0014\u0016\u0018\u001a\u001c\u001e \"$&(*,.02468:\u0000\u0004\u0001"+
 		"\u0000\"%\u0001\u0000\u0017!\u0002\u0000\u0017\u0017&&\u0002\u0000+,."+
-		".\u0145\u00008\u0001\u0000\u0000\u0000\u0002J\u0001\u0000\u0000\u0000"+
-		"\u0004P\u0001\u0000\u0000\u0000\u0006T\u0001\u0000\u0000\u0000\bZ\u0001"+
-		"\u0000\u0000\u0000\n\\\u0001\u0000\u0000\u0000\ff\u0001\u0000\u0000\u0000"+
-		"\u000eo\u0001\u0000\u0000\u0000\u0010x\u0001\u0000\u0000\u0000\u0012\u0080"+
-		"\u0001\u0000\u0000\u0000\u0014\u0083\u0001\u0000\u0000\u0000\u0016\u008f"+
-		"\u0001\u0000\u0000\u0000\u0018\u0092\u0001\u0000\u0000\u0000\u001a\u009d"+
-		"\u0001\u0000\u0000\u0000\u001c\u00d2\u0001\u0000\u0000\u0000\u001e\u00d6"+
-		"\u0001\u0000\u0000\u0000 \u00e3\u0001\u0000\u0000\u0000\"\u00ee\u0001"+
-		"\u0000\u0000\u0000$\u00f0\u0001\u0000\u0000\u0000&\u00f7\u0001\u0000\u0000"+
-		"\u0000(\u0103\u0001\u0000\u0000\u0000*\u010c\u0001\u0000\u0000\u0000,"+
-		"\u0118\u0001\u0000\u0000\u0000.\u0122\u0001\u0000\u0000\u00000\u0124\u0001"+
-		"\u0000\u0000\u00002\u012b\u0001\u0000\u0000\u00004\u0133\u0001\u0000\u0000"+
-		"\u00006\u0135\u0001\u0000\u0000\u000089\u0005\u0013\u0000\u00009:\u0005"+
-		"\u0001\u0000\u0000:;\u00036\u001b\u0000;=\u0005\u0002\u0000\u0000<>\u0003"+
-		"\f\u0006\u0000=<\u0001\u0000\u0000\u0000=>\u0001\u0000\u0000\u0000>D\u0001"+
-		"\u0000\u0000\u0000?C\u0003\u0002\u0001\u0000@C\u0003\n\u0005\u0000AC\u0003"+
-		"\u000e\u0007\u0000B?\u0001\u0000\u0000\u0000B@\u0001\u0000\u0000\u0000"+
-		"BA\u0001\u0000\u0000\u0000CF\u0001\u0000\u0000\u0000DB\u0001\u0000\u0000"+
-		"\u0000DE\u0001\u0000\u0000\u0000EG\u0001\u0000\u0000\u0000FD\u0001\u0000"+
-		"\u0000\u0000GH\u0005\u0003\u0000\u0000H\u0001\u0001\u0000\u0000\u0000"+
-		"IK\u0005\u0013\u0000\u0000JI\u0001\u0000\u0000\u0000JK\u0001\u0000\u0000"+
-		"\u0000KL\u0001\u0000\u0000\u0000LM\u0003\b\u0004\u0000MN\u00036\u001b"+
-		"\u0000NO\u0005\u0004\u0000\u0000O\u0003\u0001\u0000\u0000\u0000PQ\u0007"+
-		"\u0000\u0000\u0000Q\u0005\u0001\u0000\u0000\u0000RU\u0003\b\u0004\u0000"+
-		"SU\u0005)\u0000\u0000TR\u0001\u0000\u0000\u0000TS\u0001\u0000\u0000\u0000"+
-		"U\u0007\u0001\u0000\u0000\u0000V[\u0005\'\u0000\u0000W[\u0005(\u0000\u0000"+
-		"X[\u0005*\u0000\u0000Y[\u00036\u001b\u0000ZV\u0001\u0000\u0000\u0000Z"+
-		"W\u0001\u0000\u0000\u0000ZX\u0001\u0000\u0000\u0000ZY\u0001\u0000\u0000"+
-		"\u0000[\t\u0001\u0000\u0000\u0000\\]\u0005\u0013\u0000\u0000]^\u0003\u0006"+
-		"\u0003\u0000^_\u00036\u001b\u0000_a\u0005\u0005\u0000\u0000`b\u0003\u0010"+
-		"\b\u0000a`\u0001\u0000\u0000\u0000ab\u0001\u0000\u0000\u0000bc\u0001\u0000"+
-		"\u0000\u0000cd\u0005\u0006\u0000\u0000de\u0003\u0014\n\u0000e\u000b\u0001"+
-		"\u0000\u0000\u0000fg\u0005\u0013\u0000\u0000gh\u0005\u0007\u0000\u0000"+
-		"hi\u0005)\u0000\u0000ij\u0005\b\u0000\u0000jk\u0005\u0005\u0000\u0000"+
-		"kl\u0005\t\u0000\u0000lm\u0005\u0006\u0000\u0000mn\u0003\u0014\n\u0000"+
-		"n\r\u0001\u0000\u0000\u0000op\u0005\u0013\u0000\u0000pq\u00036\u001b\u0000"+
-		"qs\u0005\u0005\u0000\u0000rt\u0003\u0010\b\u0000sr\u0001\u0000\u0000\u0000"+
-		"st\u0001\u0000\u0000\u0000tu\u0001\u0000\u0000\u0000uv\u0005\u0006\u0000"+
-		"\u0000vw\u0003\u0014\n\u0000w\u000f\u0001\u0000\u0000\u0000x}\u0003\u0012"+
-		"\t\u0000yz\u0005\n\u0000\u0000z|\u0003\u0012\t\u0000{y\u0001\u0000\u0000"+
-		"\u0000|\u007f\u0001\u0000\u0000\u0000}{\u0001\u0000\u0000\u0000}~\u0001"+
-		"\u0000\u0000\u0000~\u0011\u0001\u0000\u0000\u0000\u007f}\u0001\u0000\u0000"+
-		"\u0000\u0080\u0081\u0003\b\u0004\u0000\u0081\u0082\u00036\u001b\u0000"+
-		"\u0082\u0013\u0001\u0000\u0000\u0000\u0083\u0087\u0005\u0002\u0000\u0000"+
-		"\u0084\u0086\u0003\u001c\u000e\u0000\u0085\u0084\u0001\u0000\u0000\u0000"+
-		"\u0086\u0089\u0001\u0000\u0000\u0000\u0087\u0085\u0001\u0000\u0000\u0000"+
-		"\u0087\u0088\u0001\u0000\u0000\u0000\u0088\u008b\u0001\u0000\u0000\u0000"+
-		"\u0089\u0087\u0001\u0000\u0000\u0000\u008a\u008c\u0003\u001a\r\u0000\u008b"+
-		"\u008a\u0001\u0000\u0000\u0000\u008b\u008c\u0001\u0000\u0000\u0000\u008c"+
-		"\u008d\u0001\u0000\u0000\u0000\u008d\u008e\u0005\u0003\u0000\u0000\u008e"+
-		"\u0015\u0001\u0000\u0000\u0000\u008f\u0090\u0003\b\u0004\u0000\u0090\u0091"+
-		"\u00036\u001b\u0000\u0091\u0017\u0001\u0000\u0000\u0000\u0092\u0093\u0003"+
-		"\b\u0004\u0000\u0093\u0094\u00036\u001b\u0000\u0094\u0095\u0005\"\u0000"+
-		"\u0000\u0095\u0096\u0003 \u0010\u0000\u0096\u0019\u0001\u0000\u0000\u0000"+
-		"\u0097\u0098\u0005\u000b\u0000\u0000\u0098\u0099\u0003 \u0010\u0000\u0099"+
-		"\u009a\u0005\u0004\u0000\u0000\u009a\u009e\u0001\u0000\u0000\u0000\u009b"+
-		"\u009c\u0005\u000b\u0000\u0000\u009c\u009e\u0005\u0004\u0000\u0000\u009d"+
-		"\u0097\u0001\u0000\u0000\u0000\u009d\u009b\u0001\u0000\u0000\u0000\u009e"+
-		"\u001b\u0001\u0000\u0000\u0000\u009f\u00a0\u0005\f\u0000\u0000\u00a0\u00a1"+
-		"\u0005\u0005\u0000\u0000\u00a1\u00a2\u0003 \u0010\u0000\u00a2\u00a3\u0005"+
-		"\u0006\u0000\u0000\u00a3\u00a6\u0003\u0014\n\u0000\u00a4\u00a5\u0005\r"+
-		"\u0000\u0000\u00a5\u00a7\u0003\u0014\n\u0000\u00a6\u00a4\u0001\u0000\u0000"+
-		"\u0000\u00a6\u00a7\u0001\u0000\u0000\u0000\u00a7\u00d3\u0001\u0000\u0000"+
-		"\u0000\u00a8\u00a9\u0005\u000e\u0000\u0000\u00a9\u00ac\u0005\u0005\u0000"+
-		"\u0000\u00aa\u00ad\u0003(\u0014\u0000\u00ab\u00ad\u0003\u0018\f\u0000"+
-		"\u00ac\u00aa\u0001\u0000\u0000\u0000\u00ac\u00ab\u0001\u0000\u0000\u0000"+
-		"\u00ad\u00ae\u0001\u0000\u0000\u0000\u00ae\u00af\u0005\u0004\u0000\u0000"+
-		"\u00af\u00b0\u0003 \u0010\u0000\u00b0\u00b1\u0005\u0004\u0000\u0000\u00b1"+
-		"\u00b2\u0003(\u0014\u0000\u00b2\u00b3\u0005\u0006\u0000\u0000\u00b3\u00b4"+
-		"\u0003\u0014\n\u0000\u00b4\u00d3\u0001\u0000\u0000\u0000\u00b5\u00b6\u0005"+
-		"\u000f\u0000\u0000\u00b6\u00b7\u0005\u0005\u0000\u0000\u00b7\u00b8\u0003"+
-		" \u0010\u0000\u00b8\u00b9\u0005\u0006\u0000\u0000\u00b9\u00ba\u0003\u0014"+
-		"\n\u0000\u00ba\u00d3\u0001\u0000\u0000\u0000\u00bb\u00bc\u0005\u0010\u0000"+
-		"\u0000\u00bc\u00bd\u0003\u0014\n\u0000\u00bd\u00be\u0005\u000f\u0000\u0000"+
-		"\u00be\u00bf\u0005\u0005\u0000\u0000\u00bf\u00c0\u0003 \u0010\u0000\u00c0"+
-		"\u00c2\u0005\u0006\u0000\u0000\u00c1\u00c3\u0005\u0004\u0000\u0000\u00c2"+
-		"\u00c1\u0001\u0000\u0000\u0000\u00c2\u00c3\u0001\u0000\u0000\u0000\u00c3"+
-		"\u00d3\u0001\u0000\u0000\u0000\u00c4\u00c5\u0005\u0011\u0000\u0000\u00c5"+
-		"\u00d3\u0005\u0004\u0000\u0000\u00c6\u00c7\u0003\u0016\u000b\u0000\u00c7"+
-		"\u00c8\u0005\u0004\u0000\u0000\u00c8\u00d3\u0001\u0000\u0000\u0000\u00c9"+
-		"\u00ca\u0003\u0018\f\u0000\u00ca\u00cb\u0005\u0004\u0000\u0000\u00cb\u00d3"+
-		"\u0001\u0000\u0000\u0000\u00cc\u00cd\u0003(\u0014\u0000\u00cd\u00ce\u0005"+
-		"\u0004\u0000\u0000\u00ce\u00d3\u0001\u0000\u0000\u0000\u00cf\u00d0\u0003"+
-		"\u001e\u000f\u0000\u00d0\u00d1\u0005\u0004\u0000\u0000\u00d1\u00d3\u0001"+
-		"\u0000\u0000\u0000\u00d2\u009f\u0001\u0000\u0000\u0000\u00d2\u00a8\u0001"+
-		"\u0000\u0000\u0000\u00d2\u00b5\u0001\u0000\u0000\u0000\u00d2\u00bb\u0001"+
-		"\u0000\u0000\u0000\u00d2\u00c4\u0001\u0000\u0000\u0000\u00d2\u00c6\u0001"+
-		"\u0000\u0000\u0000\u00d2\u00c9\u0001\u0000\u0000\u0000\u00d2\u00cc\u0001"+
-		"\u0000\u0000\u0000\u00d2\u00cf\u0001\u0000\u0000\u0000\u00d3\u001d\u0001"+
-		"\u0000\u0000\u0000\u00d4\u00d7\u0003*\u0015\u0000\u00d5\u00d7\u0003,\u0016"+
-		"\u0000\u00d6\u00d4\u0001\u0000\u0000\u0000\u00d6\u00d5\u0001\u0000\u0000"+
-		"\u0000\u00d7\u001f\u0001\u0000\u0000\u0000\u00d8\u00d9\u0006\u0010\uffff"+
-		"\uffff\u0000\u00d9\u00da\u0003$\u0012\u0000\u00da\u00db\u0003 \u0010\u0005"+
-		"\u00db\u00e4\u0001\u0000\u0000\u0000\u00dc\u00e4\u00034\u001a\u0000\u00dd"+
-		"\u00de\u0005\u0005\u0000\u0000\u00de\u00df\u0003 \u0010\u0000\u00df\u00e0"+
-		"\u0005\u0006\u0000\u0000\u00e0\u00e4\u0001\u0000\u0000\u0000\u00e1\u00e4"+
-		"\u0003&\u0013\u0000\u00e2\u00e4\u0003\u001e\u000f\u0000\u00e3\u00d8\u0001"+
-		"\u0000\u0000\u0000\u00e3\u00dc\u0001\u0000\u0000\u0000\u00e3\u00dd\u0001"+
-		"\u0000\u0000\u0000\u00e3\u00e1\u0001\u0000\u0000\u0000\u00e3\u00e2\u0001"+
-		"\u0000\u0000\u0000\u00e4\u00eb\u0001\u0000\u0000\u0000\u00e5\u00e6\n\u0006"+
-		"\u0000\u0000\u00e6\u00e7\u0003\"\u0011\u0000\u00e7\u00e8\u0003 \u0010"+
-		"\u0007\u00e8\u00ea\u0001\u0000\u0000\u0000\u00e9\u00e5\u0001\u0000\u0000"+
-		"\u0000\u00ea\u00ed\u0001\u0000\u0000\u0000\u00eb\u00e9\u0001\u0000\u0000"+
-		"\u0000\u00eb\u00ec\u0001\u0000\u0000\u0000\u00ec!\u0001\u0000\u0000\u0000"+
-		"\u00ed\u00eb\u0001\u0000\u0000\u0000\u00ee\u00ef\u0007\u0001\u0000\u0000"+
-		"\u00ef#\u0001\u0000\u0000\u0000\u00f0\u00f1\u0007\u0002\u0000\u0000\u00f1"+
-		"%\u0001\u0000\u0000\u0000\u00f2\u00f3\u0005\u0016\u0000\u0000\u00f3\u00f8"+
-		"\u0005\u0012\u0000\u0000\u00f4\u00f5\u0003,\u0016\u0000\u00f5\u00f6\u0005"+
-		"\u0012\u0000\u0000\u00f6\u00f8\u0001\u0000\u0000\u0000\u00f7\u00f2\u0001"+
-		"\u0000\u0000\u0000\u00f7\u00f4\u0001\u0000\u0000\u0000\u00f7\u00f8\u0001"+
-		"\u0000\u0000\u0000\u00f8\u00fe\u0001\u0000\u0000\u0000\u00f9\u00fa\u0003"+
-		".\u0017\u0000\u00fa\u00fb\u0005\u0012\u0000\u0000\u00fb\u00fd\u0001\u0000"+
-		"\u0000\u0000\u00fc\u00f9\u0001\u0000\u0000\u0000\u00fd\u0100\u0001\u0000"+
-		"\u0000\u0000\u00fe\u00fc\u0001\u0000\u0000\u0000\u00fe\u00ff\u0001\u0000"+
-		"\u0000\u0000\u00ff\u0101\u0001\u0000\u0000\u0000\u0100\u00fe\u0001\u0000"+
-		"\u0000\u0000\u0101\u0102\u00036\u001b\u0000\u0102\'\u0001\u0000\u0000"+
-		"\u0000\u0103\u0104\u0003&\u0013\u0000\u0104\u0105\u0003\u0004\u0002\u0000"+
-		"\u0105\u0106\u0003 \u0010\u0000\u0106)\u0001\u0000\u0000\u0000\u0107\u0108"+
-		"\u0005\u0016\u0000\u0000\u0108\u010d\u0005\u0012\u0000\u0000\u0109\u010a"+
-		"\u0003,\u0016\u0000\u010a\u010b\u0005\u0012\u0000\u0000\u010b\u010d\u0001"+
-		"\u0000\u0000\u0000\u010c\u0107\u0001\u0000\u0000\u0000\u010c\u0109\u0001"+
-		"\u0000\u0000\u0000\u010c\u010d\u0001\u0000\u0000\u0000\u010d\u0113\u0001"+
-		"\u0000\u0000\u0000\u010e\u010f\u0003.\u0017\u0000\u010f\u0110\u0005\u0012"+
-		"\u0000\u0000\u0110\u0112\u0001\u0000\u0000\u0000\u0111\u010e\u0001\u0000"+
-		"\u0000\u0000\u0112\u0115\u0001\u0000\u0000\u0000\u0113\u0111\u0001\u0000"+
-		"\u0000\u0000\u0113\u0114\u0001\u0000\u0000\u0000\u0114\u0116\u0001\u0000"+
-		"\u0000\u0000\u0115\u0113\u0001\u0000\u0000\u0000\u0116\u0117\u00030\u0018"+
-		"\u0000\u0117+\u0001\u0000\u0000\u0000\u0118\u0119\u0005\u0014\u0000\u0000"+
-		"\u0119\u011a\u0003\b\u0004\u0000\u011a\u011c\u0005\u0005\u0000\u0000\u011b"+
-		"\u011d\u00032\u0019\u0000\u011c\u011b\u0001\u0000\u0000\u0000\u011c\u011d"+
-		"\u0001\u0000\u0000\u0000\u011d\u011e\u0001\u0000\u0000\u0000\u011e\u011f"+
-		"\u0005\u0006\u0000\u0000\u011f-\u0001\u0000\u0000\u0000\u0120\u0123\u0003"+
-		"0\u0018\u0000\u0121\u0123\u00036\u001b\u0000\u0122\u0120\u0001\u0000\u0000"+
-		"\u0000\u0122\u0121\u0001\u0000\u0000\u0000\u0123/\u0001\u0000\u0000\u0000"+
-		"\u0124\u0125\u00036\u001b\u0000\u0125\u0127\u0005\u0005\u0000\u0000\u0126"+
-		"\u0128\u00032\u0019\u0000\u0127\u0126\u0001\u0000\u0000\u0000\u0127\u0128"+
-		"\u0001\u0000\u0000\u0000\u0128\u0129\u0001\u0000\u0000\u0000\u0129\u012a"+
-		"\u0005\u0006\u0000\u0000\u012a1\u0001\u0000\u0000\u0000\u012b\u0130\u0003"+
-		" \u0010\u0000\u012c\u012d\u0005\n\u0000\u0000\u012d\u012f\u0003 \u0010"+
-		"\u0000\u012e\u012c\u0001\u0000\u0000\u0000\u012f\u0132\u0001\u0000\u0000"+
-		"\u0000\u0130\u012e\u0001\u0000\u0000\u0000\u0130\u0131\u0001\u0000\u0000"+
-		"\u0000\u01313\u0001\u0000\u0000\u0000\u0132\u0130\u0001\u0000\u0000\u0000"+
-		"\u0133\u0134\u0007\u0003\u0000\u0000\u01345\u0001\u0000\u0000\u0000\u0135"+
-		"\u0136\u0005-\u0000\u0000\u01367\u0001\u0000\u0000\u0000\u001b=BDJTZa"+
-		"s}\u0087\u008b\u009d\u00a6\u00ac\u00c2\u00d2\u00d6\u00e3\u00eb\u00f7\u00fe"+
-		"\u010c\u0113\u011c\u0122\u0127\u0130";
+		".\u0156\u0000<\u0001\u0000\u0000\u0000\u0002N\u0001\u0000\u0000\u0000"+
+		"\u0004T\u0001\u0000\u0000\u0000\u0006X\u0001\u0000\u0000\u0000\b^\u0001"+
+		"\u0000\u0000\u0000\n`\u0001\u0000\u0000\u0000\fj\u0001\u0000\u0000\u0000"+
+		"\u000es\u0001\u0000\u0000\u0000\u0010|\u0001\u0000\u0000\u0000\u0012\u0084"+
+		"\u0001\u0000\u0000\u0000\u0014\u0087\u0001\u0000\u0000\u0000\u0016\u0093"+
+		"\u0001\u0000\u0000\u0000\u0018\u0096\u0001\u0000\u0000\u0000\u001a\u00a1"+
+		"\u0001\u0000\u0000\u0000\u001c\u00ce\u0001\u0000\u0000\u0000\u001e\u00d2"+
+		"\u0001\u0000\u0000\u0000 \u00df\u0001\u0000\u0000\u0000\"\u00ea\u0001"+
+		"\u0000\u0000\u0000$\u00ec\u0001\u0000\u0000\u0000&\u00f3\u0001\u0000\u0000"+
+		"\u0000(\u00ff\u0001\u0000\u0000\u0000*\u0108\u0001\u0000\u0000\u0000,"+
+		"\u0114\u0001\u0000\u0000\u0000.\u011e\u0001\u0000\u0000\u00000\u0120\u0001"+
+		"\u0000\u0000\u00002\u0127\u0001\u0000\u0000\u00004\u012f\u0001\u0000\u0000"+
+		"\u00006\u013e\u0001\u0000\u0000\u00008\u0145\u0001\u0000\u0000\u0000:"+
+		"\u0147\u0001\u0000\u0000\u0000<=\u0005\u0011\u0000\u0000=>\u0005\u0001"+
+		"\u0000\u0000>?\u0003:\u001d\u0000?A\u0005\u0002\u0000\u0000@B\u0003\f"+
+		"\u0006\u0000A@\u0001\u0000\u0000\u0000AB\u0001\u0000\u0000\u0000BH\u0001"+
+		"\u0000\u0000\u0000CG\u0003\u0002\u0001\u0000DG\u0003\n\u0005\u0000EG\u0003"+
+		"\u000e\u0007\u0000FC\u0001\u0000\u0000\u0000FD\u0001\u0000\u0000\u0000"+
+		"FE\u0001\u0000\u0000\u0000GJ\u0001\u0000\u0000\u0000HF\u0001\u0000\u0000"+
+		"\u0000HI\u0001\u0000\u0000\u0000IK\u0001\u0000\u0000\u0000JH\u0001\u0000"+
+		"\u0000\u0000KL\u0005\u0003\u0000\u0000L\u0001\u0001\u0000\u0000\u0000"+
+		"MO\u0005\u0011\u0000\u0000NM\u0001\u0000\u0000\u0000NO\u0001\u0000\u0000"+
+		"\u0000OP\u0001\u0000\u0000\u0000PQ\u0003\b\u0004\u0000QR\u0003:\u001d"+
+		"\u0000RS\u0005\u0004\u0000\u0000S\u0003\u0001\u0000\u0000\u0000TU\u0007"+
+		"\u0000\u0000\u0000U\u0005\u0001\u0000\u0000\u0000VY\u0003\b\u0004\u0000"+
+		"WY\u0005)\u0000\u0000XV\u0001\u0000\u0000\u0000XW\u0001\u0000\u0000\u0000"+
+		"Y\u0007\u0001\u0000\u0000\u0000Z_\u0005\'\u0000\u0000[_\u0005(\u0000\u0000"+
+		"\\_\u0005*\u0000\u0000]_\u0003:\u001d\u0000^Z\u0001\u0000\u0000\u0000"+
+		"^[\u0001\u0000\u0000\u0000^\\\u0001\u0000\u0000\u0000^]\u0001\u0000\u0000"+
+		"\u0000_\t\u0001\u0000\u0000\u0000`a\u0005\u0011\u0000\u0000ab\u0003\u0006"+
+		"\u0003\u0000bc\u0003:\u001d\u0000ce\u0005\u0005\u0000\u0000df\u0003\u0010"+
+		"\b\u0000ed\u0001\u0000\u0000\u0000ef\u0001\u0000\u0000\u0000fg\u0001\u0000"+
+		"\u0000\u0000gh\u0005\u0006\u0000\u0000hi\u0003\u0014\n\u0000i\u000b\u0001"+
+		"\u0000\u0000\u0000jk\u0005\u0011\u0000\u0000kl\u0005\u0007\u0000\u0000"+
+		"lm\u0005)\u0000\u0000mn\u0005\b\u0000\u0000no\u0005\u0005\u0000\u0000"+
+		"op\u0005\t\u0000\u0000pq\u0005\u0006\u0000\u0000qr\u0003\u0014\n\u0000"+
+		"r\r\u0001\u0000\u0000\u0000st\u0005\u0011\u0000\u0000tu\u0003:\u001d\u0000"+
+		"uw\u0005\u0005\u0000\u0000vx\u0003\u0010\b\u0000wv\u0001\u0000\u0000\u0000"+
+		"wx\u0001\u0000\u0000\u0000xy\u0001\u0000\u0000\u0000yz\u0005\u0006\u0000"+
+		"\u0000z{\u0003\u0014\n\u0000{\u000f\u0001\u0000\u0000\u0000|\u0081\u0003"+
+		"\u0012\t\u0000}~\u0005\n\u0000\u0000~\u0080\u0003\u0012\t\u0000\u007f"+
+		"}\u0001\u0000\u0000\u0000\u0080\u0083\u0001\u0000\u0000\u0000\u0081\u007f"+
+		"\u0001\u0000\u0000\u0000\u0081\u0082\u0001\u0000\u0000\u0000\u0082\u0011"+
+		"\u0001\u0000\u0000\u0000\u0083\u0081\u0001\u0000\u0000\u0000\u0084\u0085"+
+		"\u0003\b\u0004\u0000\u0085\u0086\u0003:\u001d\u0000\u0086\u0013\u0001"+
+		"\u0000\u0000\u0000\u0087\u008b\u0005\u0002\u0000\u0000\u0088\u008a\u0003"+
+		"\u001c\u000e\u0000\u0089\u0088\u0001\u0000\u0000\u0000\u008a\u008d\u0001"+
+		"\u0000\u0000\u0000\u008b\u0089\u0001\u0000\u0000\u0000\u008b\u008c\u0001"+
+		"\u0000\u0000\u0000\u008c\u008f\u0001\u0000\u0000\u0000\u008d\u008b\u0001"+
+		"\u0000\u0000\u0000\u008e\u0090\u0003\u001a\r\u0000\u008f\u008e\u0001\u0000"+
+		"\u0000\u0000\u008f\u0090\u0001\u0000\u0000\u0000\u0090\u0091\u0001\u0000"+
+		"\u0000\u0000\u0091\u0092\u0005\u0003\u0000\u0000\u0092\u0015\u0001\u0000"+
+		"\u0000\u0000\u0093\u0094\u0003\b\u0004\u0000\u0094\u0095\u0003:\u001d"+
+		"\u0000\u0095\u0017\u0001\u0000\u0000\u0000\u0096\u0097\u0003\b\u0004\u0000"+
+		"\u0097\u0098\u0003:\u001d\u0000\u0098\u0099\u0005\"\u0000\u0000\u0099"+
+		"\u009a\u0003 \u0010\u0000\u009a\u0019\u0001\u0000\u0000\u0000\u009b\u009c"+
+		"\u0005\u000b\u0000\u0000\u009c\u009d\u0003 \u0010\u0000\u009d\u009e\u0005"+
+		"\u0004\u0000\u0000\u009e\u00a2\u0001\u0000\u0000\u0000\u009f\u00a0\u0005"+
+		"\u000b\u0000\u0000\u00a0\u00a2\u0005\u0004\u0000\u0000\u00a1\u009b\u0001"+
+		"\u0000\u0000\u0000\u00a1\u009f\u0001\u0000\u0000\u0000\u00a2\u001b\u0001"+
+		"\u0000\u0000\u0000\u00a3\u00cf\u00034\u001a\u0000\u00a4\u00a5\u0005\f"+
+		"\u0000\u0000\u00a5\u00a8\u0005\u0005\u0000\u0000\u00a6\u00a9\u0003(\u0014"+
+		"\u0000\u00a7\u00a9\u0003\u0018\f\u0000\u00a8\u00a6\u0001\u0000\u0000\u0000"+
+		"\u00a8\u00a7\u0001\u0000\u0000\u0000\u00a9\u00aa\u0001\u0000\u0000\u0000"+
+		"\u00aa\u00ab\u0005\u0004\u0000\u0000\u00ab\u00ac\u0003 \u0010\u0000\u00ac"+
+		"\u00ad\u0005\u0004\u0000\u0000\u00ad\u00ae\u0003(\u0014\u0000\u00ae\u00af"+
+		"\u0005\u0006\u0000\u0000\u00af\u00b0\u0003\u0014\n\u0000\u00b0\u00cf\u0001"+
+		"\u0000\u0000\u0000\u00b1\u00b2\u0005\r\u0000\u0000\u00b2\u00b3\u0005\u0005"+
+		"\u0000\u0000\u00b3\u00b4\u0003 \u0010\u0000\u00b4\u00b5\u0005\u0006\u0000"+
+		"\u0000\u00b5\u00b6\u0003\u0014\n\u0000\u00b6\u00cf\u0001\u0000\u0000\u0000"+
+		"\u00b7\u00b8\u0005\u000e\u0000\u0000\u00b8\u00b9\u0003\u0014\n\u0000\u00b9"+
+		"\u00ba\u0005\r\u0000\u0000\u00ba\u00bb\u0005\u0005\u0000\u0000\u00bb\u00bc"+
+		"\u0003 \u0010\u0000\u00bc\u00be\u0005\u0006\u0000\u0000\u00bd\u00bf\u0005"+
+		"\u0004\u0000\u0000\u00be\u00bd\u0001\u0000\u0000\u0000\u00be\u00bf\u0001"+
+		"\u0000\u0000\u0000\u00bf\u00cf\u0001\u0000\u0000\u0000\u00c0\u00c1\u0005"+
+		"\u000f\u0000\u0000\u00c1\u00cf\u0005\u0004\u0000\u0000\u00c2\u00c3\u0003"+
+		"\u0016\u000b\u0000\u00c3\u00c4\u0005\u0004\u0000\u0000\u00c4\u00cf\u0001"+
+		"\u0000\u0000\u0000\u00c5\u00c6\u0003\u0018\f\u0000\u00c6\u00c7\u0005\u0004"+
+		"\u0000\u0000\u00c7\u00cf\u0001\u0000\u0000\u0000\u00c8\u00c9\u0003(\u0014"+
+		"\u0000\u00c9\u00ca\u0005\u0004\u0000\u0000\u00ca\u00cf\u0001\u0000\u0000"+
+		"\u0000\u00cb\u00cc\u0003\u001e\u000f\u0000\u00cc\u00cd\u0005\u0004\u0000"+
+		"\u0000\u00cd\u00cf\u0001\u0000\u0000\u0000\u00ce\u00a3\u0001\u0000\u0000"+
+		"\u0000\u00ce\u00a4\u0001\u0000\u0000\u0000\u00ce\u00b1\u0001\u0000\u0000"+
+		"\u0000\u00ce\u00b7\u0001\u0000\u0000\u0000\u00ce\u00c0\u0001\u0000\u0000"+
+		"\u0000\u00ce\u00c2\u0001\u0000\u0000\u0000\u00ce\u00c5\u0001\u0000\u0000"+
+		"\u0000\u00ce\u00c8\u0001\u0000\u0000\u0000\u00ce\u00cb\u0001\u0000\u0000"+
+		"\u0000\u00cf\u001d\u0001\u0000\u0000\u0000\u00d0\u00d3\u0003*\u0015\u0000"+
+		"\u00d1\u00d3\u0003,\u0016\u0000\u00d2\u00d0\u0001\u0000\u0000\u0000\u00d2"+
+		"\u00d1\u0001\u0000\u0000\u0000\u00d3\u001f\u0001\u0000\u0000\u0000\u00d4"+
+		"\u00d5\u0006\u0010\uffff\uffff\u0000\u00d5\u00d6\u0003$\u0012\u0000\u00d6"+
+		"\u00d7\u0003 \u0010\u0005\u00d7\u00e0\u0001\u0000\u0000\u0000\u00d8\u00e0"+
+		"\u00038\u001c\u0000\u00d9\u00da\u0005\u0005\u0000\u0000\u00da\u00db\u0003"+
+		" \u0010\u0000\u00db\u00dc\u0005\u0006\u0000\u0000\u00dc\u00e0\u0001\u0000"+
+		"\u0000\u0000\u00dd\u00e0\u0003&\u0013\u0000\u00de\u00e0\u0003\u001e\u000f"+
+		"\u0000\u00df\u00d4\u0001\u0000\u0000\u0000\u00df\u00d8\u0001\u0000\u0000"+
+		"\u0000\u00df\u00d9\u0001\u0000\u0000\u0000\u00df\u00dd\u0001\u0000\u0000"+
+		"\u0000\u00df\u00de\u0001\u0000\u0000\u0000\u00e0\u00e7\u0001\u0000\u0000"+
+		"\u0000\u00e1\u00e2\n\u0006\u0000\u0000\u00e2\u00e3\u0003\"\u0011\u0000"+
+		"\u00e3\u00e4\u0003 \u0010\u0007\u00e4\u00e6\u0001\u0000\u0000\u0000\u00e5"+
+		"\u00e1\u0001\u0000\u0000\u0000\u00e6\u00e9\u0001\u0000\u0000\u0000\u00e7"+
+		"\u00e5\u0001\u0000\u0000\u0000\u00e7\u00e8\u0001\u0000\u0000\u0000\u00e8"+
+		"!\u0001\u0000\u0000\u0000\u00e9\u00e7\u0001\u0000\u0000\u0000\u00ea\u00eb"+
+		"\u0007\u0001\u0000\u0000\u00eb#\u0001\u0000\u0000\u0000\u00ec\u00ed\u0007"+
+		"\u0002\u0000\u0000\u00ed%\u0001\u0000\u0000\u0000\u00ee\u00ef\u0005\u0014"+
+		"\u0000\u0000\u00ef\u00f4\u0005\u0010\u0000\u0000\u00f0\u00f1\u0003,\u0016"+
+		"\u0000\u00f1\u00f2\u0005\u0010\u0000\u0000\u00f2\u00f4\u0001\u0000\u0000"+
+		"\u0000\u00f3\u00ee\u0001\u0000\u0000\u0000\u00f3\u00f0\u0001\u0000\u0000"+
+		"\u0000\u00f3\u00f4\u0001\u0000\u0000\u0000\u00f4\u00fa\u0001\u0000\u0000"+
+		"\u0000\u00f5\u00f6\u0003.\u0017\u0000\u00f6\u00f7\u0005\u0010\u0000\u0000"+
+		"\u00f7\u00f9\u0001\u0000\u0000\u0000\u00f8\u00f5\u0001\u0000\u0000\u0000"+
+		"\u00f9\u00fc\u0001\u0000\u0000\u0000\u00fa\u00f8\u0001\u0000\u0000\u0000"+
+		"\u00fa\u00fb\u0001\u0000\u0000\u0000\u00fb\u00fd\u0001\u0000\u0000\u0000"+
+		"\u00fc\u00fa\u0001\u0000\u0000\u0000\u00fd\u00fe\u0003:\u001d\u0000\u00fe"+
+		"\'\u0001\u0000\u0000\u0000\u00ff\u0100\u0003&\u0013\u0000\u0100\u0101"+
+		"\u0003\u0004\u0002\u0000\u0101\u0102\u0003 \u0010\u0000\u0102)\u0001\u0000"+
+		"\u0000\u0000\u0103\u0104\u0005\u0014\u0000\u0000\u0104\u0109\u0005\u0010"+
+		"\u0000\u0000\u0105\u0106\u0003,\u0016\u0000\u0106\u0107\u0005\u0010\u0000"+
+		"\u0000\u0107\u0109\u0001\u0000\u0000\u0000\u0108\u0103\u0001\u0000\u0000"+
+		"\u0000\u0108\u0105\u0001\u0000\u0000\u0000\u0108\u0109\u0001\u0000\u0000"+
+		"\u0000\u0109\u010f\u0001\u0000\u0000\u0000\u010a\u010b\u0003.\u0017\u0000"+
+		"\u010b\u010c\u0005\u0010\u0000\u0000\u010c\u010e\u0001\u0000\u0000\u0000"+
+		"\u010d\u010a\u0001\u0000\u0000\u0000\u010e\u0111\u0001\u0000\u0000\u0000"+
+		"\u010f\u010d\u0001\u0000\u0000\u0000\u010f\u0110\u0001\u0000\u0000\u0000"+
+		"\u0110\u0112\u0001\u0000\u0000\u0000\u0111\u010f\u0001\u0000\u0000\u0000"+
+		"\u0112\u0113\u00030\u0018\u0000\u0113+\u0001\u0000\u0000\u0000\u0114\u0115"+
+		"\u0005\u0012\u0000\u0000\u0115\u0116\u0003\b\u0004\u0000\u0116\u0118\u0005"+
+		"\u0005\u0000\u0000\u0117\u0119\u00032\u0019\u0000\u0118\u0117\u0001\u0000"+
+		"\u0000\u0000\u0118\u0119\u0001\u0000\u0000\u0000\u0119\u011a\u0001\u0000"+
+		"\u0000\u0000\u011a\u011b\u0005\u0006\u0000\u0000\u011b-\u0001\u0000\u0000"+
+		"\u0000\u011c\u011f\u00030\u0018\u0000\u011d\u011f\u0003:\u001d\u0000\u011e"+
+		"\u011c\u0001\u0000\u0000\u0000\u011e\u011d\u0001\u0000\u0000\u0000\u011f"+
+		"/\u0001\u0000\u0000\u0000\u0120\u0121\u0003:\u001d\u0000\u0121\u0123\u0005"+
+		"\u0005\u0000\u0000\u0122\u0124\u00032\u0019\u0000\u0123\u0122\u0001\u0000"+
+		"\u0000\u0000\u0123\u0124\u0001\u0000\u0000\u0000\u0124\u0125\u0001\u0000"+
+		"\u0000\u0000\u0125\u0126\u0005\u0006\u0000\u0000\u01261\u0001\u0000\u0000"+
+		"\u0000\u0127\u012c\u0003 \u0010\u0000\u0128\u0129\u0005\n\u0000\u0000"+
+		"\u0129\u012b\u0003 \u0010\u0000\u012a\u0128\u0001\u0000\u0000\u0000\u012b"+
+		"\u012e\u0001\u0000\u0000\u0000\u012c\u012a\u0001\u0000\u0000\u0000\u012c"+
+		"\u012d\u0001\u0000\u0000\u0000\u012d3\u0001\u0000\u0000\u0000\u012e\u012c"+
+		"\u0001\u0000\u0000\u0000\u012f\u0130\u0005\u0015\u0000\u0000\u0130\u0131"+
+		"\u0005\u0005\u0000\u0000\u0131\u0132\u0003 \u0010\u0000\u0132\u0133\u0005"+
+		"\u0006\u0000\u0000\u0133\u0137\u0003\u0014\n\u0000\u0134\u0136\u00036"+
+		"\u001b\u0000\u0135\u0134\u0001\u0000\u0000\u0000\u0136\u0139\u0001\u0000"+
+		"\u0000\u0000\u0137\u0135\u0001\u0000\u0000\u0000\u0137\u0138\u0001\u0000"+
+		"\u0000\u0000\u0138\u013c\u0001\u0000\u0000\u0000\u0139\u0137\u0001\u0000"+
+		"\u0000\u0000\u013a\u013b\u0005\u0016\u0000\u0000\u013b\u013d\u0003\u0014"+
+		"\n\u0000\u013c\u013a\u0001\u0000\u0000\u0000\u013c\u013d\u0001\u0000\u0000"+
+		"\u0000\u013d5\u0001\u0000\u0000\u0000\u013e\u013f\u0005\u0016\u0000\u0000"+
+		"\u013f\u0140\u0005\u0015\u0000\u0000\u0140\u0141\u0005\u0005\u0000\u0000"+
+		"\u0141\u0142\u0003 \u0010\u0000\u0142\u0143\u0005\u0006\u0000\u0000\u0143"+
+		"\u0144\u0003\u0014\n\u0000\u01447\u0001\u0000\u0000\u0000\u0145\u0146"+
+		"\u0007\u0003\u0000\u0000\u01469\u0001\u0000\u0000\u0000\u0147\u0148\u0005"+
+		"-\u0000\u0000\u0148;\u0001\u0000\u0000\u0000\u001cAFHNX^ew\u0081\u008b"+
+		"\u008f\u00a1\u00a8\u00be\u00ce\u00d2\u00df\u00e7\u00f3\u00fa\u0108\u010f"+
+		"\u0118\u011e\u0123\u012c\u0137\u013c";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/de/maishai/antlr/DecafVisitor.java b/src/main/java/de/maishai/antlr/DecafVisitor.java
index fbaafbe..bbc67af 100644
--- a/src/main/java/de/maishai/antlr/DecafVisitor.java
+++ b/src/main/java/de/maishai/antlr/DecafVisitor.java
@@ -267,6 +267,18 @@ public interface DecafVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitArgs(DecafParser.ArgsContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link DecafParser#ifCall}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitIfCall(DecafParser.IfCallContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link DecafParser#elseIf}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitElseIf(DecafParser.ElseIfContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link DecafParser#literal}.
 	 * @param ctx the parse tree
diff --git a/src/test/java/E2ETests.java b/src/test/java/E2ETests.java
index 8ae34ec..de9b800 100644
--- a/src/test/java/E2ETests.java
+++ b/src/test/java/E2ETests.java
@@ -3,5 +3,28 @@ public class E2ETests {
 
     public E2ETests() {
         this.ZZ = 'z';
+//        if (stuff1) {
+//            ifcontent
+//        } else if (stuff2) {
+//            content2
+//        } else if (stuffs3) {
+//            content3
+//        } else {
+//            contents4
+//        }
+//
+//        if (stuff1) {
+//            ifcontent
+//        } else {
+//            if (stuff2) {
+//                content2
+//            } else {
+//                if (stuff3) {
+//                    content3
+//                } else {
+//                    content4
+//                }
+//            }
+//        }
     }
 }