From 31290c7c2c842504504d81efd77a45b3d5abacfb Mon Sep 17 00:00:00 2001
From: laurenz <i22032@hb.dhbw-stuttgart.de>
Date: Thu, 16 May 2024 18:09:29 +0200
Subject: [PATCH] Parser doesn't accept code after a return statement
 (unreachable)

---
 src/main/antlr/Decaf.g4                       |   8 +-
 src/main/java/de/maishai/BlockGenerator.java  |   8 +-
 .../java/de/maishai/StatementGenerator.java   |  10 -
 src/main/java/de/maishai/antlr/Decaf.interp   |   5 +-
 src/main/java/de/maishai/antlr/Decaf.tokens   |  12 +-
 .../de/maishai/antlr/DecafBaseListener.java   |  36 +-
 .../de/maishai/antlr/DecafBaseVisitor.java    |  21 +-
 .../java/de/maishai/antlr/DecafLexer.interp   |   4 +-
 .../java/de/maishai/antlr/DecafLexer.java     | 360 +++----
 .../java/de/maishai/antlr/DecafLexer.tokens   |  12 +-
 .../java/de/maishai/antlr/DecafListener.java  |  34 +-
 .../java/de/maishai/antlr/DecafParser.java    | 908 +++++++++---------
 .../java/de/maishai/antlr/DecafVisitor.java   |  20 +-
 13 files changed, 710 insertions(+), 728 deletions(-)

diff --git a/src/main/antlr/Decaf.g4 b/src/main/antlr/Decaf.g4
index 733e6b8..2761fa8 100644
--- a/src/main/antlr/Decaf.g4
+++ b/src/main/antlr/Decaf.g4
@@ -15,14 +15,16 @@ constructor: PUBLIC id '(' params? ')' block;
 params : param (',' param)*;
 param : type id;
 
-block : '{' (localVar | stmt)* '}';
+block : '{' (localVar | stmt)* return? '}';
+return:     'return' expr ';'
+            | 'return' ';'
+;
+
 
 stmt : 'if' '(' expr ')' block ('else' block)?  #If
     | 'for' '(' assign ';' expr ';' assign ')' block  #For
     | 'while' '(' expr ')' block                #While
     | 'do' block 'while' '(' expr ')' ';'?      #DoWhile
-    | 'return' expr ';'                         #Return
-    | 'return' ';'                              #ReturnVoid
     | 'break' ';'                               #Break
     | assign ';'                                #Assignment
     | stmtexpr ';'                              #StatementExpressionstmt
diff --git a/src/main/java/de/maishai/BlockGenerator.java b/src/main/java/de/maishai/BlockGenerator.java
index 162da80..6a8a3bf 100644
--- a/src/main/java/de/maishai/BlockGenerator.java
+++ b/src/main/java/de/maishai/BlockGenerator.java
@@ -3,16 +3,22 @@ package de.maishai;
 import de.maishai.antlr.DecafBaseVisitor;
 import de.maishai.antlr.DecafParser;
 import de.maishai.ast.records.Declaration;
+import de.maishai.ast.records.Return;
 import de.maishai.ast.records.Statement;
 import de.maishai.ast.records.Block;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class BlockGenerator extends DecafBaseVisitor<Block> {
     @Override
     public Block visitBlock(DecafParser.BlockContext ctx) {
         List<Declaration> vars = ctx.localVar().stream().map(var -> new VariableGenerator().visit(var)).toList();
-        List<Statement> statements = ctx.stmt().stream().map(stmt -> new StatementGenerator().visit(stmt)).toList();
+        List<Statement> statements = ctx.stmt().stream().map(stmt -> new StatementGenerator().visit(stmt)).collect(Collectors.toCollection(ArrayList<Statement> :: new));
+        if (ctx.return_() != null){
+            statements.add(ctx.return_().isEmpty() ? new Return(null) : new Return(new ExpressionGenerator().visit(ctx.return_())));
+        }
         return new Block(vars, statements);
     }
 }
diff --git a/src/main/java/de/maishai/StatementGenerator.java b/src/main/java/de/maishai/StatementGenerator.java
index e4e8366..ee138eb 100644
--- a/src/main/java/de/maishai/StatementGenerator.java
+++ b/src/main/java/de/maishai/StatementGenerator.java
@@ -46,16 +46,6 @@ public class StatementGenerator extends DecafBaseVisitor<Statement> {
         return new DoWhile(block, expr);
     }
 
-    @Override
-    public Statement visitReturn(DecafParser.ReturnContext ctx) {
-        return new Return(new ExpressionGenerator().visit(ctx.expr()));
-    }
-
-    @Override
-    public Statement visitReturnVoid(DecafParser.ReturnVoidContext ctx) {
-        return new Return(null);
-    }
-
     @Override
     public Statement visitBreak(DecafParser.BreakContext ctx) {
         return new Break();
diff --git a/src/main/java/de/maishai/antlr/Decaf.interp b/src/main/java/de/maishai/antlr/Decaf.interp
index a3eb86d..3d6dcc2 100644
--- a/src/main/java/de/maishai/antlr/Decaf.interp
+++ b/src/main/java/de/maishai/antlr/Decaf.interp
@@ -10,12 +10,12 @@ null
 'main'
 'String[] args'
 ','
+'return'
 'if'
 'else'
 'for'
 'while'
 'do'
-'return'
 'break'
 '.'
 'public'
@@ -115,6 +115,7 @@ constructor
 params
 param
 block
+return
 stmt
 stmtexpr
 expr
@@ -131,4 +132,4 @@ id
 
 
 atn:
-[4, 1, 49, 282, 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, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 56, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 61, 8, 0, 10, 0, 12, 0, 64, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 69, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 83, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 89, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 96, 8, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 114, 8, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 5, 9, 122, 8, 9, 10, 9, 12, 9, 125, 9, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 133, 8, 11, 10, 11, 12, 11, 136, 9, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 147, 8, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 172, 8, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 188, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 195, 8, 13, 1, 13, 1, 13, 3, 13, 199, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 212, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 218, 8, 14, 10, 14, 12, 14, 221, 9, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 3, 17, 229, 8, 17, 1, 17, 1, 17, 1, 17, 5, 17, 234, 8, 17, 10, 17, 12, 17, 237, 9, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 247, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 252, 8, 19, 10, 19, 12, 19, 255, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 261, 8, 20, 1, 21, 1, 21, 1, 21, 3, 21, 266, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 5, 22, 273, 8, 22, 10, 22, 12, 22, 276, 9, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 0, 1, 28, 25, 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, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 294, 0, 50, 1, 0, 0, 0, 2, 68, 1, 0, 0, 0, 4, 74, 1, 0, 0, 0, 6, 78, 1, 0, 0, 0, 8, 82, 1, 0, 0, 0, 10, 88, 1, 0, 0, 0, 12, 90, 1, 0, 0, 0, 14, 100, 1, 0, 0, 0, 16, 109, 1, 0, 0, 0, 18, 118, 1, 0, 0, 0, 20, 126, 1, 0, 0, 0, 22, 129, 1, 0, 0, 0, 24, 187, 1, 0, 0, 0, 26, 198, 1, 0, 0, 0, 28, 211, 1, 0, 0, 0, 30, 222, 1, 0, 0, 0, 32, 224, 1, 0, 0, 0, 34, 228, 1, 0, 0, 0, 36, 240, 1, 0, 0, 0, 38, 246, 1, 0, 0, 0, 40, 260, 1, 0, 0, 0, 42, 262, 1, 0, 0, 0, 44, 269, 1, 0, 0, 0, 46, 277, 1, 0, 0, 0, 48, 279, 1, 0, 0, 0, 50, 51, 5, 19, 0, 0, 51, 52, 5, 1, 0, 0, 52, 53, 3, 48, 24, 0, 53, 55, 5, 2, 0, 0, 54, 56, 3, 14, 7, 0, 55, 54, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 62, 1, 0, 0, 0, 57, 61, 3, 2, 1, 0, 58, 61, 3, 12, 6, 0, 59, 61, 3, 16, 8, 0, 60, 57, 1, 0, 0, 0, 60, 58, 1, 0, 0, 0, 60, 59, 1, 0, 0, 0, 61, 64, 1, 0, 0, 0, 62, 60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 65, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 65, 66, 5, 3, 0, 0, 66, 1, 1, 0, 0, 0, 67, 69, 5, 19, 0, 0, 68, 67, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 70, 1, 0, 0, 0, 70, 71, 3, 10, 5, 0, 71, 72, 3, 48, 24, 0, 72, 73, 5, 4, 0, 0, 73, 3, 1, 0, 0, 0, 74, 75, 3, 10, 5, 0, 75, 76, 3, 48, 24, 0, 76, 77, 5, 4, 0, 0, 77, 5, 1, 0, 0, 0, 78, 79, 7, 0, 0, 0, 79, 7, 1, 0, 0, 0, 80, 83, 3, 10, 5, 0, 81, 83, 5, 41, 0, 0, 82, 80, 1, 0, 0, 0, 82, 81, 1, 0, 0, 0, 83, 9, 1, 0, 0, 0, 84, 89, 5, 39, 0, 0, 85, 89, 5, 40, 0, 0, 86, 89, 5, 42, 0, 0, 87, 89, 3, 48, 24, 0, 88, 84, 1, 0, 0, 0, 88, 85, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 88, 87, 1, 0, 0, 0, 89, 11, 1, 0, 0, 0, 90, 91, 5, 19, 0, 0, 91, 92, 3, 8, 4, 0, 92, 93, 3, 48, 24, 0, 93, 95, 5, 5, 0, 0, 94, 96, 3, 18, 9, 0, 95, 94, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 97, 1, 0, 0, 0, 97, 98, 5, 6, 0, 0, 98, 99, 3, 22, 11, 0, 99, 13, 1, 0, 0, 0, 100, 101, 5, 19, 0, 0, 101, 102, 5, 7, 0, 0, 102, 103, 5, 41, 0, 0, 103, 104, 5, 8, 0, 0, 104, 105, 5, 5, 0, 0, 105, 106, 5, 9, 0, 0, 106, 107, 5, 6, 0, 0, 107, 108, 3, 22, 11, 0, 108, 15, 1, 0, 0, 0, 109, 110, 5, 19, 0, 0, 110, 111, 3, 48, 24, 0, 111, 113, 5, 5, 0, 0, 112, 114, 3, 18, 9, 0, 113, 112, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 116, 5, 6, 0, 0, 116, 117, 3, 22, 11, 0, 117, 17, 1, 0, 0, 0, 118, 123, 3, 20, 10, 0, 119, 120, 5, 10, 0, 0, 120, 122, 3, 20, 10, 0, 121, 119, 1, 0, 0, 0, 122, 125, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 19, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 126, 127, 3, 10, 5, 0, 127, 128, 3, 48, 24, 0, 128, 21, 1, 0, 0, 0, 129, 134, 5, 2, 0, 0, 130, 133, 3, 4, 2, 0, 131, 133, 3, 24, 12, 0, 132, 130, 1, 0, 0, 0, 132, 131, 1, 0, 0, 0, 133, 136, 1, 0, 0, 0, 134, 132, 1, 0, 0, 0, 134, 135, 1, 0, 0, 0, 135, 137, 1, 0, 0, 0, 136, 134, 1, 0, 0, 0, 137, 138, 5, 3, 0, 0, 138, 23, 1, 0, 0, 0, 139, 140, 5, 11, 0, 0, 140, 141, 5, 5, 0, 0, 141, 142, 3, 28, 14, 0, 142, 143, 5, 6, 0, 0, 143, 146, 3, 22, 11, 0, 144, 145, 5, 12, 0, 0, 145, 147, 3, 22, 11, 0, 146, 144, 1, 0, 0, 0, 146, 147, 1, 0, 0, 0, 147, 188, 1, 0, 0, 0, 148, 149, 5, 13, 0, 0, 149, 150, 5, 5, 0, 0, 150, 151, 3, 36, 18, 0, 151, 152, 5, 4, 0, 0, 152, 153, 3, 28, 14, 0, 153, 154, 5, 4, 0, 0, 154, 155, 3, 36, 18, 0, 155, 156, 5, 6, 0, 0, 156, 157, 3, 22, 11, 0, 157, 188, 1, 0, 0, 0, 158, 159, 5, 14, 0, 0, 159, 160, 5, 5, 0, 0, 160, 161, 3, 28, 14, 0, 161, 162, 5, 6, 0, 0, 162, 163, 3, 22, 11, 0, 163, 188, 1, 0, 0, 0, 164, 165, 5, 15, 0, 0, 165, 166, 3, 22, 11, 0, 166, 167, 5, 14, 0, 0, 167, 168, 5, 5, 0, 0, 168, 169, 3, 28, 14, 0, 169, 171, 5, 6, 0, 0, 170, 172, 5, 4, 0, 0, 171, 170, 1, 0, 0, 0, 171, 172, 1, 0, 0, 0, 172, 188, 1, 0, 0, 0, 173, 174, 5, 16, 0, 0, 174, 175, 3, 28, 14, 0, 175, 176, 5, 4, 0, 0, 176, 188, 1, 0, 0, 0, 177, 178, 5, 16, 0, 0, 178, 188, 5, 4, 0, 0, 179, 180, 5, 17, 0, 0, 180, 188, 5, 4, 0, 0, 181, 182, 3, 36, 18, 0, 182, 183, 5, 4, 0, 0, 183, 188, 1, 0, 0, 0, 184, 185, 3, 26, 13, 0, 185, 186, 5, 4, 0, 0, 186, 188, 1, 0, 0, 0, 187, 139, 1, 0, 0, 0, 187, 148, 1, 0, 0, 0, 187, 158, 1, 0, 0, 0, 187, 164, 1, 0, 0, 0, 187, 173, 1, 0, 0, 0, 187, 177, 1, 0, 0, 0, 187, 179, 1, 0, 0, 0, 187, 181, 1, 0, 0, 0, 187, 184, 1, 0, 0, 0, 188, 25, 1, 0, 0, 0, 189, 199, 3, 38, 19, 0, 190, 191, 5, 20, 0, 0, 191, 192, 3, 10, 5, 0, 192, 194, 5, 5, 0, 0, 193, 195, 3, 44, 22, 0, 194, 193, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 197, 5, 6, 0, 0, 197, 199, 1, 0, 0, 0, 198, 189, 1, 0, 0, 0, 198, 190, 1, 0, 0, 0, 199, 27, 1, 0, 0, 0, 200, 201, 6, 14, -1, 0, 201, 202, 3, 32, 16, 0, 202, 203, 3, 28, 14, 5, 203, 212, 1, 0, 0, 0, 204, 212, 3, 46, 23, 0, 205, 206, 5, 5, 0, 0, 206, 207, 3, 28, 14, 0, 207, 208, 5, 6, 0, 0, 208, 212, 1, 0, 0, 0, 209, 212, 3, 34, 17, 0, 210, 212, 3, 26, 13, 0, 211, 200, 1, 0, 0, 0, 211, 204, 1, 0, 0, 0, 211, 205, 1, 0, 0, 0, 211, 209, 1, 0, 0, 0, 211, 210, 1, 0, 0, 0, 212, 219, 1, 0, 0, 0, 213, 214, 10, 6, 0, 0, 214, 215, 3, 30, 15, 0, 215, 216, 3, 28, 14, 7, 216, 218, 1, 0, 0, 0, 217, 213, 1, 0, 0, 0, 218, 221, 1, 0, 0, 0, 219, 217, 1, 0, 0, 0, 219, 220, 1, 0, 0, 0, 220, 29, 1, 0, 0, 0, 221, 219, 1, 0, 0, 0, 222, 223, 7, 1, 0, 0, 223, 31, 1, 0, 0, 0, 224, 225, 7, 2, 0, 0, 225, 33, 1, 0, 0, 0, 226, 227, 5, 22, 0, 0, 227, 229, 5, 18, 0, 0, 228, 226, 1, 0, 0, 0, 228, 229, 1, 0, 0, 0, 229, 235, 1, 0, 0, 0, 230, 231, 3, 40, 20, 0, 231, 232, 5, 18, 0, 0, 232, 234, 1, 0, 0, 0, 233, 230, 1, 0, 0, 0, 234, 237, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 238, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0, 238, 239, 3, 48, 24, 0, 239, 35, 1, 0, 0, 0, 240, 241, 3, 34, 17, 0, 241, 242, 3, 6, 3, 0, 242, 243, 3, 28, 14, 0, 243, 37, 1, 0, 0, 0, 244, 245, 5, 22, 0, 0, 245, 247, 5, 18, 0, 0, 246, 244, 1, 0, 0, 0, 246, 247, 1, 0, 0, 0, 247, 253, 1, 0, 0, 0, 248, 249, 3, 40, 20, 0, 249, 250, 5, 18, 0, 0, 250, 252, 1, 0, 0, 0, 251, 248, 1, 0, 0, 0, 252, 255, 1, 0, 0, 0, 253, 251, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 256, 1, 0, 0, 0, 255, 253, 1, 0, 0, 0, 256, 257, 3, 42, 21, 0, 257, 39, 1, 0, 0, 0, 258, 261, 3, 42, 21, 0, 259, 261, 3, 48, 24, 0, 260, 258, 1, 0, 0, 0, 260, 259, 1, 0, 0, 0, 261, 41, 1, 0, 0, 0, 262, 263, 3, 48, 24, 0, 263, 265, 5, 5, 0, 0, 264, 266, 3, 44, 22, 0, 265, 264, 1, 0, 0, 0, 265, 266, 1, 0, 0, 0, 266, 267, 1, 0, 0, 0, 267, 268, 5, 6, 0, 0, 268, 43, 1, 0, 0, 0, 269, 274, 3, 28, 14, 0, 270, 271, 5, 10, 0, 0, 271, 273, 3, 28, 14, 0, 272, 270, 1, 0, 0, 0, 273, 276, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 274, 275, 1, 0, 0, 0, 275, 45, 1, 0, 0, 0, 276, 274, 1, 0, 0, 0, 277, 278, 7, 3, 0, 0, 278, 47, 1, 0, 0, 0, 279, 280, 5, 45, 0, 0, 280, 49, 1, 0, 0, 0, 25, 55, 60, 62, 68, 82, 88, 95, 113, 123, 132, 134, 146, 171, 187, 194, 198, 211, 219, 228, 235, 246, 253, 260, 265, 274]
\ No newline at end of file
+[4, 1, 49, 289, 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, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 58, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 63, 8, 0, 10, 0, 12, 0, 66, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 71, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 85, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 91, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 98, 8, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 116, 8, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 5, 9, 124, 8, 9, 10, 9, 12, 9, 127, 9, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 135, 8, 11, 10, 11, 12, 11, 138, 9, 11, 1, 11, 3, 11, 141, 8, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 151, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 160, 8, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 185, 8, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 195, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 202, 8, 14, 1, 14, 1, 14, 3, 14, 206, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 219, 8, 15, 1, 15, 1, 15, 1, 15, 1, 15, 5, 15, 225, 8, 15, 10, 15, 12, 15, 228, 9, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 3, 18, 236, 8, 18, 1, 18, 1, 18, 1, 18, 5, 18, 241, 8, 18, 10, 18, 12, 18, 244, 9, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 254, 8, 20, 1, 20, 1, 20, 1, 20, 5, 20, 259, 8, 20, 10, 20, 12, 20, 262, 9, 20, 1, 20, 1, 20, 1, 21, 1, 21, 3, 21, 268, 8, 21, 1, 22, 1, 22, 1, 22, 3, 22, 273, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 5, 23, 280, 8, 23, 10, 23, 12, 23, 283, 9, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 0, 1, 30, 26, 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, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 300, 0, 52, 1, 0, 0, 0, 2, 70, 1, 0, 0, 0, 4, 76, 1, 0, 0, 0, 6, 80, 1, 0, 0, 0, 8, 84, 1, 0, 0, 0, 10, 90, 1, 0, 0, 0, 12, 92, 1, 0, 0, 0, 14, 102, 1, 0, 0, 0, 16, 111, 1, 0, 0, 0, 18, 120, 1, 0, 0, 0, 20, 128, 1, 0, 0, 0, 22, 131, 1, 0, 0, 0, 24, 150, 1, 0, 0, 0, 26, 194, 1, 0, 0, 0, 28, 205, 1, 0, 0, 0, 30, 218, 1, 0, 0, 0, 32, 229, 1, 0, 0, 0, 34, 231, 1, 0, 0, 0, 36, 235, 1, 0, 0, 0, 38, 247, 1, 0, 0, 0, 40, 253, 1, 0, 0, 0, 42, 267, 1, 0, 0, 0, 44, 269, 1, 0, 0, 0, 46, 276, 1, 0, 0, 0, 48, 284, 1, 0, 0, 0, 50, 286, 1, 0, 0, 0, 52, 53, 5, 19, 0, 0, 53, 54, 5, 1, 0, 0, 54, 55, 3, 50, 25, 0, 55, 57, 5, 2, 0, 0, 56, 58, 3, 14, 7, 0, 57, 56, 1, 0, 0, 0, 57, 58, 1, 0, 0, 0, 58, 64, 1, 0, 0, 0, 59, 63, 3, 2, 1, 0, 60, 63, 3, 12, 6, 0, 61, 63, 3, 16, 8, 0, 62, 59, 1, 0, 0, 0, 62, 60, 1, 0, 0, 0, 62, 61, 1, 0, 0, 0, 63, 66, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 67, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 67, 68, 5, 3, 0, 0, 68, 1, 1, 0, 0, 0, 69, 71, 5, 19, 0, 0, 70, 69, 1, 0, 0, 0, 70, 71, 1, 0, 0, 0, 71, 72, 1, 0, 0, 0, 72, 73, 3, 10, 5, 0, 73, 74, 3, 50, 25, 0, 74, 75, 5, 4, 0, 0, 75, 3, 1, 0, 0, 0, 76, 77, 3, 10, 5, 0, 77, 78, 3, 50, 25, 0, 78, 79, 5, 4, 0, 0, 79, 5, 1, 0, 0, 0, 80, 81, 7, 0, 0, 0, 81, 7, 1, 0, 0, 0, 82, 85, 3, 10, 5, 0, 83, 85, 5, 41, 0, 0, 84, 82, 1, 0, 0, 0, 84, 83, 1, 0, 0, 0, 85, 9, 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, 50, 25, 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, 11, 1, 0, 0, 0, 92, 93, 5, 19, 0, 0, 93, 94, 3, 8, 4, 0, 94, 95, 3, 50, 25, 0, 95, 97, 5, 5, 0, 0, 96, 98, 3, 18, 9, 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, 22, 11, 0, 101, 13, 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, 22, 11, 0, 110, 15, 1, 0, 0, 0, 111, 112, 5, 19, 0, 0, 112, 113, 3, 50, 25, 0, 113, 115, 5, 5, 0, 0, 114, 116, 3, 18, 9, 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, 22, 11, 0, 119, 17, 1, 0, 0, 0, 120, 125, 3, 20, 10, 0, 121, 122, 5, 10, 0, 0, 122, 124, 3, 20, 10, 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, 19, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 128, 129, 3, 10, 5, 0, 129, 130, 3, 50, 25, 0, 130, 21, 1, 0, 0, 0, 131, 136, 5, 2, 0, 0, 132, 135, 3, 4, 2, 0, 133, 135, 3, 26, 13, 0, 134, 132, 1, 0, 0, 0, 134, 133, 1, 0, 0, 0, 135, 138, 1, 0, 0, 0, 136, 134, 1, 0, 0, 0, 136, 137, 1, 0, 0, 0, 137, 140, 1, 0, 0, 0, 138, 136, 1, 0, 0, 0, 139, 141, 3, 24, 12, 0, 140, 139, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 143, 5, 3, 0, 0, 143, 23, 1, 0, 0, 0, 144, 145, 5, 11, 0, 0, 145, 146, 3, 30, 15, 0, 146, 147, 5, 4, 0, 0, 147, 151, 1, 0, 0, 0, 148, 149, 5, 11, 0, 0, 149, 151, 5, 4, 0, 0, 150, 144, 1, 0, 0, 0, 150, 148, 1, 0, 0, 0, 151, 25, 1, 0, 0, 0, 152, 153, 5, 12, 0, 0, 153, 154, 5, 5, 0, 0, 154, 155, 3, 30, 15, 0, 155, 156, 5, 6, 0, 0, 156, 159, 3, 22, 11, 0, 157, 158, 5, 13, 0, 0, 158, 160, 3, 22, 11, 0, 159, 157, 1, 0, 0, 0, 159, 160, 1, 0, 0, 0, 160, 195, 1, 0, 0, 0, 161, 162, 5, 14, 0, 0, 162, 163, 5, 5, 0, 0, 163, 164, 3, 38, 19, 0, 164, 165, 5, 4, 0, 0, 165, 166, 3, 30, 15, 0, 166, 167, 5, 4, 0, 0, 167, 168, 3, 38, 19, 0, 168, 169, 5, 6, 0, 0, 169, 170, 3, 22, 11, 0, 170, 195, 1, 0, 0, 0, 171, 172, 5, 15, 0, 0, 172, 173, 5, 5, 0, 0, 173, 174, 3, 30, 15, 0, 174, 175, 5, 6, 0, 0, 175, 176, 3, 22, 11, 0, 176, 195, 1, 0, 0, 0, 177, 178, 5, 16, 0, 0, 178, 179, 3, 22, 11, 0, 179, 180, 5, 15, 0, 0, 180, 181, 5, 5, 0, 0, 181, 182, 3, 30, 15, 0, 182, 184, 5, 6, 0, 0, 183, 185, 5, 4, 0, 0, 184, 183, 1, 0, 0, 0, 184, 185, 1, 0, 0, 0, 185, 195, 1, 0, 0, 0, 186, 187, 5, 17, 0, 0, 187, 195, 5, 4, 0, 0, 188, 189, 3, 38, 19, 0, 189, 190, 5, 4, 0, 0, 190, 195, 1, 0, 0, 0, 191, 192, 3, 28, 14, 0, 192, 193, 5, 4, 0, 0, 193, 195, 1, 0, 0, 0, 194, 152, 1, 0, 0, 0, 194, 161, 1, 0, 0, 0, 194, 171, 1, 0, 0, 0, 194, 177, 1, 0, 0, 0, 194, 186, 1, 0, 0, 0, 194, 188, 1, 0, 0, 0, 194, 191, 1, 0, 0, 0, 195, 27, 1, 0, 0, 0, 196, 206, 3, 40, 20, 0, 197, 198, 5, 20, 0, 0, 198, 199, 3, 10, 5, 0, 199, 201, 5, 5, 0, 0, 200, 202, 3, 46, 23, 0, 201, 200, 1, 0, 0, 0, 201, 202, 1, 0, 0, 0, 202, 203, 1, 0, 0, 0, 203, 204, 5, 6, 0, 0, 204, 206, 1, 0, 0, 0, 205, 196, 1, 0, 0, 0, 205, 197, 1, 0, 0, 0, 206, 29, 1, 0, 0, 0, 207, 208, 6, 15, -1, 0, 208, 209, 3, 34, 17, 0, 209, 210, 3, 30, 15, 5, 210, 219, 1, 0, 0, 0, 211, 219, 3, 48, 24, 0, 212, 213, 5, 5, 0, 0, 213, 214, 3, 30, 15, 0, 214, 215, 5, 6, 0, 0, 215, 219, 1, 0, 0, 0, 216, 219, 3, 36, 18, 0, 217, 219, 3, 28, 14, 0, 218, 207, 1, 0, 0, 0, 218, 211, 1, 0, 0, 0, 218, 212, 1, 0, 0, 0, 218, 216, 1, 0, 0, 0, 218, 217, 1, 0, 0, 0, 219, 226, 1, 0, 0, 0, 220, 221, 10, 6, 0, 0, 221, 222, 3, 32, 16, 0, 222, 223, 3, 30, 15, 7, 223, 225, 1, 0, 0, 0, 224, 220, 1, 0, 0, 0, 225, 228, 1, 0, 0, 0, 226, 224, 1, 0, 0, 0, 226, 227, 1, 0, 0, 0, 227, 31, 1, 0, 0, 0, 228, 226, 1, 0, 0, 0, 229, 230, 7, 1, 0, 0, 230, 33, 1, 0, 0, 0, 231, 232, 7, 2, 0, 0, 232, 35, 1, 0, 0, 0, 233, 234, 5, 22, 0, 0, 234, 236, 5, 18, 0, 0, 235, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 242, 1, 0, 0, 0, 237, 238, 3, 42, 21, 0, 238, 239, 5, 18, 0, 0, 239, 241, 1, 0, 0, 0, 240, 237, 1, 0, 0, 0, 241, 244, 1, 0, 0, 0, 242, 240, 1, 0, 0, 0, 242, 243, 1, 0, 0, 0, 243, 245, 1, 0, 0, 0, 244, 242, 1, 0, 0, 0, 245, 246, 3, 50, 25, 0, 246, 37, 1, 0, 0, 0, 247, 248, 3, 36, 18, 0, 248, 249, 3, 6, 3, 0, 249, 250, 3, 30, 15, 0, 250, 39, 1, 0, 0, 0, 251, 252, 5, 22, 0, 0, 252, 254, 5, 18, 0, 0, 253, 251, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 260, 1, 0, 0, 0, 255, 256, 3, 42, 21, 0, 256, 257, 5, 18, 0, 0, 257, 259, 1, 0, 0, 0, 258, 255, 1, 0, 0, 0, 259, 262, 1, 0, 0, 0, 260, 258, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 263, 1, 0, 0, 0, 262, 260, 1, 0, 0, 0, 263, 264, 3, 44, 22, 0, 264, 41, 1, 0, 0, 0, 265, 268, 3, 44, 22, 0, 266, 268, 3, 50, 25, 0, 267, 265, 1, 0, 0, 0, 267, 266, 1, 0, 0, 0, 268, 43, 1, 0, 0, 0, 269, 270, 3, 50, 25, 0, 270, 272, 5, 5, 0, 0, 271, 273, 3, 46, 23, 0, 272, 271, 1, 0, 0, 0, 272, 273, 1, 0, 0, 0, 273, 274, 1, 0, 0, 0, 274, 275, 5, 6, 0, 0, 275, 45, 1, 0, 0, 0, 276, 281, 3, 30, 15, 0, 277, 278, 5, 10, 0, 0, 278, 280, 3, 30, 15, 0, 279, 277, 1, 0, 0, 0, 280, 283, 1, 0, 0, 0, 281, 279, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 47, 1, 0, 0, 0, 283, 281, 1, 0, 0, 0, 284, 285, 7, 3, 0, 0, 285, 49, 1, 0, 0, 0, 286, 287, 5, 45, 0, 0, 287, 51, 1, 0, 0, 0, 27, 57, 62, 64, 70, 84, 90, 97, 115, 125, 134, 136, 140, 150, 159, 184, 194, 201, 205, 218, 226, 235, 242, 253, 260, 267, 272, 281]
\ 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 2df6e26..2cd07b1 100644
--- a/src/main/java/de/maishai/antlr/Decaf.tokens
+++ b/src/main/java/de/maishai/antlr/Decaf.tokens
@@ -57,12 +57,12 @@ LINE_COMMENT=49
 'main'=8
 'String[] args'=9
 ','=10
-'if'=11
-'else'=12
-'for'=13
-'while'=14
-'do'=15
-'return'=16
+'return'=11
+'if'=12
+'else'=13
+'for'=14
+'while'=15
+'do'=16
 'break'=17
 '.'=18
 'public'=19
diff --git a/src/main/java/de/maishai/antlr/DecafBaseListener.java b/src/main/java/de/maishai/antlr/DecafBaseListener.java
index 75aecd2..9eb8367 100644
--- a/src/main/java/de/maishai/antlr/DecafBaseListener.java
+++ b/src/main/java/de/maishai/antlr/DecafBaseListener.java
@@ -156,6 +156,18 @@ public class DecafBaseListener implements DecafListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitBlock(DecafParser.BlockContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterReturn(DecafParser.ReturnContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitReturn(DecafParser.ReturnContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -204,30 +216,6 @@ public class DecafBaseListener implements DecafListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitDoWhile(DecafParser.DoWhileContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterReturn(DecafParser.ReturnContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitReturn(DecafParser.ReturnContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterReturnVoid(DecafParser.ReturnVoidContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitReturnVoid(DecafParser.ReturnVoidContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
diff --git a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
index 4931c04..4c5d764 100644
--- a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
+++ b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
@@ -96,6 +96,13 @@ public class DecafBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitBlock(DecafParser.BlockContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitReturn(DecafParser.ReturnContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -124,20 +131,6 @@ public class DecafBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitDoWhile(DecafParser.DoWhileContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitReturn(DecafParser.ReturnContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitReturnVoid(DecafParser.ReturnVoidContext 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 fbe07f5..2649ac7 100644
--- a/src/main/java/de/maishai/antlr/DecafLexer.interp
+++ b/src/main/java/de/maishai/antlr/DecafLexer.interp
@@ -10,12 +10,12 @@ null
 'main'
 'String[] args'
 ','
+'return'
 'if'
 'else'
 'for'
 'while'
 'do'
-'return'
 'break'
 '.'
 'public'
@@ -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, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 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, 146, 1, 0, 0, 0, 25, 151, 1, 0, 0, 0, 27, 155, 1, 0, 0, 0, 29, 161, 1, 0, 0, 0, 31, 164, 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, 105, 0, 0, 144, 145, 5, 102, 0, 0, 145, 22, 1, 0, 0, 0, 146, 147, 5, 101, 0, 0, 147, 148, 5, 108, 0, 0, 148, 149, 5, 115, 0, 0, 149, 150, 5, 101, 0, 0, 150, 24, 1, 0, 0, 0, 151, 152, 5, 102, 0, 0, 152, 153, 5, 111, 0, 0, 153, 154, 5, 114, 0, 0, 154, 26, 1, 0, 0, 0, 155, 156, 5, 119, 0, 0, 156, 157, 5, 104, 0, 0, 157, 158, 5, 105, 0, 0, 158, 159, 5, 108, 0, 0, 159, 160, 5, 101, 0, 0, 160, 28, 1, 0, 0, 0, 161, 162, 5, 100, 0, 0, 162, 163, 5, 111, 0, 0, 163, 30, 1, 0, 0, 0, 164, 165, 5, 114, 0, 0, 165, 166, 5, 101, 0, 0, 166, 167, 5, 116, 0, 0, 167, 168, 5, 117, 0, 0, 168, 169, 5, 114, 0, 0, 169, 170, 5, 110, 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, 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
diff --git a/src/main/java/de/maishai/antlr/DecafLexer.java b/src/main/java/de/maishai/antlr/DecafLexer.java
index 47b0fd1..772a592 100644
--- a/src/main/java/de/maishai/antlr/DecafLexer.java
+++ b/src/main/java/de/maishai/antlr/DecafLexer.java
@@ -47,10 +47,10 @@ public class DecafLexer extends Lexer {
 	private static String[] makeLiteralNames() {
 		return new String[] {
 			null, "'class'", "'{'", "'}'", "';'", "'('", "')'", "'static'", "'main'", 
-			"'String[] args'", "','", "'if'", "'else'", "'for'", "'while'", "'do'", 
-			"'return'", "'break'", "'.'", "'public'", "'new'", "'null'", "'this'", 
-			"'-'", "'+'", "'*'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'&&'", 
-			"'||'", "'='", "'+='", "'-='", "'*='", "'!'", "'int'", "'boolean'", "'void'", 
+			"'String[] args'", "','", "'return'", "'if'", "'else'", "'for'", "'while'", 
+			"'do'", "'break'", "'.'", "'public'", "'new'", "'null'", "'this'", "'-'", 
+			"'+'", "'*'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'&&'", "'||'", 
+			"'='", "'+='", "'-='", "'*='", "'!'", "'int'", "'boolean'", "'void'", 
 			"'char'"
 		};
 	}
@@ -144,182 +144,182 @@ public class DecafLexer extends Lexer {
 		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007"+
 		"\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\u000b"+
-		"\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001"+
-		"\f\u0001\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f"+
-		"\u0001\u000f\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\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\u001b\u0001\u001b\u0001\u001c\u0001\u001c\u0001\u001c"+
-		"\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001e"+
-		"\u0001\u001f\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001 \u0001!\u0001"+
-		"!\u0001\"\u0001\"\u0001\"\u0001#\u0001#\u0001#\u0001$\u0001$\u0001$\u0001"+
-		"%\u0001%\u0001&\u0001&\u0001&\u0001&\u0001\'\u0001\'\u0001\'\u0001\'\u0001"+
-		"\'\u0001\'\u0001\'\u0001\'\u0001(\u0001(\u0001(\u0001(\u0001(\u0001)\u0001"+
-		")\u0001)\u0001)\u0001)\u0001*\u0001*\u0001*\u0001*\u0001*\u0001*\u0001"+
-		"*\u0001*\u0001*\u0003*\u0111\b*\u0001+\u0001+\u0001+\u0001+\u0001,\u0004"+
-		",\u0118\b,\u000b,\f,\u0119\u0001,\u0005,\u011d\b,\n,\f,\u0120\t,\u0004"+
-		",\u0122\b,\u000b,\f,\u0123\u0001-\u0004-\u0127\b-\u000b-\f-\u0128\u0001"+
-		".\u0001.\u0001.\u0001.\u0001/\u0001/\u0001/\u0001/\u0005/\u0133\b/\n/"+
-		"\f/\u0136\t/\u0001/\u0001/\u0001/\u0001/\u0001/\u00010\u00010\u00010\u0001"+
-		"0\u00050\u0141\b0\n0\f0\u0144\t0\u00010\u00010\u0001\u0134\u00001\u0001"+
-		"\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007"+
-		"\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e\u001d"+
-		"\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015+\u0016-\u0017/"+
-		"\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\"E#G$I%K"+
-		"&M\'O(Q)S*U+W,Y-[.]/_0a1\u0001\u0000\u0005\u0001\u0000\'\'\u0002\u0000"+
-		"AZaz\u0001\u000009\u0003\u0000\t\n\r\r  \u0002\u0000\n\n\r\r\u014d\u0000"+
-		"\u0001\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000"+
-		"\u0005\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000"+
-		"\t\u0001\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r"+
-		"\u0001\u0000\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011"+
-		"\u0001\u0000\u0000\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015"+
-		"\u0001\u0000\u0000\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019"+
-		"\u0001\u0000\u0000\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d"+
-		"\u0001\u0000\u0000\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001"+
-		"\u0000\u0000\u0000\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000"+
-		"\u0000\u0000\'\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000"+
-		"\u0000+\u0001\u0000\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/"+
-		"\u0001\u0000\u0000\u0000\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000"+
-		"\u0000\u0000\u00005\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000"+
-		"\u00009\u0001\u0000\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000="+
-		"\u0001\u0000\u0000\u0000\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000"+
-		"\u0000\u0000\u0000C\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000"+
-		"\u0000G\u0001\u0000\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K"+
-		"\u0001\u0000\u0000\u0000\u0000M\u0001\u0000\u0000\u0000\u0000O\u0001\u0000"+
-		"\u0000\u0000\u0000Q\u0001\u0000\u0000\u0000\u0000S\u0001\u0000\u0000\u0000"+
-		"\u0000U\u0001\u0000\u0000\u0000\u0000W\u0001\u0000\u0000\u0000\u0000Y"+
-		"\u0001\u0000\u0000\u0000\u0000[\u0001\u0000\u0000\u0000\u0000]\u0001\u0000"+
-		"\u0000\u0000\u0000_\u0001\u0000\u0000\u0000\u0000a\u0001\u0000\u0000\u0000"+
-		"\u0001c\u0001\u0000\u0000\u0000\u0003i\u0001\u0000\u0000\u0000\u0005k"+
-		"\u0001\u0000\u0000\u0000\u0007m\u0001\u0000\u0000\u0000\to\u0001\u0000"+
-		"\u0000\u0000\u000bq\u0001\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"+
-		"\u0092\u0001\u0000\u0000\u0000\u0019\u0097\u0001\u0000\u0000\u0000\u001b"+
-		"\u009b\u0001\u0000\u0000\u0000\u001d\u00a1\u0001\u0000\u0000\u0000\u001f"+
-		"\u00a4\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\u0001\u0000\u0000\u0000+\u00c3\u0001\u0000\u0000\u0000"+
-		"-\u00c8\u0001\u0000\u0000\u0000/\u00ca\u0001\u0000\u0000\u00001\u00cc"+
-		"\u0001\u0000\u0000\u00003\u00ce\u0001\u0000\u0000\u00005\u00d0\u0001\u0000"+
-		"\u0000\u00007\u00d2\u0001\u0000\u0000\u00009\u00d5\u0001\u0000\u0000\u0000"+
-		";\u00d8\u0001\u0000\u0000\u0000=\u00db\u0001\u0000\u0000\u0000?\u00de"+
-		"\u0001\u0000\u0000\u0000A\u00e1\u0001\u0000\u0000\u0000C\u00e4\u0001\u0000"+
-		"\u0000\u0000E\u00e6\u0001\u0000\u0000\u0000G\u00e9\u0001\u0000\u0000\u0000"+
-		"I\u00ec\u0001\u0000\u0000\u0000K\u00ef\u0001\u0000\u0000\u0000M\u00f1"+
-		"\u0001\u0000\u0000\u0000O\u00f5\u0001\u0000\u0000\u0000Q\u00fd\u0001\u0000"+
-		"\u0000\u0000S\u0102\u0001\u0000\u0000\u0000U\u0110\u0001\u0000\u0000\u0000"+
-		"W\u0112\u0001\u0000\u0000\u0000Y\u0121\u0001\u0000\u0000\u0000[\u0126"+
-		"\u0001\u0000\u0000\u0000]\u012a\u0001\u0000\u0000\u0000_\u012e\u0001\u0000"+
-		"\u0000\u0000a\u013c\u0001\u0000\u0000\u0000cd\u0005c\u0000\u0000de\u0005"+
-		"l\u0000\u0000ef\u0005a\u0000\u0000fg\u0005s\u0000\u0000gh\u0005s\u0000"+
-		"\u0000h\u0002\u0001\u0000\u0000\u0000ij\u0005{\u0000\u0000j\u0004\u0001"+
-		"\u0000\u0000\u0000kl\u0005}\u0000\u0000l\u0006\u0001\u0000\u0000\u0000"+
-		"mn\u0005;\u0000\u0000n\b\u0001\u0000\u0000\u0000op\u0005(\u0000\u0000"+
-		"p\n\u0001\u0000\u0000\u0000qr\u0005)\u0000\u0000r\f\u0001\u0000\u0000"+
-		"\u0000st\u0005s\u0000\u0000tu\u0005t\u0000\u0000uv\u0005a\u0000\u0000"+
-		"vw\u0005t\u0000\u0000wx\u0005i\u0000\u0000xy\u0005c\u0000\u0000y\u000e"+
-		"\u0001\u0000\u0000\u0000z{\u0005m\u0000\u0000{|\u0005a\u0000\u0000|}\u0005"+
-		"i\u0000\u0000}~\u0005n\u0000\u0000~\u0010\u0001\u0000\u0000\u0000\u007f"+
-		"\u0080\u0005S\u0000\u0000\u0080\u0081\u0005t\u0000\u0000\u0081\u0082\u0005"+
-		"r\u0000\u0000\u0082\u0083\u0005i\u0000\u0000\u0083\u0084\u0005n\u0000"+
-		"\u0000\u0084\u0085\u0005g\u0000\u0000\u0085\u0086\u0005[\u0000\u0000\u0086"+
-		"\u0087\u0005]\u0000\u0000\u0087\u0088\u0005 \u0000\u0000\u0088\u0089\u0005"+
-		"a\u0000\u0000\u0089\u008a\u0005r\u0000\u0000\u008a\u008b\u0005g\u0000"+
-		"\u0000\u008b\u008c\u0005s\u0000\u0000\u008c\u0012\u0001\u0000\u0000\u0000"+
-		"\u008d\u008e\u0005,\u0000\u0000\u008e\u0014\u0001\u0000\u0000\u0000\u008f"+
-		"\u0090\u0005i\u0000\u0000\u0090\u0091\u0005f\u0000\u0000\u0091\u0016\u0001"+
-		"\u0000\u0000\u0000\u0092\u0093\u0005e\u0000\u0000\u0093\u0094\u0005l\u0000"+
-		"\u0000\u0094\u0095\u0005s\u0000\u0000\u0095\u0096\u0005e\u0000\u0000\u0096"+
-		"\u0018\u0001\u0000\u0000\u0000\u0097\u0098\u0005f\u0000\u0000\u0098\u0099"+
-		"\u0005o\u0000\u0000\u0099\u009a\u0005r\u0000\u0000\u009a\u001a\u0001\u0000"+
-		"\u0000\u0000\u009b\u009c\u0005w\u0000\u0000\u009c\u009d\u0005h\u0000\u0000"+
-		"\u009d\u009e\u0005i\u0000\u0000\u009e\u009f\u0005l\u0000\u0000\u009f\u00a0"+
-		"\u0005e\u0000\u0000\u00a0\u001c\u0001\u0000\u0000\u0000\u00a1\u00a2\u0005"+
-		"d\u0000\u0000\u00a2\u00a3\u0005o\u0000\u0000\u00a3\u001e\u0001\u0000\u0000"+
-		"\u0000\u00a4\u00a5\u0005r\u0000\u0000\u00a5\u00a6\u0005e\u0000\u0000\u00a6"+
-		"\u00a7\u0005t\u0000\u0000\u00a7\u00a8\u0005u\u0000\u0000\u00a8\u00a9\u0005"+
-		"r\u0000\u0000\u00a9\u00aa\u0005n\u0000\u0000\u00aa \u0001\u0000\u0000"+
-		"\u0000\u00ab\u00ac\u0005b\u0000\u0000\u00ac\u00ad\u0005r\u0000\u0000\u00ad"+
-		"\u00ae\u0005e\u0000\u0000\u00ae\u00af\u0005a\u0000\u0000\u00af\u00b0\u0005"+
-		"k\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\u0005"+
-		"l\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\u0005l\u0000\u0000\u00c1\u00c2\u0005l\u0000\u0000\u00c2"+
-		"*\u0001\u0000\u0000\u0000\u00c3\u00c4\u0005t\u0000\u0000\u00c4\u00c5\u0005"+
-		"h\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\u00e5"+
-		"D\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\u00f4N\u0001\u0000\u0000\u0000\u00f5\u00f6\u0005"+
-		"b\u0000\u0000\u00f6\u00f7\u0005o\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\u0005v\u0000\u0000\u00fe\u00ff\u0005o\u0000"+
-		"\u0000\u00ff\u0100\u0005i\u0000\u0000\u0100\u0101\u0005d\u0000\u0000\u0101"+
-		"R\u0001\u0000\u0000\u0000\u0102\u0103\u0005c\u0000\u0000\u0103\u0104\u0005"+
-		"h\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\u0005"+
-		"e\u0000\u0000\u010b\u010c\u0005f\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\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\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";
+		"\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"+
+		"\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"+
+		"\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"+
+		"\u001b\u0001\u001b\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001d\u0001"+
+		"\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001f\u0001"+
+		"\u001f\u0001\u001f\u0001 \u0001 \u0001 \u0001!\u0001!\u0001\"\u0001\""+
+		"\u0001\"\u0001#\u0001#\u0001#\u0001$\u0001$\u0001$\u0001%\u0001%\u0001"+
+		"&\u0001&\u0001&\u0001&\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'"+
+		"\u0001\'\u0001\'\u0001(\u0001(\u0001(\u0001(\u0001(\u0001)\u0001)\u0001"+
+		")\u0001)\u0001)\u0001*\u0001*\u0001*\u0001*\u0001*\u0001*\u0001*\u0001"+
+		"*\u0001*\u0003*\u0111\b*\u0001+\u0001+\u0001+\u0001+\u0001,\u0004,\u0118"+
+		"\b,\u000b,\f,\u0119\u0001,\u0005,\u011d\b,\n,\f,\u0120\t,\u0004,\u0122"+
+		"\b,\u000b,\f,\u0123\u0001-\u0004-\u0127\b-\u000b-\f-\u0128\u0001.\u0001"+
+		".\u0001.\u0001.\u0001/\u0001/\u0001/\u0001/\u0005/\u0133\b/\n/\f/\u0136"+
+		"\t/\u0001/\u0001/\u0001/\u0001/\u0001/\u00010\u00010\u00010\u00010\u0005"+
+		"0\u0141\b0\n0\f0\u0144\t0\u00010\u00010\u0001\u0134\u00001\u0001\u0001"+
+		"\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007\u000f"+
+		"\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e\u001d\u000f"+
+		"\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015+\u0016-\u0017/\u0018"+
+		"1\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\"E#G$I%K&M\'O("+
+		"Q)S*U+W,Y-[.]/_0a1\u0001\u0000\u0005\u0001\u0000\'\'\u0002\u0000AZaz\u0001"+
+		"\u000009\u0003\u0000\t\n\r\r  \u0002\u0000\n\n\r\r\u014d\u0000\u0001\u0001"+
+		"\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001"+
+		"\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000"+
+		"\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000"+
+		"\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000\u0000"+
+		"\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000\u0000"+
+		"\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000\u0000"+
+		"\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000\u0000"+
+		"\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000\u0000"+
+		"\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000\'"+
+		"\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001\u0000"+
+		"\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000\u0000"+
+		"\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u00005"+
+		"\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001\u0000"+
+		"\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000\u0000"+
+		"\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000C"+
+		"\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001\u0000"+
+		"\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000\u0000"+
+		"\u0000M\u0001\u0000\u0000\u0000\u0000O\u0001\u0000\u0000\u0000\u0000Q"+
+		"\u0001\u0000\u0000\u0000\u0000S\u0001\u0000\u0000\u0000\u0000U\u0001\u0000"+
+		"\u0000\u0000\u0000W\u0001\u0000\u0000\u0000\u0000Y\u0001\u0000\u0000\u0000"+
+		"\u0000[\u0001\u0000\u0000\u0000\u0000]\u0001\u0000\u0000\u0000\u0000_"+
+		"\u0001\u0000\u0000\u0000\u0000a\u0001\u0000\u0000\u0000\u0001c\u0001\u0000"+
+		"\u0000\u0000\u0003i\u0001\u0000\u0000\u0000\u0005k\u0001\u0000\u0000\u0000"+
+		"\u0007m\u0001\u0000\u0000\u0000\to\u0001\u0000\u0000\u0000\u000bq\u0001"+
+		"\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"+
+		"\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"+
+		"\u0001\u0000\u0000\u00009\u00d5\u0001\u0000\u0000\u0000;\u00d8\u0001\u0000"+
+		"\u0000\u0000=\u00db\u0001\u0000\u0000\u0000?\u00de\u0001\u0000\u0000\u0000"+
+		"A\u00e1\u0001\u0000\u0000\u0000C\u00e4\u0001\u0000\u0000\u0000E\u00e6"+
+		"\u0001\u0000\u0000\u0000G\u00e9\u0001\u0000\u0000\u0000I\u00ec\u0001\u0000"+
+		"\u0000\u0000K\u00ef\u0001\u0000\u0000\u0000M\u00f1\u0001\u0000\u0000\u0000"+
+		"O\u00f5\u0001\u0000\u0000\u0000Q\u00fd\u0001\u0000\u0000\u0000S\u0102"+
+		"\u0001\u0000\u0000\u0000U\u0110\u0001\u0000\u0000\u0000W\u0112\u0001\u0000"+
+		"\u0000\u0000Y\u0121\u0001\u0000\u0000\u0000[\u0126\u0001\u0000\u0000\u0000"+
+		"]\u012a\u0001\u0000\u0000\u0000_\u012e\u0001\u0000\u0000\u0000a\u013c"+
+		"\u0001\u0000\u0000\u0000cd\u0005c\u0000\u0000de\u0005l\u0000\u0000ef\u0005"+
+		"a\u0000\u0000fg\u0005s\u0000\u0000gh\u0005s\u0000\u0000h\u0002\u0001\u0000"+
+		"\u0000\u0000ij\u0005{\u0000\u0000j\u0004\u0001\u0000\u0000\u0000kl\u0005"+
+		"}\u0000\u0000l\u0006\u0001\u0000\u0000\u0000mn\u0005;\u0000\u0000n\b\u0001"+
+		"\u0000\u0000\u0000op\u0005(\u0000\u0000p\n\u0001\u0000\u0000\u0000qr\u0005"+
+		")\u0000\u0000r\f\u0001\u0000\u0000\u0000st\u0005s\u0000\u0000tu\u0005"+
+		"t\u0000\u0000uv\u0005a\u0000\u0000vw\u0005t\u0000\u0000wx\u0005i\u0000"+
+		"\u0000xy\u0005c\u0000\u0000y\u000e\u0001\u0000\u0000\u0000z{\u0005m\u0000"+
+		"\u0000{|\u0005a\u0000\u0000|}\u0005i\u0000\u0000}~\u0005n\u0000\u0000"+
+		"~\u0010\u0001\u0000\u0000\u0000\u007f\u0080\u0005S\u0000\u0000\u0080\u0081"+
+		"\u0005t\u0000\u0000\u0081\u0082\u0005r\u0000\u0000\u0082\u0083\u0005i"+
+		"\u0000\u0000\u0083\u0084\u0005n\u0000\u0000\u0084\u0085\u0005g\u0000\u0000"+
+		"\u0085\u0086\u0005[\u0000\u0000\u0086\u0087\u0005]\u0000\u0000\u0087\u0088"+
+		"\u0005 \u0000\u0000\u0088\u0089\u0005a\u0000\u0000\u0089\u008a\u0005r"+
+		"\u0000\u0000\u008a\u008b\u0005g\u0000\u0000\u008b\u008c\u0005s\u0000\u0000"+
+		"\u008c\u0012\u0001\u0000\u0000\u0000\u008d\u008e\u0005,\u0000\u0000\u008e"+
+		"\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";
 	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 2df6e26..2cd07b1 100644
--- a/src/main/java/de/maishai/antlr/DecafLexer.tokens
+++ b/src/main/java/de/maishai/antlr/DecafLexer.tokens
@@ -57,12 +57,12 @@ LINE_COMMENT=49
 'main'=8
 'String[] args'=9
 ','=10
-'if'=11
-'else'=12
-'for'=13
-'while'=14
-'do'=15
-'return'=16
+'return'=11
+'if'=12
+'else'=13
+'for'=14
+'while'=15
+'do'=16
 'break'=17
 '.'=18
 'public'=19
diff --git a/src/main/java/de/maishai/antlr/DecafListener.java b/src/main/java/de/maishai/antlr/DecafListener.java
index e4a1bde..78c5ce5 100644
--- a/src/main/java/de/maishai/antlr/DecafListener.java
+++ b/src/main/java/de/maishai/antlr/DecafListener.java
@@ -127,6 +127,16 @@ public interface DecafListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitBlock(DecafParser.BlockContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link DecafParser#return}.
+	 * @param ctx the parse tree
+	 */
+	void enterReturn(DecafParser.ReturnContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link DecafParser#return}.
+	 * @param ctx the parse tree
+	 */
+	void exitReturn(DecafParser.ReturnContext ctx);
 	/**
 	 * Enter a parse tree produced by the {@code If}
 	 * labeled alternative in {@link DecafParser#stmt}.
@@ -175,30 +185,6 @@ public interface DecafListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitDoWhile(DecafParser.DoWhileContext ctx);
-	/**
-	 * Enter a parse tree produced by the {@code Return}
-	 * labeled alternative in {@link DecafParser#stmt}.
-	 * @param ctx the parse tree
-	 */
-	void enterReturn(DecafParser.ReturnContext ctx);
-	/**
-	 * Exit a parse tree produced by the {@code Return}
-	 * labeled alternative in {@link DecafParser#stmt}.
-	 * @param ctx the parse tree
-	 */
-	void exitReturn(DecafParser.ReturnContext ctx);
-	/**
-	 * Enter a parse tree produced by the {@code ReturnVoid}
-	 * labeled alternative in {@link DecafParser#stmt}.
-	 * @param ctx the parse tree
-	 */
-	void enterReturnVoid(DecafParser.ReturnVoidContext ctx);
-	/**
-	 * Exit a parse tree produced by the {@code ReturnVoid}
-	 * labeled alternative in {@link DecafParser#stmt}.
-	 * @param ctx the parse tree
-	 */
-	void exitReturnVoid(DecafParser.ReturnVoidContext ctx);
 	/**
 	 * Enter a parse tree produced by the {@code Break}
 	 * labeled alternative in {@link DecafParser#stmt}.
diff --git a/src/main/java/de/maishai/antlr/DecafParser.java b/src/main/java/de/maishai/antlr/DecafParser.java
index 3ec3cff..c9914f3 100644
--- a/src/main/java/de/maishai/antlr/DecafParser.java
+++ b/src/main/java/de/maishai/antlr/DecafParser.java
@@ -28,16 +28,16 @@ public class DecafParser extends Parser {
 		RULE_class = 0, RULE_field = 1, RULE_localVar = 2, RULE_assignSign = 3, 
 		RULE_returntype = 4, RULE_type = 5, RULE_meth = 6, RULE_mainmeth = 7, 
 		RULE_constructor = 8, RULE_params = 9, RULE_param = 10, RULE_block = 11, 
-		RULE_stmt = 12, RULE_stmtexpr = 13, RULE_expr = 14, RULE_binaryOp = 15, 
-		RULE_unaryOp = 16, RULE_fieldVarAccess = 17, RULE_assign = 18, RULE_methCall = 19, 
-		RULE_recipient = 20, RULE_methName = 21, RULE_args = 22, RULE_literal = 23, 
-		RULE_id = 24;
+		RULE_return = 12, RULE_stmt = 13, RULE_stmtexpr = 14, RULE_expr = 15, 
+		RULE_binaryOp = 16, RULE_unaryOp = 17, RULE_fieldVarAccess = 18, RULE_assign = 19, 
+		RULE_methCall = 20, RULE_recipient = 21, RULE_methName = 22, RULE_args = 23, 
+		RULE_literal = 24, RULE_id = 25;
 	private static String[] makeRuleNames() {
 		return new String[] {
 			"class", "field", "localVar", "assignSign", "returntype", "type", "meth", 
-			"mainmeth", "constructor", "params", "param", "block", "stmt", "stmtexpr", 
-			"expr", "binaryOp", "unaryOp", "fieldVarAccess", "assign", "methCall", 
-			"recipient", "methName", "args", "literal", "id"
+			"mainmeth", "constructor", "params", "param", "block", "return", "stmt", 
+			"stmtexpr", "expr", "binaryOp", "unaryOp", "fieldVarAccess", "assign", 
+			"methCall", "recipient", "methName", "args", "literal", "id"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
@@ -45,10 +45,10 @@ public class DecafParser extends Parser {
 	private static String[] makeLiteralNames() {
 		return new String[] {
 			null, "'class'", "'{'", "'}'", "';'", "'('", "')'", "'static'", "'main'", 
-			"'String[] args'", "','", "'if'", "'else'", "'for'", "'while'", "'do'", 
-			"'return'", "'break'", "'.'", "'public'", "'new'", "'null'", "'this'", 
-			"'-'", "'+'", "'*'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'&&'", 
-			"'||'", "'='", "'+='", "'-='", "'*='", "'!'", "'int'", "'boolean'", "'void'", 
+			"'String[] args'", "','", "'return'", "'if'", "'else'", "'for'", "'while'", 
+			"'do'", "'break'", "'.'", "'public'", "'new'", "'null'", "'this'", "'-'", 
+			"'+'", "'*'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'&&'", "'||'", 
+			"'='", "'+='", "'-='", "'*='", "'!'", "'int'", "'boolean'", "'void'", 
 			"'char'"
 		};
 	}
@@ -167,57 +167,57 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(50);
-			match(PUBLIC);
-			setState(51);
-			match(T__0);
 			setState(52);
-			id();
+			match(PUBLIC);
 			setState(53);
-			match(T__1);
+			match(T__0);
+			setState(54);
+			id();
 			setState(55);
+			match(T__1);
+			setState(57);
 			_errHandler.sync(this);
 			switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) {
 			case 1:
 				{
-				setState(54);
+				setState(56);
 				mainmeth();
 				}
 				break;
 			}
-			setState(62);
+			setState(64);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686565888L) != 0)) {
 				{
-				setState(60);
+				setState(62);
 				_errHandler.sync(this);
 				switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
 				case 1:
 					{
-					setState(57);
+					setState(59);
 					field();
 					}
 					break;
 				case 2:
 					{
-					setState(58);
+					setState(60);
 					meth();
 					}
 					break;
 				case 3:
 					{
-					setState(59);
+					setState(61);
 					constructor();
 					}
 					break;
 				}
 				}
-				setState(64);
+				setState(66);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(65);
+			setState(67);
 			match(T__2);
 			}
 		}
@@ -267,21 +267,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(68);
+			setState(70);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==PUBLIC) {
 				{
-				setState(67);
+				setState(69);
 				match(PUBLIC);
 				}
 			}
 
-			setState(70);
-			type();
-			setState(71);
-			id();
 			setState(72);
+			type();
+			setState(73);
+			id();
+			setState(74);
 			match(T__3);
 			}
 		}
@@ -329,11 +329,11 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(74);
-			type();
-			setState(75);
-			id();
 			setState(76);
+			type();
+			setState(77);
+			id();
+			setState(78);
 			match(T__3);
 			}
 		}
@@ -380,7 +380,7 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(78);
+			setState(80);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 257698037760L) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -432,7 +432,7 @@ public class DecafParser extends Parser {
 		ReturntypeContext _localctx = new ReturntypeContext(_ctx, getState());
 		enterRule(_localctx, 8, RULE_returntype);
 		try {
-			setState(82);
+			setState(84);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INT:
@@ -441,14 +441,14 @@ public class DecafParser extends Parser {
 			case IDENTIFIER:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(80);
+				setState(82);
 				type();
 				}
 				break;
 			case VOID:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(81);
+				setState(83);
 				match(VOID);
 				}
 				break;
@@ -498,34 +498,34 @@ public class DecafParser extends Parser {
 		TypeContext _localctx = new TypeContext(_ctx, getState());
 		enterRule(_localctx, 10, RULE_type);
 		try {
-			setState(88);
+			setState(90);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case INT:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(84);
+				setState(86);
 				match(INT);
 				}
 				break;
 			case BOOL:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(85);
+				setState(87);
 				match(BOOL);
 				}
 				break;
 			case CHAR:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(86);
+				setState(88);
 				match(CHAR);
 				}
 				break;
 			case IDENTIFIER:
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(87);
+				setState(89);
 				id();
 				}
 				break;
@@ -585,27 +585,27 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(90);
-			match(PUBLIC);
-			setState(91);
-			returntype();
 			setState(92);
-			id();
+			match(PUBLIC);
 			setState(93);
-			match(T__4);
+			returntype();
+			setState(94);
+			id();
 			setState(95);
+			match(T__4);
+			setState(97);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686041600L) != 0)) {
 				{
-				setState(94);
+				setState(96);
 				params();
 				}
 			}
 
-			setState(97);
+			setState(99);
 			match(T__5);
-			setState(98);
+			setState(100);
 			block();
 			}
 		}
@@ -652,21 +652,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(100);
-			match(PUBLIC);
-			setState(101);
-			match(T__6);
 			setState(102);
-			match(VOID);
+			match(PUBLIC);
 			setState(103);
-			match(T__7);
+			match(T__6);
 			setState(104);
-			match(T__4);
+			match(VOID);
 			setState(105);
-			match(T__8);
+			match(T__7);
 			setState(106);
-			match(T__5);
+			match(T__4);
 			setState(107);
+			match(T__8);
+			setState(108);
+			match(T__5);
+			setState(109);
 			block();
 			}
 		}
@@ -719,25 +719,25 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(109);
-			match(PUBLIC);
-			setState(110);
-			id();
 			setState(111);
-			match(T__4);
+			match(PUBLIC);
+			setState(112);
+			id();
 			setState(113);
+			match(T__4);
+			setState(115);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686041600L) != 0)) {
 				{
-				setState(112);
+				setState(114);
 				params();
 				}
 			}
 
-			setState(115);
+			setState(117);
 			match(T__5);
-			setState(116);
+			setState(118);
 			block();
 			}
 		}
@@ -786,21 +786,21 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(118);
+			setState(120);
 			param();
-			setState(123);
+			setState(125);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__9) {
 				{
 				{
-				setState(119);
+				setState(121);
 				match(T__9);
-				setState(120);
+				setState(122);
 				param();
 				}
 				}
-				setState(125);
+				setState(127);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -850,9 +850,9 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(126);
+			setState(128);
 			type();
-			setState(127);
+			setState(129);
 			id();
 			}
 		}
@@ -881,6 +881,9 @@ public class DecafParser extends Parser {
 		public StmtContext stmt(int i) {
 			return getRuleContext(StmtContext.class,i);
 		}
+		public ReturnContext return_() {
+			return getRuleContext(ReturnContext.class,0);
+		}
 		public BlockContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -907,35 +910,45 @@ public class DecafParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(129);
+			setState(131);
 			match(T__1);
-			setState(134);
+			setState(136);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231691540480L) != 0)) {
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231691534336L) != 0)) {
 				{
-				setState(132);
+				setState(134);
 				_errHandler.sync(this);
 				switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) {
 				case 1:
 					{
-					setState(130);
+					setState(132);
 					localVar();
 					}
 					break;
 				case 2:
 					{
-					setState(131);
+					setState(133);
 					stmt();
 					}
 					break;
 				}
 				}
-				setState(136);
+				setState(138);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(137);
+			setState(140);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==T__10) {
+				{
+				setState(139);
+				return_();
+				}
+			}
+
+			setState(142);
 			match(T__2);
 			}
 		}
@@ -950,6 +963,70 @@ public class DecafParser extends Parser {
 		return _localctx;
 	}
 
+	@SuppressWarnings("CheckReturnValue")
+	public static class ReturnContext extends ParserRuleContext {
+		public ExprContext expr() {
+			return getRuleContext(ExprContext.class,0);
+		}
+		public ReturnContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_return; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof DecafListener ) ((DecafListener)listener).enterReturn(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof DecafListener ) ((DecafListener)listener).exitReturn(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof DecafVisitor ) return ((DecafVisitor<? extends T>)visitor).visitReturn(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final ReturnContext return_() throws RecognitionException {
+		ReturnContext _localctx = new ReturnContext(_ctx, getState());
+		enterRule(_localctx, 24, RULE_return);
+		try {
+			setState(150);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(144);
+				match(T__10);
+				setState(145);
+				expr(0);
+				setState(146);
+				match(T__3);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(148);
+				match(T__10);
+				setState(149);
+				match(T__3);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
 	@SuppressWarnings("CheckReturnValue")
 	public static class StmtContext extends ParserRuleContext {
 		public StmtContext(ParserRuleContext parent, int invokingState) {
@@ -983,43 +1060,6 @@ public class DecafParser extends Parser {
 		}
 	}
 	@SuppressWarnings("CheckReturnValue")
-	public static class ReturnVoidContext extends StmtContext {
-		public ReturnVoidContext(StmtContext ctx) { copyFrom(ctx); }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof DecafListener ) ((DecafListener)listener).enterReturnVoid(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof DecafListener ) ((DecafListener)listener).exitReturnVoid(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof DecafVisitor ) return ((DecafVisitor<? extends T>)visitor).visitReturnVoid(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class ReturnContext extends StmtContext {
-		public ExprContext expr() {
-			return getRuleContext(ExprContext.class,0);
-		}
-		public ReturnContext(StmtContext ctx) { copyFrom(ctx); }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof DecafListener ) ((DecafListener)listener).enterReturn(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof DecafListener ) ((DecafListener)listener).exitReturn(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof DecafVisitor ) return ((DecafVisitor<? extends T>)visitor).visitReturn(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
 	public static class StatementExpressionstmtContext extends StmtContext {
 		public StmtexprContext stmtexpr() {
 			return getRuleContext(StmtexprContext.class,0);
@@ -1160,34 +1200,34 @@ public class DecafParser extends Parser {
 
 	public final StmtContext stmt() throws RecognitionException {
 		StmtContext _localctx = new StmtContext(_ctx, getState());
-		enterRule(_localctx, 24, RULE_stmt);
+		enterRule(_localctx, 26, RULE_stmt);
 		int _la;
 		try {
-			setState(187);
+			setState(194);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
 			case 1:
 				_localctx = new IfContext(_localctx);
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(139);
-				match(T__10);
-				setState(140);
+				setState(152);
+				match(T__11);
+				setState(153);
 				match(T__4);
-				setState(141);
+				setState(154);
 				expr(0);
-				setState(142);
+				setState(155);
 				match(T__5);
-				setState(143);
+				setState(156);
 				block();
-				setState(146);
+				setState(159);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
-				if (_la==T__11) {
+				if (_la==T__12) {
 					{
-					setState(144);
-					match(T__11);
-					setState(145);
+					setState(157);
+					match(T__12);
+					setState(158);
 					block();
 					}
 				}
@@ -1198,23 +1238,23 @@ public class DecafParser extends Parser {
 				_localctx = new ForContext(_localctx);
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(148);
-				match(T__12);
-				setState(149);
+				setState(161);
+				match(T__13);
+				setState(162);
 				match(T__4);
-				setState(150);
+				setState(163);
 				assign();
-				setState(151);
+				setState(164);
 				match(T__3);
-				setState(152);
+				setState(165);
 				expr(0);
-				setState(153);
+				setState(166);
 				match(T__3);
-				setState(154);
+				setState(167);
 				assign();
-				setState(155);
+				setState(168);
 				match(T__5);
-				setState(156);
+				setState(169);
 				block();
 				}
 				break;
@@ -1222,15 +1262,15 @@ public class DecafParser extends Parser {
 				_localctx = new WhileContext(_localctx);
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(158);
-				match(T__13);
-				setState(159);
+				setState(171);
+				match(T__14);
+				setState(172);
 				match(T__4);
-				setState(160);
+				setState(173);
 				expr(0);
-				setState(161);
+				setState(174);
 				match(T__5);
-				setState(162);
+				setState(175);
 				block();
 				}
 				break;
@@ -1238,24 +1278,24 @@ public class DecafParser extends Parser {
 				_localctx = new DoWhileContext(_localctx);
 				enterOuterAlt(_localctx, 4);
 				{
-				setState(164);
-				match(T__14);
-				setState(165);
+				setState(177);
+				match(T__15);
+				setState(178);
 				block();
-				setState(166);
-				match(T__13);
-				setState(167);
+				setState(179);
+				match(T__14);
+				setState(180);
 				match(T__4);
-				setState(168);
+				setState(181);
 				expr(0);
-				setState(169);
+				setState(182);
 				match(T__5);
-				setState(171);
+				setState(184);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 				if (_la==T__3) {
 					{
-					setState(170);
+					setState(183);
 					match(T__3);
 					}
 				}
@@ -1263,54 +1303,32 @@ public class DecafParser extends Parser {
 				}
 				break;
 			case 5:
-				_localctx = new ReturnContext(_localctx);
+				_localctx = new BreakContext(_localctx);
 				enterOuterAlt(_localctx, 5);
 				{
-				setState(173);
-				match(T__15);
-				setState(174);
-				expr(0);
-				setState(175);
+				setState(186);
+				match(T__16);
+				setState(187);
 				match(T__3);
 				}
 				break;
 			case 6:
-				_localctx = new ReturnVoidContext(_localctx);
+				_localctx = new AssignmentContext(_localctx);
 				enterOuterAlt(_localctx, 6);
 				{
-				setState(177);
-				match(T__15);
-				setState(178);
+				setState(188);
+				assign();
+				setState(189);
 				match(T__3);
 				}
 				break;
 			case 7:
-				_localctx = new BreakContext(_localctx);
+				_localctx = new StatementExpressionstmtContext(_localctx);
 				enterOuterAlt(_localctx, 7);
 				{
-				setState(179);
-				match(T__16);
-				setState(180);
-				match(T__3);
-				}
-				break;
-			case 8:
-				_localctx = new AssignmentContext(_localctx);
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(181);
-				assign();
-				setState(182);
-				match(T__3);
-				}
-				break;
-			case 9:
-				_localctx = new StatementExpressionstmtContext(_localctx);
-				enterOuterAlt(_localctx, 9);
-				{
-				setState(184);
+				setState(191);
 				stmtexpr();
-				setState(185);
+				setState(192);
 				match(T__3);
 				}
 				break;
@@ -1386,10 +1404,10 @@ public class DecafParser extends Parser {
 
 	public final StmtexprContext stmtexpr() throws RecognitionException {
 		StmtexprContext _localctx = new StmtexprContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_stmtexpr);
+		enterRule(_localctx, 28, RULE_stmtexpr);
 		int _la;
 		try {
-			setState(198);
+			setState(205);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
 			case THIS:
@@ -1397,7 +1415,7 @@ public class DecafParser extends Parser {
 				_localctx = new MethodCallContext(_localctx);
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(189);
+				setState(196);
 				methCall();
 				}
 				break;
@@ -1405,23 +1423,23 @@ public class DecafParser extends Parser {
 				_localctx = new NewContext(_localctx);
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(190);
+				setState(197);
 				match(NEW);
-				setState(191);
+				setState(198);
 				type();
-				setState(192);
+				setState(199);
 				match(T__4);
-				setState(194);
+				setState(201);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 				if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216286871584L) != 0)) {
 					{
-					setState(193);
+					setState(200);
 					args();
 					}
 				}
 
-				setState(196);
+				setState(203);
 				match(T__5);
 				}
 				break;
@@ -1591,24 +1609,24 @@ public class DecafParser extends Parser {
 		int _parentState = getState();
 		ExprContext _localctx = new ExprContext(_ctx, _parentState);
 		ExprContext _prevctx = _localctx;
-		int _startState = 28;
-		enterRecursionRule(_localctx, 28, RULE_expr, _p);
+		int _startState = 30;
+		enterRecursionRule(_localctx, 30, RULE_expr, _p);
 		try {
 			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(211);
+			setState(218);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) {
 			case 1:
 				{
 				_localctx = new UnaryOperationContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
 
-				setState(201);
+				setState(208);
 				unaryOp();
-				setState(202);
+				setState(209);
 				expr(5);
 				}
 				break;
@@ -1617,7 +1635,7 @@ public class DecafParser extends Parser {
 				_localctx = new ConstantContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(204);
+				setState(211);
 				literal();
 				}
 				break;
@@ -1626,11 +1644,11 @@ public class DecafParser extends Parser {
 				_localctx = new ExpressionContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(205);
+				setState(212);
 				match(T__4);
-				setState(206);
+				setState(213);
 				expr(0);
-				setState(207);
+				setState(214);
 				match(T__5);
 				}
 				break;
@@ -1639,7 +1657,7 @@ public class DecafParser extends Parser {
 				_localctx = new IdentifierContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(209);
+				setState(216);
 				fieldVarAccess();
 				}
 				break;
@@ -1648,15 +1666,15 @@ public class DecafParser extends Parser {
 				_localctx = new StatementExpressionexprContext(_localctx);
 				_ctx = _localctx;
 				_prevctx = _localctx;
-				setState(210);
+				setState(217);
 				stmtexpr();
 				}
 				break;
 			}
 			_ctx.stop = _input.LT(-1);
-			setState(219);
+			setState(226);
 			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
+			_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
 			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
 				if ( _alt==1 ) {
 					if ( _parseListeners!=null ) triggerExitRuleEvent();
@@ -1665,18 +1683,18 @@ public class DecafParser extends Parser {
 					{
 					_localctx = new BinaryOperationContext(new ExprContext(_parentctx, _parentState));
 					pushNewRecursionContext(_localctx, _startState, RULE_expr);
-					setState(213);
+					setState(220);
 					if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
-					setState(214);
+					setState(221);
 					binaryOp();
-					setState(215);
+					setState(222);
 					expr(7);
 					}
 					} 
 				}
-				setState(221);
+				setState(228);
 				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
+				_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
 			}
 			}
 		}
@@ -1725,12 +1743,12 @@ public class DecafParser extends Parser {
 
 	public final BinaryOpContext binaryOp() throws RecognitionException {
 		BinaryOpContext _localctx = new BinaryOpContext(_ctx, getState());
-		enterRule(_localctx, 30, RULE_binaryOp);
+		enterRule(_localctx, 32, RULE_binaryOp);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(222);
+			setState(229);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 17171480576L) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -1778,12 +1796,12 @@ public class DecafParser extends Parser {
 
 	public final UnaryOpContext unaryOp() throws RecognitionException {
 		UnaryOpContext _localctx = new UnaryOpContext(_ctx, getState());
-		enterRule(_localctx, 32, RULE_unaryOp);
+		enterRule(_localctx, 34, RULE_unaryOp);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(224);
+			setState(231);
 			_la = _input.LA(1);
 			if ( !(_la==SUB || _la==NOT) ) {
 			_errHandler.recoverInline(this);
@@ -1839,43 +1857,43 @@ public class DecafParser extends Parser {
 
 	public final FieldVarAccessContext fieldVarAccess() throws RecognitionException {
 		FieldVarAccessContext _localctx = new FieldVarAccessContext(_ctx, getState());
-		enterRule(_localctx, 34, RULE_fieldVarAccess);
+		enterRule(_localctx, 36, RULE_fieldVarAccess);
 		int _la;
 		try {
 			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(228);
+			setState(235);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==THIS) {
 				{
-				setState(226);
+				setState(233);
 				match(THIS);
-				setState(227);
+				setState(234);
 				match(T__17);
 				}
 			}
 
-			setState(235);
+			setState(242);
 			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
+			_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
 			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
 				if ( _alt==1 ) {
 					{
 					{
-					setState(230);
+					setState(237);
 					recipient();
-					setState(231);
+					setState(238);
 					match(T__17);
 					}
 					} 
 				}
-				setState(237);
+				setState(244);
 				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
+				_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
 			}
-			setState(238);
+			setState(245);
 			id();
 			}
 		}
@@ -1922,15 +1940,15 @@ public class DecafParser extends Parser {
 
 	public final AssignContext assign() throws RecognitionException {
 		AssignContext _localctx = new AssignContext(_ctx, getState());
-		enterRule(_localctx, 36, RULE_assign);
+		enterRule(_localctx, 38, RULE_assign);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(240);
+			setState(247);
 			fieldVarAccess();
-			setState(241);
+			setState(248);
 			assignSign();
-			setState(242);
+			setState(249);
 			expr(0);
 			}
 		}
@@ -1978,43 +1996,43 @@ public class DecafParser extends Parser {
 
 	public final MethCallContext methCall() throws RecognitionException {
 		MethCallContext _localctx = new MethCallContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_methCall);
+		enterRule(_localctx, 40, RULE_methCall);
 		int _la;
 		try {
 			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(246);
+			setState(253);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if (_la==THIS) {
 				{
-				setState(244);
+				setState(251);
 				match(THIS);
-				setState(245);
+				setState(252);
 				match(T__17);
 				}
 			}
 
-			setState(253);
+			setState(260);
 			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
+			_alt = getInterpreter().adaptivePredict(_input,23,_ctx);
 			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
 				if ( _alt==1 ) {
 					{
 					{
-					setState(248);
+					setState(255);
 					recipient();
-					setState(249);
+					setState(256);
 					match(T__17);
 					}
 					} 
 				}
-				setState(255);
+				setState(262);
 				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
+				_alt = getInterpreter().adaptivePredict(_input,23,_ctx);
 			}
-			setState(256);
+			setState(263);
 			methName();
 			}
 		}
@@ -2058,22 +2076,22 @@ public class DecafParser extends Parser {
 
 	public final RecipientContext recipient() throws RecognitionException {
 		RecipientContext _localctx = new RecipientContext(_ctx, getState());
-		enterRule(_localctx, 40, RULE_recipient);
+		enterRule(_localctx, 42, RULE_recipient);
 		try {
-			setState(260);
+			setState(267);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(258);
+				setState(265);
 				methName();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(259);
+				setState(266);
 				id();
 				}
 				break;
@@ -2119,26 +2137,26 @@ public class DecafParser extends Parser {
 
 	public final MethNameContext methName() throws RecognitionException {
 		MethNameContext _localctx = new MethNameContext(_ctx, getState());
-		enterRule(_localctx, 42, RULE_methName);
+		enterRule(_localctx, 44, RULE_methName);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(262);
+			setState(269);
 			id();
-			setState(263);
+			setState(270);
 			match(T__4);
-			setState(265);
+			setState(272);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216286871584L) != 0)) {
 				{
-				setState(264);
+				setState(271);
 				args();
 				}
 			}
 
-			setState(267);
+			setState(274);
 			match(T__5);
 			}
 		}
@@ -2182,26 +2200,26 @@ public class DecafParser extends Parser {
 
 	public final ArgsContext args() throws RecognitionException {
 		ArgsContext _localctx = new ArgsContext(_ctx, getState());
-		enterRule(_localctx, 44, RULE_args);
+		enterRule(_localctx, 46, RULE_args);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(269);
+			setState(276);
 			expr(0);
-			setState(274);
+			setState(281);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			while (_la==T__9) {
 				{
 				{
-				setState(270);
+				setState(277);
 				match(T__9);
-				setState(271);
+				setState(278);
 				expr(0);
 				}
 				}
-				setState(276);
+				setState(283);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -2244,12 +2262,12 @@ public class DecafParser extends Parser {
 
 	public final LiteralContext literal() throws RecognitionException {
 		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 46, RULE_literal);
+		enterRule(_localctx, 48, RULE_literal);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(277);
+			setState(284);
 			_la = _input.LA(1);
 			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 96757023244288L) != 0)) ) {
 			_errHandler.recoverInline(this);
@@ -2296,11 +2314,11 @@ public class DecafParser extends Parser {
 
 	public final IdContext id() throws RecognitionException {
 		IdContext _localctx = new IdContext(_ctx, getState());
-		enterRule(_localctx, 48, RULE_id);
+		enterRule(_localctx, 50, RULE_id);
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(279);
+			setState(286);
 			match(IDENTIFIER);
 			}
 		}
@@ -2317,7 +2335,7 @@ public class DecafParser extends Parser {
 
 	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
-		case 14:
+		case 15:
 			return expr_sempred((ExprContext)_localctx, predIndex);
 		}
 		return true;
@@ -2331,7 +2349,7 @@ public class DecafParser extends Parser {
 	}
 
 	public static final String _serializedATN =
-		"\u0004\u00011\u011a\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
+		"\u0004\u00011\u0121\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"+
@@ -2339,174 +2357,180 @@ public class DecafParser extends Parser {
 		"\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002\u0012\u0007\u0012"+
 		"\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002\u0015\u0007\u0015"+
 		"\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002\u0018\u0007\u0018"+
-		"\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0003\u0000"+
-		"8\b\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0005\u0000=\b\u0000\n\u0000"+
-		"\f\u0000@\t\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0003\u0001E\b\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002"+
-		"\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004"+
-		"\u0003\u0004S\b\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005"+
-		"\u0003\u0005Y\b\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
-		"\u0001\u0006\u0003\u0006`\b\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0002\u0019\u0007\u0019\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000"+
+		"\u0001\u0000\u0003\u0000:\b\u0000\u0001\u0000\u0001\u0000\u0001\u0000"+
+		"\u0005\u0000?\b\u0000\n\u0000\f\u0000B\t\u0000\u0001\u0000\u0001\u0000"+
+		"\u0001\u0001\u0003\u0001G\b\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+
+		"\u0001\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003"+
+		"\u0001\u0003\u0001\u0004\u0001\u0004\u0003\u0004U\b\u0004\u0001\u0005"+
+		"\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005[\b\u0005\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0003\u0006b\b\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0001\u0007"+
 		"\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+
-		"\u0001\u0007\u0001\u0007\u0001\u0007\u0001\b\u0001\b\u0001\b\u0001\b\u0003"+
-		"\br\b\b\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0005\tz\b\t\n"+
-		"\t\f\t}\t\t\u0001\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b"+
-		"\u0005\u000b\u0085\b\u000b\n\u000b\f\u000b\u0088\t\u000b\u0001\u000b\u0001"+
-		"\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f"+
-		"\u0093\b\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+
-		"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+
-		"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f\u00ac\b\f\u0001"+
-		"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+
-		"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f\u00bc\b\f\u0001\r\u0001\r\u0001"+
-		"\r\u0001\r\u0001\r\u0003\r\u00c3\b\r\u0001\r\u0001\r\u0003\r\u00c7\b\r"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e"+
-		"\u00d4\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0005\u000e"+
-		"\u00da\b\u000e\n\u000e\f\u000e\u00dd\t\u000e\u0001\u000f\u0001\u000f\u0001"+
-		"\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0003\u0011\u00e5\b\u0011\u0001"+
-		"\u0011\u0001\u0011\u0001\u0011\u0005\u0011\u00ea\b\u0011\n\u0011\f\u0011"+
-		"\u00ed\t\u0011\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0012"+
-		"\u0001\u0012\u0001\u0013\u0001\u0013\u0003\u0013\u00f7\b\u0013\u0001\u0013"+
-		"\u0001\u0013\u0001\u0013\u0005\u0013\u00fc\b\u0013\n\u0013\f\u0013\u00ff"+
-		"\t\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0003\u0014\u0105"+
-		"\b\u0014\u0001\u0015\u0001\u0015\u0001\u0015\u0003\u0015\u010a\b\u0015"+
-		"\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0005\u0016"+
-		"\u0111\b\u0016\n\u0016\f\u0016\u0114\t\u0016\u0001\u0017\u0001\u0017\u0001"+
-		"\u0018\u0001\u0018\u0001\u0018\u0000\u0001\u001c\u0019\u0000\u0002\u0004"+
+		"\u0001\b\u0001\b\u0001\b\u0001\b\u0003\bt\b\b\u0001\b\u0001\b\u0001\b"+
+		"\u0001\t\u0001\t\u0001\t\u0005\t|\b\t\n\t\f\t\u007f\t\t\u0001\n\u0001"+
+		"\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0005\u000b\u0087\b\u000b"+
+		"\n\u000b\f\u000b\u008a\t\u000b\u0001\u000b\u0003\u000b\u008d\b\u000b\u0001"+
+		"\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0003"+
+		"\f\u0097\b\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003"+
+		"\r\u00a0\b\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001"+
+		"\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001"+
+		"\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003\r\u00b9\b\r\u0001"+
+		"\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003\r\u00c3"+
+		"\b\r\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003"+
+		"\u000e\u00ca\b\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00ce\b\u000e"+
+		"\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f"+
+		"\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0003\u000f"+
+		"\u00db\b\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0005\u000f"+
+		"\u00e1\b\u000f\n\u000f\f\u000f\u00e4\t\u000f\u0001\u0010\u0001\u0010\u0001"+
+		"\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0003\u0012\u00ec\b\u0012\u0001"+
+		"\u0012\u0001\u0012\u0001\u0012\u0005\u0012\u00f1\b\u0012\n\u0012\f\u0012"+
+		"\u00f4\t\u0012\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0001\u0013"+
+		"\u0001\u0013\u0001\u0014\u0001\u0014\u0003\u0014\u00fe\b\u0014\u0001\u0014"+
+		"\u0001\u0014\u0001\u0014\u0005\u0014\u0103\b\u0014\n\u0014\f\u0014\u0106"+
+		"\t\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0003\u0015\u010c"+
+		"\b\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0003\u0016\u0111\b\u0016"+
+		"\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017\u0001\u0017\u0005\u0017"+
+		"\u0118\b\u0017\n\u0017\f\u0017\u011b\t\u0017\u0001\u0018\u0001\u0018\u0001"+
+		"\u0019\u0001\u0019\u0001\u0019\u0000\u0001\u001e\u001a\u0000\u0002\u0004"+
 		"\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c\u001e \""+
-		"$&(*,.0\u0000\u0004\u0001\u0000\"%\u0001\u0000\u0017!\u0002\u0000\u0017"+
-		"\u0017&&\u0002\u0000+,..\u0126\u00002\u0001\u0000\u0000\u0000\u0002D\u0001"+
-		"\u0000\u0000\u0000\u0004J\u0001\u0000\u0000\u0000\u0006N\u0001\u0000\u0000"+
-		"\u0000\bR\u0001\u0000\u0000\u0000\nX\u0001\u0000\u0000\u0000\fZ\u0001"+
-		"\u0000\u0000\u0000\u000ed\u0001\u0000\u0000\u0000\u0010m\u0001\u0000\u0000"+
-		"\u0000\u0012v\u0001\u0000\u0000\u0000\u0014~\u0001\u0000\u0000\u0000\u0016"+
-		"\u0081\u0001\u0000\u0000\u0000\u0018\u00bb\u0001\u0000\u0000\u0000\u001a"+
-		"\u00c6\u0001\u0000\u0000\u0000\u001c\u00d3\u0001\u0000\u0000\u0000\u001e"+
-		"\u00de\u0001\u0000\u0000\u0000 \u00e0\u0001\u0000\u0000\u0000\"\u00e4"+
-		"\u0001\u0000\u0000\u0000$\u00f0\u0001\u0000\u0000\u0000&\u00f6\u0001\u0000"+
-		"\u0000\u0000(\u0104\u0001\u0000\u0000\u0000*\u0106\u0001\u0000\u0000\u0000"+
-		",\u010d\u0001\u0000\u0000\u0000.\u0115\u0001\u0000\u0000\u00000\u0117"+
-		"\u0001\u0000\u0000\u000023\u0005\u0013\u0000\u000034\u0005\u0001\u0000"+
-		"\u000045\u00030\u0018\u000057\u0005\u0002\u0000\u000068\u0003\u000e\u0007"+
-		"\u000076\u0001\u0000\u0000\u000078\u0001\u0000\u0000\u00008>\u0001\u0000"+
-		"\u0000\u00009=\u0003\u0002\u0001\u0000:=\u0003\f\u0006\u0000;=\u0003\u0010"+
-		"\b\u0000<9\u0001\u0000\u0000\u0000<:\u0001\u0000\u0000\u0000<;\u0001\u0000"+
-		"\u0000\u0000=@\u0001\u0000\u0000\u0000><\u0001\u0000\u0000\u0000>?\u0001"+
-		"\u0000\u0000\u0000?A\u0001\u0000\u0000\u0000@>\u0001\u0000\u0000\u0000"+
-		"AB\u0005\u0003\u0000\u0000B\u0001\u0001\u0000\u0000\u0000CE\u0005\u0013"+
-		"\u0000\u0000DC\u0001\u0000\u0000\u0000DE\u0001\u0000\u0000\u0000EF\u0001"+
-		"\u0000\u0000\u0000FG\u0003\n\u0005\u0000GH\u00030\u0018\u0000HI\u0005"+
-		"\u0004\u0000\u0000I\u0003\u0001\u0000\u0000\u0000JK\u0003\n\u0005\u0000"+
-		"KL\u00030\u0018\u0000LM\u0005\u0004\u0000\u0000M\u0005\u0001\u0000\u0000"+
-		"\u0000NO\u0007\u0000\u0000\u0000O\u0007\u0001\u0000\u0000\u0000PS\u0003"+
-		"\n\u0005\u0000QS\u0005)\u0000\u0000RP\u0001\u0000\u0000\u0000RQ\u0001"+
-		"\u0000\u0000\u0000S\t\u0001\u0000\u0000\u0000TY\u0005\'\u0000\u0000UY"+
-		"\u0005(\u0000\u0000VY\u0005*\u0000\u0000WY\u00030\u0018\u0000XT\u0001"+
-		"\u0000\u0000\u0000XU\u0001\u0000\u0000\u0000XV\u0001\u0000\u0000\u0000"+
-		"XW\u0001\u0000\u0000\u0000Y\u000b\u0001\u0000\u0000\u0000Z[\u0005\u0013"+
-		"\u0000\u0000[\\\u0003\b\u0004\u0000\\]\u00030\u0018\u0000]_\u0005\u0005"+
-		"\u0000\u0000^`\u0003\u0012\t\u0000_^\u0001\u0000\u0000\u0000_`\u0001\u0000"+
-		"\u0000\u0000`a\u0001\u0000\u0000\u0000ab\u0005\u0006\u0000\u0000bc\u0003"+
-		"\u0016\u000b\u0000c\r\u0001\u0000\u0000\u0000de\u0005\u0013\u0000\u0000"+
-		"ef\u0005\u0007\u0000\u0000fg\u0005)\u0000\u0000gh\u0005\b\u0000\u0000"+
-		"hi\u0005\u0005\u0000\u0000ij\u0005\t\u0000\u0000jk\u0005\u0006\u0000\u0000"+
-		"kl\u0003\u0016\u000b\u0000l\u000f\u0001\u0000\u0000\u0000mn\u0005\u0013"+
-		"\u0000\u0000no\u00030\u0018\u0000oq\u0005\u0005\u0000\u0000pr\u0003\u0012"+
-		"\t\u0000qp\u0001\u0000\u0000\u0000qr\u0001\u0000\u0000\u0000rs\u0001\u0000"+
-		"\u0000\u0000st\u0005\u0006\u0000\u0000tu\u0003\u0016\u000b\u0000u\u0011"+
-		"\u0001\u0000\u0000\u0000v{\u0003\u0014\n\u0000wx\u0005\n\u0000\u0000x"+
-		"z\u0003\u0014\n\u0000yw\u0001\u0000\u0000\u0000z}\u0001\u0000\u0000\u0000"+
-		"{y\u0001\u0000\u0000\u0000{|\u0001\u0000\u0000\u0000|\u0013\u0001\u0000"+
-		"\u0000\u0000}{\u0001\u0000\u0000\u0000~\u007f\u0003\n\u0005\u0000\u007f"+
-		"\u0080\u00030\u0018\u0000\u0080\u0015\u0001\u0000\u0000\u0000\u0081\u0086"+
-		"\u0005\u0002\u0000\u0000\u0082\u0085\u0003\u0004\u0002\u0000\u0083\u0085"+
-		"\u0003\u0018\f\u0000\u0084\u0082\u0001\u0000\u0000\u0000\u0084\u0083\u0001"+
-		"\u0000\u0000\u0000\u0085\u0088\u0001\u0000\u0000\u0000\u0086\u0084\u0001"+
-		"\u0000\u0000\u0000\u0086\u0087\u0001\u0000\u0000\u0000\u0087\u0089\u0001"+
-		"\u0000\u0000\u0000\u0088\u0086\u0001\u0000\u0000\u0000\u0089\u008a\u0005"+
-		"\u0003\u0000\u0000\u008a\u0017\u0001\u0000\u0000\u0000\u008b\u008c\u0005"+
-		"\u000b\u0000\u0000\u008c\u008d\u0005\u0005\u0000\u0000\u008d\u008e\u0003"+
-		"\u001c\u000e\u0000\u008e\u008f\u0005\u0006\u0000\u0000\u008f\u0092\u0003"+
-		"\u0016\u000b\u0000\u0090\u0091\u0005\f\u0000\u0000\u0091\u0093\u0003\u0016"+
-		"\u000b\u0000\u0092\u0090\u0001\u0000\u0000\u0000\u0092\u0093\u0001\u0000"+
-		"\u0000\u0000\u0093\u00bc\u0001\u0000\u0000\u0000\u0094\u0095\u0005\r\u0000"+
-		"\u0000\u0095\u0096\u0005\u0005\u0000\u0000\u0096\u0097\u0003$\u0012\u0000"+
-		"\u0097\u0098\u0005\u0004\u0000\u0000\u0098\u0099\u0003\u001c\u000e\u0000"+
-		"\u0099\u009a\u0005\u0004\u0000\u0000\u009a\u009b\u0003$\u0012\u0000\u009b"+
-		"\u009c\u0005\u0006\u0000\u0000\u009c\u009d\u0003\u0016\u000b\u0000\u009d"+
-		"\u00bc\u0001\u0000\u0000\u0000\u009e\u009f\u0005\u000e\u0000\u0000\u009f"+
-		"\u00a0\u0005\u0005\u0000\u0000\u00a0\u00a1\u0003\u001c\u000e\u0000\u00a1"+
-		"\u00a2\u0005\u0006\u0000\u0000\u00a2\u00a3\u0003\u0016\u000b\u0000\u00a3"+
-		"\u00bc\u0001\u0000\u0000\u0000\u00a4\u00a5\u0005\u000f\u0000\u0000\u00a5"+
-		"\u00a6\u0003\u0016\u000b\u0000\u00a6\u00a7\u0005\u000e\u0000\u0000\u00a7"+
-		"\u00a8\u0005\u0005\u0000\u0000\u00a8\u00a9\u0003\u001c\u000e\u0000\u00a9"+
-		"\u00ab\u0005\u0006\u0000\u0000\u00aa\u00ac\u0005\u0004\u0000\u0000\u00ab"+
-		"\u00aa\u0001\u0000\u0000\u0000\u00ab\u00ac\u0001\u0000\u0000\u0000\u00ac"+
-		"\u00bc\u0001\u0000\u0000\u0000\u00ad\u00ae\u0005\u0010\u0000\u0000\u00ae"+
-		"\u00af\u0003\u001c\u000e\u0000\u00af\u00b0\u0005\u0004\u0000\u0000\u00b0"+
-		"\u00bc\u0001\u0000\u0000\u0000\u00b1\u00b2\u0005\u0010\u0000\u0000\u00b2"+
-		"\u00bc\u0005\u0004\u0000\u0000\u00b3\u00b4\u0005\u0011\u0000\u0000\u00b4"+
-		"\u00bc\u0005\u0004\u0000\u0000\u00b5\u00b6\u0003$\u0012\u0000\u00b6\u00b7"+
-		"\u0005\u0004\u0000\u0000\u00b7\u00bc\u0001\u0000\u0000\u0000\u00b8\u00b9"+
-		"\u0003\u001a\r\u0000\u00b9\u00ba\u0005\u0004\u0000\u0000\u00ba\u00bc\u0001"+
-		"\u0000\u0000\u0000\u00bb\u008b\u0001\u0000\u0000\u0000\u00bb\u0094\u0001"+
-		"\u0000\u0000\u0000\u00bb\u009e\u0001\u0000\u0000\u0000\u00bb\u00a4\u0001"+
-		"\u0000\u0000\u0000\u00bb\u00ad\u0001\u0000\u0000\u0000\u00bb\u00b1\u0001"+
-		"\u0000\u0000\u0000\u00bb\u00b3\u0001\u0000\u0000\u0000\u00bb\u00b5\u0001"+
-		"\u0000\u0000\u0000\u00bb\u00b8\u0001\u0000\u0000\u0000\u00bc\u0019\u0001"+
-		"\u0000\u0000\u0000\u00bd\u00c7\u0003&\u0013\u0000\u00be\u00bf\u0005\u0014"+
-		"\u0000\u0000\u00bf\u00c0\u0003\n\u0005\u0000\u00c0\u00c2\u0005\u0005\u0000"+
-		"\u0000\u00c1\u00c3\u0003,\u0016\u0000\u00c2\u00c1\u0001\u0000\u0000\u0000"+
-		"\u00c2\u00c3\u0001\u0000\u0000\u0000\u00c3\u00c4\u0001\u0000\u0000\u0000"+
-		"\u00c4\u00c5\u0005\u0006\u0000\u0000\u00c5\u00c7\u0001\u0000\u0000\u0000"+
-		"\u00c6\u00bd\u0001\u0000\u0000\u0000\u00c6\u00be\u0001\u0000\u0000\u0000"+
-		"\u00c7\u001b\u0001\u0000\u0000\u0000\u00c8\u00c9\u0006\u000e\uffff\uffff"+
-		"\u0000\u00c9\u00ca\u0003 \u0010\u0000\u00ca\u00cb\u0003\u001c\u000e\u0005"+
-		"\u00cb\u00d4\u0001\u0000\u0000\u0000\u00cc\u00d4\u0003.\u0017\u0000\u00cd"+
-		"\u00ce\u0005\u0005\u0000\u0000\u00ce\u00cf\u0003\u001c\u000e\u0000\u00cf"+
-		"\u00d0\u0005\u0006\u0000\u0000\u00d0\u00d4\u0001\u0000\u0000\u0000\u00d1"+
-		"\u00d4\u0003\"\u0011\u0000\u00d2\u00d4\u0003\u001a\r\u0000\u00d3\u00c8"+
-		"\u0001\u0000\u0000\u0000\u00d3\u00cc\u0001\u0000\u0000\u0000\u00d3\u00cd"+
-		"\u0001\u0000\u0000\u0000\u00d3\u00d1\u0001\u0000\u0000\u0000\u00d3\u00d2"+
-		"\u0001\u0000\u0000\u0000\u00d4\u00db\u0001\u0000\u0000\u0000\u00d5\u00d6"+
-		"\n\u0006\u0000\u0000\u00d6\u00d7\u0003\u001e\u000f\u0000\u00d7\u00d8\u0003"+
-		"\u001c\u000e\u0007\u00d8\u00da\u0001\u0000\u0000\u0000\u00d9\u00d5\u0001"+
-		"\u0000\u0000\u0000\u00da\u00dd\u0001\u0000\u0000\u0000\u00db\u00d9\u0001"+
-		"\u0000\u0000\u0000\u00db\u00dc\u0001\u0000\u0000\u0000\u00dc\u001d\u0001"+
-		"\u0000\u0000\u0000\u00dd\u00db\u0001\u0000\u0000\u0000\u00de\u00df\u0007"+
-		"\u0001\u0000\u0000\u00df\u001f\u0001\u0000\u0000\u0000\u00e0\u00e1\u0007"+
-		"\u0002\u0000\u0000\u00e1!\u0001\u0000\u0000\u0000\u00e2\u00e3\u0005\u0016"+
-		"\u0000\u0000\u00e3\u00e5\u0005\u0012\u0000\u0000\u00e4\u00e2\u0001\u0000"+
-		"\u0000\u0000\u00e4\u00e5\u0001\u0000\u0000\u0000\u00e5\u00eb\u0001\u0000"+
-		"\u0000\u0000\u00e6\u00e7\u0003(\u0014\u0000\u00e7\u00e8\u0005\u0012\u0000"+
-		"\u0000\u00e8\u00ea\u0001\u0000\u0000\u0000\u00e9\u00e6\u0001\u0000\u0000"+
-		"\u0000\u00ea\u00ed\u0001\u0000\u0000\u0000\u00eb\u00e9\u0001\u0000\u0000"+
-		"\u0000\u00eb\u00ec\u0001\u0000\u0000\u0000\u00ec\u00ee\u0001\u0000\u0000"+
-		"\u0000\u00ed\u00eb\u0001\u0000\u0000\u0000\u00ee\u00ef\u00030\u0018\u0000"+
-		"\u00ef#\u0001\u0000\u0000\u0000\u00f0\u00f1\u0003\"\u0011\u0000\u00f1"+
-		"\u00f2\u0003\u0006\u0003\u0000\u00f2\u00f3\u0003\u001c\u000e\u0000\u00f3"+
-		"%\u0001\u0000\u0000\u0000\u00f4\u00f5\u0005\u0016\u0000\u0000\u00f5\u00f7"+
-		"\u0005\u0012\u0000\u0000\u00f6\u00f4\u0001\u0000\u0000\u0000\u00f6\u00f7"+
-		"\u0001\u0000\u0000\u0000\u00f7\u00fd\u0001\u0000\u0000\u0000\u00f8\u00f9"+
-		"\u0003(\u0014\u0000\u00f9\u00fa\u0005\u0012\u0000\u0000\u00fa\u00fc\u0001"+
-		"\u0000\u0000\u0000\u00fb\u00f8\u0001\u0000\u0000\u0000\u00fc\u00ff\u0001"+
-		"\u0000\u0000\u0000\u00fd\u00fb\u0001\u0000\u0000\u0000\u00fd\u00fe\u0001"+
-		"\u0000\u0000\u0000\u00fe\u0100\u0001\u0000\u0000\u0000\u00ff\u00fd\u0001"+
-		"\u0000\u0000\u0000\u0100\u0101\u0003*\u0015\u0000\u0101\'\u0001\u0000"+
-		"\u0000\u0000\u0102\u0105\u0003*\u0015\u0000\u0103\u0105\u00030\u0018\u0000"+
-		"\u0104\u0102\u0001\u0000\u0000\u0000\u0104\u0103\u0001\u0000\u0000\u0000"+
-		"\u0105)\u0001\u0000\u0000\u0000\u0106\u0107\u00030\u0018\u0000\u0107\u0109"+
-		"\u0005\u0005\u0000\u0000\u0108\u010a\u0003,\u0016\u0000\u0109\u0108\u0001"+
-		"\u0000\u0000\u0000\u0109\u010a\u0001\u0000\u0000\u0000\u010a\u010b\u0001"+
-		"\u0000\u0000\u0000\u010b\u010c\u0005\u0006\u0000\u0000\u010c+\u0001\u0000"+
-		"\u0000\u0000\u010d\u0112\u0003\u001c\u000e\u0000\u010e\u010f\u0005\n\u0000"+
-		"\u0000\u010f\u0111\u0003\u001c\u000e\u0000\u0110\u010e\u0001\u0000\u0000"+
-		"\u0000\u0111\u0114\u0001\u0000\u0000\u0000\u0112\u0110\u0001\u0000\u0000"+
-		"\u0000\u0112\u0113\u0001\u0000\u0000\u0000\u0113-\u0001\u0000\u0000\u0000"+
-		"\u0114\u0112\u0001\u0000\u0000\u0000\u0115\u0116\u0007\u0003\u0000\u0000"+
-		"\u0116/\u0001\u0000\u0000\u0000\u0117\u0118\u0005-\u0000\u0000\u01181"+
-		"\u0001\u0000\u0000\u0000\u00197<>DRX_q{\u0084\u0086\u0092\u00ab\u00bb"+
-		"\u00c2\u00c6\u00d3\u00db\u00e4\u00eb\u00f6\u00fd\u0104\u0109\u0112";
+		"$&(*,.02\u0000\u0004\u0001\u0000\"%\u0001\u0000\u0017!\u0002\u0000\u0017"+
+		"\u0017&&\u0002\u0000+,..\u012c\u00004\u0001\u0000\u0000\u0000\u0002F\u0001"+
+		"\u0000\u0000\u0000\u0004L\u0001\u0000\u0000\u0000\u0006P\u0001\u0000\u0000"+
+		"\u0000\bT\u0001\u0000\u0000\u0000\nZ\u0001\u0000\u0000\u0000\f\\\u0001"+
+		"\u0000\u0000\u0000\u000ef\u0001\u0000\u0000\u0000\u0010o\u0001\u0000\u0000"+
+		"\u0000\u0012x\u0001\u0000\u0000\u0000\u0014\u0080\u0001\u0000\u0000\u0000"+
+		"\u0016\u0083\u0001\u0000\u0000\u0000\u0018\u0096\u0001\u0000\u0000\u0000"+
+		"\u001a\u00c2\u0001\u0000\u0000\u0000\u001c\u00cd\u0001\u0000\u0000\u0000"+
+		"\u001e\u00da\u0001\u0000\u0000\u0000 \u00e5\u0001\u0000\u0000\u0000\""+
+		"\u00e7\u0001\u0000\u0000\u0000$\u00eb\u0001\u0000\u0000\u0000&\u00f7\u0001"+
+		"\u0000\u0000\u0000(\u00fd\u0001\u0000\u0000\u0000*\u010b\u0001\u0000\u0000"+
+		"\u0000,\u010d\u0001\u0000\u0000\u0000.\u0114\u0001\u0000\u0000\u00000"+
+		"\u011c\u0001\u0000\u0000\u00002\u011e\u0001\u0000\u0000\u000045\u0005"+
+		"\u0013\u0000\u000056\u0005\u0001\u0000\u000067\u00032\u0019\u000079\u0005"+
+		"\u0002\u0000\u00008:\u0003\u000e\u0007\u000098\u0001\u0000\u0000\u0000"+
+		"9:\u0001\u0000\u0000\u0000:@\u0001\u0000\u0000\u0000;?\u0003\u0002\u0001"+
+		"\u0000<?\u0003\f\u0006\u0000=?\u0003\u0010\b\u0000>;\u0001\u0000\u0000"+
+		"\u0000><\u0001\u0000\u0000\u0000>=\u0001\u0000\u0000\u0000?B\u0001\u0000"+
+		"\u0000\u0000@>\u0001\u0000\u0000\u0000@A\u0001\u0000\u0000\u0000AC\u0001"+
+		"\u0000\u0000\u0000B@\u0001\u0000\u0000\u0000CD\u0005\u0003\u0000\u0000"+
+		"D\u0001\u0001\u0000\u0000\u0000EG\u0005\u0013\u0000\u0000FE\u0001\u0000"+
+		"\u0000\u0000FG\u0001\u0000\u0000\u0000GH\u0001\u0000\u0000\u0000HI\u0003"+
+		"\n\u0005\u0000IJ\u00032\u0019\u0000JK\u0005\u0004\u0000\u0000K\u0003\u0001"+
+		"\u0000\u0000\u0000LM\u0003\n\u0005\u0000MN\u00032\u0019\u0000NO\u0005"+
+		"\u0004\u0000\u0000O\u0005\u0001\u0000\u0000\u0000PQ\u0007\u0000\u0000"+
+		"\u0000Q\u0007\u0001\u0000\u0000\u0000RU\u0003\n\u0005\u0000SU\u0005)\u0000"+
+		"\u0000TR\u0001\u0000\u0000\u0000TS\u0001\u0000\u0000\u0000U\t\u0001\u0000"+
+		"\u0000\u0000V[\u0005\'\u0000\u0000W[\u0005(\u0000\u0000X[\u0005*\u0000"+
+		"\u0000Y[\u00032\u0019\u0000ZV\u0001\u0000\u0000\u0000ZW\u0001\u0000\u0000"+
+		"\u0000ZX\u0001\u0000\u0000\u0000ZY\u0001\u0000\u0000\u0000[\u000b\u0001"+
+		"\u0000\u0000\u0000\\]\u0005\u0013\u0000\u0000]^\u0003\b\u0004\u0000^_"+
+		"\u00032\u0019\u0000_a\u0005\u0005\u0000\u0000`b\u0003\u0012\t\u0000a`"+
+		"\u0001\u0000\u0000\u0000ab\u0001\u0000\u0000\u0000bc\u0001\u0000\u0000"+
+		"\u0000cd\u0005\u0006\u0000\u0000de\u0003\u0016\u000b\u0000e\r\u0001\u0000"+
+		"\u0000\u0000fg\u0005\u0013\u0000\u0000gh\u0005\u0007\u0000\u0000hi\u0005"+
+		")\u0000\u0000ij\u0005\b\u0000\u0000jk\u0005\u0005\u0000\u0000kl\u0005"+
+		"\t\u0000\u0000lm\u0005\u0006\u0000\u0000mn\u0003\u0016\u000b\u0000n\u000f"+
+		"\u0001\u0000\u0000\u0000op\u0005\u0013\u0000\u0000pq\u00032\u0019\u0000"+
+		"qs\u0005\u0005\u0000\u0000rt\u0003\u0012\t\u0000sr\u0001\u0000\u0000\u0000"+
+		"st\u0001\u0000\u0000\u0000tu\u0001\u0000\u0000\u0000uv\u0005\u0006\u0000"+
+		"\u0000vw\u0003\u0016\u000b\u0000w\u0011\u0001\u0000\u0000\u0000x}\u0003"+
+		"\u0014\n\u0000yz\u0005\n\u0000\u0000z|\u0003\u0014\n\u0000{y\u0001\u0000"+
+		"\u0000\u0000|\u007f\u0001\u0000\u0000\u0000}{\u0001\u0000\u0000\u0000"+
+		"}~\u0001\u0000\u0000\u0000~\u0013\u0001\u0000\u0000\u0000\u007f}\u0001"+
+		"\u0000\u0000\u0000\u0080\u0081\u0003\n\u0005\u0000\u0081\u0082\u00032"+
+		"\u0019\u0000\u0082\u0015\u0001\u0000\u0000\u0000\u0083\u0088\u0005\u0002"+
+		"\u0000\u0000\u0084\u0087\u0003\u0004\u0002\u0000\u0085\u0087\u0003\u001a"+
+		"\r\u0000\u0086\u0084\u0001\u0000\u0000\u0000\u0086\u0085\u0001\u0000\u0000"+
+		"\u0000\u0087\u008a\u0001\u0000\u0000\u0000\u0088\u0086\u0001\u0000\u0000"+
+		"\u0000\u0088\u0089\u0001\u0000\u0000\u0000\u0089\u008c\u0001\u0000\u0000"+
+		"\u0000\u008a\u0088\u0001\u0000\u0000\u0000\u008b\u008d\u0003\u0018\f\u0000"+
+		"\u008c\u008b\u0001\u0000\u0000\u0000\u008c\u008d\u0001\u0000\u0000\u0000"+
+		"\u008d\u008e\u0001\u0000\u0000\u0000\u008e\u008f\u0005\u0003\u0000\u0000"+
+		"\u008f\u0017\u0001\u0000\u0000\u0000\u0090\u0091\u0005\u000b\u0000\u0000"+
+		"\u0091\u0092\u0003\u001e\u000f\u0000\u0092\u0093\u0005\u0004\u0000\u0000"+
+		"\u0093\u0097\u0001\u0000\u0000\u0000\u0094\u0095\u0005\u000b\u0000\u0000"+
+		"\u0095\u0097\u0005\u0004\u0000\u0000\u0096\u0090\u0001\u0000\u0000\u0000"+
+		"\u0096\u0094\u0001\u0000\u0000\u0000\u0097\u0019\u0001\u0000\u0000\u0000"+
+		"\u0098\u0099\u0005\f\u0000\u0000\u0099\u009a\u0005\u0005\u0000\u0000\u009a"+
+		"\u009b\u0003\u001e\u000f\u0000\u009b\u009c\u0005\u0006\u0000\u0000\u009c"+
+		"\u009f\u0003\u0016\u000b\u0000\u009d\u009e\u0005\r\u0000\u0000\u009e\u00a0"+
+		"\u0003\u0016\u000b\u0000\u009f\u009d\u0001\u0000\u0000\u0000\u009f\u00a0"+
+		"\u0001\u0000\u0000\u0000\u00a0\u00c3\u0001\u0000\u0000\u0000\u00a1\u00a2"+
+		"\u0005\u000e\u0000\u0000\u00a2\u00a3\u0005\u0005\u0000\u0000\u00a3\u00a4"+
+		"\u0003&\u0013\u0000\u00a4\u00a5\u0005\u0004\u0000\u0000\u00a5\u00a6\u0003"+
+		"\u001e\u000f\u0000\u00a6\u00a7\u0005\u0004\u0000\u0000\u00a7\u00a8\u0003"+
+		"&\u0013\u0000\u00a8\u00a9\u0005\u0006\u0000\u0000\u00a9\u00aa\u0003\u0016"+
+		"\u000b\u0000\u00aa\u00c3\u0001\u0000\u0000\u0000\u00ab\u00ac\u0005\u000f"+
+		"\u0000\u0000\u00ac\u00ad\u0005\u0005\u0000\u0000\u00ad\u00ae\u0003\u001e"+
+		"\u000f\u0000\u00ae\u00af\u0005\u0006\u0000\u0000\u00af\u00b0\u0003\u0016"+
+		"\u000b\u0000\u00b0\u00c3\u0001\u0000\u0000\u0000\u00b1\u00b2\u0005\u0010"+
+		"\u0000\u0000\u00b2\u00b3\u0003\u0016\u000b\u0000\u00b3\u00b4\u0005\u000f"+
+		"\u0000\u0000\u00b4\u00b5\u0005\u0005\u0000\u0000\u00b5\u00b6\u0003\u001e"+
+		"\u000f\u0000\u00b6\u00b8\u0005\u0006\u0000\u0000\u00b7\u00b9\u0005\u0004"+
+		"\u0000\u0000\u00b8\u00b7\u0001\u0000\u0000\u0000\u00b8\u00b9\u0001\u0000"+
+		"\u0000\u0000\u00b9\u00c3\u0001\u0000\u0000\u0000\u00ba\u00bb\u0005\u0011"+
+		"\u0000\u0000\u00bb\u00c3\u0005\u0004\u0000\u0000\u00bc\u00bd\u0003&\u0013"+
+		"\u0000\u00bd\u00be\u0005\u0004\u0000\u0000\u00be\u00c3\u0001\u0000\u0000"+
+		"\u0000\u00bf\u00c0\u0003\u001c\u000e\u0000\u00c0\u00c1\u0005\u0004\u0000"+
+		"\u0000\u00c1\u00c3\u0001\u0000\u0000\u0000\u00c2\u0098\u0001\u0000\u0000"+
+		"\u0000\u00c2\u00a1\u0001\u0000\u0000\u0000\u00c2\u00ab\u0001\u0000\u0000"+
+		"\u0000\u00c2\u00b1\u0001\u0000\u0000\u0000\u00c2\u00ba\u0001\u0000\u0000"+
+		"\u0000\u00c2\u00bc\u0001\u0000\u0000\u0000\u00c2\u00bf\u0001\u0000\u0000"+
+		"\u0000\u00c3\u001b\u0001\u0000\u0000\u0000\u00c4\u00ce\u0003(\u0014\u0000"+
+		"\u00c5\u00c6\u0005\u0014\u0000\u0000\u00c6\u00c7\u0003\n\u0005\u0000\u00c7"+
+		"\u00c9\u0005\u0005\u0000\u0000\u00c8\u00ca\u0003.\u0017\u0000\u00c9\u00c8"+
+		"\u0001\u0000\u0000\u0000\u00c9\u00ca\u0001\u0000\u0000\u0000\u00ca\u00cb"+
+		"\u0001\u0000\u0000\u0000\u00cb\u00cc\u0005\u0006\u0000\u0000\u00cc\u00ce"+
+		"\u0001\u0000\u0000\u0000\u00cd\u00c4\u0001\u0000\u0000\u0000\u00cd\u00c5"+
+		"\u0001\u0000\u0000\u0000\u00ce\u001d\u0001\u0000\u0000\u0000\u00cf\u00d0"+
+		"\u0006\u000f\uffff\uffff\u0000\u00d0\u00d1\u0003\"\u0011\u0000\u00d1\u00d2"+
+		"\u0003\u001e\u000f\u0005\u00d2\u00db\u0001\u0000\u0000\u0000\u00d3\u00db"+
+		"\u00030\u0018\u0000\u00d4\u00d5\u0005\u0005\u0000\u0000\u00d5\u00d6\u0003"+
+		"\u001e\u000f\u0000\u00d6\u00d7\u0005\u0006\u0000\u0000\u00d7\u00db\u0001"+
+		"\u0000\u0000\u0000\u00d8\u00db\u0003$\u0012\u0000\u00d9\u00db\u0003\u001c"+
+		"\u000e\u0000\u00da\u00cf\u0001\u0000\u0000\u0000\u00da\u00d3\u0001\u0000"+
+		"\u0000\u0000\u00da\u00d4\u0001\u0000\u0000\u0000\u00da\u00d8\u0001\u0000"+
+		"\u0000\u0000\u00da\u00d9\u0001\u0000\u0000\u0000\u00db\u00e2\u0001\u0000"+
+		"\u0000\u0000\u00dc\u00dd\n\u0006\u0000\u0000\u00dd\u00de\u0003 \u0010"+
+		"\u0000\u00de\u00df\u0003\u001e\u000f\u0007\u00df\u00e1\u0001\u0000\u0000"+
+		"\u0000\u00e0\u00dc\u0001\u0000\u0000\u0000\u00e1\u00e4\u0001\u0000\u0000"+
+		"\u0000\u00e2\u00e0\u0001\u0000\u0000\u0000\u00e2\u00e3\u0001\u0000\u0000"+
+		"\u0000\u00e3\u001f\u0001\u0000\u0000\u0000\u00e4\u00e2\u0001\u0000\u0000"+
+		"\u0000\u00e5\u00e6\u0007\u0001\u0000\u0000\u00e6!\u0001\u0000\u0000\u0000"+
+		"\u00e7\u00e8\u0007\u0002\u0000\u0000\u00e8#\u0001\u0000\u0000\u0000\u00e9"+
+		"\u00ea\u0005\u0016\u0000\u0000\u00ea\u00ec\u0005\u0012\u0000\u0000\u00eb"+
+		"\u00e9\u0001\u0000\u0000\u0000\u00eb\u00ec\u0001\u0000\u0000\u0000\u00ec"+
+		"\u00f2\u0001\u0000\u0000\u0000\u00ed\u00ee\u0003*\u0015\u0000\u00ee\u00ef"+
+		"\u0005\u0012\u0000\u0000\u00ef\u00f1\u0001\u0000\u0000\u0000\u00f0\u00ed"+
+		"\u0001\u0000\u0000\u0000\u00f1\u00f4\u0001\u0000\u0000\u0000\u00f2\u00f0"+
+		"\u0001\u0000\u0000\u0000\u00f2\u00f3\u0001\u0000\u0000\u0000\u00f3\u00f5"+
+		"\u0001\u0000\u0000\u0000\u00f4\u00f2\u0001\u0000\u0000\u0000\u00f5\u00f6"+
+		"\u00032\u0019\u0000\u00f6%\u0001\u0000\u0000\u0000\u00f7\u00f8\u0003$"+
+		"\u0012\u0000\u00f8\u00f9\u0003\u0006\u0003\u0000\u00f9\u00fa\u0003\u001e"+
+		"\u000f\u0000\u00fa\'\u0001\u0000\u0000\u0000\u00fb\u00fc\u0005\u0016\u0000"+
+		"\u0000\u00fc\u00fe\u0005\u0012\u0000\u0000\u00fd\u00fb\u0001\u0000\u0000"+
+		"\u0000\u00fd\u00fe\u0001\u0000\u0000\u0000\u00fe\u0104\u0001\u0000\u0000"+
+		"\u0000\u00ff\u0100\u0003*\u0015\u0000\u0100\u0101\u0005\u0012\u0000\u0000"+
+		"\u0101\u0103\u0001\u0000\u0000\u0000\u0102\u00ff\u0001\u0000\u0000\u0000"+
+		"\u0103\u0106\u0001\u0000\u0000\u0000\u0104\u0102\u0001\u0000\u0000\u0000"+
+		"\u0104\u0105\u0001\u0000\u0000\u0000\u0105\u0107\u0001\u0000\u0000\u0000"+
+		"\u0106\u0104\u0001\u0000\u0000\u0000\u0107\u0108\u0003,\u0016\u0000\u0108"+
+		")\u0001\u0000\u0000\u0000\u0109\u010c\u0003,\u0016\u0000\u010a\u010c\u0003"+
+		"2\u0019\u0000\u010b\u0109\u0001\u0000\u0000\u0000\u010b\u010a\u0001\u0000"+
+		"\u0000\u0000\u010c+\u0001\u0000\u0000\u0000\u010d\u010e\u00032\u0019\u0000"+
+		"\u010e\u0110\u0005\u0005\u0000\u0000\u010f\u0111\u0003.\u0017\u0000\u0110"+
+		"\u010f\u0001\u0000\u0000\u0000\u0110\u0111\u0001\u0000\u0000\u0000\u0111"+
+		"\u0112\u0001\u0000\u0000\u0000\u0112\u0113\u0005\u0006\u0000\u0000\u0113"+
+		"-\u0001\u0000\u0000\u0000\u0114\u0119\u0003\u001e\u000f\u0000\u0115\u0116"+
+		"\u0005\n\u0000\u0000\u0116\u0118\u0003\u001e\u000f\u0000\u0117\u0115\u0001"+
+		"\u0000\u0000\u0000\u0118\u011b\u0001\u0000\u0000\u0000\u0119\u0117\u0001"+
+		"\u0000\u0000\u0000\u0119\u011a\u0001\u0000\u0000\u0000\u011a/\u0001\u0000"+
+		"\u0000\u0000\u011b\u0119\u0001\u0000\u0000\u0000\u011c\u011d\u0007\u0003"+
+		"\u0000\u0000\u011d1\u0001\u0000\u0000\u0000\u011e\u011f\u0005-\u0000\u0000"+
+		"\u011f3\u0001\u0000\u0000\u0000\u001b9>@FTZas}\u0086\u0088\u008c\u0096"+
+		"\u009f\u00b8\u00c2\u00c9\u00cd\u00da\u00e2\u00eb\u00f2\u00fd\u0104\u010b"+
+		"\u0110\u0119";
 	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 9c24df8..5523945 100644
--- a/src/main/java/de/maishai/antlr/DecafVisitor.java
+++ b/src/main/java/de/maishai/antlr/DecafVisitor.java
@@ -82,6 +82,12 @@ public interface DecafVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitBlock(DecafParser.BlockContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link DecafParser#return}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitReturn(DecafParser.ReturnContext ctx);
 	/**
 	 * Visit a parse tree produced by the {@code If}
 	 * labeled alternative in {@link DecafParser#stmt}.
@@ -110,20 +116,6 @@ public interface DecafVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitDoWhile(DecafParser.DoWhileContext ctx);
-	/**
-	 * Visit a parse tree produced by the {@code Return}
-	 * labeled alternative in {@link DecafParser#stmt}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitReturn(DecafParser.ReturnContext ctx);
-	/**
-	 * Visit a parse tree produced by the {@code ReturnVoid}
-	 * labeled alternative in {@link DecafParser#stmt}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitReturnVoid(DecafParser.ReturnVoidContext ctx);
 	/**
 	 * Visit a parse tree produced by the {@code Break}
 	 * labeled alternative in {@link DecafParser#stmt}.