diff --git a/.idea/misc.xml b/.idea/misc.xml
index bb14756..fe442df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,6 +13,16 @@
           <option name="language" value="" />
           <option name="generateVisitor" value="true" />
         </PerGrammarGenerationSettings>
+        <PerGrammarGenerationSettings>
+          <option name="fileName" value="$PROJECT_DIR$/src/main/java/parser/grammar/SimpleJava.g4" />
+          <option name="autoGen" value="true" />
+          <option name="outputDir" value="C:\Users\Maxi\Documents\DHBW\Compilerbau\NichtHaskell2.0\src\main\java" />
+          <option name="libDir" value="" />
+          <option name="encoding" value="" />
+          <option name="pkg" value="parser.generated" />
+          <option name="language" value="" />
+          <option name="generateVisitor" value="true" />
+        </PerGrammarGenerationSettings>
       </list>
     </option>
   </component>
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 94d29cf..779e5d1 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -1,21 +1,18 @@
-import ast.ASTNode;
+import oldAst.ASTNode;
 import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.Token;
-import ast.ProgramNode;
+import oldAst.ProgramNode;
 import bytecode.ByteCodeGenerator;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.CommonTokenStream;
-import parser.ASTBuilder;
+import parser.astBuilder.ASTBuilder;
 import parser.generated.SimpleJavaLexer;
 import parser.generated.SimpleJavaParser;
 import semantic.SemanticAnalyzer;
-import bytecode.ByteCodeGenerator;
 
 import java.io.IOException;
 import java.nio.file.Paths;
-import java.util.List;
 
 public class Main {
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/ast/ClassNode.java b/src/main/java/ast/ClassNode.java
index 26310f8..9690600 100644
--- a/src/main/java/ast/ClassNode.java
+++ b/src/main/java/ast/ClassNode.java
@@ -1,19 +1,19 @@
 package ast;
 
-import ast.member.ConstructorNode;
-import ast.member.MemberNode;
-import ast.member.MethodNode;
-import ast.type.AccessTypeNode;
-import ast.type.EnumAccessTypeNode;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import bytecode.visitor.ClassVisitor;
+import oldAst.ASTNode;
+import oldAst.member.ConstructorNode;
+import oldAst.member.MemberNode;
+import oldAst.member.MethodNode;
+import oldAst.type.AccessTypeNode;
+import oldAst.type.EnumAccessTypeNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 import visitor.Visitable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ClassNode implements ASTNode, Visitable {
     public String identifier;
     public AccessTypeNode accessType;
diff --git a/src/main/java/ast/IdentifierNode.java b/src/main/java/ast/IdentifierNode.java
new file mode 100644
index 0000000..cd09699
--- /dev/null
+++ b/src/main/java/ast/IdentifierNode.java
@@ -0,0 +1,4 @@
+package ast;
+
+public class IdentifierNode {
+}
diff --git a/src/main/java/ast/ProgramNode.java b/src/main/java/ast/ProgramNode.java
index 1aac1b1..afed589 100644
--- a/src/main/java/ast/ProgramNode.java
+++ b/src/main/java/ast/ProgramNode.java
@@ -1,14 +1,16 @@
 package ast;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import ast.ASTNode;
+import ast.ClassNode;
 import bytecode.visitor.ProgramVisitor;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 import visitor.Visitable;
 
-public class ProgramNode implements ASTNode, Visitable{
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProgramNode implements ASTNode, Visitable {
     public List<ClassNode> classes = new ArrayList<>();
 
     public void addClass(ClassNode classNode) {
@@ -24,4 +26,4 @@ public class ProgramNode implements ASTNode, Visitable{
     public void accept(ProgramVisitor programVisitor) {
         programVisitor.visit(this);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ast/type/AccessModifierNode.java b/src/main/java/ast/type/AccessModifierNode.java
new file mode 100644
index 0000000..5bf3292
--- /dev/null
+++ b/src/main/java/ast/type/AccessModifierNode.java
@@ -0,0 +1,14 @@
+package ast.type;
+
+import oldAst.ASTNode;
+import oldAst.type.EnumAccessTypeNode;
+
+public class AccessModifierNode implements ASTNode {
+    public EnumAccessModifierNode enumAccessModifierNode;
+
+    public AccessModifierNode(){}
+
+    public AccessModifierNode(EnumAccessModifierNode enumAccessTypeNode) {
+        this.enumAccessModifierNode = enumAccessTypeNode;
+    }
+}
diff --git a/src/main/java/ast/type/EnumAccessModifierNode.java b/src/main/java/ast/type/EnumAccessModifierNode.java
new file mode 100644
index 0000000..a59e904
--- /dev/null
+++ b/src/main/java/ast/type/EnumAccessModifierNode.java
@@ -0,0 +1,5 @@
+package ast.type;
+
+public enum EnumAccessModifierNode {
+    PUBLIC, PRIVATE, PUBLIC_STATIC, PRIVATE_STATIC
+}
diff --git a/src/main/java/bytecode/ByteCodeGenerator.java b/src/main/java/bytecode/ByteCodeGenerator.java
index 5494255..eeda3ae 100644
--- a/src/main/java/bytecode/ByteCodeGenerator.java
+++ b/src/main/java/bytecode/ByteCodeGenerator.java
@@ -1,7 +1,7 @@
 package bytecode;
 
-import ast.ProgramNode;
-import ast.ClassNode;
+import oldAst.ProgramNode;
+import oldAst.ClassNode;
 import bytecode.visitor.ProgramVisitor;
 
 public class ByteCodeGenerator implements ProgramVisitor {
diff --git a/src/main/java/bytecode/ClassCodeGen.java b/src/main/java/bytecode/ClassCodeGen.java
index b0afa69..266f03c 100644
--- a/src/main/java/bytecode/ClassCodeGen.java
+++ b/src/main/java/bytecode/ClassCodeGen.java
@@ -1,10 +1,10 @@
 package bytecode;
 
-import ast.ClassNode;
-import ast.member.FieldNode;
-import ast.member.MemberNode;
-import ast.member.MethodNode;
-import ast.type.BaseTypeNode;
+import oldAst.ClassNode;
+import oldAst.member.FieldNode;
+import oldAst.member.MemberNode;
+import oldAst.member.MethodNode;
+import oldAst.type.BaseTypeNode;
 import bytecode.visitor.ClassVisitor;
 import java.io.File;
 import org.objectweb.asm.ClassWriter;
diff --git a/src/main/java/bytecode/Mapper.java b/src/main/java/bytecode/Mapper.java
index 4f25846..91f4a2d 100644
--- a/src/main/java/bytecode/Mapper.java
+++ b/src/main/java/bytecode/Mapper.java
@@ -1,10 +1,10 @@
 package bytecode;
 
-import ast.parameter.ParameterListNode;
-import ast.parameter.ParameterNode;
-import ast.type.*;
+import oldAst.parameter.ParameterListNode;
+import oldAst.parameter.ParameterNode;
+import oldAst.type.*;
 import org.objectweb.asm.Opcodes;
-import ast.type.BaseTypeNode;
+import oldAst.type.BaseTypeNode;
 
 public class Mapper {
     public int mapAccessTypeToOpcode(AccessTypeNode type) {
diff --git a/src/main/java/bytecode/MethodCodeGen.java b/src/main/java/bytecode/MethodCodeGen.java
index a4249f1..4fed389 100644
--- a/src/main/java/bytecode/MethodCodeGen.java
+++ b/src/main/java/bytecode/MethodCodeGen.java
@@ -1,11 +1,9 @@
 package bytecode;
 
-import ast.member.ConstructorNode;
-import ast.member.MethodNode;
-import ast.parameter.ParameterListNode;
-import ast.parameter.ParameterNode;
-import ast.type.BaseTypeNode;
-import ast.type.EnumTypeNode;
+import oldAst.member.ConstructorNode;
+import oldAst.member.MethodNode;
+import oldAst.parameter.ParameterNode;
+import oldAst.type.BaseTypeNode;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
diff --git a/src/main/java/bytecode/visitor/ClassVisitor.java b/src/main/java/bytecode/visitor/ClassVisitor.java
index 98ef25c..903775a 100644
--- a/src/main/java/bytecode/visitor/ClassVisitor.java
+++ b/src/main/java/bytecode/visitor/ClassVisitor.java
@@ -2,7 +2,6 @@ package bytecode.visitor;
 
 import ast.ClassNode;
 import ast.member.FieldNode;
-import org.objectweb.asm.ClassWriter;
 
 public interface ClassVisitor {
   void visit(ClassNode classNode);
diff --git a/src/main/java/bytecode/visitor/MethodVisitor.java b/src/main/java/bytecode/visitor/MethodVisitor.java
index 70177ce..bda46ab 100644
--- a/src/main/java/bytecode/visitor/MethodVisitor.java
+++ b/src/main/java/bytecode/visitor/MethodVisitor.java
@@ -1,7 +1,7 @@
 package bytecode.visitor;
 
-import ast.member.ConstructorNode;
-import ast.member.MethodNode;
+import oldAst.member.ConstructorNode;
+import oldAst.member.MethodNode;
 
 public interface MethodVisitor {
     void visit(ConstructorNode constructorNode);
diff --git a/src/main/java/classFileOutput/Test.class b/src/main/java/classFileOutput/Test.class
index 8ba4c23..98f2799 100644
Binary files a/src/main/java/classFileOutput/Test.class and b/src/main/java/classFileOutput/Test.class differ
diff --git a/src/main/java/oldAst/ASTNode.java b/src/main/java/oldAst/ASTNode.java
new file mode 100644
index 0000000..1d8dcf5
--- /dev/null
+++ b/src/main/java/oldAst/ASTNode.java
@@ -0,0 +1,12 @@
+package oldAst;
+
+//import java.util.List;
+
+public interface ASTNode {
+    /**
+     * Please implement this method to return a list of children of each node.
+     */
+   // public List<ASTNode> getChildren();
+}
+
+
diff --git a/src/main/java/ast/BlockNode.java b/src/main/java/oldAst/BlockNode.java
similarity index 63%
rename from src/main/java/ast/BlockNode.java
rename to src/main/java/oldAst/BlockNode.java
index 2dd5307..5c8a932 100644
--- a/src/main/java/ast/BlockNode.java
+++ b/src/main/java/oldAst/BlockNode.java
@@ -1,4 +1,4 @@
-package ast;
+package oldAst;
 
 public class BlockNode {
 }
diff --git a/src/main/java/oldAst/ClassNode.java b/src/main/java/oldAst/ClassNode.java
new file mode 100644
index 0000000..34d08dc
--- /dev/null
+++ b/src/main/java/oldAst/ClassNode.java
@@ -0,0 +1,63 @@
+package oldAst;
+
+import oldAst.member.ConstructorNode;
+import oldAst.member.MemberNode;
+import oldAst.member.MethodNode;
+import oldAst.type.AccessTypeNode;
+import oldAst.type.EnumAccessTypeNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import bytecode.visitor.ClassVisitor;
+import semantic.SemanticVisitor;
+import typechecker.TypeCheckResult;
+import visitor.Visitable;
+
+public class ClassNode implements ASTNode, Visitable {
+    public String identifier;
+    public AccessTypeNode accessType;
+    public List<MemberNode> members = new ArrayList<>();
+    public boolean hasConstructor = false;
+
+    public ClassNode() {}
+
+    public ClassNode(AccessTypeNode accessType, String identifier){
+        this.accessType = accessType;
+        this.identifier = identifier;
+    }
+
+    public void addMember(MemberNode member) {
+        if (member instanceof ConstructorNode) {
+            this.hasConstructor = true;
+        }
+        members.add(member);
+    }
+
+    public void ensureConstructor(){
+        if(!hasConstructor) {
+            ConstructorNode constructor = new ConstructorNode(new AccessTypeNode(EnumAccessTypeNode.PUBLIC), identifier);
+            members.add(0,constructor);
+        }
+    }
+
+    public List<MethodNode> getMethods(){
+        List<MethodNode> methods = new ArrayList<>();
+        for (MemberNode member : members) {
+            if (member instanceof MethodNode methodNode) {
+                methods.add(methodNode);
+            }
+        }
+        return methods;
+    }
+
+    @Override
+    public TypeCheckResult accept(SemanticVisitor visitor) {
+        return visitor.analyze(this);
+    }
+
+    @Override
+    public void accept(ClassVisitor classVisitor) {
+        classVisitor.visit(this);
+    }
+}
diff --git a/src/main/java/oldAst/ProgramNode.java b/src/main/java/oldAst/ProgramNode.java
new file mode 100644
index 0000000..beb97d9
--- /dev/null
+++ b/src/main/java/oldAst/ProgramNode.java
@@ -0,0 +1,27 @@
+package oldAst;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import bytecode.visitor.ProgramVisitor;
+import semantic.SemanticVisitor;
+import typechecker.TypeCheckResult;
+import visitor.Visitable;
+
+public class ProgramNode implements ASTNode, Visitable{
+    public List<ClassNode> classes = new ArrayList<>();
+
+    public void addClass(ClassNode classNode) {
+        classes.add(classNode);
+    }
+
+    @Override
+    public TypeCheckResult accept(SemanticVisitor visitor) {
+        return visitor.analyze(this);
+    }
+
+    @Override
+    public void accept(ProgramVisitor programVisitor) {
+        programVisitor.visit(this);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ast/expression/BinaryExpressionNode.java b/src/main/java/oldAst/expression/BinaryExpressionNode.java
similarity index 95%
rename from src/main/java/ast/expression/BinaryExpressionNode.java
rename to src/main/java/oldAst/expression/BinaryExpressionNode.java
index e4a0e41..bdb1467 100644
--- a/src/main/java/ast/expression/BinaryExpressionNode.java
+++ b/src/main/java/oldAst/expression/BinaryExpressionNode.java
@@ -1,4 +1,4 @@
-package ast.expression;
+package oldAst.expression;
 
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
diff --git a/src/main/java/ast/expression/ExpressionNode.java b/src/main/java/oldAst/expression/ExpressionNode.java
similarity index 82%
rename from src/main/java/ast/expression/ExpressionNode.java
rename to src/main/java/oldAst/expression/ExpressionNode.java
index 42be180..27c43e3 100644
--- a/src/main/java/ast/expression/ExpressionNode.java
+++ b/src/main/java/oldAst/expression/ExpressionNode.java
@@ -1,9 +1,6 @@
-package ast.expression;
+package oldAst.expression;
 
-import ast.ASTNode;
-import ast.statement.AssignmentStatementNode;
-import ast.statement.IfStatementNode;
-import ast.statement.VariableDeclarationStatementNode;
+import oldAst.ASTNode;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/src/main/java/ast/expression/ExpresssionOperator.java b/src/main/java/oldAst/expression/ExpresssionOperator.java
similarity index 90%
rename from src/main/java/ast/expression/ExpresssionOperator.java
rename to src/main/java/oldAst/expression/ExpresssionOperator.java
index 42bc137..dfd7ef8 100644
--- a/src/main/java/ast/expression/ExpresssionOperator.java
+++ b/src/main/java/oldAst/expression/ExpresssionOperator.java
@@ -1,4 +1,4 @@
-package ast.expression;
+package oldAst.expression;
 
 public enum ExpresssionOperator {
   DOT, // . NICHT MEHR GEBRAUCHT
diff --git a/src/main/java/ast/expression/IdentifierExpressionNode.java b/src/main/java/oldAst/expression/IdentifierExpressionNode.java
similarity index 88%
rename from src/main/java/ast/expression/IdentifierExpressionNode.java
rename to src/main/java/oldAst/expression/IdentifierExpressionNode.java
index 1bb8d56..4552a82 100644
--- a/src/main/java/ast/expression/IdentifierExpressionNode.java
+++ b/src/main/java/oldAst/expression/IdentifierExpressionNode.java
@@ -1,6 +1,6 @@
-package ast.expression;
+package oldAst.expression;
 
-import ast.type.TypeNode;
+import oldAst.type.TypeNode;
 import semantic.SemanticVisitor;
 
 import typechecker.TypeCheckResult;
diff --git a/src/main/java/ast/expression/InstVar.java b/src/main/java/oldAst/expression/InstVar.java
similarity index 90%
rename from src/main/java/ast/expression/InstVar.java
rename to src/main/java/oldAst/expression/InstVar.java
index 6ffbba3..dc9a204 100644
--- a/src/main/java/ast/expression/InstVar.java
+++ b/src/main/java/oldAst/expression/InstVar.java
@@ -1,6 +1,6 @@
-package ast.expression;
+package oldAst.expression;
 
-import ast.type.TypeNode;
+import oldAst.type.TypeNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 import visitor.Visitable;
diff --git a/src/main/java/ast/expression/LiteralNode.java b/src/main/java/oldAst/expression/LiteralNode.java
similarity index 89%
rename from src/main/java/ast/expression/LiteralNode.java
rename to src/main/java/oldAst/expression/LiteralNode.java
index d97f7df..c53f04a 100644
--- a/src/main/java/ast/expression/LiteralNode.java
+++ b/src/main/java/oldAst/expression/LiteralNode.java
@@ -1,6 +1,6 @@
-package ast.expression;
+package oldAst.expression;
 
-import ast.type.TypeNode;
+import oldAst.type.TypeNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
diff --git a/src/main/java/ast/expression/This.java b/src/main/java/oldAst/expression/This.java
similarity index 79%
rename from src/main/java/ast/expression/This.java
rename to src/main/java/oldAst/expression/This.java
index 29fc827..1a0fbb3 100644
--- a/src/main/java/ast/expression/This.java
+++ b/src/main/java/oldAst/expression/This.java
@@ -1,8 +1,8 @@
-package ast.expression;
+package oldAst.expression;
 
-import ast.ASTNode;
-import ast.type.ReferenceTypeNode;
-import ast.type.TypeNode;
+import oldAst.ASTNode;
+import oldAst.type.ReferenceTypeNode;
+import oldAst.type.TypeNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
diff --git a/src/main/java/ast/expression/UnaryExpressionNode.java b/src/main/java/oldAst/expression/UnaryExpressionNode.java
similarity index 95%
rename from src/main/java/ast/expression/UnaryExpressionNode.java
rename to src/main/java/oldAst/expression/UnaryExpressionNode.java
index be1a660..17b0a9b 100644
--- a/src/main/java/ast/expression/UnaryExpressionNode.java
+++ b/src/main/java/oldAst/expression/UnaryExpressionNode.java
@@ -1,4 +1,4 @@
-package ast.expression;
+package oldAst.expression;
 
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
diff --git a/src/main/java/ast/member/ConstructorNode.java b/src/main/java/oldAst/member/ConstructorNode.java
similarity index 86%
rename from src/main/java/ast/member/ConstructorNode.java
rename to src/main/java/oldAst/member/ConstructorNode.java
index 998d727..9c3bc08 100644
--- a/src/main/java/ast/member/ConstructorNode.java
+++ b/src/main/java/oldAst/member/ConstructorNode.java
@@ -1,6 +1,6 @@
-package ast.member;
+package oldAst.member;
 
-import ast.type.AccessTypeNode;
+import oldAst.type.AccessTypeNode;
 import bytecode.visitor.MethodVisitor;
 import visitor.Visitable;
 
diff --git a/src/main/java/ast/member/FieldNode.java b/src/main/java/oldAst/member/FieldNode.java
similarity index 89%
rename from src/main/java/ast/member/FieldNode.java
rename to src/main/java/oldAst/member/FieldNode.java
index 7273f6b..3f34f1d 100644
--- a/src/main/java/ast/member/FieldNode.java
+++ b/src/main/java/oldAst/member/FieldNode.java
@@ -1,7 +1,7 @@
-package ast.member;
+package oldAst.member;
 
-import ast.type.AccessTypeNode;
-import ast.type.TypeNode;
+import oldAst.type.AccessTypeNode;
+import oldAst.type.TypeNode;
 import bytecode.visitor.ClassVisitor;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
diff --git a/src/main/java/ast/member/MemberNode.java b/src/main/java/oldAst/member/MemberNode.java
similarity index 91%
rename from src/main/java/ast/member/MemberNode.java
rename to src/main/java/oldAst/member/MemberNode.java
index ace0d6d..56e01e3 100644
--- a/src/main/java/ast/member/MemberNode.java
+++ b/src/main/java/oldAst/member/MemberNode.java
@@ -1,6 +1,6 @@
-package ast.member;
+package oldAst.member;
 
-import ast.ASTNode;
+import oldAst.ASTNode;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/src/main/java/ast/member/MethodNode.java b/src/main/java/oldAst/member/MethodNode.java
similarity index 91%
rename from src/main/java/ast/member/MethodNode.java
rename to src/main/java/oldAst/member/MethodNode.java
index f3cba60..34d14e1 100644
--- a/src/main/java/ast/member/MethodNode.java
+++ b/src/main/java/oldAst/member/MethodNode.java
@@ -1,13 +1,13 @@
-package ast.member;
+package oldAst.member;
 
-import ast.parameter.ParameterListNode;
-import ast.statement.StatementNode;
-import ast.type.AccessTypeNode;
+import oldAst.parameter.ParameterListNode;
+import oldAst.statement.StatementNode;
+import oldAst.type.AccessTypeNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import ast.type.TypeNode;
+import oldAst.type.TypeNode;
 import bytecode.visitor.MethodVisitor;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
diff --git a/src/main/java/ast/parameter/ParameterListNode.java b/src/main/java/oldAst/parameter/ParameterListNode.java
similarity index 86%
rename from src/main/java/ast/parameter/ParameterListNode.java
rename to src/main/java/oldAst/parameter/ParameterListNode.java
index 76a39fb..b241791 100644
--- a/src/main/java/ast/parameter/ParameterListNode.java
+++ b/src/main/java/oldAst/parameter/ParameterListNode.java
@@ -1,6 +1,6 @@
-package ast.parameter;
+package oldAst.parameter;
 
-import ast.ASTNode;
+import oldAst.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/ast/parameter/ParameterNode.java b/src/main/java/oldAst/parameter/ParameterNode.java
similarity index 77%
rename from src/main/java/ast/parameter/ParameterNode.java
rename to src/main/java/oldAst/parameter/ParameterNode.java
index 176e987..976375c 100644
--- a/src/main/java/ast/parameter/ParameterNode.java
+++ b/src/main/java/oldAst/parameter/ParameterNode.java
@@ -1,7 +1,7 @@
-package ast.parameter;
+package oldAst.parameter;
 
-import ast.ASTNode;
-import ast.type.TypeNode;
+import oldAst.ASTNode;
+import oldAst.type.TypeNode;
 
 public class ParameterNode implements ASTNode {
     public TypeNode type;
diff --git a/src/main/java/ast/statement/AssignmentStatementNode.java b/src/main/java/oldAst/statement/AssignmentStatementNode.java
similarity index 82%
rename from src/main/java/ast/statement/AssignmentStatementNode.java
rename to src/main/java/oldAst/statement/AssignmentStatementNode.java
index abd00a5..556fe5e 100644
--- a/src/main/java/ast/statement/AssignmentStatementNode.java
+++ b/src/main/java/oldAst/statement/AssignmentStatementNode.java
@@ -1,8 +1,6 @@
-package ast.statement;
+package oldAst.statement;
 
-import ast.expression.BinaryExpressionNode;
-import ast.expression.ExpressionNode;
-import ast.type.TypeNode;
+import oldAst.expression.ExpressionNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 import visitor.Visitable;
diff --git a/src/main/java/ast/statement/IfStatementNode.java b/src/main/java/oldAst/statement/IfStatementNode.java
similarity index 89%
rename from src/main/java/ast/statement/IfStatementNode.java
rename to src/main/java/oldAst/statement/IfStatementNode.java
index 3f585dd..6050e7a 100644
--- a/src/main/java/ast/statement/IfStatementNode.java
+++ b/src/main/java/oldAst/statement/IfStatementNode.java
@@ -1,6 +1,6 @@
-package ast.statement;
+package oldAst.statement;
 
-import ast.expression.ExpressionNode;
+import oldAst.expression.ExpressionNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
diff --git a/src/main/java/ast/statement/ReturnStatementNode.java b/src/main/java/oldAst/statement/ReturnStatementNode.java
similarity index 85%
rename from src/main/java/ast/statement/ReturnStatementNode.java
rename to src/main/java/oldAst/statement/ReturnStatementNode.java
index c5e4d6b..21db22d 100644
--- a/src/main/java/ast/statement/ReturnStatementNode.java
+++ b/src/main/java/oldAst/statement/ReturnStatementNode.java
@@ -1,6 +1,6 @@
-package ast.statement;
+package oldAst.statement;
 
-import ast.expression.ExpressionNode;
+import oldAst.expression.ExpressionNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
diff --git a/src/main/java/ast/statement/StatementNode.java b/src/main/java/oldAst/statement/StatementNode.java
similarity index 86%
rename from src/main/java/ast/statement/StatementNode.java
rename to src/main/java/oldAst/statement/StatementNode.java
index 5a96ee5..6ae0192 100644
--- a/src/main/java/ast/statement/StatementNode.java
+++ b/src/main/java/oldAst/statement/StatementNode.java
@@ -1,8 +1,6 @@
-package ast.statement;
+package oldAst.statement;
 
-import ast.ASTNode;
-import ast.type.BaseTypeNode;
-import ast.type.ReferenceTypeNode;
+import oldAst.ASTNode;
 import visitor.Visitable;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/src/main/java/ast/statement/VariableDeclarationStatementNode.java b/src/main/java/oldAst/statement/VariableDeclarationStatementNode.java
similarity index 86%
rename from src/main/java/ast/statement/VariableDeclarationStatementNode.java
rename to src/main/java/oldAst/statement/VariableDeclarationStatementNode.java
index 9feb086..854b9e1 100644
--- a/src/main/java/ast/statement/VariableDeclarationStatementNode.java
+++ b/src/main/java/oldAst/statement/VariableDeclarationStatementNode.java
@@ -1,7 +1,7 @@
-package ast.statement;
+package oldAst.statement;
 
-import ast.expression.ExpressionNode;
-import ast.type.TypeNode;
+import oldAst.expression.ExpressionNode;
+import oldAst.type.TypeNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
diff --git a/src/main/java/ast/statement/WhileStatementNode.java b/src/main/java/oldAst/statement/WhileStatementNode.java
similarity index 87%
rename from src/main/java/ast/statement/WhileStatementNode.java
rename to src/main/java/oldAst/statement/WhileStatementNode.java
index a3f4007..b3fcee5 100644
--- a/src/main/java/ast/statement/WhileStatementNode.java
+++ b/src/main/java/oldAst/statement/WhileStatementNode.java
@@ -1,6 +1,6 @@
-package ast.statement;
+package oldAst.statement;
 
-import ast.expression.ExpressionNode;
+import oldAst.expression.ExpressionNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
diff --git a/src/main/java/ast/type/AccessTypeNode.java b/src/main/java/oldAst/type/AccessTypeNode.java
similarity index 85%
rename from src/main/java/ast/type/AccessTypeNode.java
rename to src/main/java/oldAst/type/AccessTypeNode.java
index 4e0db89..e1f884f 100644
--- a/src/main/java/ast/type/AccessTypeNode.java
+++ b/src/main/java/oldAst/type/AccessTypeNode.java
@@ -1,6 +1,6 @@
-package ast.type;
+package oldAst.type;
 
-import ast.ASTNode;
+import oldAst.ASTNode;
 
 public class AccessTypeNode implements ASTNode {
     public EnumAccessTypeNode enumAccessTypeNode;
diff --git a/src/main/java/ast/type/BaseTypeNode.java b/src/main/java/oldAst/type/BaseTypeNode.java
similarity index 92%
rename from src/main/java/ast/type/BaseTypeNode.java
rename to src/main/java/oldAst/type/BaseTypeNode.java
index 8a9a4a6..2a1b23d 100644
--- a/src/main/java/ast/type/BaseTypeNode.java
+++ b/src/main/java/oldAst/type/BaseTypeNode.java
@@ -1,6 +1,6 @@
-package ast.type;
+package oldAst.type;
 
-import ast.ASTNode;
+import oldAst.ASTNode;
 
 public class BaseTypeNode implements ASTNode, TypeNode {
 
diff --git a/src/main/java/ast/type/EnumAccessTypeNode.java b/src/main/java/oldAst/type/EnumAccessTypeNode.java
similarity index 72%
rename from src/main/java/ast/type/EnumAccessTypeNode.java
rename to src/main/java/oldAst/type/EnumAccessTypeNode.java
index 12cdda9..c8625e5 100644
--- a/src/main/java/ast/type/EnumAccessTypeNode.java
+++ b/src/main/java/oldAst/type/EnumAccessTypeNode.java
@@ -1,4 +1,4 @@
-package ast.type;
+package oldAst.type;
 
 public enum EnumAccessTypeNode {
     PUBLIC, PRIVATE
diff --git a/src/main/java/ast/type/EnumTypeNode.java b/src/main/java/oldAst/type/EnumTypeNode.java
similarity index 71%
rename from src/main/java/ast/type/EnumTypeNode.java
rename to src/main/java/oldAst/type/EnumTypeNode.java
index d858461..1e84e81 100644
--- a/src/main/java/ast/type/EnumTypeNode.java
+++ b/src/main/java/oldAst/type/EnumTypeNode.java
@@ -1,4 +1,4 @@
-package ast.type;
+package oldAst.type;
 
 public enum EnumTypeNode {
     INT, BOOLEAN, CHAR
diff --git a/src/main/java/ast/type/ReferenceTypeNode.java b/src/main/java/oldAst/type/ReferenceTypeNode.java
similarity index 94%
rename from src/main/java/ast/type/ReferenceTypeNode.java
rename to src/main/java/oldAst/type/ReferenceTypeNode.java
index 91da6bc..b73f4dd 100644
--- a/src/main/java/ast/type/ReferenceTypeNode.java
+++ b/src/main/java/oldAst/type/ReferenceTypeNode.java
@@ -1,6 +1,6 @@
-package ast.type;
+package oldAst.type;
 
-import ast.ASTNode;
+import oldAst.ASTNode;
 
 public class ReferenceTypeNode implements ASTNode, TypeNode {
 
diff --git a/src/main/java/ast/type/TypeNode.java b/src/main/java/oldAst/type/TypeNode.java
similarity index 91%
rename from src/main/java/ast/type/TypeNode.java
rename to src/main/java/oldAst/type/TypeNode.java
index a855f09..7248755 100644
--- a/src/main/java/ast/type/TypeNode.java
+++ b/src/main/java/oldAst/type/TypeNode.java
@@ -1,6 +1,6 @@
-package ast.type;
+package oldAst.type;
 
-import ast.ASTNode;
+import oldAst.ASTNode;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
diff --git a/src/main/java/parser/SimpleJava.g4 b/src/main/java/parser/SimpleJava.g4
deleted file mode 100644
index 7d09aba..0000000
--- a/src/main/java/parser/SimpleJava.g4
+++ /dev/null
@@ -1,62 +0,0 @@
-grammar SimpleJava;
-
-program : classDeclaration+;
-
-classDeclaration : accessType 'class' IDENTIFIER '{' memberDeclaration* '}';
-
-memberDeclaration : fieldDeclaration | methodDeclaration | constructorDeclaration;
-
-fieldDeclaration : accessType type IDENTIFIER ';';
-
-methodDeclaration : accessType 'static' type IDENTIFIER '(' parameterList? ')' '{' statement* '}' ;
-
-constructorDeclaration : accessType IDENTIFIER '(' parameterList? ')' '{' statement* '}' ;
-
-parameterList : parameter (',' parameter)* ;
-parameter : type IDENTIFIER ;
-
-type : 'int' | 'boolean' | 'char' ;
-accessType : 'public' | 'private' ;
-
-statement
-    : variableDeclarationStatement
-    | assignmentStatement
-    | ifStatement
-    | whileStatement
-    | returnStatement
-    | block
-    ;
-
-variableDeclarationStatement : type IDENTIFIER ('=' expression)? ';' ;
-
-assignmentStatement : var '=' expression ';' ;
-
-var: IDENTIFIER;
-
-ifStatement : 'if' '(' expression ')' statement ('else' statement)? ;
-
-whileStatement : 'while' '(' expression ')' statement ;
-
-returnStatement : 'return' (expression)? ';' ;
-
-block : '{' statement* '}' ;
-
-expression
-    : expression ('&&' | '||') expression
-    | expression ('==' | '!=' | '<' | '<=' | '>' | '>=') expression
-    | expression ('+' | '-' | '*' | '/' | '%') expression
-    | '-' expression
-    | '!' expression
-    | '(' expression ')'
-    | literal
-    | IDENTIFIER
-    ;
-
-literal : INTEGERLITERAL | booleanLiteral | charLiteral ;
-
-INTEGERLITERAL : [0-9]+ ;
-booleanLiteral : 'true' | 'false' ;
-charLiteral : '\'' . '\'' ;
-IDENTIFIER : [a-zA-Z][a-zA-Z0-9_]* ;
-
-WS : [ \t\r\n]+ -> skip;
\ No newline at end of file
diff --git a/src/main/java/parser/ASTBuilder.java b/src/main/java/parser/astBuilder/ASTBuilder.java
similarity index 96%
rename from src/main/java/parser/ASTBuilder.java
rename to src/main/java/parser/astBuilder/ASTBuilder.java
index 9110f2c..69cad70 100644
--- a/src/main/java/parser/ASTBuilder.java
+++ b/src/main/java/parser/astBuilder/ASTBuilder.java
@@ -1,21 +1,21 @@
-package parser;
+package parser.astBuilder;
 
-import ast.*;
-import ast.expression.*;
-import ast.member.FieldNode;
-import ast.member.MemberNode;
-import ast.member.MethodNode;
-import ast.parameter.ParameterListNode;
-import ast.parameter.ParameterNode;
-import ast.statement.*;
-import ast.type.*;
+import oldAst.*;
+import oldAst.expression.*;
+import oldAst.member.FieldNode;
+import oldAst.member.MemberNode;
+import oldAst.member.MethodNode;
+import oldAst.parameter.ParameterListNode;
+import oldAst.parameter.ParameterNode;
+import oldAst.statement.*;
+import oldAst.type.*;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 import java.util.ArrayList;
 import java.util.List;
 import parser.generated.*;
 import parser.generated.SimpleJavaParser.LiteralContext;
-import ast.type.BaseTypeNode;
+import oldAst.type.BaseTypeNode;
 
 public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
     @Override
diff --git a/src/main/java/parser/generated/SimpleJava.interp b/src/main/java/parser/generated/SimpleJava.interp
index c3cff60..c977686 100644
--- a/src/main/java/parser/generated/SimpleJava.interp
+++ b/src/main/java/parser/generated/SimpleJava.interp
@@ -1,40 +1,52 @@
 token literal names:
 null
-'class'
-'{'
-'}'
-';'
-'static'
-'('
-')'
-','
-'int'
+'++'
+'--'
+'void'
 'boolean'
 'char'
-'public'
-'private'
+'int'
+null
+'public static void main(String[] args)'
+null
+null
+null
+null
 '='
-'if'
-'else'
-'while'
-'return'
-'&&'
-'||'
-'=='
-'!='
-'<'
-'<='
-'>'
-'>='
 '+'
 '-'
 '*'
-'/'
 '%'
+'/'
+'>'
+'<'
+'>='
+'<='
+'=='
+'!='
 '!'
-'true'
-'false'
-'\''
+'&&'
+'||'
+'.'
+'('
+')'
+'{'
+'}'
+';'
+','
+'class'
+'this'
+'while'
+'if'
+'else'
+'for'
+'return'
+'new'
+null
+null
+null
+'null'
+null
 null
 null
 null
@@ -43,67 +55,101 @@ token symbolic names:
 null
 null
 null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-INTEGERLITERAL
-IDENTIFIER
+Void
+Boolean
+Char
+Int
+AccessModifier
+MainMethodDeclaration
+DotOperator
+LineOperator
+ComparisonOperator
+LogicalOperator
+Assign
+Plus
+Minus
+Mult
+Modulo
+Div
+Greater
+Less
+GreaterEqual
+LessEqual
+Equal
+NotEqual
+Not
+And
+Or
+Dot
+OpenRoundBracket
+ClosedRoundBracket
+OpenCurlyBracket
+ClosedCurlyBracket
+Semicolon
+Comma
+Class
+This
+While
+If
+Else
+For
+Return
+New
+CharValue
+IntValue
+BooleanValue
+NullValue
+Identifier
 WS
+InlineComment
+MultilineComment
 
 rule names:
 program
 classDeclaration
 memberDeclaration
+constructorDeclaration
 fieldDeclaration
 methodDeclaration
-constructorDeclaration
 parameterList
 parameter
-type
-accessType
+argumentList
 statement
-variableDeclarationStatement
-assignmentStatement
-var
-ifStatement
-whileStatement
-returnStatement
 block
+returnStatement
+localVariableDeclaration
+whileStatement
+forStatement
+ifElseStatement
+ifStatement
+elseStatement
+statementExpression
+assign
+newDeclaration
 expression
-literal
-booleanLiteral
-charLiteral
+unaryExpression
+notExpression
+crementExpression
+incrementExpression
+prefixIncrementExpression
+suffixIncrementExpression
+decrementExpression
+prefixDecrementExpression
+suffixDecrementExpression
+assignableExpression
+memberAccess
+binaryExpression
+calculationExpression
+dotExpression
+dotSubtractionExpression
+nonCalculationExpression
+methodCall
+target
+chainedMethod
+type
+value
+nonCalculationOperator
 
 
 atn:
-[4, 1, 38, 212, 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, 1, 0, 4, 0, 46, 8, 0, 11, 0, 12, 0, 47, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 55, 8, 1, 10, 1, 12, 1, 58, 9, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 3, 2, 65, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 78, 8, 4, 1, 4, 1, 4, 1, 4, 5, 4, 83, 8, 4, 10, 4, 12, 4, 86, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 94, 8, 5, 1, 5, 1, 5, 1, 5, 5, 5, 99, 8, 5, 10, 5, 12, 5, 102, 9, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 5, 6, 109, 8, 6, 10, 6, 12, 6, 112, 9, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 127, 8, 10, 1, 11, 1, 11, 1, 11, 1, 11, 3, 11, 133, 8, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 151, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 3, 16, 161, 8, 16, 1, 16, 1, 16, 1, 17, 1, 17, 5, 17, 167, 8, 17, 10, 17, 12, 17, 170, 9, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 3, 18, 185, 8, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 5, 18, 196, 8, 18, 10, 18, 12, 18, 199, 9, 18, 1, 19, 1, 19, 1, 19, 3, 19, 204, 8, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 0, 1, 36, 22, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 0, 6, 1, 0, 9, 11, 1, 0, 12, 13, 1, 0, 19, 20, 1, 0, 21, 26, 1, 0, 27, 31, 1, 0, 33, 34, 216, 0, 45, 1, 0, 0, 0, 2, 49, 1, 0, 0, 0, 4, 64, 1, 0, 0, 0, 6, 66, 1, 0, 0, 0, 8, 71, 1, 0, 0, 0, 10, 89, 1, 0, 0, 0, 12, 105, 1, 0, 0, 0, 14, 113, 1, 0, 0, 0, 16, 116, 1, 0, 0, 0, 18, 118, 1, 0, 0, 0, 20, 126, 1, 0, 0, 0, 22, 128, 1, 0, 0, 0, 24, 136, 1, 0, 0, 0, 26, 141, 1, 0, 0, 0, 28, 143, 1, 0, 0, 0, 30, 152, 1, 0, 0, 0, 32, 158, 1, 0, 0, 0, 34, 164, 1, 0, 0, 0, 36, 184, 1, 0, 0, 0, 38, 203, 1, 0, 0, 0, 40, 205, 1, 0, 0, 0, 42, 207, 1, 0, 0, 0, 44, 46, 3, 2, 1, 0, 45, 44, 1, 0, 0, 0, 46, 47, 1, 0, 0, 0, 47, 45, 1, 0, 0, 0, 47, 48, 1, 0, 0, 0, 48, 1, 1, 0, 0, 0, 49, 50, 3, 18, 9, 0, 50, 51, 5, 1, 0, 0, 51, 52, 5, 37, 0, 0, 52, 56, 5, 2, 0, 0, 53, 55, 3, 4, 2, 0, 54, 53, 1, 0, 0, 0, 55, 58, 1, 0, 0, 0, 56, 54, 1, 0, 0, 0, 56, 57, 1, 0, 0, 0, 57, 59, 1, 0, 0, 0, 58, 56, 1, 0, 0, 0, 59, 60, 5, 3, 0, 0, 60, 3, 1, 0, 0, 0, 61, 65, 3, 6, 3, 0, 62, 65, 3, 8, 4, 0, 63, 65, 3, 10, 5, 0, 64, 61, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 64, 63, 1, 0, 0, 0, 65, 5, 1, 0, 0, 0, 66, 67, 3, 18, 9, 0, 67, 68, 3, 16, 8, 0, 68, 69, 5, 37, 0, 0, 69, 70, 5, 4, 0, 0, 70, 7, 1, 0, 0, 0, 71, 72, 3, 18, 9, 0, 72, 73, 5, 5, 0, 0, 73, 74, 3, 16, 8, 0, 74, 75, 5, 37, 0, 0, 75, 77, 5, 6, 0, 0, 76, 78, 3, 12, 6, 0, 77, 76, 1, 0, 0, 0, 77, 78, 1, 0, 0, 0, 78, 79, 1, 0, 0, 0, 79, 80, 5, 7, 0, 0, 80, 84, 5, 2, 0, 0, 81, 83, 3, 20, 10, 0, 82, 81, 1, 0, 0, 0, 83, 86, 1, 0, 0, 0, 84, 82, 1, 0, 0, 0, 84, 85, 1, 0, 0, 0, 85, 87, 1, 0, 0, 0, 86, 84, 1, 0, 0, 0, 87, 88, 5, 3, 0, 0, 88, 9, 1, 0, 0, 0, 89, 90, 3, 18, 9, 0, 90, 91, 5, 37, 0, 0, 91, 93, 5, 6, 0, 0, 92, 94, 3, 12, 6, 0, 93, 92, 1, 0, 0, 0, 93, 94, 1, 0, 0, 0, 94, 95, 1, 0, 0, 0, 95, 96, 5, 7, 0, 0, 96, 100, 5, 2, 0, 0, 97, 99, 3, 20, 10, 0, 98, 97, 1, 0, 0, 0, 99, 102, 1, 0, 0, 0, 100, 98, 1, 0, 0, 0, 100, 101, 1, 0, 0, 0, 101, 103, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 103, 104, 5, 3, 0, 0, 104, 11, 1, 0, 0, 0, 105, 110, 3, 14, 7, 0, 106, 107, 5, 8, 0, 0, 107, 109, 3, 14, 7, 0, 108, 106, 1, 0, 0, 0, 109, 112, 1, 0, 0, 0, 110, 108, 1, 0, 0, 0, 110, 111, 1, 0, 0, 0, 111, 13, 1, 0, 0, 0, 112, 110, 1, 0, 0, 0, 113, 114, 3, 16, 8, 0, 114, 115, 5, 37, 0, 0, 115, 15, 1, 0, 0, 0, 116, 117, 7, 0, 0, 0, 117, 17, 1, 0, 0, 0, 118, 119, 7, 1, 0, 0, 119, 19, 1, 0, 0, 0, 120, 127, 3, 22, 11, 0, 121, 127, 3, 24, 12, 0, 122, 127, 3, 28, 14, 0, 123, 127, 3, 30, 15, 0, 124, 127, 3, 32, 16, 0, 125, 127, 3, 34, 17, 0, 126, 120, 1, 0, 0, 0, 126, 121, 1, 0, 0, 0, 126, 122, 1, 0, 0, 0, 126, 123, 1, 0, 0, 0, 126, 124, 1, 0, 0, 0, 126, 125, 1, 0, 0, 0, 127, 21, 1, 0, 0, 0, 128, 129, 3, 16, 8, 0, 129, 132, 5, 37, 0, 0, 130, 131, 5, 14, 0, 0, 131, 133, 3, 36, 18, 0, 132, 130, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 135, 5, 4, 0, 0, 135, 23, 1, 0, 0, 0, 136, 137, 3, 26, 13, 0, 137, 138, 5, 14, 0, 0, 138, 139, 3, 36, 18, 0, 139, 140, 5, 4, 0, 0, 140, 25, 1, 0, 0, 0, 141, 142, 5, 37, 0, 0, 142, 27, 1, 0, 0, 0, 143, 144, 5, 15, 0, 0, 144, 145, 5, 6, 0, 0, 145, 146, 3, 36, 18, 0, 146, 147, 5, 7, 0, 0, 147, 150, 3, 20, 10, 0, 148, 149, 5, 16, 0, 0, 149, 151, 3, 20, 10, 0, 150, 148, 1, 0, 0, 0, 150, 151, 1, 0, 0, 0, 151, 29, 1, 0, 0, 0, 152, 153, 5, 17, 0, 0, 153, 154, 5, 6, 0, 0, 154, 155, 3, 36, 18, 0, 155, 156, 5, 7, 0, 0, 156, 157, 3, 20, 10, 0, 157, 31, 1, 0, 0, 0, 158, 160, 5, 18, 0, 0, 159, 161, 3, 36, 18, 0, 160, 159, 1, 0, 0, 0, 160, 161, 1, 0, 0, 0, 161, 162, 1, 0, 0, 0, 162, 163, 5, 4, 0, 0, 163, 33, 1, 0, 0, 0, 164, 168, 5, 2, 0, 0, 165, 167, 3, 20, 10, 0, 166, 165, 1, 0, 0, 0, 167, 170, 1, 0, 0, 0, 168, 166, 1, 0, 0, 0, 168, 169, 1, 0, 0, 0, 169, 171, 1, 0, 0, 0, 170, 168, 1, 0, 0, 0, 171, 172, 5, 3, 0, 0, 172, 35, 1, 0, 0, 0, 173, 174, 6, 18, -1, 0, 174, 175, 5, 28, 0, 0, 175, 185, 3, 36, 18, 5, 176, 177, 5, 32, 0, 0, 177, 185, 3, 36, 18, 4, 178, 179, 5, 6, 0, 0, 179, 180, 3, 36, 18, 0, 180, 181, 5, 7, 0, 0, 181, 185, 1, 0, 0, 0, 182, 185, 3, 38, 19, 0, 183, 185, 5, 37, 0, 0, 184, 173, 1, 0, 0, 0, 184, 176, 1, 0, 0, 0, 184, 178, 1, 0, 0, 0, 184, 182, 1, 0, 0, 0, 184, 183, 1, 0, 0, 0, 185, 197, 1, 0, 0, 0, 186, 187, 10, 8, 0, 0, 187, 188, 7, 2, 0, 0, 188, 196, 3, 36, 18, 9, 189, 190, 10, 7, 0, 0, 190, 191, 7, 3, 0, 0, 191, 196, 3, 36, 18, 8, 192, 193, 10, 6, 0, 0, 193, 194, 7, 4, 0, 0, 194, 196, 3, 36, 18, 7, 195, 186, 1, 0, 0, 0, 195, 189, 1, 0, 0, 0, 195, 192, 1, 0, 0, 0, 196, 199, 1, 0, 0, 0, 197, 195, 1, 0, 0, 0, 197, 198, 1, 0, 0, 0, 198, 37, 1, 0, 0, 0, 199, 197, 1, 0, 0, 0, 200, 204, 5, 36, 0, 0, 201, 204, 3, 40, 20, 0, 202, 204, 3, 42, 21, 0, 203, 200, 1, 0, 0, 0, 203, 201, 1, 0, 0, 0, 203, 202, 1, 0, 0, 0, 204, 39, 1, 0, 0, 0, 205, 206, 7, 5, 0, 0, 206, 41, 1, 0, 0, 0, 207, 208, 5, 35, 0, 0, 208, 209, 9, 0, 0, 0, 209, 210, 5, 35, 0, 0, 210, 43, 1, 0, 0, 0, 17, 47, 56, 64, 77, 84, 93, 100, 110, 126, 132, 150, 160, 168, 184, 195, 197, 203]
\ No newline at end of file
+[4, 1, 50, 393, 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, 1, 0, 4, 0, 90, 8, 0, 11, 0, 12, 0, 91, 1, 1, 3, 1, 95, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 101, 8, 1, 10, 1, 12, 1, 104, 9, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 3, 2, 111, 8, 2, 1, 3, 3, 3, 114, 8, 3, 1, 3, 1, 3, 1, 3, 3, 3, 119, 8, 3, 1, 3, 1, 3, 1, 3, 1, 4, 3, 4, 125, 8, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 3, 5, 134, 8, 5, 1, 5, 1, 5, 3, 5, 138, 8, 5, 1, 5, 1, 5, 1, 5, 3, 5, 143, 8, 5, 1, 5, 1, 5, 3, 5, 147, 8, 5, 1, 6, 1, 6, 1, 6, 5, 6, 152, 8, 6, 10, 6, 12, 6, 155, 9, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 5, 8, 163, 8, 8, 10, 8, 12, 8, 166, 9, 8, 3, 8, 168, 8, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 183, 8, 9, 1, 10, 1, 10, 5, 10, 187, 8, 10, 10, 10, 12, 10, 190, 9, 10, 1, 10, 1, 10, 1, 11, 1, 11, 3, 11, 196, 8, 11, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 202, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 214, 8, 14, 1, 14, 1, 14, 3, 14, 218, 8, 14, 1, 14, 1, 14, 3, 14, 222, 8, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 3, 15, 229, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 3, 18, 244, 8, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 3, 21, 258, 8, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 3, 22, 270, 8, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 3, 24, 277, 8, 24, 1, 25, 1, 25, 3, 25, 281, 8, 25, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 3, 28, 291, 8, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 3, 31, 301, 8, 31, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 3, 32, 308, 8, 32, 1, 32, 1, 32, 4, 32, 312, 8, 32, 11, 32, 12, 32, 313, 1, 32, 3, 32, 317, 8, 32, 1, 33, 1, 33, 3, 33, 321, 8, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 5, 34, 329, 8, 34, 10, 34, 12, 34, 332, 9, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 5, 35, 340, 8, 35, 10, 35, 12, 35, 343, 9, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 3, 36, 353, 8, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 38, 3, 38, 360, 8, 38, 1, 38, 5, 38, 363, 8, 38, 10, 38, 12, 38, 366, 9, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 3, 39, 377, 8, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 0, 2, 68, 70, 44, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 0, 3, 2, 0, 4, 6, 47, 47, 1, 0, 43, 46, 1, 0, 11, 12, 404, 0, 89, 1, 0, 0, 0, 2, 94, 1, 0, 0, 0, 4, 110, 1, 0, 0, 0, 6, 113, 1, 0, 0, 0, 8, 124, 1, 0, 0, 0, 10, 146, 1, 0, 0, 0, 12, 148, 1, 0, 0, 0, 14, 156, 1, 0, 0, 0, 16, 167, 1, 0, 0, 0, 18, 182, 1, 0, 0, 0, 20, 184, 1, 0, 0, 0, 22, 193, 1, 0, 0, 0, 24, 197, 1, 0, 0, 0, 26, 203, 1, 0, 0, 0, 28, 209, 1, 0, 0, 0, 30, 226, 1, 0, 0, 0, 32, 230, 1, 0, 0, 0, 34, 236, 1, 0, 0, 0, 36, 243, 1, 0, 0, 0, 38, 245, 1, 0, 0, 0, 40, 249, 1, 0, 0, 0, 42, 257, 1, 0, 0, 0, 44, 269, 1, 0, 0, 0, 46, 271, 1, 0, 0, 0, 48, 276, 1, 0, 0, 0, 50, 280, 1, 0, 0, 0, 52, 282, 1, 0, 0, 0, 54, 285, 1, 0, 0, 0, 56, 290, 1, 0, 0, 0, 58, 292, 1, 0, 0, 0, 60, 295, 1, 0, 0, 0, 62, 300, 1, 0, 0, 0, 64, 316, 1, 0, 0, 0, 66, 320, 1, 0, 0, 0, 68, 322, 1, 0, 0, 0, 70, 333, 1, 0, 0, 0, 72, 352, 1, 0, 0, 0, 74, 354, 1, 0, 0, 0, 76, 359, 1, 0, 0, 0, 78, 376, 1, 0, 0, 0, 80, 380, 1, 0, 0, 0, 82, 386, 1, 0, 0, 0, 84, 388, 1, 0, 0, 0, 86, 390, 1, 0, 0, 0, 88, 90, 3, 2, 1, 0, 89, 88, 1, 0, 0, 0, 90, 91, 1, 0, 0, 0, 91, 89, 1, 0, 0, 0, 91, 92, 1, 0, 0, 0, 92, 1, 1, 0, 0, 0, 93, 95, 5, 7, 0, 0, 94, 93, 1, 0, 0, 0, 94, 95, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 97, 5, 35, 0, 0, 97, 98, 5, 47, 0, 0, 98, 102, 5, 31, 0, 0, 99, 101, 3, 4, 2, 0, 100, 99, 1, 0, 0, 0, 101, 104, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 102, 103, 1, 0, 0, 0, 103, 105, 1, 0, 0, 0, 104, 102, 1, 0, 0, 0, 105, 106, 5, 32, 0, 0, 106, 3, 1, 0, 0, 0, 107, 111, 3, 6, 3, 0, 108, 111, 3, 8, 4, 0, 109, 111, 3, 10, 5, 0, 110, 107, 1, 0, 0, 0, 110, 108, 1, 0, 0, 0, 110, 109, 1, 0, 0, 0, 111, 5, 1, 0, 0, 0, 112, 114, 5, 7, 0, 0, 113, 112, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 116, 5, 47, 0, 0, 116, 118, 5, 29, 0, 0, 117, 119, 3, 12, 6, 0, 118, 117, 1, 0, 0, 0, 118, 119, 1, 0, 0, 0, 119, 120, 1, 0, 0, 0, 120, 121, 5, 30, 0, 0, 121, 122, 3, 20, 10, 0, 122, 7, 1, 0, 0, 0, 123, 125, 5, 7, 0, 0, 124, 123, 1, 0, 0, 0, 124, 125, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 127, 3, 82, 41, 0, 127, 128, 5, 47, 0, 0, 128, 129, 5, 33, 0, 0, 129, 9, 1, 0, 0, 0, 130, 131, 5, 8, 0, 0, 131, 147, 3, 20, 10, 0, 132, 134, 5, 7, 0, 0, 133, 132, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 137, 1, 0, 0, 0, 135, 138, 3, 82, 41, 0, 136, 138, 5, 3, 0, 0, 137, 135, 1, 0, 0, 0, 137, 136, 1, 0, 0, 0, 138, 139, 1, 0, 0, 0, 139, 140, 5, 47, 0, 0, 140, 142, 5, 29, 0, 0, 141, 143, 3, 12, 6, 0, 142, 141, 1, 0, 0, 0, 142, 143, 1, 0, 0, 0, 143, 144, 1, 0, 0, 0, 144, 145, 5, 30, 0, 0, 145, 147, 3, 20, 10, 0, 146, 130, 1, 0, 0, 0, 146, 133, 1, 0, 0, 0, 147, 11, 1, 0, 0, 0, 148, 153, 3, 14, 7, 0, 149, 150, 5, 34, 0, 0, 150, 152, 3, 14, 7, 0, 151, 149, 1, 0, 0, 0, 152, 155, 1, 0, 0, 0, 153, 151, 1, 0, 0, 0, 153, 154, 1, 0, 0, 0, 154, 13, 1, 0, 0, 0, 155, 153, 1, 0, 0, 0, 156, 157, 3, 82, 41, 0, 157, 158, 5, 47, 0, 0, 158, 15, 1, 0, 0, 0, 159, 164, 3, 42, 21, 0, 160, 161, 5, 34, 0, 0, 161, 163, 3, 42, 21, 0, 162, 160, 1, 0, 0, 0, 163, 166, 1, 0, 0, 0, 164, 162, 1, 0, 0, 0, 164, 165, 1, 0, 0, 0, 165, 168, 1, 0, 0, 0, 166, 164, 1, 0, 0, 0, 167, 159, 1, 0, 0, 0, 167, 168, 1, 0, 0, 0, 168, 17, 1, 0, 0, 0, 169, 170, 3, 22, 11, 0, 170, 171, 5, 33, 0, 0, 171, 183, 1, 0, 0, 0, 172, 173, 3, 24, 12, 0, 173, 174, 5, 33, 0, 0, 174, 183, 1, 0, 0, 0, 175, 183, 3, 20, 10, 0, 176, 183, 3, 26, 13, 0, 177, 183, 3, 28, 14, 0, 178, 183, 3, 30, 15, 0, 179, 180, 3, 36, 18, 0, 180, 181, 5, 33, 0, 0, 181, 183, 1, 0, 0, 0, 182, 169, 1, 0, 0, 0, 182, 172, 1, 0, 0, 0, 182, 175, 1, 0, 0, 0, 182, 176, 1, 0, 0, 0, 182, 177, 1, 0, 0, 0, 182, 178, 1, 0, 0, 0, 182, 179, 1, 0, 0, 0, 183, 19, 1, 0, 0, 0, 184, 188, 5, 31, 0, 0, 185, 187, 3, 18, 9, 0, 186, 185, 1, 0, 0, 0, 187, 190, 1, 0, 0, 0, 188, 186, 1, 0, 0, 0, 188, 189, 1, 0, 0, 0, 189, 191, 1, 0, 0, 0, 190, 188, 1, 0, 0, 0, 191, 192, 5, 32, 0, 0, 192, 21, 1, 0, 0, 0, 193, 195, 5, 41, 0, 0, 194, 196, 3, 42, 21, 0, 195, 194, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 23, 1, 0, 0, 0, 197, 198, 3, 82, 41, 0, 198, 201, 5, 47, 0, 0, 199, 200, 5, 13, 0, 0, 200, 202, 3, 42, 21, 0, 201, 199, 1, 0, 0, 0, 201, 202, 1, 0, 0, 0, 202, 25, 1, 0, 0, 0, 203, 204, 5, 37, 0, 0, 204, 205, 5, 29, 0, 0, 205, 206, 3, 42, 21, 0, 206, 207, 5, 30, 0, 0, 207, 208, 3, 20, 10, 0, 208, 27, 1, 0, 0, 0, 209, 210, 5, 40, 0, 0, 210, 213, 5, 29, 0, 0, 211, 214, 3, 36, 18, 0, 212, 214, 3, 24, 12, 0, 213, 211, 1, 0, 0, 0, 213, 212, 1, 0, 0, 0, 214, 215, 1, 0, 0, 0, 215, 217, 5, 33, 0, 0, 216, 218, 3, 42, 21, 0, 217, 216, 1, 0, 0, 0, 217, 218, 1, 0, 0, 0, 218, 219, 1, 0, 0, 0, 219, 221, 5, 33, 0, 0, 220, 222, 3, 36, 18, 0, 221, 220, 1, 0, 0, 0, 221, 222, 1, 0, 0, 0, 222, 223, 1, 0, 0, 0, 223, 224, 5, 30, 0, 0, 224, 225, 3, 18, 9, 0, 225, 29, 1, 0, 0, 0, 226, 228, 3, 32, 16, 0, 227, 229, 3, 34, 17, 0, 228, 227, 1, 0, 0, 0, 228, 229, 1, 0, 0, 0, 229, 31, 1, 0, 0, 0, 230, 231, 5, 38, 0, 0, 231, 232, 5, 29, 0, 0, 232, 233, 3, 42, 21, 0, 233, 234, 5, 30, 0, 0, 234, 235, 3, 18, 9, 0, 235, 33, 1, 0, 0, 0, 236, 237, 5, 39, 0, 0, 237, 238, 3, 18, 9, 0, 238, 35, 1, 0, 0, 0, 239, 244, 3, 38, 19, 0, 240, 244, 3, 40, 20, 0, 241, 244, 3, 76, 38, 0, 242, 244, 3, 48, 24, 0, 243, 239, 1, 0, 0, 0, 243, 240, 1, 0, 0, 0, 243, 241, 1, 0, 0, 0, 243, 242, 1, 0, 0, 0, 244, 37, 1, 0, 0, 0, 245, 246, 3, 62, 31, 0, 246, 247, 5, 13, 0, 0, 247, 248, 3, 42, 21, 0, 248, 39, 1, 0, 0, 0, 249, 250, 5, 42, 0, 0, 250, 251, 5, 47, 0, 0, 251, 252, 5, 29, 0, 0, 252, 253, 3, 16, 8, 0, 253, 254, 5, 30, 0, 0, 254, 41, 1, 0, 0, 0, 255, 258, 3, 44, 22, 0, 256, 258, 3, 66, 33, 0, 257, 255, 1, 0, 0, 0, 257, 256, 1, 0, 0, 0, 258, 43, 1, 0, 0, 0, 259, 270, 5, 36, 0, 0, 260, 270, 5, 47, 0, 0, 261, 270, 3, 64, 32, 0, 262, 270, 3, 84, 42, 0, 263, 270, 3, 46, 23, 0, 264, 270, 3, 36, 18, 0, 265, 266, 5, 29, 0, 0, 266, 267, 3, 42, 21, 0, 267, 268, 5, 30, 0, 0, 268, 270, 1, 0, 0, 0, 269, 259, 1, 0, 0, 0, 269, 260, 1, 0, 0, 0, 269, 261, 1, 0, 0, 0, 269, 262, 1, 0, 0, 0, 269, 263, 1, 0, 0, 0, 269, 264, 1, 0, 0, 0, 269, 265, 1, 0, 0, 0, 270, 45, 1, 0, 0, 0, 271, 272, 5, 25, 0, 0, 272, 273, 3, 42, 21, 0, 273, 47, 1, 0, 0, 0, 274, 277, 3, 50, 25, 0, 275, 277, 3, 56, 28, 0, 276, 274, 1, 0, 0, 0, 276, 275, 1, 0, 0, 0, 277, 49, 1, 0, 0, 0, 278, 281, 3, 52, 26, 0, 279, 281, 3, 54, 27, 0, 280, 278, 1, 0, 0, 0, 280, 279, 1, 0, 0, 0, 281, 51, 1, 0, 0, 0, 282, 283, 5, 1, 0, 0, 283, 284, 3, 62, 31, 0, 284, 53, 1, 0, 0, 0, 285, 286, 3, 62, 31, 0, 286, 287, 5, 1, 0, 0, 287, 55, 1, 0, 0, 0, 288, 291, 3, 58, 29, 0, 289, 291, 3, 60, 30, 0, 290, 288, 1, 0, 0, 0, 290, 289, 1, 0, 0, 0, 291, 57, 1, 0, 0, 0, 292, 293, 5, 2, 0, 0, 293, 294, 3, 62, 31, 0, 294, 59, 1, 0, 0, 0, 295, 296, 3, 62, 31, 0, 296, 297, 5, 2, 0, 0, 297, 61, 1, 0, 0, 0, 298, 301, 5, 47, 0, 0, 299, 301, 3, 64, 32, 0, 300, 298, 1, 0, 0, 0, 300, 299, 1, 0, 0, 0, 301, 63, 1, 0, 0, 0, 302, 303, 5, 36, 0, 0, 303, 304, 5, 28, 0, 0, 304, 317, 5, 47, 0, 0, 305, 306, 5, 36, 0, 0, 306, 308, 5, 28, 0, 0, 307, 305, 1, 0, 0, 0, 307, 308, 1, 0, 0, 0, 308, 311, 1, 0, 0, 0, 309, 310, 5, 47, 0, 0, 310, 312, 5, 28, 0, 0, 311, 309, 1, 0, 0, 0, 312, 313, 1, 0, 0, 0, 313, 311, 1, 0, 0, 0, 313, 314, 1, 0, 0, 0, 314, 315, 1, 0, 0, 0, 315, 317, 5, 47, 0, 0, 316, 302, 1, 0, 0, 0, 316, 307, 1, 0, 0, 0, 317, 65, 1, 0, 0, 0, 318, 321, 3, 68, 34, 0, 319, 321, 3, 74, 37, 0, 320, 318, 1, 0, 0, 0, 320, 319, 1, 0, 0, 0, 321, 67, 1, 0, 0, 0, 322, 323, 6, 34, -1, 0, 323, 324, 3, 70, 35, 0, 324, 330, 1, 0, 0, 0, 325, 326, 10, 2, 0, 0, 326, 327, 5, 10, 0, 0, 327, 329, 3, 70, 35, 0, 328, 325, 1, 0, 0, 0, 329, 332, 1, 0, 0, 0, 330, 328, 1, 0, 0, 0, 330, 331, 1, 0, 0, 0, 331, 69, 1, 0, 0, 0, 332, 330, 1, 0, 0, 0, 333, 334, 6, 35, -1, 0, 334, 335, 3, 72, 36, 0, 335, 341, 1, 0, 0, 0, 336, 337, 10, 2, 0, 0, 337, 338, 5, 9, 0, 0, 338, 340, 3, 72, 36, 0, 339, 336, 1, 0, 0, 0, 340, 343, 1, 0, 0, 0, 341, 339, 1, 0, 0, 0, 341, 342, 1, 0, 0, 0, 342, 71, 1, 0, 0, 0, 343, 341, 1, 0, 0, 0, 344, 353, 5, 44, 0, 0, 345, 353, 5, 47, 0, 0, 346, 353, 3, 64, 32, 0, 347, 348, 3, 76, 38, 0, 348, 349, 5, 29, 0, 0, 349, 350, 3, 68, 34, 0, 350, 351, 5, 30, 0, 0, 351, 353, 1, 0, 0, 0, 352, 344, 1, 0, 0, 0, 352, 345, 1, 0, 0, 0, 352, 346, 1, 0, 0, 0, 352, 347, 1, 0, 0, 0, 353, 73, 1, 0, 0, 0, 354, 355, 3, 44, 22, 0, 355, 356, 3, 86, 43, 0, 356, 357, 3, 42, 21, 0, 357, 75, 1, 0, 0, 0, 358, 360, 3, 78, 39, 0, 359, 358, 1, 0, 0, 0, 359, 360, 1, 0, 0, 0, 360, 364, 1, 0, 0, 0, 361, 363, 3, 80, 40, 0, 362, 361, 1, 0, 0, 0, 363, 366, 1, 0, 0, 0, 364, 362, 1, 0, 0, 0, 364, 365, 1, 0, 0, 0, 365, 367, 1, 0, 0, 0, 366, 364, 1, 0, 0, 0, 367, 368, 5, 47, 0, 0, 368, 369, 5, 29, 0, 0, 369, 370, 3, 16, 8, 0, 370, 371, 5, 30, 0, 0, 371, 77, 1, 0, 0, 0, 372, 377, 5, 36, 0, 0, 373, 377, 3, 64, 32, 0, 374, 377, 3, 40, 20, 0, 375, 377, 5, 47, 0, 0, 376, 372, 1, 0, 0, 0, 376, 373, 1, 0, 0, 0, 376, 374, 1, 0, 0, 0, 376, 375, 1, 0, 0, 0, 377, 378, 1, 0, 0, 0, 378, 379, 5, 28, 0, 0, 379, 79, 1, 0, 0, 0, 380, 381, 5, 47, 0, 0, 381, 382, 5, 29, 0, 0, 382, 383, 3, 16, 8, 0, 383, 384, 5, 30, 0, 0, 384, 385, 5, 28, 0, 0, 385, 81, 1, 0, 0, 0, 386, 387, 7, 0, 0, 0, 387, 83, 1, 0, 0, 0, 388, 389, 7, 1, 0, 0, 389, 85, 1, 0, 0, 0, 390, 391, 7, 2, 0, 0, 391, 87, 1, 0, 0, 0, 39, 91, 94, 102, 110, 113, 118, 124, 133, 137, 142, 146, 153, 164, 167, 182, 188, 195, 201, 213, 217, 221, 228, 243, 257, 269, 276, 280, 290, 300, 307, 313, 316, 320, 330, 341, 352, 359, 364, 376]
\ No newline at end of file
diff --git a/src/main/java/parser/generated/SimpleJava.tokens b/src/main/java/parser/generated/SimpleJava.tokens
index fa21229..bed7437 100644
--- a/src/main/java/parser/generated/SimpleJava.tokens
+++ b/src/main/java/parser/generated/SimpleJava.tokens
@@ -1,73 +1,88 @@
 T__0=1
 T__1=2
-T__2=3
-T__3=4
-T__4=5
-T__5=6
-T__6=7
-T__7=8
-T__8=9
-T__9=10
-T__10=11
-T__11=12
-T__12=13
-T__13=14
-T__14=15
-T__15=16
-T__16=17
-T__17=18
-T__18=19
-T__19=20
-T__20=21
-T__21=22
-T__22=23
-T__23=24
-T__24=25
-T__25=26
-T__26=27
-T__27=28
-T__28=29
-T__29=30
-T__30=31
-T__31=32
-T__32=33
-T__33=34
-T__34=35
-INTEGERLITERAL=36
-IDENTIFIER=37
-WS=38
-'class'=1
-'{'=2
-'}'=3
-';'=4
-'static'=5
-'('=6
-')'=7
-','=8
-'int'=9
-'boolean'=10
-'char'=11
-'public'=12
-'private'=13
-'='=14
-'if'=15
-'else'=16
-'while'=17
-'return'=18
-'&&'=19
-'||'=20
-'=='=21
-'!='=22
-'<'=23
-'<='=24
-'>'=25
-'>='=26
-'+'=27
-'-'=28
-'*'=29
-'/'=30
-'%'=31
-'!'=32
-'true'=33
-'false'=34
-'\''=35
+Void=3
+Boolean=4
+Char=5
+Int=6
+AccessModifier=7
+MainMethodDeclaration=8
+DotOperator=9
+LineOperator=10
+ComparisonOperator=11
+LogicalOperator=12
+Assign=13
+Plus=14
+Minus=15
+Mult=16
+Modulo=17
+Div=18
+Greater=19
+Less=20
+GreaterEqual=21
+LessEqual=22
+Equal=23
+NotEqual=24
+Not=25
+And=26
+Or=27
+Dot=28
+OpenRoundBracket=29
+ClosedRoundBracket=30
+OpenCurlyBracket=31
+ClosedCurlyBracket=32
+Semicolon=33
+Comma=34
+Class=35
+This=36
+While=37
+If=38
+Else=39
+For=40
+Return=41
+New=42
+CharValue=43
+IntValue=44
+BooleanValue=45
+NullValue=46
+Identifier=47
+WS=48
+InlineComment=49
+MultilineComment=50
+'++'=1
+'--'=2
+'void'=3
+'boolean'=4
+'char'=5
+'int'=6
+'public static void main(String[] args)'=8
+'='=13
+'+'=14
+'-'=15
+'*'=16
+'%'=17
+'/'=18
+'>'=19
+'<'=20
+'>='=21
+'<='=22
+'=='=23
+'!='=24
+'!'=25
+'&&'=26
+'||'=27
+'.'=28
+'('=29
+')'=30
+'{'=31
+'}'=32
+';'=33
+','=34
+'class'=35
+'this'=36
+'while'=37
+'if'=38
+'else'=39
+'for'=40
+'return'=41
+'new'=42
+'null'=46
diff --git a/src/main/java/parser/generated/SimpleJavaBaseListener.java b/src/main/java/parser/generated/SimpleJavaBaseListener.java
index 342f385..2bf9ddd 100644
--- a/src/main/java/parser/generated/SimpleJavaBaseListener.java
+++ b/src/main/java/parser/generated/SimpleJavaBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from C:/Users/Johannes/Documents/Github/JavaCompiler/src/main/java/parser/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -48,6 +48,18 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitMemberDeclaration(SimpleJavaParser.MemberDeclarationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -72,18 +84,6 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -113,25 +113,13 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterType(SimpleJavaParser.TypeContext ctx) { }
+	@Override public void enterArgumentList(SimpleJavaParser.ArgumentListContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitType(SimpleJavaParser.TypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAccessType(SimpleJavaParser.AccessTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAccessType(SimpleJavaParser.AccessTypeContext ctx) { }
+	@Override public void exitArgumentList(SimpleJavaParser.ArgumentListContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -149,61 +137,13 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterVariableDeclarationStatement(SimpleJavaParser.VariableDeclarationStatementContext ctx) { }
+	@Override public void enterBlock(SimpleJavaParser.BlockContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitVariableDeclarationStatement(SimpleJavaParser.VariableDeclarationStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAssignmentStatement(SimpleJavaParser.AssignmentStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAssignmentStatement(SimpleJavaParser.AssignmentStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVar(SimpleJavaParser.VarContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVar(SimpleJavaParser.VarContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterIfStatement(SimpleJavaParser.IfStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitIfStatement(SimpleJavaParser.IfStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterWhileStatement(SimpleJavaParser.WhileStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitWhileStatement(SimpleJavaParser.WhileStatementContext ctx) { }
+	@Override public void exitBlock(SimpleJavaParser.BlockContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -221,13 +161,109 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterBlock(SimpleJavaParser.BlockContext ctx) { }
+	@Override public void enterLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitBlock(SimpleJavaParser.BlockContext ctx) { }
+	@Override public void exitLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterWhileStatement(SimpleJavaParser.WhileStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitWhileStatement(SimpleJavaParser.WhileStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterForStatement(SimpleJavaParser.ForStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitForStatement(SimpleJavaParser.ForStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIfStatement(SimpleJavaParser.IfStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIfStatement(SimpleJavaParser.IfStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterElseStatement(SimpleJavaParser.ElseStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitElseStatement(SimpleJavaParser.ElseStatementContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterStatementExpression(SimpleJavaParser.StatementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitStatementExpression(SimpleJavaParser.StatementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterAssign(SimpleJavaParser.AssignContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitAssign(SimpleJavaParser.AssignContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -245,37 +281,265 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterLiteral(SimpleJavaParser.LiteralContext ctx) { }
+	@Override public void enterUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitLiteral(SimpleJavaParser.LiteralContext ctx) { }
+	@Override public void exitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterBooleanLiteral(SimpleJavaParser.BooleanLiteralContext ctx) { }
+	@Override public void enterNotExpression(SimpleJavaParser.NotExpressionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitBooleanLiteral(SimpleJavaParser.BooleanLiteralContext ctx) { }
+	@Override public void exitNotExpression(SimpleJavaParser.NotExpressionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterCharLiteral(SimpleJavaParser.CharLiteralContext ctx) { }
+	@Override public void enterCrementExpression(SimpleJavaParser.CrementExpressionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitCharLiteral(SimpleJavaParser.CharLiteralContext ctx) { }
+	@Override public void exitCrementExpression(SimpleJavaParser.CrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterMemberAccess(SimpleJavaParser.MemberAccessContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitMemberAccess(SimpleJavaParser.MemberAccessContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterDotExpression(SimpleJavaParser.DotExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitDotExpression(SimpleJavaParser.DotExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterMethodCall(SimpleJavaParser.MethodCallContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitMethodCall(SimpleJavaParser.MethodCallContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterTarget(SimpleJavaParser.TargetContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitTarget(SimpleJavaParser.TargetContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterChainedMethod(SimpleJavaParser.ChainedMethodContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitChainedMethod(SimpleJavaParser.ChainedMethodContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterType(SimpleJavaParser.TypeContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitType(SimpleJavaParser.TypeContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterValue(SimpleJavaParser.ValueContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitValue(SimpleJavaParser.ValueContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterNonCalculationOperator(SimpleJavaParser.NonCalculationOperatorContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitNonCalculationOperator(SimpleJavaParser.NonCalculationOperatorContext ctx) { }
 
 	/**
 	 * {@inheritDoc}
diff --git a/src/main/java/parser/generated/SimpleJavaBaseVisitor.java b/src/main/java/parser/generated/SimpleJavaBaseVisitor.java
index 4feb7ea..92fb64c 100644
--- a/src/main/java/parser/generated/SimpleJavaBaseVisitor.java
+++ b/src/main/java/parser/generated/SimpleJavaBaseVisitor.java
@@ -1,4 +1,4 @@
-// Generated from C:/Users/Johannes/Documents/Github/JavaCompiler/src/main/java/parser/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
@@ -33,6 +33,13 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitMemberDeclaration(SimpleJavaParser.MemberDeclarationContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -47,13 +54,6 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -74,14 +74,7 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitType(SimpleJavaParser.TypeContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAccessType(SimpleJavaParser.AccessTypeContext ctx) { return visitChildren(ctx); }
+	@Override public T visitArgumentList(SimpleJavaParser.ArgumentListContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -95,35 +88,7 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitVariableDeclarationStatement(SimpleJavaParser.VariableDeclarationStatementContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitAssignmentStatement(SimpleJavaParser.AssignmentStatementContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitVar(SimpleJavaParser.VarContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitIfStatement(SimpleJavaParser.IfStatementContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitWhileStatement(SimpleJavaParser.WhileStatementContext ctx) { return visitChildren(ctx); }
+	@Override public T visitBlock(SimpleJavaParser.BlockContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -137,7 +102,63 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitBlock(SimpleJavaParser.BlockContext ctx) { return visitChildren(ctx); }
+	@Override public T visitLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitWhileStatement(SimpleJavaParser.WhileStatementContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitForStatement(SimpleJavaParser.ForStatementContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitIfStatement(SimpleJavaParser.IfStatementContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitElseStatement(SimpleJavaParser.ElseStatementContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitStatementExpression(SimpleJavaParser.StatementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitAssign(SimpleJavaParser.AssignContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -151,19 +172,152 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitLiteral(SimpleJavaParser.LiteralContext ctx) { return visitChildren(ctx); }
+	@Override public T visitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitBooleanLiteral(SimpleJavaParser.BooleanLiteralContext ctx) { return visitChildren(ctx); }
+	@Override public T visitNotExpression(SimpleJavaParser.NotExpressionContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitCharLiteral(SimpleJavaParser.CharLiteralContext ctx) { return visitChildren(ctx); }
+	@Override public T visitCrementExpression(SimpleJavaParser.CrementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitMemberAccess(SimpleJavaParser.MemberAccessContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitDotExpression(SimpleJavaParser.DotExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitMethodCall(SimpleJavaParser.MethodCallContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitTarget(SimpleJavaParser.TargetContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitChainedMethod(SimpleJavaParser.ChainedMethodContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitType(SimpleJavaParser.TypeContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitValue(SimpleJavaParser.ValueContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitNonCalculationOperator(SimpleJavaParser.NonCalculationOperatorContext ctx) { return visitChildren(ctx); }
 }
\ No newline at end of file
diff --git a/src/main/java/parser/generated/SimpleJavaLexer.interp b/src/main/java/parser/generated/SimpleJavaLexer.interp
index e2f453d..919e1fd 100644
--- a/src/main/java/parser/generated/SimpleJavaLexer.interp
+++ b/src/main/java/parser/generated/SimpleJavaLexer.interp
@@ -1,40 +1,52 @@
 token literal names:
 null
-'class'
-'{'
-'}'
-';'
-'static'
-'('
-')'
-','
-'int'
+'++'
+'--'
+'void'
 'boolean'
 'char'
-'public'
-'private'
+'int'
+null
+'public static void main(String[] args)'
+null
+null
+null
+null
 '='
-'if'
-'else'
-'while'
-'return'
-'&&'
-'||'
-'=='
-'!='
-'<'
-'<='
-'>'
-'>='
 '+'
 '-'
 '*'
-'/'
 '%'
+'/'
+'>'
+'<'
+'>='
+'<='
+'=='
+'!='
 '!'
-'true'
-'false'
-'\''
+'&&'
+'||'
+'.'
+'('
+')'
+'{'
+'}'
+';'
+','
+'class'
+'this'
+'while'
+'if'
+'else'
+'for'
+'return'
+'new'
+null
+null
+null
+'null'
+null
 null
 null
 null
@@ -43,82 +55,109 @@ token symbolic names:
 null
 null
 null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-INTEGERLITERAL
-IDENTIFIER
+Void
+Boolean
+Char
+Int
+AccessModifier
+MainMethodDeclaration
+DotOperator
+LineOperator
+ComparisonOperator
+LogicalOperator
+Assign
+Plus
+Minus
+Mult
+Modulo
+Div
+Greater
+Less
+GreaterEqual
+LessEqual
+Equal
+NotEqual
+Not
+And
+Or
+Dot
+OpenRoundBracket
+ClosedRoundBracket
+OpenCurlyBracket
+ClosedCurlyBracket
+Semicolon
+Comma
+Class
+This
+While
+If
+Else
+For
+Return
+New
+CharValue
+IntValue
+BooleanValue
+NullValue
+Identifier
 WS
+InlineComment
+MultilineComment
 
 rule names:
 T__0
 T__1
-T__2
-T__3
-T__4
-T__5
-T__6
-T__7
-T__8
-T__9
-T__10
-T__11
-T__12
-T__13
-T__14
-T__15
-T__16
-T__17
-T__18
-T__19
-T__20
-T__21
-T__22
-T__23
-T__24
-T__25
-T__26
-T__27
-T__28
-T__29
-T__30
-T__31
-T__32
-T__33
-T__34
-INTEGERLITERAL
-IDENTIFIER
+Void
+Boolean
+Char
+Int
+AccessModifier
+MainMethodDeclaration
+DotOperator
+LineOperator
+ComparisonOperator
+LogicalOperator
+Assign
+Plus
+Minus
+Mult
+Modulo
+Div
+Greater
+Less
+GreaterEqual
+LessEqual
+Equal
+NotEqual
+Not
+And
+Or
+Dot
+OpenRoundBracket
+ClosedRoundBracket
+OpenCurlyBracket
+ClosedCurlyBracket
+Semicolon
+Comma
+Class
+This
+While
+If
+Else
+For
+Return
+New
+CharValue
+IntValue
+BooleanValue
+NullValue
+Alphabetic
+Numeric
+ValidIdentSymbols
+Identifier
 WS
+InlineComment
+MultilineComment
 
 channel names:
 DEFAULT_TOKEN_CHANNEL
@@ -128,4 +167,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[4, 0, 38, 223, 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, 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, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 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, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 4, 35, 206, 8, 35, 11, 35, 12, 35, 207, 1, 36, 1, 36, 5, 36, 212, 8, 36, 10, 36, 12, 36, 215, 9, 36, 1, 37, 4, 37, 218, 8, 37, 11, 37, 12, 37, 219, 1, 37, 1, 37, 0, 0, 38, 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, 1, 0, 4, 1, 0, 48, 57, 2, 0, 65, 90, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 225, 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, 1, 77, 1, 0, 0, 0, 3, 83, 1, 0, 0, 0, 5, 85, 1, 0, 0, 0, 7, 87, 1, 0, 0, 0, 9, 89, 1, 0, 0, 0, 11, 96, 1, 0, 0, 0, 13, 98, 1, 0, 0, 0, 15, 100, 1, 0, 0, 0, 17, 102, 1, 0, 0, 0, 19, 106, 1, 0, 0, 0, 21, 114, 1, 0, 0, 0, 23, 119, 1, 0, 0, 0, 25, 126, 1, 0, 0, 0, 27, 134, 1, 0, 0, 0, 29, 136, 1, 0, 0, 0, 31, 139, 1, 0, 0, 0, 33, 144, 1, 0, 0, 0, 35, 150, 1, 0, 0, 0, 37, 157, 1, 0, 0, 0, 39, 160, 1, 0, 0, 0, 41, 163, 1, 0, 0, 0, 43, 166, 1, 0, 0, 0, 45, 169, 1, 0, 0, 0, 47, 171, 1, 0, 0, 0, 49, 174, 1, 0, 0, 0, 51, 176, 1, 0, 0, 0, 53, 179, 1, 0, 0, 0, 55, 181, 1, 0, 0, 0, 57, 183, 1, 0, 0, 0, 59, 185, 1, 0, 0, 0, 61, 187, 1, 0, 0, 0, 63, 189, 1, 0, 0, 0, 65, 191, 1, 0, 0, 0, 67, 196, 1, 0, 0, 0, 69, 202, 1, 0, 0, 0, 71, 205, 1, 0, 0, 0, 73, 209, 1, 0, 0, 0, 75, 217, 1, 0, 0, 0, 77, 78, 5, 99, 0, 0, 78, 79, 5, 108, 0, 0, 79, 80, 5, 97, 0, 0, 80, 81, 5, 115, 0, 0, 81, 82, 5, 115, 0, 0, 82, 2, 1, 0, 0, 0, 83, 84, 5, 123, 0, 0, 84, 4, 1, 0, 0, 0, 85, 86, 5, 125, 0, 0, 86, 6, 1, 0, 0, 0, 87, 88, 5, 59, 0, 0, 88, 8, 1, 0, 0, 0, 89, 90, 5, 115, 0, 0, 90, 91, 5, 116, 0, 0, 91, 92, 5, 97, 0, 0, 92, 93, 5, 116, 0, 0, 93, 94, 5, 105, 0, 0, 94, 95, 5, 99, 0, 0, 95, 10, 1, 0, 0, 0, 96, 97, 5, 40, 0, 0, 97, 12, 1, 0, 0, 0, 98, 99, 5, 41, 0, 0, 99, 14, 1, 0, 0, 0, 100, 101, 5, 44, 0, 0, 101, 16, 1, 0, 0, 0, 102, 103, 5, 105, 0, 0, 103, 104, 5, 110, 0, 0, 104, 105, 5, 116, 0, 0, 105, 18, 1, 0, 0, 0, 106, 107, 5, 98, 0, 0, 107, 108, 5, 111, 0, 0, 108, 109, 5, 111, 0, 0, 109, 110, 5, 108, 0, 0, 110, 111, 5, 101, 0, 0, 111, 112, 5, 97, 0, 0, 112, 113, 5, 110, 0, 0, 113, 20, 1, 0, 0, 0, 114, 115, 5, 99, 0, 0, 115, 116, 5, 104, 0, 0, 116, 117, 5, 97, 0, 0, 117, 118, 5, 114, 0, 0, 118, 22, 1, 0, 0, 0, 119, 120, 5, 112, 0, 0, 120, 121, 5, 117, 0, 0, 121, 122, 5, 98, 0, 0, 122, 123, 5, 108, 0, 0, 123, 124, 5, 105, 0, 0, 124, 125, 5, 99, 0, 0, 125, 24, 1, 0, 0, 0, 126, 127, 5, 112, 0, 0, 127, 128, 5, 114, 0, 0, 128, 129, 5, 105, 0, 0, 129, 130, 5, 118, 0, 0, 130, 131, 5, 97, 0, 0, 131, 132, 5, 116, 0, 0, 132, 133, 5, 101, 0, 0, 133, 26, 1, 0, 0, 0, 134, 135, 5, 61, 0, 0, 135, 28, 1, 0, 0, 0, 136, 137, 5, 105, 0, 0, 137, 138, 5, 102, 0, 0, 138, 30, 1, 0, 0, 0, 139, 140, 5, 101, 0, 0, 140, 141, 5, 108, 0, 0, 141, 142, 5, 115, 0, 0, 142, 143, 5, 101, 0, 0, 143, 32, 1, 0, 0, 0, 144, 145, 5, 119, 0, 0, 145, 146, 5, 104, 0, 0, 146, 147, 5, 105, 0, 0, 147, 148, 5, 108, 0, 0, 148, 149, 5, 101, 0, 0, 149, 34, 1, 0, 0, 0, 150, 151, 5, 114, 0, 0, 151, 152, 5, 101, 0, 0, 152, 153, 5, 116, 0, 0, 153, 154, 5, 117, 0, 0, 154, 155, 5, 114, 0, 0, 155, 156, 5, 110, 0, 0, 156, 36, 1, 0, 0, 0, 157, 158, 5, 38, 0, 0, 158, 159, 5, 38, 0, 0, 159, 38, 1, 0, 0, 0, 160, 161, 5, 124, 0, 0, 161, 162, 5, 124, 0, 0, 162, 40, 1, 0, 0, 0, 163, 164, 5, 61, 0, 0, 164, 165, 5, 61, 0, 0, 165, 42, 1, 0, 0, 0, 166, 167, 5, 33, 0, 0, 167, 168, 5, 61, 0, 0, 168, 44, 1, 0, 0, 0, 169, 170, 5, 60, 0, 0, 170, 46, 1, 0, 0, 0, 171, 172, 5, 60, 0, 0, 172, 173, 5, 61, 0, 0, 173, 48, 1, 0, 0, 0, 174, 175, 5, 62, 0, 0, 175, 50, 1, 0, 0, 0, 176, 177, 5, 62, 0, 0, 177, 178, 5, 61, 0, 0, 178, 52, 1, 0, 0, 0, 179, 180, 5, 43, 0, 0, 180, 54, 1, 0, 0, 0, 181, 182, 5, 45, 0, 0, 182, 56, 1, 0, 0, 0, 183, 184, 5, 42, 0, 0, 184, 58, 1, 0, 0, 0, 185, 186, 5, 47, 0, 0, 186, 60, 1, 0, 0, 0, 187, 188, 5, 37, 0, 0, 188, 62, 1, 0, 0, 0, 189, 190, 5, 33, 0, 0, 190, 64, 1, 0, 0, 0, 191, 192, 5, 116, 0, 0, 192, 193, 5, 114, 0, 0, 193, 194, 5, 117, 0, 0, 194, 195, 5, 101, 0, 0, 195, 66, 1, 0, 0, 0, 196, 197, 5, 102, 0, 0, 197, 198, 5, 97, 0, 0, 198, 199, 5, 108, 0, 0, 199, 200, 5, 115, 0, 0, 200, 201, 5, 101, 0, 0, 201, 68, 1, 0, 0, 0, 202, 203, 5, 39, 0, 0, 203, 70, 1, 0, 0, 0, 204, 206, 7, 0, 0, 0, 205, 204, 1, 0, 0, 0, 206, 207, 1, 0, 0, 0, 207, 205, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 72, 1, 0, 0, 0, 209, 213, 7, 1, 0, 0, 210, 212, 7, 2, 0, 0, 211, 210, 1, 0, 0, 0, 212, 215, 1, 0, 0, 0, 213, 211, 1, 0, 0, 0, 213, 214, 1, 0, 0, 0, 214, 74, 1, 0, 0, 0, 215, 213, 1, 0, 0, 0, 216, 218, 7, 3, 0, 0, 217, 216, 1, 0, 0, 0, 218, 219, 1, 0, 0, 0, 219, 217, 1, 0, 0, 0, 219, 220, 1, 0, 0, 0, 220, 221, 1, 0, 0, 0, 221, 222, 6, 37, 0, 0, 222, 76, 1, 0, 0, 0, 4, 0, 207, 213, 219, 1, 6, 0, 0]
\ No newline at end of file
+[4, 0, 50, 408, 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, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 176, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 3, 8, 220, 8, 8, 1, 9, 1, 9, 3, 9, 224, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 232, 8, 10, 1, 11, 1, 11, 3, 11, 236, 8, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 5, 42, 330, 8, 42, 10, 42, 12, 42, 333, 9, 42, 1, 42, 1, 42, 1, 43, 3, 43, 338, 8, 43, 1, 43, 4, 43, 341, 8, 43, 11, 43, 12, 43, 342, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 3, 44, 354, 8, 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 3, 48, 368, 8, 48, 1, 49, 1, 49, 5, 49, 372, 8, 49, 10, 49, 12, 49, 375, 9, 49, 1, 50, 4, 50, 378, 8, 50, 11, 50, 12, 50, 379, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 51, 5, 51, 388, 8, 51, 10, 51, 12, 51, 391, 9, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 5, 52, 399, 8, 52, 10, 52, 12, 52, 402, 9, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 400, 0, 53, 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, 0, 95, 0, 97, 0, 99, 47, 101, 48, 103, 49, 105, 50, 1, 0, 5, 2, 0, 10, 10, 13, 13, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 2, 0, 36, 36, 95, 95, 3, 0, 9, 10, 13, 13, 32, 32, 426, 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, 99, 1, 0, 0, 0, 0, 101, 1, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, 105, 1, 0, 0, 0, 1, 107, 1, 0, 0, 0, 3, 110, 1, 0, 0, 0, 5, 113, 1, 0, 0, 0, 7, 118, 1, 0, 0, 0, 9, 126, 1, 0, 0, 0, 11, 131, 1, 0, 0, 0, 13, 175, 1, 0, 0, 0, 15, 177, 1, 0, 0, 0, 17, 219, 1, 0, 0, 0, 19, 223, 1, 0, 0, 0, 21, 231, 1, 0, 0, 0, 23, 235, 1, 0, 0, 0, 25, 237, 1, 0, 0, 0, 27, 239, 1, 0, 0, 0, 29, 241, 1, 0, 0, 0, 31, 243, 1, 0, 0, 0, 33, 245, 1, 0, 0, 0, 35, 247, 1, 0, 0, 0, 37, 249, 1, 0, 0, 0, 39, 251, 1, 0, 0, 0, 41, 253, 1, 0, 0, 0, 43, 256, 1, 0, 0, 0, 45, 259, 1, 0, 0, 0, 47, 262, 1, 0, 0, 0, 49, 265, 1, 0, 0, 0, 51, 267, 1, 0, 0, 0, 53, 270, 1, 0, 0, 0, 55, 273, 1, 0, 0, 0, 57, 275, 1, 0, 0, 0, 59, 277, 1, 0, 0, 0, 61, 279, 1, 0, 0, 0, 63, 281, 1, 0, 0, 0, 65, 283, 1, 0, 0, 0, 67, 285, 1, 0, 0, 0, 69, 287, 1, 0, 0, 0, 71, 293, 1, 0, 0, 0, 73, 298, 1, 0, 0, 0, 75, 304, 1, 0, 0, 0, 77, 307, 1, 0, 0, 0, 79, 312, 1, 0, 0, 0, 81, 316, 1, 0, 0, 0, 83, 323, 1, 0, 0, 0, 85, 327, 1, 0, 0, 0, 87, 337, 1, 0, 0, 0, 89, 353, 1, 0, 0, 0, 91, 355, 1, 0, 0, 0, 93, 360, 1, 0, 0, 0, 95, 362, 1, 0, 0, 0, 97, 367, 1, 0, 0, 0, 99, 369, 1, 0, 0, 0, 101, 377, 1, 0, 0, 0, 103, 383, 1, 0, 0, 0, 105, 394, 1, 0, 0, 0, 107, 108, 5, 43, 0, 0, 108, 109, 5, 43, 0, 0, 109, 2, 1, 0, 0, 0, 110, 111, 5, 45, 0, 0, 111, 112, 5, 45, 0, 0, 112, 4, 1, 0, 0, 0, 113, 114, 5, 118, 0, 0, 114, 115, 5, 111, 0, 0, 115, 116, 5, 105, 0, 0, 116, 117, 5, 100, 0, 0, 117, 6, 1, 0, 0, 0, 118, 119, 5, 98, 0, 0, 119, 120, 5, 111, 0, 0, 120, 121, 5, 111, 0, 0, 121, 122, 5, 108, 0, 0, 122, 123, 5, 101, 0, 0, 123, 124, 5, 97, 0, 0, 124, 125, 5, 110, 0, 0, 125, 8, 1, 0, 0, 0, 126, 127, 5, 99, 0, 0, 127, 128, 5, 104, 0, 0, 128, 129, 5, 97, 0, 0, 129, 130, 5, 114, 0, 0, 130, 10, 1, 0, 0, 0, 131, 132, 5, 105, 0, 0, 132, 133, 5, 110, 0, 0, 133, 134, 5, 116, 0, 0, 134, 12, 1, 0, 0, 0, 135, 136, 5, 112, 0, 0, 136, 137, 5, 117, 0, 0, 137, 138, 5, 98, 0, 0, 138, 139, 5, 108, 0, 0, 139, 140, 5, 105, 0, 0, 140, 176, 5, 99, 0, 0, 141, 142, 5, 112, 0, 0, 142, 143, 5, 114, 0, 0, 143, 144, 5, 105, 0, 0, 144, 145, 5, 118, 0, 0, 145, 146, 5, 97, 0, 0, 146, 147, 5, 116, 0, 0, 147, 176, 5, 101, 0, 0, 148, 149, 5, 112, 0, 0, 149, 150, 5, 117, 0, 0, 150, 151, 5, 98, 0, 0, 151, 152, 5, 108, 0, 0, 152, 153, 5, 105, 0, 0, 153, 154, 5, 99, 0, 0, 154, 155, 5, 32, 0, 0, 155, 156, 5, 115, 0, 0, 156, 157, 5, 116, 0, 0, 157, 158, 5, 97, 0, 0, 158, 159, 5, 116, 0, 0, 159, 160, 5, 105, 0, 0, 160, 176, 5, 99, 0, 0, 161, 162, 5, 112, 0, 0, 162, 163, 5, 114, 0, 0, 163, 164, 5, 105, 0, 0, 164, 165, 5, 118, 0, 0, 165, 166, 5, 97, 0, 0, 166, 167, 5, 116, 0, 0, 167, 168, 5, 101, 0, 0, 168, 169, 5, 32, 0, 0, 169, 170, 5, 115, 0, 0, 170, 171, 5, 116, 0, 0, 171, 172, 5, 97, 0, 0, 172, 173, 5, 116, 0, 0, 173, 174, 5, 105, 0, 0, 174, 176, 5, 99, 0, 0, 175, 135, 1, 0, 0, 0, 175, 141, 1, 0, 0, 0, 175, 148, 1, 0, 0, 0, 175, 161, 1, 0, 0, 0, 176, 14, 1, 0, 0, 0, 177, 178, 5, 112, 0, 0, 178, 179, 5, 117, 0, 0, 179, 180, 5, 98, 0, 0, 180, 181, 5, 108, 0, 0, 181, 182, 5, 105, 0, 0, 182, 183, 5, 99, 0, 0, 183, 184, 5, 32, 0, 0, 184, 185, 5, 115, 0, 0, 185, 186, 5, 116, 0, 0, 186, 187, 5, 97, 0, 0, 187, 188, 5, 116, 0, 0, 188, 189, 5, 105, 0, 0, 189, 190, 5, 99, 0, 0, 190, 191, 5, 32, 0, 0, 191, 192, 5, 118, 0, 0, 192, 193, 5, 111, 0, 0, 193, 194, 5, 105, 0, 0, 194, 195, 5, 100, 0, 0, 195, 196, 5, 32, 0, 0, 196, 197, 5, 109, 0, 0, 197, 198, 5, 97, 0, 0, 198, 199, 5, 105, 0, 0, 199, 200, 5, 110, 0, 0, 200, 201, 5, 40, 0, 0, 201, 202, 5, 83, 0, 0, 202, 203, 5, 116, 0, 0, 203, 204, 5, 114, 0, 0, 204, 205, 5, 105, 0, 0, 205, 206, 5, 110, 0, 0, 206, 207, 5, 103, 0, 0, 207, 208, 5, 91, 0, 0, 208, 209, 5, 93, 0, 0, 209, 210, 5, 32, 0, 0, 210, 211, 5, 97, 0, 0, 211, 212, 5, 114, 0, 0, 212, 213, 5, 103, 0, 0, 213, 214, 5, 115, 0, 0, 214, 215, 5, 41, 0, 0, 215, 16, 1, 0, 0, 0, 216, 220, 3, 31, 15, 0, 217, 220, 3, 35, 17, 0, 218, 220, 3, 33, 16, 0, 219, 216, 1, 0, 0, 0, 219, 217, 1, 0, 0, 0, 219, 218, 1, 0, 0, 0, 220, 18, 1, 0, 0, 0, 221, 224, 3, 27, 13, 0, 222, 224, 3, 29, 14, 0, 223, 221, 1, 0, 0, 0, 223, 222, 1, 0, 0, 0, 224, 20, 1, 0, 0, 0, 225, 232, 3, 37, 18, 0, 226, 232, 3, 39, 19, 0, 227, 232, 3, 41, 20, 0, 228, 232, 3, 43, 21, 0, 229, 232, 3, 45, 22, 0, 230, 232, 3, 47, 23, 0, 231, 225, 1, 0, 0, 0, 231, 226, 1, 0, 0, 0, 231, 227, 1, 0, 0, 0, 231, 228, 1, 0, 0, 0, 231, 229, 1, 0, 0, 0, 231, 230, 1, 0, 0, 0, 232, 22, 1, 0, 0, 0, 233, 236, 3, 51, 25, 0, 234, 236, 3, 53, 26, 0, 235, 233, 1, 0, 0, 0, 235, 234, 1, 0, 0, 0, 236, 24, 1, 0, 0, 0, 237, 238, 5, 61, 0, 0, 238, 26, 1, 0, 0, 0, 239, 240, 5, 43, 0, 0, 240, 28, 1, 0, 0, 0, 241, 242, 5, 45, 0, 0, 242, 30, 1, 0, 0, 0, 243, 244, 5, 42, 0, 0, 244, 32, 1, 0, 0, 0, 245, 246, 5, 37, 0, 0, 246, 34, 1, 0, 0, 0, 247, 248, 5, 47, 0, 0, 248, 36, 1, 0, 0, 0, 249, 250, 5, 62, 0, 0, 250, 38, 1, 0, 0, 0, 251, 252, 5, 60, 0, 0, 252, 40, 1, 0, 0, 0, 253, 254, 5, 62, 0, 0, 254, 255, 5, 61, 0, 0, 255, 42, 1, 0, 0, 0, 256, 257, 5, 60, 0, 0, 257, 258, 5, 61, 0, 0, 258, 44, 1, 0, 0, 0, 259, 260, 5, 61, 0, 0, 260, 261, 5, 61, 0, 0, 261, 46, 1, 0, 0, 0, 262, 263, 5, 33, 0, 0, 263, 264, 5, 61, 0, 0, 264, 48, 1, 0, 0, 0, 265, 266, 5, 33, 0, 0, 266, 50, 1, 0, 0, 0, 267, 268, 5, 38, 0, 0, 268, 269, 5, 38, 0, 0, 269, 52, 1, 0, 0, 0, 270, 271, 5, 124, 0, 0, 271, 272, 5, 124, 0, 0, 272, 54, 1, 0, 0, 0, 273, 274, 5, 46, 0, 0, 274, 56, 1, 0, 0, 0, 275, 276, 5, 40, 0, 0, 276, 58, 1, 0, 0, 0, 277, 278, 5, 41, 0, 0, 278, 60, 1, 0, 0, 0, 279, 280, 5, 123, 0, 0, 280, 62, 1, 0, 0, 0, 281, 282, 5, 125, 0, 0, 282, 64, 1, 0, 0, 0, 283, 284, 5, 59, 0, 0, 284, 66, 1, 0, 0, 0, 285, 286, 5, 44, 0, 0, 286, 68, 1, 0, 0, 0, 287, 288, 5, 99, 0, 0, 288, 289, 5, 108, 0, 0, 289, 290, 5, 97, 0, 0, 290, 291, 5, 115, 0, 0, 291, 292, 5, 115, 0, 0, 292, 70, 1, 0, 0, 0, 293, 294, 5, 116, 0, 0, 294, 295, 5, 104, 0, 0, 295, 296, 5, 105, 0, 0, 296, 297, 5, 115, 0, 0, 297, 72, 1, 0, 0, 0, 298, 299, 5, 119, 0, 0, 299, 300, 5, 104, 0, 0, 300, 301, 5, 105, 0, 0, 301, 302, 5, 108, 0, 0, 302, 303, 5, 101, 0, 0, 303, 74, 1, 0, 0, 0, 304, 305, 5, 105, 0, 0, 305, 306, 5, 102, 0, 0, 306, 76, 1, 0, 0, 0, 307, 308, 5, 101, 0, 0, 308, 309, 5, 108, 0, 0, 309, 310, 5, 115, 0, 0, 310, 311, 5, 101, 0, 0, 311, 78, 1, 0, 0, 0, 312, 313, 5, 102, 0, 0, 313, 314, 5, 111, 0, 0, 314, 315, 5, 114, 0, 0, 315, 80, 1, 0, 0, 0, 316, 317, 5, 114, 0, 0, 317, 318, 5, 101, 0, 0, 318, 319, 5, 116, 0, 0, 319, 320, 5, 117, 0, 0, 320, 321, 5, 114, 0, 0, 321, 322, 5, 110, 0, 0, 322, 82, 1, 0, 0, 0, 323, 324, 5, 110, 0, 0, 324, 325, 5, 101, 0, 0, 325, 326, 5, 119, 0, 0, 326, 84, 1, 0, 0, 0, 327, 331, 5, 39, 0, 0, 328, 330, 8, 0, 0, 0, 329, 328, 1, 0, 0, 0, 330, 333, 1, 0, 0, 0, 331, 329, 1, 0, 0, 0, 331, 332, 1, 0, 0, 0, 332, 334, 1, 0, 0, 0, 333, 331, 1, 0, 0, 0, 334, 335, 5, 39, 0, 0, 335, 86, 1, 0, 0, 0, 336, 338, 3, 29, 14, 0, 337, 336, 1, 0, 0, 0, 337, 338, 1, 0, 0, 0, 338, 340, 1, 0, 0, 0, 339, 341, 3, 95, 47, 0, 340, 339, 1, 0, 0, 0, 341, 342, 1, 0, 0, 0, 342, 340, 1, 0, 0, 0, 342, 343, 1, 0, 0, 0, 343, 88, 1, 0, 0, 0, 344, 345, 5, 116, 0, 0, 345, 346, 5, 114, 0, 0, 346, 347, 5, 117, 0, 0, 347, 354, 5, 101, 0, 0, 348, 349, 5, 102, 0, 0, 349, 350, 5, 97, 0, 0, 350, 351, 5, 108, 0, 0, 351, 352, 5, 115, 0, 0, 352, 354, 5, 101, 0, 0, 353, 344, 1, 0, 0, 0, 353, 348, 1, 0, 0, 0, 354, 90, 1, 0, 0, 0, 355, 356, 5, 110, 0, 0, 356, 357, 5, 117, 0, 0, 357, 358, 5, 108, 0, 0, 358, 359, 5, 108, 0, 0, 359, 92, 1, 0, 0, 0, 360, 361, 7, 1, 0, 0, 361, 94, 1, 0, 0, 0, 362, 363, 7, 2, 0, 0, 363, 96, 1, 0, 0, 0, 364, 368, 3, 93, 46, 0, 365, 368, 3, 95, 47, 0, 366, 368, 7, 3, 0, 0, 367, 364, 1, 0, 0, 0, 367, 365, 1, 0, 0, 0, 367, 366, 1, 0, 0, 0, 368, 98, 1, 0, 0, 0, 369, 373, 3, 93, 46, 0, 370, 372, 3, 97, 48, 0, 371, 370, 1, 0, 0, 0, 372, 375, 1, 0, 0, 0, 373, 371, 1, 0, 0, 0, 373, 374, 1, 0, 0, 0, 374, 100, 1, 0, 0, 0, 375, 373, 1, 0, 0, 0, 376, 378, 7, 4, 0, 0, 377, 376, 1, 0, 0, 0, 378, 379, 1, 0, 0, 0, 379, 377, 1, 0, 0, 0, 379, 380, 1, 0, 0, 0, 380, 381, 1, 0, 0, 0, 381, 382, 6, 50, 0, 0, 382, 102, 1, 0, 0, 0, 383, 384, 5, 47, 0, 0, 384, 385, 5, 47, 0, 0, 385, 389, 1, 0, 0, 0, 386, 388, 8, 0, 0, 0, 387, 386, 1, 0, 0, 0, 388, 391, 1, 0, 0, 0, 389, 387, 1, 0, 0, 0, 389, 390, 1, 0, 0, 0, 390, 392, 1, 0, 0, 0, 391, 389, 1, 0, 0, 0, 392, 393, 6, 51, 0, 0, 393, 104, 1, 0, 0, 0, 394, 395, 5, 47, 0, 0, 395, 396, 5, 42, 0, 0, 396, 400, 1, 0, 0, 0, 397, 399, 9, 0, 0, 0, 398, 397, 1, 0, 0, 0, 399, 402, 1, 0, 0, 0, 400, 401, 1, 0, 0, 0, 400, 398, 1, 0, 0, 0, 401, 403, 1, 0, 0, 0, 402, 400, 1, 0, 0, 0, 403, 404, 5, 42, 0, 0, 404, 405, 5, 47, 0, 0, 405, 406, 1, 0, 0, 0, 406, 407, 6, 52, 0, 0, 407, 106, 1, 0, 0, 0, 15, 0, 175, 219, 223, 231, 235, 331, 337, 342, 353, 367, 373, 379, 389, 400, 1, 6, 0, 0]
\ No newline at end of file
diff --git a/src/main/java/parser/generated/SimpleJavaLexer.java b/src/main/java/parser/generated/SimpleJavaLexer.java
index 979b0a4..cb01452 100644
--- a/src/main/java/parser/generated/SimpleJavaLexer.java
+++ b/src/main/java/parser/generated/SimpleJavaLexer.java
@@ -1,4 +1,4 @@
-// Generated from C:/Users/Johannes/Documents/Github/JavaCompiler/src/main/java/parser/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
@@ -17,12 +17,15 @@ public class SimpleJavaLexer extends Lexer {
 	protected static final PredictionContextCache _sharedContextCache =
 		new PredictionContextCache();
 	public static final int
-		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
-		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24, 
-		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
-		T__31=32, T__32=33, T__33=34, T__34=35, INTEGERLITERAL=36, IDENTIFIER=37, 
-		WS=38;
+		T__0=1, T__1=2, Void=3, Boolean=4, Char=5, Int=6, AccessModifier=7, MainMethodDeclaration=8, 
+		DotOperator=9, LineOperator=10, ComparisonOperator=11, LogicalOperator=12, 
+		Assign=13, Plus=14, Minus=15, Mult=16, Modulo=17, Div=18, Greater=19, 
+		Less=20, GreaterEqual=21, LessEqual=22, Equal=23, NotEqual=24, Not=25, 
+		And=26, Or=27, Dot=28, OpenRoundBracket=29, ClosedRoundBracket=30, OpenCurlyBracket=31, 
+		ClosedCurlyBracket=32, Semicolon=33, Comma=34, Class=35, This=36, While=37, 
+		If=38, Else=39, For=40, Return=41, New=42, CharValue=43, IntValue=44, 
+		BooleanValue=45, NullValue=46, Identifier=47, WS=48, InlineComment=49, 
+		MultilineComment=50;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -33,31 +36,40 @@ public class SimpleJavaLexer extends Lexer {
 
 	private static String[] makeRuleNames() {
 		return new String[] {
-			"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", 
-			"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", 
-			"T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "T__23", "T__24", 
-			"T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32", 
-			"T__33", "T__34", "INTEGERLITERAL", "IDENTIFIER", "WS"
+			"T__0", "T__1", "Void", "Boolean", "Char", "Int", "AccessModifier", "MainMethodDeclaration", 
+			"DotOperator", "LineOperator", "ComparisonOperator", "LogicalOperator", 
+			"Assign", "Plus", "Minus", "Mult", "Modulo", "Div", "Greater", "Less", 
+			"GreaterEqual", "LessEqual", "Equal", "NotEqual", "Not", "And", "Or", 
+			"Dot", "OpenRoundBracket", "ClosedRoundBracket", "OpenCurlyBracket", 
+			"ClosedCurlyBracket", "Semicolon", "Comma", "Class", "This", "While", 
+			"If", "Else", "For", "Return", "New", "CharValue", "IntValue", "BooleanValue", 
+			"NullValue", "Alphabetic", "Numeric", "ValidIdentSymbols", "Identifier", 
+			"WS", "InlineComment", "MultilineComment"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'class'", "'{'", "'}'", "';'", "'static'", "'('", "')'", "','", 
-			"'int'", "'boolean'", "'char'", "'public'", "'private'", "'='", "'if'", 
-			"'else'", "'while'", "'return'", "'&&'", "'||'", "'=='", "'!='", "'<'", 
-			"'<='", "'>'", "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "'true'", 
-			"'false'", "'''"
+			null, "'++'", "'--'", "'void'", "'boolean'", "'char'", "'int'", null, 
+			"'public static void main(String[] args)'", null, null, null, null, "'='", 
+			"'+'", "'-'", "'*'", "'%'", "'/'", "'>'", "'<'", "'>='", "'<='", "'=='", 
+			"'!='", "'!'", "'&&'", "'||'", "'.'", "'('", "')'", "'{'", "'}'", "';'", 
+			"','", "'class'", "'this'", "'while'", "'if'", "'else'", "'for'", "'return'", 
+			"'new'", null, null, null, "'null'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
 	private static String[] makeSymbolicNames() {
 		return new String[] {
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			"INTEGERLITERAL", "IDENTIFIER", "WS"
+			null, null, null, "Void", "Boolean", "Char", "Int", "AccessModifier", 
+			"MainMethodDeclaration", "DotOperator", "LineOperator", "ComparisonOperator", 
+			"LogicalOperator", "Assign", "Plus", "Minus", "Mult", "Modulo", "Div", 
+			"Greater", "Less", "GreaterEqual", "LessEqual", "Equal", "NotEqual", 
+			"Not", "And", "Or", "Dot", "OpenRoundBracket", "ClosedRoundBracket", 
+			"OpenCurlyBracket", "ClosedCurlyBracket", "Semicolon", "Comma", "Class", 
+			"This", "While", "If", "Else", "For", "Return", "New", "CharValue", "IntValue", 
+			"BooleanValue", "NullValue", "Identifier", "WS", "InlineComment", "MultilineComment"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -119,7 +131,7 @@ public class SimpleJavaLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\u0004\u0000&\u00df\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
+		"\u0004\u00002\u0198\u0006\uffff\uffff\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"+
@@ -130,43 +142,67 @@ public class SimpleJavaLexer extends Lexer {
 		"\u0018\u0007\u0018\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002"+
 		"\u001b\u0007\u001b\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0002"+
 		"\u001e\u0007\u001e\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007"+
-		"!\u0002\"\u0007\"\u0002#\u0007#\u0002$\u0007$\u0002%\u0007%\u0001\u0000"+
-		"\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001"+
-		"\u0001\u0001\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0004"+
-		"\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004"+
-		"\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007"+
-		"\u0001\b\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+
-		"\t\u0001\t\u0001\t\u0001\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001"+
-		"\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001"+
-		"\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f"+
-		"\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000e\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"+
-		"\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0012\u0001"+
-		"\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001"+
-		"\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001"+
-		"\u0016\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001"+
-		"\u0019\u0001\u0019\u0001\u0019\u0001\u001a\u0001\u001a\u0001\u001b\u0001"+
-		"\u001b\u0001\u001c\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001"+
-		"\u001e\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001 \u0001 \u0001 \u0001"+
-		"!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001\"\u0001\"\u0001#\u0004#\u00ce"+
-		"\b#\u000b#\f#\u00cf\u0001$\u0001$\u0005$\u00d4\b$\n$\f$\u00d7\t$\u0001"+
-		"%\u0004%\u00da\b%\u000b%\f%\u00db\u0001%\u0001%\u0000\u0000&\u0001\u0001"+
+		"!\u0002\"\u0007\"\u0002#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007"+
+		"&\u0002\'\u0007\'\u0002(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007"+
+		"+\u0002,\u0007,\u0002-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u0007"+
+		"0\u00021\u00071\u00022\u00072\u00023\u00073\u00024\u00074\u0001\u0000"+
+		"\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002"+
+		"\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003"+
+		"\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+
+		"\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005"+
+		"\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+		"\u0001\u0006\u0003\u0006\u00b0\b\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\u0007\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\u0007\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\u0007"+
+		"\u0001\b\u0001\b\u0001\b\u0003\b\u00dc\b\b\u0001\t\u0001\t\u0003\t\u00e0"+
+		"\b\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0003\n\u00e8\b\n"+
+		"\u0001\u000b\u0001\u000b\u0003\u000b\u00ec\b\u000b\u0001\f\u0001\f\u0001"+
+		"\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0001\u0010"+
+		"\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0013"+
+		"\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015"+
+		"\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017"+
+		"\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019"+
+		"\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001c"+
+		"\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\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*\u0005*\u014a"+
+		"\b*\n*\f*\u014d\t*\u0001*\u0001*\u0001+\u0003+\u0152\b+\u0001+\u0004+"+
+		"\u0155\b+\u000b+\f+\u0156\u0001,\u0001,\u0001,\u0001,\u0001,\u0001,\u0001"+
+		",\u0001,\u0001,\u0003,\u0162\b,\u0001-\u0001-\u0001-\u0001-\u0001-\u0001"+
+		".\u0001.\u0001/\u0001/\u00010\u00010\u00010\u00030\u0170\b0\u00011\u0001"+
+		"1\u00051\u0174\b1\n1\f1\u0177\t1\u00012\u00042\u017a\b2\u000b2\f2\u017b"+
+		"\u00012\u00012\u00013\u00013\u00013\u00013\u00053\u0184\b3\n3\f3\u0187"+
+		"\t3\u00013\u00013\u00014\u00014\u00014\u00014\u00054\u018f\b4\n4\f4\u0192"+
+		"\t4\u00014\u00014\u00014\u00014\u00014\u0001\u0190\u00005\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&\u0001"+
-		"\u0000\u0004\u0001\u000009\u0002\u0000AZaz\u0004\u000009AZ__az\u0003\u0000"+
-		"\t\n\r\r  \u00e1\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"+
+		"1\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\"E#G$I%K&M\'O("+
+		"Q)S*U+W,Y-[.]\u0000_\u0000a\u0000c/e0g1i2\u0001\u0000\u0005\u0002\u0000"+
+		"\n\n\r\r\u0002\u0000AZaz\u0001\u000009\u0002\u0000$$__\u0003\u0000\t\n"+
+		"\r\r  \u01aa\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\u0000"+
 		"3\u0001\u0000\u0000\u0000\u00005\u0001\u0000\u0000\u0000\u00007\u0001"+
@@ -174,84 +210,179 @@ public class SimpleJavaLexer extends Lexer {
 		"\u0000\u0000=\u0001\u0000\u0000\u0000\u0000?\u0001\u0000\u0000\u0000\u0000"+
 		"A\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\u0001M\u0001\u0000\u0000\u0000\u0003"+
-		"S\u0001\u0000\u0000\u0000\u0005U\u0001\u0000\u0000\u0000\u0007W\u0001"+
-		"\u0000\u0000\u0000\tY\u0001\u0000\u0000\u0000\u000b`\u0001\u0000\u0000"+
-		"\u0000\rb\u0001\u0000\u0000\u0000\u000fd\u0001\u0000\u0000\u0000\u0011"+
-		"f\u0001\u0000\u0000\u0000\u0013j\u0001\u0000\u0000\u0000\u0015r\u0001"+
-		"\u0000\u0000\u0000\u0017w\u0001\u0000\u0000\u0000\u0019~\u0001\u0000\u0000"+
-		"\u0000\u001b\u0086\u0001\u0000\u0000\u0000\u001d\u0088\u0001\u0000\u0000"+
-		"\u0000\u001f\u008b\u0001\u0000\u0000\u0000!\u0090\u0001\u0000\u0000\u0000"+
-		"#\u0096\u0001\u0000\u0000\u0000%\u009d\u0001\u0000\u0000\u0000\'\u00a0"+
-		"\u0001\u0000\u0000\u0000)\u00a3\u0001\u0000\u0000\u0000+\u00a6\u0001\u0000"+
-		"\u0000\u0000-\u00a9\u0001\u0000\u0000\u0000/\u00ab\u0001\u0000\u0000\u0000"+
-		"1\u00ae\u0001\u0000\u0000\u00003\u00b0\u0001\u0000\u0000\u00005\u00b3"+
-		"\u0001\u0000\u0000\u00007\u00b5\u0001\u0000\u0000\u00009\u00b7\u0001\u0000"+
-		"\u0000\u0000;\u00b9\u0001\u0000\u0000\u0000=\u00bb\u0001\u0000\u0000\u0000"+
-		"?\u00bd\u0001\u0000\u0000\u0000A\u00bf\u0001\u0000\u0000\u0000C\u00c4"+
-		"\u0001\u0000\u0000\u0000E\u00ca\u0001\u0000\u0000\u0000G\u00cd\u0001\u0000"+
-		"\u0000\u0000I\u00d1\u0001\u0000\u0000\u0000K\u00d9\u0001\u0000\u0000\u0000"+
-		"MN\u0005c\u0000\u0000NO\u0005l\u0000\u0000OP\u0005a\u0000\u0000PQ\u0005"+
-		"s\u0000\u0000QR\u0005s\u0000\u0000R\u0002\u0001\u0000\u0000\u0000ST\u0005"+
-		"{\u0000\u0000T\u0004\u0001\u0000\u0000\u0000UV\u0005}\u0000\u0000V\u0006"+
-		"\u0001\u0000\u0000\u0000WX\u0005;\u0000\u0000X\b\u0001\u0000\u0000\u0000"+
-		"YZ\u0005s\u0000\u0000Z[\u0005t\u0000\u0000[\\\u0005a\u0000\u0000\\]\u0005"+
-		"t\u0000\u0000]^\u0005i\u0000\u0000^_\u0005c\u0000\u0000_\n\u0001\u0000"+
-		"\u0000\u0000`a\u0005(\u0000\u0000a\f\u0001\u0000\u0000\u0000bc\u0005)"+
-		"\u0000\u0000c\u000e\u0001\u0000\u0000\u0000de\u0005,\u0000\u0000e\u0010"+
-		"\u0001\u0000\u0000\u0000fg\u0005i\u0000\u0000gh\u0005n\u0000\u0000hi\u0005"+
-		"t\u0000\u0000i\u0012\u0001\u0000\u0000\u0000jk\u0005b\u0000\u0000kl\u0005"+
-		"o\u0000\u0000lm\u0005o\u0000\u0000mn\u0005l\u0000\u0000no\u0005e\u0000"+
-		"\u0000op\u0005a\u0000\u0000pq\u0005n\u0000\u0000q\u0014\u0001\u0000\u0000"+
-		"\u0000rs\u0005c\u0000\u0000st\u0005h\u0000\u0000tu\u0005a\u0000\u0000"+
-		"uv\u0005r\u0000\u0000v\u0016\u0001\u0000\u0000\u0000wx\u0005p\u0000\u0000"+
-		"xy\u0005u\u0000\u0000yz\u0005b\u0000\u0000z{\u0005l\u0000\u0000{|\u0005"+
-		"i\u0000\u0000|}\u0005c\u0000\u0000}\u0018\u0001\u0000\u0000\u0000~\u007f"+
-		"\u0005p\u0000\u0000\u007f\u0080\u0005r\u0000\u0000\u0080\u0081\u0005i"+
-		"\u0000\u0000\u0081\u0082\u0005v\u0000\u0000\u0082\u0083\u0005a\u0000\u0000"+
-		"\u0083\u0084\u0005t\u0000\u0000\u0084\u0085\u0005e\u0000\u0000\u0085\u001a"+
-		"\u0001\u0000\u0000\u0000\u0086\u0087\u0005=\u0000\u0000\u0087\u001c\u0001"+
-		"\u0000\u0000\u0000\u0088\u0089\u0005i\u0000\u0000\u0089\u008a\u0005f\u0000"+
-		"\u0000\u008a\u001e\u0001\u0000\u0000\u0000\u008b\u008c\u0005e\u0000\u0000"+
-		"\u008c\u008d\u0005l\u0000\u0000\u008d\u008e\u0005s\u0000\u0000\u008e\u008f"+
-		"\u0005e\u0000\u0000\u008f \u0001\u0000\u0000\u0000\u0090\u0091\u0005w"+
-		"\u0000\u0000\u0091\u0092\u0005h\u0000\u0000\u0092\u0093\u0005i\u0000\u0000"+
-		"\u0093\u0094\u0005l\u0000\u0000\u0094\u0095\u0005e\u0000\u0000\u0095\""+
-		"\u0001\u0000\u0000\u0000\u0096\u0097\u0005r\u0000\u0000\u0097\u0098\u0005"+
-		"e\u0000\u0000\u0098\u0099\u0005t\u0000\u0000\u0099\u009a\u0005u\u0000"+
-		"\u0000\u009a\u009b\u0005r\u0000\u0000\u009b\u009c\u0005n\u0000\u0000\u009c"+
-		"$\u0001\u0000\u0000\u0000\u009d\u009e\u0005&\u0000\u0000\u009e\u009f\u0005"+
-		"&\u0000\u0000\u009f&\u0001\u0000\u0000\u0000\u00a0\u00a1\u0005|\u0000"+
-		"\u0000\u00a1\u00a2\u0005|\u0000\u0000\u00a2(\u0001\u0000\u0000\u0000\u00a3"+
-		"\u00a4\u0005=\u0000\u0000\u00a4\u00a5\u0005=\u0000\u0000\u00a5*\u0001"+
-		"\u0000\u0000\u0000\u00a6\u00a7\u0005!\u0000\u0000\u00a7\u00a8\u0005=\u0000"+
-		"\u0000\u00a8,\u0001\u0000\u0000\u0000\u00a9\u00aa\u0005<\u0000\u0000\u00aa"+
-		".\u0001\u0000\u0000\u0000\u00ab\u00ac\u0005<\u0000\u0000\u00ac\u00ad\u0005"+
-		"=\u0000\u0000\u00ad0\u0001\u0000\u0000\u0000\u00ae\u00af\u0005>\u0000"+
-		"\u0000\u00af2\u0001\u0000\u0000\u0000\u00b0\u00b1\u0005>\u0000\u0000\u00b1"+
-		"\u00b2\u0005=\u0000\u0000\u00b24\u0001\u0000\u0000\u0000\u00b3\u00b4\u0005"+
-		"+\u0000\u0000\u00b46\u0001\u0000\u0000\u0000\u00b5\u00b6\u0005-\u0000"+
-		"\u0000\u00b68\u0001\u0000\u0000\u0000\u00b7\u00b8\u0005*\u0000\u0000\u00b8"+
-		":\u0001\u0000\u0000\u0000\u00b9\u00ba\u0005/\u0000\u0000\u00ba<\u0001"+
-		"\u0000\u0000\u0000\u00bb\u00bc\u0005%\u0000\u0000\u00bc>\u0001\u0000\u0000"+
-		"\u0000\u00bd\u00be\u0005!\u0000\u0000\u00be@\u0001\u0000\u0000\u0000\u00bf"+
-		"\u00c0\u0005t\u0000\u0000\u00c0\u00c1\u0005r\u0000\u0000\u00c1\u00c2\u0005"+
-		"u\u0000\u0000\u00c2\u00c3\u0005e\u0000\u0000\u00c3B\u0001\u0000\u0000"+
-		"\u0000\u00c4\u00c5\u0005f\u0000\u0000\u00c5\u00c6\u0005a\u0000\u0000\u00c6"+
-		"\u00c7\u0005l\u0000\u0000\u00c7\u00c8\u0005s\u0000\u0000\u00c8\u00c9\u0005"+
-		"e\u0000\u0000\u00c9D\u0001\u0000\u0000\u0000\u00ca\u00cb\u0005\'\u0000"+
-		"\u0000\u00cbF\u0001\u0000\u0000\u0000\u00cc\u00ce\u0007\u0000\u0000\u0000"+
-		"\u00cd\u00cc\u0001\u0000\u0000\u0000\u00ce\u00cf\u0001\u0000\u0000\u0000"+
-		"\u00cf\u00cd\u0001\u0000\u0000\u0000\u00cf\u00d0\u0001\u0000\u0000\u0000"+
-		"\u00d0H\u0001\u0000\u0000\u0000\u00d1\u00d5\u0007\u0001\u0000\u0000\u00d2"+
-		"\u00d4\u0007\u0002\u0000\u0000\u00d3\u00d2\u0001\u0000\u0000\u0000\u00d4"+
-		"\u00d7\u0001\u0000\u0000\u0000\u00d5\u00d3\u0001\u0000\u0000\u0000\u00d5"+
-		"\u00d6\u0001\u0000\u0000\u0000\u00d6J\u0001\u0000\u0000\u0000\u00d7\u00d5"+
-		"\u0001\u0000\u0000\u0000\u00d8\u00da\u0007\u0003\u0000\u0000\u00d9\u00d8"+
-		"\u0001\u0000\u0000\u0000\u00da\u00db\u0001\u0000\u0000\u0000\u00db\u00d9"+
-		"\u0001\u0000\u0000\u0000\u00db\u00dc\u0001\u0000\u0000\u0000\u00dc\u00dd"+
-		"\u0001\u0000\u0000\u0000\u00dd\u00de\u0006%\u0000\u0000\u00deL\u0001\u0000"+
-		"\u0000\u0000\u0004\u0000\u00cf\u00d5\u00db\u0001\u0006\u0000\u0000";
+		"\u0000\u0000K\u0001\u0000\u0000\u0000\u0000M\u0001\u0000\u0000\u0000\u0000"+
+		"O\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"+
+		"c\u0001\u0000\u0000\u0000\u0000e\u0001\u0000\u0000\u0000\u0000g\u0001"+
+		"\u0000\u0000\u0000\u0000i\u0001\u0000\u0000\u0000\u0001k\u0001\u0000\u0000"+
+		"\u0000\u0003n\u0001\u0000\u0000\u0000\u0005q\u0001\u0000\u0000\u0000\u0007"+
+		"v\u0001\u0000\u0000\u0000\t~\u0001\u0000\u0000\u0000\u000b\u0083\u0001"+
+		"\u0000\u0000\u0000\r\u00af\u0001\u0000\u0000\u0000\u000f\u00b1\u0001\u0000"+
+		"\u0000\u0000\u0011\u00db\u0001\u0000\u0000\u0000\u0013\u00df\u0001\u0000"+
+		"\u0000\u0000\u0015\u00e7\u0001\u0000\u0000\u0000\u0017\u00eb\u0001\u0000"+
+		"\u0000\u0000\u0019\u00ed\u0001\u0000\u0000\u0000\u001b\u00ef\u0001\u0000"+
+		"\u0000\u0000\u001d\u00f1\u0001\u0000\u0000\u0000\u001f\u00f3\u0001\u0000"+
+		"\u0000\u0000!\u00f5\u0001\u0000\u0000\u0000#\u00f7\u0001\u0000\u0000\u0000"+
+		"%\u00f9\u0001\u0000\u0000\u0000\'\u00fb\u0001\u0000\u0000\u0000)\u00fd"+
+		"\u0001\u0000\u0000\u0000+\u0100\u0001\u0000\u0000\u0000-\u0103\u0001\u0000"+
+		"\u0000\u0000/\u0106\u0001\u0000\u0000\u00001\u0109\u0001\u0000\u0000\u0000"+
+		"3\u010b\u0001\u0000\u0000\u00005\u010e\u0001\u0000\u0000\u00007\u0111"+
+		"\u0001\u0000\u0000\u00009\u0113\u0001\u0000\u0000\u0000;\u0115\u0001\u0000"+
+		"\u0000\u0000=\u0117\u0001\u0000\u0000\u0000?\u0119\u0001\u0000\u0000\u0000"+
+		"A\u011b\u0001\u0000\u0000\u0000C\u011d\u0001\u0000\u0000\u0000E\u011f"+
+		"\u0001\u0000\u0000\u0000G\u0125\u0001\u0000\u0000\u0000I\u012a\u0001\u0000"+
+		"\u0000\u0000K\u0130\u0001\u0000\u0000\u0000M\u0133\u0001\u0000\u0000\u0000"+
+		"O\u0138\u0001\u0000\u0000\u0000Q\u013c\u0001\u0000\u0000\u0000S\u0143"+
+		"\u0001\u0000\u0000\u0000U\u0147\u0001\u0000\u0000\u0000W\u0151\u0001\u0000"+
+		"\u0000\u0000Y\u0161\u0001\u0000\u0000\u0000[\u0163\u0001\u0000\u0000\u0000"+
+		"]\u0168\u0001\u0000\u0000\u0000_\u016a\u0001\u0000\u0000\u0000a\u016f"+
+		"\u0001\u0000\u0000\u0000c\u0171\u0001\u0000\u0000\u0000e\u0179\u0001\u0000"+
+		"\u0000\u0000g\u017f\u0001\u0000\u0000\u0000i\u018a\u0001\u0000\u0000\u0000"+
+		"kl\u0005+\u0000\u0000lm\u0005+\u0000\u0000m\u0002\u0001\u0000\u0000\u0000"+
+		"no\u0005-\u0000\u0000op\u0005-\u0000\u0000p\u0004\u0001\u0000\u0000\u0000"+
+		"qr\u0005v\u0000\u0000rs\u0005o\u0000\u0000st\u0005i\u0000\u0000tu\u0005"+
+		"d\u0000\u0000u\u0006\u0001\u0000\u0000\u0000vw\u0005b\u0000\u0000wx\u0005"+
+		"o\u0000\u0000xy\u0005o\u0000\u0000yz\u0005l\u0000\u0000z{\u0005e\u0000"+
+		"\u0000{|\u0005a\u0000\u0000|}\u0005n\u0000\u0000}\b\u0001\u0000\u0000"+
+		"\u0000~\u007f\u0005c\u0000\u0000\u007f\u0080\u0005h\u0000\u0000\u0080"+
+		"\u0081\u0005a\u0000\u0000\u0081\u0082\u0005r\u0000\u0000\u0082\n\u0001"+
+		"\u0000\u0000\u0000\u0083\u0084\u0005i\u0000\u0000\u0084\u0085\u0005n\u0000"+
+		"\u0000\u0085\u0086\u0005t\u0000\u0000\u0086\f\u0001\u0000\u0000\u0000"+
+		"\u0087\u0088\u0005p\u0000\u0000\u0088\u0089\u0005u\u0000\u0000\u0089\u008a"+
+		"\u0005b\u0000\u0000\u008a\u008b\u0005l\u0000\u0000\u008b\u008c\u0005i"+
+		"\u0000\u0000\u008c\u00b0\u0005c\u0000\u0000\u008d\u008e\u0005p\u0000\u0000"+
+		"\u008e\u008f\u0005r\u0000\u0000\u008f\u0090\u0005i\u0000\u0000\u0090\u0091"+
+		"\u0005v\u0000\u0000\u0091\u0092\u0005a\u0000\u0000\u0092\u0093\u0005t"+
+		"\u0000\u0000\u0093\u00b0\u0005e\u0000\u0000\u0094\u0095\u0005p\u0000\u0000"+
+		"\u0095\u0096\u0005u\u0000\u0000\u0096\u0097\u0005b\u0000\u0000\u0097\u0098"+
+		"\u0005l\u0000\u0000\u0098\u0099\u0005i\u0000\u0000\u0099\u009a\u0005c"+
+		"\u0000\u0000\u009a\u009b\u0005 \u0000\u0000\u009b\u009c\u0005s\u0000\u0000"+
+		"\u009c\u009d\u0005t\u0000\u0000\u009d\u009e\u0005a\u0000\u0000\u009e\u009f"+
+		"\u0005t\u0000\u0000\u009f\u00a0\u0005i\u0000\u0000\u00a0\u00b0\u0005c"+
+		"\u0000\u0000\u00a1\u00a2\u0005p\u0000\u0000\u00a2\u00a3\u0005r\u0000\u0000"+
+		"\u00a3\u00a4\u0005i\u0000\u0000\u00a4\u00a5\u0005v\u0000\u0000\u00a5\u00a6"+
+		"\u0005a\u0000\u0000\u00a6\u00a7\u0005t\u0000\u0000\u00a7\u00a8\u0005e"+
+		"\u0000\u0000\u00a8\u00a9\u0005 \u0000\u0000\u00a9\u00aa\u0005s\u0000\u0000"+
+		"\u00aa\u00ab\u0005t\u0000\u0000\u00ab\u00ac\u0005a\u0000\u0000\u00ac\u00ad"+
+		"\u0005t\u0000\u0000\u00ad\u00ae\u0005i\u0000\u0000\u00ae\u00b0\u0005c"+
+		"\u0000\u0000\u00af\u0087\u0001\u0000\u0000\u0000\u00af\u008d\u0001\u0000"+
+		"\u0000\u0000\u00af\u0094\u0001\u0000\u0000\u0000\u00af\u00a1\u0001\u0000"+
+		"\u0000\u0000\u00b0\u000e\u0001\u0000\u0000\u0000\u00b1\u00b2\u0005p\u0000"+
+		"\u0000\u00b2\u00b3\u0005u\u0000\u0000\u00b3\u00b4\u0005b\u0000\u0000\u00b4"+
+		"\u00b5\u0005l\u0000\u0000\u00b5\u00b6\u0005i\u0000\u0000\u00b6\u00b7\u0005"+
+		"c\u0000\u0000\u00b7\u00b8\u0005 \u0000\u0000\u00b8\u00b9\u0005s\u0000"+
+		"\u0000\u00b9\u00ba\u0005t\u0000\u0000\u00ba\u00bb\u0005a\u0000\u0000\u00bb"+
+		"\u00bc\u0005t\u0000\u0000\u00bc\u00bd\u0005i\u0000\u0000\u00bd\u00be\u0005"+
+		"c\u0000\u0000\u00be\u00bf\u0005 \u0000\u0000\u00bf\u00c0\u0005v\u0000"+
+		"\u0000\u00c0\u00c1\u0005o\u0000\u0000\u00c1\u00c2\u0005i\u0000\u0000\u00c2"+
+		"\u00c3\u0005d\u0000\u0000\u00c3\u00c4\u0005 \u0000\u0000\u00c4\u00c5\u0005"+
+		"m\u0000\u0000\u00c5\u00c6\u0005a\u0000\u0000\u00c6\u00c7\u0005i\u0000"+
+		"\u0000\u00c7\u00c8\u0005n\u0000\u0000\u00c8\u00c9\u0005(\u0000\u0000\u00c9"+
+		"\u00ca\u0005S\u0000\u0000\u00ca\u00cb\u0005t\u0000\u0000\u00cb\u00cc\u0005"+
+		"r\u0000\u0000\u00cc\u00cd\u0005i\u0000\u0000\u00cd\u00ce\u0005n\u0000"+
+		"\u0000\u00ce\u00cf\u0005g\u0000\u0000\u00cf\u00d0\u0005[\u0000\u0000\u00d0"+
+		"\u00d1\u0005]\u0000\u0000\u00d1\u00d2\u0005 \u0000\u0000\u00d2\u00d3\u0005"+
+		"a\u0000\u0000\u00d3\u00d4\u0005r\u0000\u0000\u00d4\u00d5\u0005g\u0000"+
+		"\u0000\u00d5\u00d6\u0005s\u0000\u0000\u00d6\u00d7\u0005)\u0000\u0000\u00d7"+
+		"\u0010\u0001\u0000\u0000\u0000\u00d8\u00dc\u0003\u001f\u000f\u0000\u00d9"+
+		"\u00dc\u0003#\u0011\u0000\u00da\u00dc\u0003!\u0010\u0000\u00db\u00d8\u0001"+
+		"\u0000\u0000\u0000\u00db\u00d9\u0001\u0000\u0000\u0000\u00db\u00da\u0001"+
+		"\u0000\u0000\u0000\u00dc\u0012\u0001\u0000\u0000\u0000\u00dd\u00e0\u0003"+
+		"\u001b\r\u0000\u00de\u00e0\u0003\u001d\u000e\u0000\u00df\u00dd\u0001\u0000"+
+		"\u0000\u0000\u00df\u00de\u0001\u0000\u0000\u0000\u00e0\u0014\u0001\u0000"+
+		"\u0000\u0000\u00e1\u00e8\u0003%\u0012\u0000\u00e2\u00e8\u0003\'\u0013"+
+		"\u0000\u00e3\u00e8\u0003)\u0014\u0000\u00e4\u00e8\u0003+\u0015\u0000\u00e5"+
+		"\u00e8\u0003-\u0016\u0000\u00e6\u00e8\u0003/\u0017\u0000\u00e7\u00e1\u0001"+
+		"\u0000\u0000\u0000\u00e7\u00e2\u0001\u0000\u0000\u0000\u00e7\u00e3\u0001"+
+		"\u0000\u0000\u0000\u00e7\u00e4\u0001\u0000\u0000\u0000\u00e7\u00e5\u0001"+
+		"\u0000\u0000\u0000\u00e7\u00e6\u0001\u0000\u0000\u0000\u00e8\u0016\u0001"+
+		"\u0000\u0000\u0000\u00e9\u00ec\u00033\u0019\u0000\u00ea\u00ec\u00035\u001a"+
+		"\u0000\u00eb\u00e9\u0001\u0000\u0000\u0000\u00eb\u00ea\u0001\u0000\u0000"+
+		"\u0000\u00ec\u0018\u0001\u0000\u0000\u0000\u00ed\u00ee\u0005=\u0000\u0000"+
+		"\u00ee\u001a\u0001\u0000\u0000\u0000\u00ef\u00f0\u0005+\u0000\u0000\u00f0"+
+		"\u001c\u0001\u0000\u0000\u0000\u00f1\u00f2\u0005-\u0000\u0000\u00f2\u001e"+
+		"\u0001\u0000\u0000\u0000\u00f3\u00f4\u0005*\u0000\u0000\u00f4 \u0001\u0000"+
+		"\u0000\u0000\u00f5\u00f6\u0005%\u0000\u0000\u00f6\"\u0001\u0000\u0000"+
+		"\u0000\u00f7\u00f8\u0005/\u0000\u0000\u00f8$\u0001\u0000\u0000\u0000\u00f9"+
+		"\u00fa\u0005>\u0000\u0000\u00fa&\u0001\u0000\u0000\u0000\u00fb\u00fc\u0005"+
+		"<\u0000\u0000\u00fc(\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005>\u0000"+
+		"\u0000\u00fe\u00ff\u0005=\u0000\u0000\u00ff*\u0001\u0000\u0000\u0000\u0100"+
+		"\u0101\u0005<\u0000\u0000\u0101\u0102\u0005=\u0000\u0000\u0102,\u0001"+
+		"\u0000\u0000\u0000\u0103\u0104\u0005=\u0000\u0000\u0104\u0105\u0005=\u0000"+
+		"\u0000\u0105.\u0001\u0000\u0000\u0000\u0106\u0107\u0005!\u0000\u0000\u0107"+
+		"\u0108\u0005=\u0000\u0000\u01080\u0001\u0000\u0000\u0000\u0109\u010a\u0005"+
+		"!\u0000\u0000\u010a2\u0001\u0000\u0000\u0000\u010b\u010c\u0005&\u0000"+
+		"\u0000\u010c\u010d\u0005&\u0000\u0000\u010d4\u0001\u0000\u0000\u0000\u010e"+
+		"\u010f\u0005|\u0000\u0000\u010f\u0110\u0005|\u0000\u0000\u01106\u0001"+
+		"\u0000\u0000\u0000\u0111\u0112\u0005.\u0000\u0000\u01128\u0001\u0000\u0000"+
+		"\u0000\u0113\u0114\u0005(\u0000\u0000\u0114:\u0001\u0000\u0000\u0000\u0115"+
+		"\u0116\u0005)\u0000\u0000\u0116<\u0001\u0000\u0000\u0000\u0117\u0118\u0005"+
+		"{\u0000\u0000\u0118>\u0001\u0000\u0000\u0000\u0119\u011a\u0005}\u0000"+
+		"\u0000\u011a@\u0001\u0000\u0000\u0000\u011b\u011c\u0005;\u0000\u0000\u011c"+
+		"B\u0001\u0000\u0000\u0000\u011d\u011e\u0005,\u0000\u0000\u011eD\u0001"+
+		"\u0000\u0000\u0000\u011f\u0120\u0005c\u0000\u0000\u0120\u0121\u0005l\u0000"+
+		"\u0000\u0121\u0122\u0005a\u0000\u0000\u0122\u0123\u0005s\u0000\u0000\u0123"+
+		"\u0124\u0005s\u0000\u0000\u0124F\u0001\u0000\u0000\u0000\u0125\u0126\u0005"+
+		"t\u0000\u0000\u0126\u0127\u0005h\u0000\u0000\u0127\u0128\u0005i\u0000"+
+		"\u0000\u0128\u0129\u0005s\u0000\u0000\u0129H\u0001\u0000\u0000\u0000\u012a"+
+		"\u012b\u0005w\u0000\u0000\u012b\u012c\u0005h\u0000\u0000\u012c\u012d\u0005"+
+		"i\u0000\u0000\u012d\u012e\u0005l\u0000\u0000\u012e\u012f\u0005e\u0000"+
+		"\u0000\u012fJ\u0001\u0000\u0000\u0000\u0130\u0131\u0005i\u0000\u0000\u0131"+
+		"\u0132\u0005f\u0000\u0000\u0132L\u0001\u0000\u0000\u0000\u0133\u0134\u0005"+
+		"e\u0000\u0000\u0134\u0135\u0005l\u0000\u0000\u0135\u0136\u0005s\u0000"+
+		"\u0000\u0136\u0137\u0005e\u0000\u0000\u0137N\u0001\u0000\u0000\u0000\u0138"+
+		"\u0139\u0005f\u0000\u0000\u0139\u013a\u0005o\u0000\u0000\u013a\u013b\u0005"+
+		"r\u0000\u0000\u013bP\u0001\u0000\u0000\u0000\u013c\u013d\u0005r\u0000"+
+		"\u0000\u013d\u013e\u0005e\u0000\u0000\u013e\u013f\u0005t\u0000\u0000\u013f"+
+		"\u0140\u0005u\u0000\u0000\u0140\u0141\u0005r\u0000\u0000\u0141\u0142\u0005"+
+		"n\u0000\u0000\u0142R\u0001\u0000\u0000\u0000\u0143\u0144\u0005n\u0000"+
+		"\u0000\u0144\u0145\u0005e\u0000\u0000\u0145\u0146\u0005w\u0000\u0000\u0146"+
+		"T\u0001\u0000\u0000\u0000\u0147\u014b\u0005\'\u0000\u0000\u0148\u014a"+
+		"\b\u0000\u0000\u0000\u0149\u0148\u0001\u0000\u0000\u0000\u014a\u014d\u0001"+
+		"\u0000\u0000\u0000\u014b\u0149\u0001\u0000\u0000\u0000\u014b\u014c\u0001"+
+		"\u0000\u0000\u0000\u014c\u014e\u0001\u0000\u0000\u0000\u014d\u014b\u0001"+
+		"\u0000\u0000\u0000\u014e\u014f\u0005\'\u0000\u0000\u014fV\u0001\u0000"+
+		"\u0000\u0000\u0150\u0152\u0003\u001d\u000e\u0000\u0151\u0150\u0001\u0000"+
+		"\u0000\u0000\u0151\u0152\u0001\u0000\u0000\u0000\u0152\u0154\u0001\u0000"+
+		"\u0000\u0000\u0153\u0155\u0003_/\u0000\u0154\u0153\u0001\u0000\u0000\u0000"+
+		"\u0155\u0156\u0001\u0000\u0000\u0000\u0156\u0154\u0001\u0000\u0000\u0000"+
+		"\u0156\u0157\u0001\u0000\u0000\u0000\u0157X\u0001\u0000\u0000\u0000\u0158"+
+		"\u0159\u0005t\u0000\u0000\u0159\u015a\u0005r\u0000\u0000\u015a\u015b\u0005"+
+		"u\u0000\u0000\u015b\u0162\u0005e\u0000\u0000\u015c\u015d\u0005f\u0000"+
+		"\u0000\u015d\u015e\u0005a\u0000\u0000\u015e\u015f\u0005l\u0000\u0000\u015f"+
+		"\u0160\u0005s\u0000\u0000\u0160\u0162\u0005e\u0000\u0000\u0161\u0158\u0001"+
+		"\u0000\u0000\u0000\u0161\u015c\u0001\u0000\u0000\u0000\u0162Z\u0001\u0000"+
+		"\u0000\u0000\u0163\u0164\u0005n\u0000\u0000\u0164\u0165\u0005u\u0000\u0000"+
+		"\u0165\u0166\u0005l\u0000\u0000\u0166\u0167\u0005l\u0000\u0000\u0167\\"+
+		"\u0001\u0000\u0000\u0000\u0168\u0169\u0007\u0001\u0000\u0000\u0169^\u0001"+
+		"\u0000\u0000\u0000\u016a\u016b\u0007\u0002\u0000\u0000\u016b`\u0001\u0000"+
+		"\u0000\u0000\u016c\u0170\u0003].\u0000\u016d\u0170\u0003_/\u0000\u016e"+
+		"\u0170\u0007\u0003\u0000\u0000\u016f\u016c\u0001\u0000\u0000\u0000\u016f"+
+		"\u016d\u0001\u0000\u0000\u0000\u016f\u016e\u0001\u0000\u0000\u0000\u0170"+
+		"b\u0001\u0000\u0000\u0000\u0171\u0175\u0003].\u0000\u0172\u0174\u0003"+
+		"a0\u0000\u0173\u0172\u0001\u0000\u0000\u0000\u0174\u0177\u0001\u0000\u0000"+
+		"\u0000\u0175\u0173\u0001\u0000\u0000\u0000\u0175\u0176\u0001\u0000\u0000"+
+		"\u0000\u0176d\u0001\u0000\u0000\u0000\u0177\u0175\u0001\u0000\u0000\u0000"+
+		"\u0178\u017a\u0007\u0004\u0000\u0000\u0179\u0178\u0001\u0000\u0000\u0000"+
+		"\u017a\u017b\u0001\u0000\u0000\u0000\u017b\u0179\u0001\u0000\u0000\u0000"+
+		"\u017b\u017c\u0001\u0000\u0000\u0000\u017c\u017d\u0001\u0000\u0000\u0000"+
+		"\u017d\u017e\u00062\u0000\u0000\u017ef\u0001\u0000\u0000\u0000\u017f\u0180"+
+		"\u0005/\u0000\u0000\u0180\u0181\u0005/\u0000\u0000\u0181\u0185\u0001\u0000"+
+		"\u0000\u0000\u0182\u0184\b\u0000\u0000\u0000\u0183\u0182\u0001\u0000\u0000"+
+		"\u0000\u0184\u0187\u0001\u0000\u0000\u0000\u0185\u0183\u0001\u0000\u0000"+
+		"\u0000\u0185\u0186\u0001\u0000\u0000\u0000\u0186\u0188\u0001\u0000\u0000"+
+		"\u0000\u0187\u0185\u0001\u0000\u0000\u0000\u0188\u0189\u00063\u0000\u0000"+
+		"\u0189h\u0001\u0000\u0000\u0000\u018a\u018b\u0005/\u0000\u0000\u018b\u018c"+
+		"\u0005*\u0000\u0000\u018c\u0190\u0001\u0000\u0000\u0000\u018d\u018f\t"+
+		"\u0000\u0000\u0000\u018e\u018d\u0001\u0000\u0000\u0000\u018f\u0192\u0001"+
+		"\u0000\u0000\u0000\u0190\u0191\u0001\u0000\u0000\u0000\u0190\u018e\u0001"+
+		"\u0000\u0000\u0000\u0191\u0193\u0001\u0000\u0000\u0000\u0192\u0190\u0001"+
+		"\u0000\u0000\u0000\u0193\u0194\u0005*\u0000\u0000\u0194\u0195\u0005/\u0000"+
+		"\u0000\u0195\u0196\u0001\u0000\u0000\u0000\u0196\u0197\u00064\u0000\u0000"+
+		"\u0197j\u0001\u0000\u0000\u0000\u000f\u0000\u00af\u00db\u00df\u00e7\u00eb"+
+		"\u014b\u0151\u0156\u0161\u016f\u0175\u017b\u0185\u0190\u0001\u0006\u0000"+
+		"\u0000";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/parser/generated/SimpleJavaLexer.tokens b/src/main/java/parser/generated/SimpleJavaLexer.tokens
index fa21229..bed7437 100644
--- a/src/main/java/parser/generated/SimpleJavaLexer.tokens
+++ b/src/main/java/parser/generated/SimpleJavaLexer.tokens
@@ -1,73 +1,88 @@
 T__0=1
 T__1=2
-T__2=3
-T__3=4
-T__4=5
-T__5=6
-T__6=7
-T__7=8
-T__8=9
-T__9=10
-T__10=11
-T__11=12
-T__12=13
-T__13=14
-T__14=15
-T__15=16
-T__16=17
-T__17=18
-T__18=19
-T__19=20
-T__20=21
-T__21=22
-T__22=23
-T__23=24
-T__24=25
-T__25=26
-T__26=27
-T__27=28
-T__28=29
-T__29=30
-T__30=31
-T__31=32
-T__32=33
-T__33=34
-T__34=35
-INTEGERLITERAL=36
-IDENTIFIER=37
-WS=38
-'class'=1
-'{'=2
-'}'=3
-';'=4
-'static'=5
-'('=6
-')'=7
-','=8
-'int'=9
-'boolean'=10
-'char'=11
-'public'=12
-'private'=13
-'='=14
-'if'=15
-'else'=16
-'while'=17
-'return'=18
-'&&'=19
-'||'=20
-'=='=21
-'!='=22
-'<'=23
-'<='=24
-'>'=25
-'>='=26
-'+'=27
-'-'=28
-'*'=29
-'/'=30
-'%'=31
-'!'=32
-'true'=33
-'false'=34
-'\''=35
+Void=3
+Boolean=4
+Char=5
+Int=6
+AccessModifier=7
+MainMethodDeclaration=8
+DotOperator=9
+LineOperator=10
+ComparisonOperator=11
+LogicalOperator=12
+Assign=13
+Plus=14
+Minus=15
+Mult=16
+Modulo=17
+Div=18
+Greater=19
+Less=20
+GreaterEqual=21
+LessEqual=22
+Equal=23
+NotEqual=24
+Not=25
+And=26
+Or=27
+Dot=28
+OpenRoundBracket=29
+ClosedRoundBracket=30
+OpenCurlyBracket=31
+ClosedCurlyBracket=32
+Semicolon=33
+Comma=34
+Class=35
+This=36
+While=37
+If=38
+Else=39
+For=40
+Return=41
+New=42
+CharValue=43
+IntValue=44
+BooleanValue=45
+NullValue=46
+Identifier=47
+WS=48
+InlineComment=49
+MultilineComment=50
+'++'=1
+'--'=2
+'void'=3
+'boolean'=4
+'char'=5
+'int'=6
+'public static void main(String[] args)'=8
+'='=13
+'+'=14
+'-'=15
+'*'=16
+'%'=17
+'/'=18
+'>'=19
+'<'=20
+'>='=21
+'<='=22
+'=='=23
+'!='=24
+'!'=25
+'&&'=26
+'||'=27
+'.'=28
+'('=29
+')'=30
+'{'=31
+'}'=32
+';'=33
+','=34
+'class'=35
+'this'=36
+'while'=37
+'if'=38
+'else'=39
+'for'=40
+'return'=41
+'new'=42
+'null'=46
diff --git a/src/main/java/parser/generated/SimpleJavaListener.java b/src/main/java/parser/generated/SimpleJavaListener.java
index 6debbf6..7b22466 100644
--- a/src/main/java/parser/generated/SimpleJavaListener.java
+++ b/src/main/java/parser/generated/SimpleJavaListener.java
@@ -1,4 +1,4 @@
-// Generated from C:/Users/Johannes/Documents/Github/JavaCompiler/src/main/java/parser/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
@@ -37,6 +37,16 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitMemberDeclaration(SimpleJavaParser.MemberDeclarationContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#constructorDeclaration}.
+	 * @param ctx the parse tree
+	 */
+	void enterConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#constructorDeclaration}.
+	 * @param ctx the parse tree
+	 */
+	void exitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#fieldDeclaration}.
 	 * @param ctx the parse tree
@@ -57,16 +67,6 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#constructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#constructorDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#parameterList}.
 	 * @param ctx the parse tree
@@ -88,25 +88,15 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 */
 	void exitParameter(SimpleJavaParser.ParameterContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#type}.
+	 * Enter a parse tree produced by {@link SimpleJavaParser#argumentList}.
 	 * @param ctx the parse tree
 	 */
-	void enterType(SimpleJavaParser.TypeContext ctx);
+	void enterArgumentList(SimpleJavaParser.ArgumentListContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#type}.
+	 * Exit a parse tree produced by {@link SimpleJavaParser#argumentList}.
 	 * @param ctx the parse tree
 	 */
-	void exitType(SimpleJavaParser.TypeContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#accessType}.
-	 * @param ctx the parse tree
-	 */
-	void enterAccessType(SimpleJavaParser.AccessTypeContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#accessType}.
-	 * @param ctx the parse tree
-	 */
-	void exitAccessType(SimpleJavaParser.AccessTypeContext ctx);
+	void exitArgumentList(SimpleJavaParser.ArgumentListContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#statement}.
 	 * @param ctx the parse tree
@@ -118,55 +108,15 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 */
 	void exitStatement(SimpleJavaParser.StatementContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#variableDeclarationStatement}.
+	 * Enter a parse tree produced by {@link SimpleJavaParser#block}.
 	 * @param ctx the parse tree
 	 */
-	void enterVariableDeclarationStatement(SimpleJavaParser.VariableDeclarationStatementContext ctx);
+	void enterBlock(SimpleJavaParser.BlockContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#variableDeclarationStatement}.
+	 * Exit a parse tree produced by {@link SimpleJavaParser#block}.
 	 * @param ctx the parse tree
 	 */
-	void exitVariableDeclarationStatement(SimpleJavaParser.VariableDeclarationStatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#assignmentStatement}.
-	 * @param ctx the parse tree
-	 */
-	void enterAssignmentStatement(SimpleJavaParser.AssignmentStatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#assignmentStatement}.
-	 * @param ctx the parse tree
-	 */
-	void exitAssignmentStatement(SimpleJavaParser.AssignmentStatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#var}.
-	 * @param ctx the parse tree
-	 */
-	void enterVar(SimpleJavaParser.VarContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#var}.
-	 * @param ctx the parse tree
-	 */
-	void exitVar(SimpleJavaParser.VarContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#ifStatement}.
-	 * @param ctx the parse tree
-	 */
-	void enterIfStatement(SimpleJavaParser.IfStatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#ifStatement}.
-	 * @param ctx the parse tree
-	 */
-	void exitIfStatement(SimpleJavaParser.IfStatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#whileStatement}.
-	 * @param ctx the parse tree
-	 */
-	void enterWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#whileStatement}.
-	 * @param ctx the parse tree
-	 */
-	void exitWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
+	void exitBlock(SimpleJavaParser.BlockContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#returnStatement}.
 	 * @param ctx the parse tree
@@ -178,15 +128,95 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 */
 	void exitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#block}.
+	 * Enter a parse tree produced by {@link SimpleJavaParser#localVariableDeclaration}.
 	 * @param ctx the parse tree
 	 */
-	void enterBlock(SimpleJavaParser.BlockContext ctx);
+	void enterLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#block}.
+	 * Exit a parse tree produced by {@link SimpleJavaParser#localVariableDeclaration}.
 	 * @param ctx the parse tree
 	 */
-	void exitBlock(SimpleJavaParser.BlockContext ctx);
+	void exitLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#whileStatement}.
+	 * @param ctx the parse tree
+	 */
+	void enterWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#whileStatement}.
+	 * @param ctx the parse tree
+	 */
+	void exitWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#forStatement}.
+	 * @param ctx the parse tree
+	 */
+	void enterForStatement(SimpleJavaParser.ForStatementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#forStatement}.
+	 * @param ctx the parse tree
+	 */
+	void exitForStatement(SimpleJavaParser.ForStatementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#ifElseStatement}.
+	 * @param ctx the parse tree
+	 */
+	void enterIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#ifElseStatement}.
+	 * @param ctx the parse tree
+	 */
+	void exitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#ifStatement}.
+	 * @param ctx the parse tree
+	 */
+	void enterIfStatement(SimpleJavaParser.IfStatementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#ifStatement}.
+	 * @param ctx the parse tree
+	 */
+	void exitIfStatement(SimpleJavaParser.IfStatementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#elseStatement}.
+	 * @param ctx the parse tree
+	 */
+	void enterElseStatement(SimpleJavaParser.ElseStatementContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#elseStatement}.
+	 * @param ctx the parse tree
+	 */
+	void exitElseStatement(SimpleJavaParser.ElseStatementContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#statementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterStatementExpression(SimpleJavaParser.StatementExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#statementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitStatementExpression(SimpleJavaParser.StatementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#assign}.
+	 * @param ctx the parse tree
+	 */
+	void enterAssign(SimpleJavaParser.AssignContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#assign}.
+	 * @param ctx the parse tree
+	 */
+	void exitAssign(SimpleJavaParser.AssignContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#newDeclaration}.
+	 * @param ctx the parse tree
+	 */
+	void enterNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#newDeclaration}.
+	 * @param ctx the parse tree
+	 */
+	void exitNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#expression}.
 	 * @param ctx the parse tree
@@ -198,33 +228,223 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 */
 	void exitExpression(SimpleJavaParser.ExpressionContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#literal}.
+	 * Enter a parse tree produced by {@link SimpleJavaParser#unaryExpression}.
 	 * @param ctx the parse tree
 	 */
-	void enterLiteral(SimpleJavaParser.LiteralContext ctx);
+	void enterUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#literal}.
+	 * Exit a parse tree produced by {@link SimpleJavaParser#unaryExpression}.
 	 * @param ctx the parse tree
 	 */
-	void exitLiteral(SimpleJavaParser.LiteralContext ctx);
+	void exitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#booleanLiteral}.
+	 * Enter a parse tree produced by {@link SimpleJavaParser#notExpression}.
 	 * @param ctx the parse tree
 	 */
-	void enterBooleanLiteral(SimpleJavaParser.BooleanLiteralContext ctx);
+	void enterNotExpression(SimpleJavaParser.NotExpressionContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#booleanLiteral}.
+	 * Exit a parse tree produced by {@link SimpleJavaParser#notExpression}.
 	 * @param ctx the parse tree
 	 */
-	void exitBooleanLiteral(SimpleJavaParser.BooleanLiteralContext ctx);
+	void exitNotExpression(SimpleJavaParser.NotExpressionContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#charLiteral}.
+	 * Enter a parse tree produced by {@link SimpleJavaParser#crementExpression}.
 	 * @param ctx the parse tree
 	 */
-	void enterCharLiteral(SimpleJavaParser.CharLiteralContext ctx);
+	void enterCrementExpression(SimpleJavaParser.CrementExpressionContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#charLiteral}.
+	 * Exit a parse tree produced by {@link SimpleJavaParser#crementExpression}.
 	 * @param ctx the parse tree
 	 */
-	void exitCharLiteral(SimpleJavaParser.CharLiteralContext ctx);
+	void exitCrementExpression(SimpleJavaParser.CrementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#incrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#incrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#prefixIncrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#prefixIncrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#suffixIncrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#suffixIncrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#decrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#decrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#prefixDecrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#prefixDecrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#suffixDecrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#suffixDecrementExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#assignableExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#assignableExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#memberAccess}.
+	 * @param ctx the parse tree
+	 */
+	void enterMemberAccess(SimpleJavaParser.MemberAccessContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#memberAccess}.
+	 * @param ctx the parse tree
+	 */
+	void exitMemberAccess(SimpleJavaParser.MemberAccessContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#binaryExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#binaryExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#calculationExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#calculationExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#dotExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterDotExpression(SimpleJavaParser.DotExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#dotExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitDotExpression(SimpleJavaParser.DotExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#dotSubtractionExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#dotSubtractionExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#nonCalculationExpression}.
+	 * @param ctx the parse tree
+	 */
+	void enterNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#nonCalculationExpression}.
+	 * @param ctx the parse tree
+	 */
+	void exitNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#methodCall}.
+	 * @param ctx the parse tree
+	 */
+	void enterMethodCall(SimpleJavaParser.MethodCallContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#methodCall}.
+	 * @param ctx the parse tree
+	 */
+	void exitMethodCall(SimpleJavaParser.MethodCallContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#target}.
+	 * @param ctx the parse tree
+	 */
+	void enterTarget(SimpleJavaParser.TargetContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#target}.
+	 * @param ctx the parse tree
+	 */
+	void exitTarget(SimpleJavaParser.TargetContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#chainedMethod}.
+	 * @param ctx the parse tree
+	 */
+	void enterChainedMethod(SimpleJavaParser.ChainedMethodContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#chainedMethod}.
+	 * @param ctx the parse tree
+	 */
+	void exitChainedMethod(SimpleJavaParser.ChainedMethodContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#type}.
+	 * @param ctx the parse tree
+	 */
+	void enterType(SimpleJavaParser.TypeContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#type}.
+	 * @param ctx the parse tree
+	 */
+	void exitType(SimpleJavaParser.TypeContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#value}.
+	 * @param ctx the parse tree
+	 */
+	void enterValue(SimpleJavaParser.ValueContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#value}.
+	 * @param ctx the parse tree
+	 */
+	void exitValue(SimpleJavaParser.ValueContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link SimpleJavaParser#nonCalculationOperator}.
+	 * @param ctx the parse tree
+	 */
+	void enterNonCalculationOperator(SimpleJavaParser.NonCalculationOperatorContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link SimpleJavaParser#nonCalculationOperator}.
+	 * @param ctx the parse tree
+	 */
+	void exitNonCalculationOperator(SimpleJavaParser.NonCalculationOperatorContext ctx);
 }
\ No newline at end of file
diff --git a/src/main/java/parser/generated/SimpleJavaParser.java b/src/main/java/parser/generated/SimpleJavaParser.java
index 5b14132..3d93b3e 100644
--- a/src/main/java/parser/generated/SimpleJavaParser.java
+++ b/src/main/java/parser/generated/SimpleJavaParser.java
@@ -1,4 +1,4 @@
-// Generated from C:/Users/Johannes/Documents/Github/JavaCompiler/src/main/java/parser/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
@@ -17,47 +17,68 @@ public class SimpleJavaParser extends Parser {
 	protected static final PredictionContextCache _sharedContextCache =
 		new PredictionContextCache();
 	public static final int
-		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
-		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24, 
-		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
-		T__31=32, T__32=33, T__33=34, T__34=35, INTEGERLITERAL=36, IDENTIFIER=37, 
-		WS=38;
+		T__0=1, T__1=2, Void=3, Boolean=4, Char=5, Int=6, AccessModifier=7, MainMethodDeclaration=8, 
+		DotOperator=9, LineOperator=10, ComparisonOperator=11, LogicalOperator=12, 
+		Assign=13, Plus=14, Minus=15, Mult=16, Modulo=17, Div=18, Greater=19, 
+		Less=20, GreaterEqual=21, LessEqual=22, Equal=23, NotEqual=24, Not=25, 
+		And=26, Or=27, Dot=28, OpenRoundBracket=29, ClosedRoundBracket=30, OpenCurlyBracket=31, 
+		ClosedCurlyBracket=32, Semicolon=33, Comma=34, Class=35, This=36, While=37, 
+		If=38, Else=39, For=40, Return=41, New=42, CharValue=43, IntValue=44, 
+		BooleanValue=45, NullValue=46, Identifier=47, WS=48, InlineComment=49, 
+		MultilineComment=50;
 	public static final int
 		RULE_program = 0, RULE_classDeclaration = 1, RULE_memberDeclaration = 2, 
-		RULE_fieldDeclaration = 3, RULE_methodDeclaration = 4, RULE_constructorDeclaration = 5, 
-		RULE_parameterList = 6, RULE_parameter = 7, RULE_type = 8, RULE_accessType = 9, 
-		RULE_statement = 10, RULE_variableDeclarationStatement = 11, RULE_assignmentStatement = 12, 
-		RULE_var = 13, RULE_ifStatement = 14, RULE_whileStatement = 15, RULE_returnStatement = 16, 
-		RULE_block = 17, RULE_expression = 18, RULE_literal = 19, RULE_booleanLiteral = 20, 
-		RULE_charLiteral = 21;
+		RULE_constructorDeclaration = 3, RULE_fieldDeclaration = 4, RULE_methodDeclaration = 5, 
+		RULE_parameterList = 6, RULE_parameter = 7, RULE_argumentList = 8, RULE_statement = 9, 
+		RULE_block = 10, RULE_returnStatement = 11, RULE_localVariableDeclaration = 12, 
+		RULE_whileStatement = 13, RULE_forStatement = 14, RULE_ifElseStatement = 15, 
+		RULE_ifStatement = 16, RULE_elseStatement = 17, RULE_statementExpression = 18, 
+		RULE_assign = 19, RULE_newDeclaration = 20, RULE_expression = 21, RULE_unaryExpression = 22, 
+		RULE_notExpression = 23, RULE_crementExpression = 24, RULE_incrementExpression = 25, 
+		RULE_prefixIncrementExpression = 26, RULE_suffixIncrementExpression = 27, 
+		RULE_decrementExpression = 28, RULE_prefixDecrementExpression = 29, RULE_suffixDecrementExpression = 30, 
+		RULE_assignableExpression = 31, RULE_memberAccess = 32, RULE_binaryExpression = 33, 
+		RULE_calculationExpression = 34, RULE_dotExpression = 35, RULE_dotSubtractionExpression = 36, 
+		RULE_nonCalculationExpression = 37, RULE_methodCall = 38, RULE_target = 39, 
+		RULE_chainedMethod = 40, RULE_type = 41, RULE_value = 42, RULE_nonCalculationOperator = 43;
 	private static String[] makeRuleNames() {
 		return new String[] {
-			"program", "classDeclaration", "memberDeclaration", "fieldDeclaration", 
-			"methodDeclaration", "constructorDeclaration", "parameterList", "parameter", 
-			"type", "accessType", "statement", "variableDeclarationStatement", "assignmentStatement", 
-			"var", "ifStatement", "whileStatement", "returnStatement", "block", "expression", 
-			"literal", "booleanLiteral", "charLiteral"
+			"program", "classDeclaration", "memberDeclaration", "constructorDeclaration", 
+			"fieldDeclaration", "methodDeclaration", "parameterList", "parameter", 
+			"argumentList", "statement", "block", "returnStatement", "localVariableDeclaration", 
+			"whileStatement", "forStatement", "ifElseStatement", "ifStatement", "elseStatement", 
+			"statementExpression", "assign", "newDeclaration", "expression", "unaryExpression", 
+			"notExpression", "crementExpression", "incrementExpression", "prefixIncrementExpression", 
+			"suffixIncrementExpression", "decrementExpression", "prefixDecrementExpression", 
+			"suffixDecrementExpression", "assignableExpression", "memberAccess", 
+			"binaryExpression", "calculationExpression", "dotExpression", "dotSubtractionExpression", 
+			"nonCalculationExpression", "methodCall", "target", "chainedMethod", 
+			"type", "value", "nonCalculationOperator"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'class'", "'{'", "'}'", "';'", "'static'", "'('", "')'", "','", 
-			"'int'", "'boolean'", "'char'", "'public'", "'private'", "'='", "'if'", 
-			"'else'", "'while'", "'return'", "'&&'", "'||'", "'=='", "'!='", "'<'", 
-			"'<='", "'>'", "'>='", "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "'true'", 
-			"'false'", "'''"
+			null, "'++'", "'--'", "'void'", "'boolean'", "'char'", "'int'", null, 
+			"'public static void main(String[] args)'", null, null, null, null, "'='", 
+			"'+'", "'-'", "'*'", "'%'", "'/'", "'>'", "'<'", "'>='", "'<='", "'=='", 
+			"'!='", "'!'", "'&&'", "'||'", "'.'", "'('", "')'", "'{'", "'}'", "';'", 
+			"','", "'class'", "'this'", "'while'", "'if'", "'else'", "'for'", "'return'", 
+			"'new'", null, null, null, "'null'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
 	private static String[] makeSymbolicNames() {
 		return new String[] {
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			"INTEGERLITERAL", "IDENTIFIER", "WS"
+			null, null, null, "Void", "Boolean", "Char", "Int", "AccessModifier", 
+			"MainMethodDeclaration", "DotOperator", "LineOperator", "ComparisonOperator", 
+			"LogicalOperator", "Assign", "Plus", "Minus", "Mult", "Modulo", "Div", 
+			"Greater", "Less", "GreaterEqual", "LessEqual", "Equal", "NotEqual", 
+			"Not", "And", "Or", "Dot", "OpenRoundBracket", "ClosedRoundBracket", 
+			"OpenCurlyBracket", "ClosedCurlyBracket", "Semicolon", "Comma", "Class", 
+			"This", "While", "If", "Else", "For", "Return", "New", "CharValue", "IntValue", 
+			"BooleanValue", "NullValue", "Identifier", "WS", "InlineComment", "MultilineComment"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -145,20 +166,20 @@ public class SimpleJavaParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(45); 
+			setState(89); 
 			_errHandler.sync(this);
 			_la = _input.LA(1);
 			do {
 				{
 				{
-				setState(44);
+				setState(88);
 				classDeclaration();
 				}
 				}
-				setState(47); 
+				setState(91); 
 				_errHandler.sync(this);
 				_la = _input.LA(1);
-			} while ( _la==T__11 || _la==T__12 );
+			} while ( _la==AccessModifier || _la==Class );
 			}
 		}
 		catch (RecognitionException re) {
@@ -174,10 +195,11 @@ public class SimpleJavaParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class ClassDeclarationContext extends ParserRuleContext {
-		public AccessTypeContext accessType() {
-			return getRuleContext(AccessTypeContext.class,0);
-		}
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
+		public TerminalNode Class() { return getToken(SimpleJavaParser.Class, 0); }
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode OpenCurlyBracket() { return getToken(SimpleJavaParser.OpenCurlyBracket, 0); }
+		public TerminalNode ClosedCurlyBracket() { return getToken(SimpleJavaParser.ClosedCurlyBracket, 0); }
+		public TerminalNode AccessModifier() { return getToken(SimpleJavaParser.AccessModifier, 0); }
 		public List<MemberDeclarationContext> memberDeclaration() {
 			return getRuleContexts(MemberDeclarationContext.class);
 		}
@@ -210,30 +232,38 @@ public class SimpleJavaParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(49);
-			accessType();
-			setState(50);
-			match(T__0);
-			setState(51);
-			match(IDENTIFIER);
-			setState(52);
-			match(T__1);
-			setState(56);
+			setState(94);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while (_la==T__11 || _la==T__12) {
+			if (_la==AccessModifier) {
+				{
+				setState(93);
+				match(AccessModifier);
+				}
+			}
+
+			setState(96);
+			match(Class);
+			setState(97);
+			match(Identifier);
+			setState(98);
+			match(OpenCurlyBracket);
+			setState(102);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 140737488355832L) != 0)) {
 				{
 				{
-				setState(53);
+				setState(99);
 				memberDeclaration();
 				}
 				}
-				setState(58);
+				setState(104);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(59);
-			match(T__2);
+			setState(105);
+			match(ClosedCurlyBracket);
 			}
 		}
 		catch (RecognitionException re) {
@@ -249,15 +279,15 @@ public class SimpleJavaParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class MemberDeclarationContext extends ParserRuleContext {
+		public ConstructorDeclarationContext constructorDeclaration() {
+			return getRuleContext(ConstructorDeclarationContext.class,0);
+		}
 		public FieldDeclarationContext fieldDeclaration() {
 			return getRuleContext(FieldDeclarationContext.class,0);
 		}
 		public MethodDeclarationContext methodDeclaration() {
 			return getRuleContext(MethodDeclarationContext.class,0);
 		}
-		public ConstructorDeclarationContext constructorDeclaration() {
-			return getRuleContext(ConstructorDeclarationContext.class,0);
-		}
 		public MemberDeclarationContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -281,28 +311,28 @@ public class SimpleJavaParser extends Parser {
 		MemberDeclarationContext _localctx = new MemberDeclarationContext(_ctx, getState());
 		enterRule(_localctx, 4, RULE_memberDeclaration);
 		try {
-			setState(64);
+			setState(110);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,2,_ctx) ) {
+			switch ( getInterpreter().adaptivePredict(_input,3,_ctx) ) {
 			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(61);
-				fieldDeclaration();
+				setState(107);
+				constructorDeclaration();
 				}
 				break;
 			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(62);
-				methodDeclaration();
+				setState(108);
+				fieldDeclaration();
 				}
 				break;
 			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(63);
-				constructorDeclaration();
+				setState(109);
+				methodDeclaration();
 				}
 				break;
 			}
@@ -318,173 +348,18 @@ public class SimpleJavaParser extends Parser {
 		return _localctx;
 	}
 
-	@SuppressWarnings("CheckReturnValue")
-	public static class FieldDeclarationContext extends ParserRuleContext {
-		public AccessTypeContext accessType() {
-			return getRuleContext(AccessTypeContext.class,0);
-		}
-		public TypeContext type() {
-			return getRuleContext(TypeContext.class,0);
-		}
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
-		public FieldDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_fieldDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterFieldDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitFieldDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitFieldDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final FieldDeclarationContext fieldDeclaration() throws RecognitionException {
-		FieldDeclarationContext _localctx = new FieldDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 6, RULE_fieldDeclaration);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(66);
-			accessType();
-			setState(67);
-			type();
-			setState(68);
-			match(IDENTIFIER);
-			setState(69);
-			match(T__3);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class MethodDeclarationContext extends ParserRuleContext {
-		public AccessTypeContext accessType() {
-			return getRuleContext(AccessTypeContext.class,0);
-		}
-		public TypeContext type() {
-			return getRuleContext(TypeContext.class,0);
-		}
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
-		public ParameterListContext parameterList() {
-			return getRuleContext(ParameterListContext.class,0);
-		}
-		public List<StatementContext> statement() {
-			return getRuleContexts(StatementContext.class);
-		}
-		public StatementContext statement(int i) {
-			return getRuleContext(StatementContext.class,i);
-		}
-		public MethodDeclarationContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_methodDeclaration; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterMethodDeclaration(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitMethodDeclaration(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitMethodDeclaration(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final MethodDeclarationContext methodDeclaration() throws RecognitionException {
-		MethodDeclarationContext _localctx = new MethodDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 8, RULE_methodDeclaration);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(71);
-			accessType();
-			setState(72);
-			match(T__4);
-			setState(73);
-			type();
-			setState(74);
-			match(IDENTIFIER);
-			setState(75);
-			match(T__5);
-			setState(77);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 3584L) != 0)) {
-				{
-				setState(76);
-				parameterList();
-				}
-			}
-
-			setState(79);
-			match(T__6);
-			setState(80);
-			match(T__1);
-			setState(84);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 137439383044L) != 0)) {
-				{
-				{
-				setState(81);
-				statement();
-				}
-				}
-				setState(86);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-			}
-			setState(87);
-			match(T__2);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
 	@SuppressWarnings("CheckReturnValue")
 	public static class ConstructorDeclarationContext extends ParserRuleContext {
-		public AccessTypeContext accessType() {
-			return getRuleContext(AccessTypeContext.class,0);
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public BlockContext block() {
+			return getRuleContext(BlockContext.class,0);
 		}
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
+		public TerminalNode AccessModifier() { return getToken(SimpleJavaParser.AccessModifier, 0); }
 		public ParameterListContext parameterList() {
 			return getRuleContext(ParameterListContext.class,0);
 		}
-		public List<StatementContext> statement() {
-			return getRuleContexts(StatementContext.class);
-		}
-		public StatementContext statement(int i) {
-			return getRuleContext(StatementContext.class,i);
-		}
 		public ConstructorDeclarationContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -506,47 +381,229 @@ public class SimpleJavaParser extends Parser {
 
 	public final ConstructorDeclarationContext constructorDeclaration() throws RecognitionException {
 		ConstructorDeclarationContext _localctx = new ConstructorDeclarationContext(_ctx, getState());
-		enterRule(_localctx, 10, RULE_constructorDeclaration);
+		enterRule(_localctx, 6, RULE_constructorDeclaration);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(89);
-			accessType();
-			setState(90);
-			match(IDENTIFIER);
-			setState(91);
-			match(T__5);
-			setState(93);
+			setState(113);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 3584L) != 0)) {
+			if (_la==AccessModifier) {
 				{
-				setState(92);
+				setState(112);
+				match(AccessModifier);
+				}
+			}
+
+			setState(115);
+			match(Identifier);
+			setState(116);
+			match(OpenRoundBracket);
+			setState(118);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 140737488355440L) != 0)) {
+				{
+				setState(117);
 				parameterList();
 				}
 			}
 
-			setState(95);
-			match(T__6);
-			setState(96);
-			match(T__1);
-			setState(100);
+			setState(120);
+			match(ClosedRoundBracket);
+			setState(121);
+			block();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class FieldDeclarationContext extends ParserRuleContext {
+		public TypeContext type() {
+			return getRuleContext(TypeContext.class,0);
+		}
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode Semicolon() { return getToken(SimpleJavaParser.Semicolon, 0); }
+		public TerminalNode AccessModifier() { return getToken(SimpleJavaParser.AccessModifier, 0); }
+		public FieldDeclarationContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_fieldDeclaration; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterFieldDeclaration(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitFieldDeclaration(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitFieldDeclaration(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final FieldDeclarationContext fieldDeclaration() throws RecognitionException {
+		FieldDeclarationContext _localctx = new FieldDeclarationContext(_ctx, getState());
+		enterRule(_localctx, 8, RULE_fieldDeclaration);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(124);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 137439383044L) != 0)) {
+			if (_la==AccessModifier) {
 				{
+				setState(123);
+				match(AccessModifier);
+				}
+			}
+
+			setState(126);
+			type();
+			setState(127);
+			match(Identifier);
+			setState(128);
+			match(Semicolon);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class MethodDeclarationContext extends ParserRuleContext {
+		public TerminalNode MainMethodDeclaration() { return getToken(SimpleJavaParser.MainMethodDeclaration, 0); }
+		public BlockContext block() {
+			return getRuleContext(BlockContext.class,0);
+		}
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public TypeContext type() {
+			return getRuleContext(TypeContext.class,0);
+		}
+		public TerminalNode Void() { return getToken(SimpleJavaParser.Void, 0); }
+		public TerminalNode AccessModifier() { return getToken(SimpleJavaParser.AccessModifier, 0); }
+		public ParameterListContext parameterList() {
+			return getRuleContext(ParameterListContext.class,0);
+		}
+		public MethodDeclarationContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_methodDeclaration; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterMethodDeclaration(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitMethodDeclaration(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitMethodDeclaration(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final MethodDeclarationContext methodDeclaration() throws RecognitionException {
+		MethodDeclarationContext _localctx = new MethodDeclarationContext(_ctx, getState());
+		enterRule(_localctx, 10, RULE_methodDeclaration);
+		int _la;
+		try {
+			setState(146);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case MainMethodDeclaration:
+				enterOuterAlt(_localctx, 1);
 				{
-				setState(97);
-				statement();
+				setState(130);
+				match(MainMethodDeclaration);
+				setState(131);
+				block();
 				}
-				}
-				setState(102);
+				break;
+			case Void:
+			case Boolean:
+			case Char:
+			case Int:
+			case AccessModifier:
+			case Identifier:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(133);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
-			}
-			setState(103);
-			match(T__2);
+				if (_la==AccessModifier) {
+					{
+					setState(132);
+					match(AccessModifier);
+					}
+				}
+
+				setState(137);
+				_errHandler.sync(this);
+				switch (_input.LA(1)) {
+				case Boolean:
+				case Char:
+				case Int:
+				case Identifier:
+					{
+					setState(135);
+					type();
+					}
+					break;
+				case Void:
+					{
+					setState(136);
+					match(Void);
+					}
+					break;
+				default:
+					throw new NoViableAltException(this);
+				}
+				setState(139);
+				match(Identifier);
+				setState(140);
+				match(OpenRoundBracket);
+				setState(142);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+				if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 140737488355440L) != 0)) {
+					{
+					setState(141);
+					parameterList();
+					}
+				}
+
+				setState(144);
+				match(ClosedRoundBracket);
+				setState(145);
+				block();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
 			}
 		}
 		catch (RecognitionException re) {
@@ -568,6 +625,10 @@ public class SimpleJavaParser extends Parser {
 		public ParameterContext parameter(int i) {
 			return getRuleContext(ParameterContext.class,i);
 		}
+		public List<TerminalNode> Comma() { return getTokens(SimpleJavaParser.Comma); }
+		public TerminalNode Comma(int i) {
+			return getToken(SimpleJavaParser.Comma, i);
+		}
 		public ParameterListContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -594,21 +655,21 @@ public class SimpleJavaParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(105);
+			setState(148);
 			parameter();
-			setState(110);
+			setState(153);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while (_la==T__7) {
+			while (_la==Comma) {
 				{
 				{
-				setState(106);
-				match(T__7);
-				setState(107);
+				setState(149);
+				match(Comma);
+				setState(150);
 				parameter();
 				}
 				}
-				setState(112);
+				setState(155);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
@@ -630,7 +691,7 @@ public class SimpleJavaParser extends Parser {
 		public TypeContext type() {
 			return getRuleContext(TypeContext.class,0);
 		}
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
 		public ParameterContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -656,10 +717,10 @@ public class SimpleJavaParser extends Parser {
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(113);
+			setState(156);
 			type();
-			setState(114);
-			match(IDENTIFIER);
+			setState(157);
+			match(Identifier);
 			}
 		}
 		catch (RecognitionException re) {
@@ -674,94 +735,69 @@ public class SimpleJavaParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class TypeContext extends ParserRuleContext {
-		public TypeContext(ParserRuleContext parent, int invokingState) {
+	public static class ArgumentListContext extends ParserRuleContext {
+		public List<ExpressionContext> expression() {
+			return getRuleContexts(ExpressionContext.class);
+		}
+		public ExpressionContext expression(int i) {
+			return getRuleContext(ExpressionContext.class,i);
+		}
+		public List<TerminalNode> Comma() { return getTokens(SimpleJavaParser.Comma); }
+		public TerminalNode Comma(int i) {
+			return getToken(SimpleJavaParser.Comma, i);
+		}
+		public ArgumentListContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_type; }
+		@Override public int getRuleIndex() { return RULE_argumentList; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterType(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterArgumentList(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitType(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitArgumentList(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitType(this);
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitArgumentList(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final TypeContext type() throws RecognitionException {
-		TypeContext _localctx = new TypeContext(_ctx, getState());
-		enterRule(_localctx, 16, RULE_type);
+	public final ArgumentListContext argumentList() throws RecognitionException {
+		ArgumentListContext _localctx = new ArgumentListContext(_ctx, getState());
+		enterRule(_localctx, 16, RULE_argumentList);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(116);
+			setState(167);
+			_errHandler.sync(this);
 			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 3584L) != 0)) ) {
-			_errHandler.recoverInline(this);
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 277146220101638L) != 0)) {
+				{
+				setState(159);
+				expression();
+				setState(164);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+				while (_la==Comma) {
+					{
+					{
+					setState(160);
+					match(Comma);
+					setState(161);
+					expression();
+					}
+					}
+					setState(166);
+					_errHandler.sync(this);
+					_la = _input.LA(1);
+				}
+				}
 			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
 
-	@SuppressWarnings("CheckReturnValue")
-	public static class AccessTypeContext extends ParserRuleContext {
-		public AccessTypeContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_accessType; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterAccessType(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitAccessType(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitAccessType(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AccessTypeContext accessType() throws RecognitionException {
-		AccessTypeContext _localctx = new AccessTypeContext(_ctx, getState());
-		enterRule(_localctx, 18, RULE_accessType);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(118);
-			_la = _input.LA(1);
-			if ( !(_la==T__11 || _la==T__12) ) {
-			_errHandler.recoverInline(this);
-			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
 			}
 		}
 		catch (RecognitionException re) {
@@ -777,23 +813,27 @@ public class SimpleJavaParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class StatementContext extends ParserRuleContext {
-		public VariableDeclarationStatementContext variableDeclarationStatement() {
-			return getRuleContext(VariableDeclarationStatementContext.class,0);
+		public ReturnStatementContext returnStatement() {
+			return getRuleContext(ReturnStatementContext.class,0);
 		}
-		public AssignmentStatementContext assignmentStatement() {
-			return getRuleContext(AssignmentStatementContext.class,0);
+		public TerminalNode Semicolon() { return getToken(SimpleJavaParser.Semicolon, 0); }
+		public LocalVariableDeclarationContext localVariableDeclaration() {
+			return getRuleContext(LocalVariableDeclarationContext.class,0);
 		}
-		public IfStatementContext ifStatement() {
-			return getRuleContext(IfStatementContext.class,0);
+		public BlockContext block() {
+			return getRuleContext(BlockContext.class,0);
 		}
 		public WhileStatementContext whileStatement() {
 			return getRuleContext(WhileStatementContext.class,0);
 		}
-		public ReturnStatementContext returnStatement() {
-			return getRuleContext(ReturnStatementContext.class,0);
+		public ForStatementContext forStatement() {
+			return getRuleContext(ForStatementContext.class,0);
 		}
-		public BlockContext block() {
-			return getRuleContext(BlockContext.class,0);
+		public IfElseStatementContext ifElseStatement() {
+			return getRuleContext(IfElseStatementContext.class,0);
+		}
+		public StatementExpressionContext statementExpression() {
+			return getRuleContext(StatementExpressionContext.class,0);
 		}
 		public StatementContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
@@ -816,405 +856,66 @@ public class SimpleJavaParser extends Parser {
 
 	public final StatementContext statement() throws RecognitionException {
 		StatementContext _localctx = new StatementContext(_ctx, getState());
-		enterRule(_localctx, 20, RULE_statement);
+		enterRule(_localctx, 18, RULE_statement);
 		try {
-			setState(126);
+			setState(182);
 			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case T__8:
-			case T__9:
-			case T__10:
+			switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
+			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(120);
-				variableDeclarationStatement();
+				setState(169);
+				returnStatement();
+				setState(170);
+				match(Semicolon);
 				}
 				break;
-			case IDENTIFIER:
+			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(121);
-				assignmentStatement();
+				setState(172);
+				localVariableDeclaration();
+				setState(173);
+				match(Semicolon);
 				}
 				break;
-			case T__14:
+			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(122);
-				ifStatement();
-				}
-				break;
-			case T__16:
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(123);
-				whileStatement();
-				}
-				break;
-			case T__17:
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(124);
-				returnStatement();
-				}
-				break;
-			case T__1:
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(125);
+				setState(175);
 				block();
 				}
 				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class VariableDeclarationStatementContext extends ParserRuleContext {
-		public TypeContext type() {
-			return getRuleContext(TypeContext.class,0);
-		}
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public VariableDeclarationStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_variableDeclarationStatement; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterVariableDeclarationStatement(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitVariableDeclarationStatement(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitVariableDeclarationStatement(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final VariableDeclarationStatementContext variableDeclarationStatement() throws RecognitionException {
-		VariableDeclarationStatementContext _localctx = new VariableDeclarationStatementContext(_ctx, getState());
-		enterRule(_localctx, 22, RULE_variableDeclarationStatement);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(128);
-			type();
-			setState(129);
-			match(IDENTIFIER);
-			setState(132);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==T__13) {
+			case 4:
+				enterOuterAlt(_localctx, 4);
 				{
-				setState(130);
-				match(T__13);
-				setState(131);
-				expression(0);
-				}
-			}
-
-			setState(134);
-			match(T__3);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class AssignmentStatementContext extends ParserRuleContext {
-		public VarContext var() {
-			return getRuleContext(VarContext.class,0);
-		}
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public AssignmentStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_assignmentStatement; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterAssignmentStatement(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitAssignmentStatement(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitAssignmentStatement(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final AssignmentStatementContext assignmentStatement() throws RecognitionException {
-		AssignmentStatementContext _localctx = new AssignmentStatementContext(_ctx, getState());
-		enterRule(_localctx, 24, RULE_assignmentStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(136);
-			var();
-			setState(137);
-			match(T__13);
-			setState(138);
-			expression(0);
-			setState(139);
-			match(T__3);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class VarContext extends ParserRuleContext {
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
-		public VarContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_var; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterVar(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitVar(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitVar(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final VarContext var() throws RecognitionException {
-		VarContext _localctx = new VarContext(_ctx, getState());
-		enterRule(_localctx, 26, RULE_var);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(141);
-			match(IDENTIFIER);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class IfStatementContext extends ParserRuleContext {
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public List<StatementContext> statement() {
-			return getRuleContexts(StatementContext.class);
-		}
-		public StatementContext statement(int i) {
-			return getRuleContext(StatementContext.class,i);
-		}
-		public IfStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_ifStatement; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterIfStatement(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitIfStatement(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitIfStatement(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final IfStatementContext ifStatement() throws RecognitionException {
-		IfStatementContext _localctx = new IfStatementContext(_ctx, getState());
-		enterRule(_localctx, 28, RULE_ifStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(143);
-			match(T__14);
-			setState(144);
-			match(T__5);
-			setState(145);
-			expression(0);
-			setState(146);
-			match(T__6);
-			setState(147);
-			statement();
-			setState(150);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,10,_ctx) ) {
-			case 1:
-				{
-				setState(148);
-				match(T__15);
-				setState(149);
-				statement();
+				setState(176);
+				whileStatement();
 				}
 				break;
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class WhileStatementContext extends ParserRuleContext {
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public StatementContext statement() {
-			return getRuleContext(StatementContext.class,0);
-		}
-		public WhileStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_whileStatement; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterWhileStatement(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitWhileStatement(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitWhileStatement(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final WhileStatementContext whileStatement() throws RecognitionException {
-		WhileStatementContext _localctx = new WhileStatementContext(_ctx, getState());
-		enterRule(_localctx, 30, RULE_whileStatement);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(152);
-			match(T__16);
-			setState(153);
-			match(T__5);
-			setState(154);
-			expression(0);
-			setState(155);
-			match(T__6);
-			setState(156);
-			statement();
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ReturnStatementContext extends ParserRuleContext {
-		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
-		}
-		public ReturnStatementContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_returnStatement; }
-		@Override
-		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterReturnStatement(this);
-		}
-		@Override
-		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitReturnStatement(this);
-		}
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitReturnStatement(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ReturnStatementContext returnStatement() throws RecognitionException {
-		ReturnStatementContext _localctx = new ReturnStatementContext(_ctx, getState());
-		enterRule(_localctx, 32, RULE_returnStatement);
-		int _la;
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(158);
-			match(T__17);
-			setState(160);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 270851375168L) != 0)) {
+			case 5:
+				enterOuterAlt(_localctx, 5);
 				{
-				setState(159);
-				expression(0);
+				setState(177);
+				forStatement();
 				}
-			}
-
-			setState(162);
-			match(T__3);
+				break;
+			case 6:
+				enterOuterAlt(_localctx, 6);
+				{
+				setState(178);
+				ifElseStatement();
+				}
+				break;
+			case 7:
+				enterOuterAlt(_localctx, 7);
+				{
+				setState(179);
+				statementExpression();
+				setState(180);
+				match(Semicolon);
+				}
+				break;
 			}
 		}
 		catch (RecognitionException re) {
@@ -1230,6 +931,8 @@ public class SimpleJavaParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class BlockContext extends ParserRuleContext {
+		public TerminalNode OpenCurlyBracket() { return getToken(SimpleJavaParser.OpenCurlyBracket, 0); }
+		public TerminalNode ClosedCurlyBracket() { return getToken(SimpleJavaParser.ClosedCurlyBracket, 0); }
 		public List<StatementContext> statement() {
 			return getRuleContexts(StatementContext.class);
 		}
@@ -1257,29 +960,677 @@ public class SimpleJavaParser extends Parser {
 
 	public final BlockContext block() throws RecognitionException {
 		BlockContext _localctx = new BlockContext(_ctx, getState());
-		enterRule(_localctx, 34, RULE_block);
+		enterRule(_localctx, 20, RULE_block);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(164);
-			match(T__1);
-			setState(168);
+			setState(184);
+			match(OpenCurlyBracket);
+			setState(188);
 			_errHandler.sync(this);
 			_la = _input.LA(1);
-			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 137439383044L) != 0)) {
+			while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 148917253570678L) != 0)) {
 				{
 				{
-				setState(165);
+				setState(185);
 				statement();
 				}
 				}
-				setState(170);
+				setState(190);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
 			}
-			setState(171);
-			match(T__2);
+			setState(191);
+			match(ClosedCurlyBracket);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class ReturnStatementContext extends ParserRuleContext {
+		public TerminalNode Return() { return getToken(SimpleJavaParser.Return, 0); }
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public ReturnStatementContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_returnStatement; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterReturnStatement(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitReturnStatement(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitReturnStatement(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final ReturnStatementContext returnStatement() throws RecognitionException {
+		ReturnStatementContext _localctx = new ReturnStatementContext(_ctx, getState());
+		enterRule(_localctx, 22, RULE_returnStatement);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(193);
+			match(Return);
+			setState(195);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 277146220101638L) != 0)) {
+				{
+				setState(194);
+				expression();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class LocalVariableDeclarationContext extends ParserRuleContext {
+		public TypeContext type() {
+			return getRuleContext(TypeContext.class,0);
+		}
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode Assign() { return getToken(SimpleJavaParser.Assign, 0); }
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public LocalVariableDeclarationContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_localVariableDeclaration; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterLocalVariableDeclaration(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitLocalVariableDeclaration(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitLocalVariableDeclaration(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final LocalVariableDeclarationContext localVariableDeclaration() throws RecognitionException {
+		LocalVariableDeclarationContext _localctx = new LocalVariableDeclarationContext(_ctx, getState());
+		enterRule(_localctx, 24, RULE_localVariableDeclaration);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(197);
+			type();
+			setState(198);
+			match(Identifier);
+			setState(201);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if (_la==Assign) {
+				{
+				setState(199);
+				match(Assign);
+				setState(200);
+				expression();
+				}
+			}
+
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class WhileStatementContext extends ParserRuleContext {
+		public TerminalNode While() { return getToken(SimpleJavaParser.While, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public BlockContext block() {
+			return getRuleContext(BlockContext.class,0);
+		}
+		public WhileStatementContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_whileStatement; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterWhileStatement(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitWhileStatement(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitWhileStatement(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final WhileStatementContext whileStatement() throws RecognitionException {
+		WhileStatementContext _localctx = new WhileStatementContext(_ctx, getState());
+		enterRule(_localctx, 26, RULE_whileStatement);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(203);
+			match(While);
+			setState(204);
+			match(OpenRoundBracket);
+			setState(205);
+			expression();
+			setState(206);
+			match(ClosedRoundBracket);
+			setState(207);
+			block();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class ForStatementContext extends ParserRuleContext {
+		public TerminalNode For() { return getToken(SimpleJavaParser.For, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public List<TerminalNode> Semicolon() { return getTokens(SimpleJavaParser.Semicolon); }
+		public TerminalNode Semicolon(int i) {
+			return getToken(SimpleJavaParser.Semicolon, i);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public StatementContext statement() {
+			return getRuleContext(StatementContext.class,0);
+		}
+		public List<StatementExpressionContext> statementExpression() {
+			return getRuleContexts(StatementExpressionContext.class);
+		}
+		public StatementExpressionContext statementExpression(int i) {
+			return getRuleContext(StatementExpressionContext.class,i);
+		}
+		public LocalVariableDeclarationContext localVariableDeclaration() {
+			return getRuleContext(LocalVariableDeclarationContext.class,0);
+		}
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public ForStatementContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_forStatement; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterForStatement(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitForStatement(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitForStatement(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final ForStatementContext forStatement() throws RecognitionException {
+		ForStatementContext _localctx = new ForStatementContext(_ctx, getState());
+		enterRule(_localctx, 28, RULE_forStatement);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(209);
+			match(For);
+			setState(210);
+			match(OpenRoundBracket);
+			setState(213);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) {
+			case 1:
+				{
+				setState(211);
+				statementExpression();
+				}
+				break;
+			case 2:
+				{
+				setState(212);
+				localVariableDeclaration();
+				}
+				break;
+			}
+			setState(215);
+			match(Semicolon);
+			setState(217);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 277146220101638L) != 0)) {
+				{
+				setState(216);
+				expression();
+				}
+			}
+
+			setState(219);
+			match(Semicolon);
+			setState(221);
+			_errHandler.sync(this);
+			_la = _input.LA(1);
+			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 145204254343174L) != 0)) {
+				{
+				setState(220);
+				statementExpression();
+				}
+			}
+
+			setState(223);
+			match(ClosedRoundBracket);
+			setState(224);
+			statement();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class IfElseStatementContext extends ParserRuleContext {
+		public IfStatementContext ifStatement() {
+			return getRuleContext(IfStatementContext.class,0);
+		}
+		public ElseStatementContext elseStatement() {
+			return getRuleContext(ElseStatementContext.class,0);
+		}
+		public IfElseStatementContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_ifElseStatement; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterIfElseStatement(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitIfElseStatement(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitIfElseStatement(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final IfElseStatementContext ifElseStatement() throws RecognitionException {
+		IfElseStatementContext _localctx = new IfElseStatementContext(_ctx, getState());
+		enterRule(_localctx, 30, RULE_ifElseStatement);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(226);
+			ifStatement();
+			setState(228);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) {
+			case 1:
+				{
+				setState(227);
+				elseStatement();
+				}
+				break;
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class IfStatementContext extends ParserRuleContext {
+		public TerminalNode If() { return getToken(SimpleJavaParser.If, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public StatementContext statement() {
+			return getRuleContext(StatementContext.class,0);
+		}
+		public IfStatementContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_ifStatement; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterIfStatement(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitIfStatement(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitIfStatement(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final IfStatementContext ifStatement() throws RecognitionException {
+		IfStatementContext _localctx = new IfStatementContext(_ctx, getState());
+		enterRule(_localctx, 32, RULE_ifStatement);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(230);
+			match(If);
+			setState(231);
+			match(OpenRoundBracket);
+			setState(232);
+			expression();
+			setState(233);
+			match(ClosedRoundBracket);
+			setState(234);
+			statement();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class ElseStatementContext extends ParserRuleContext {
+		public TerminalNode Else() { return getToken(SimpleJavaParser.Else, 0); }
+		public StatementContext statement() {
+			return getRuleContext(StatementContext.class,0);
+		}
+		public ElseStatementContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_elseStatement; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterElseStatement(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitElseStatement(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitElseStatement(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final ElseStatementContext elseStatement() throws RecognitionException {
+		ElseStatementContext _localctx = new ElseStatementContext(_ctx, getState());
+		enterRule(_localctx, 34, RULE_elseStatement);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(236);
+			match(Else);
+			setState(237);
+			statement();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class StatementExpressionContext extends ParserRuleContext {
+		public AssignContext assign() {
+			return getRuleContext(AssignContext.class,0);
+		}
+		public NewDeclarationContext newDeclaration() {
+			return getRuleContext(NewDeclarationContext.class,0);
+		}
+		public MethodCallContext methodCall() {
+			return getRuleContext(MethodCallContext.class,0);
+		}
+		public CrementExpressionContext crementExpression() {
+			return getRuleContext(CrementExpressionContext.class,0);
+		}
+		public StatementExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_statementExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterStatementExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitStatementExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitStatementExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final StatementExpressionContext statementExpression() throws RecognitionException {
+		StatementExpressionContext _localctx = new StatementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 36, RULE_statementExpression);
+		try {
+			setState(243);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(239);
+				assign();
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(240);
+				newDeclaration();
+				}
+				break;
+			case 3:
+				enterOuterAlt(_localctx, 3);
+				{
+				setState(241);
+				methodCall();
+				}
+				break;
+			case 4:
+				enterOuterAlt(_localctx, 4);
+				{
+				setState(242);
+				crementExpression();
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class AssignContext extends ParserRuleContext {
+		public AssignableExpressionContext assignableExpression() {
+			return getRuleContext(AssignableExpressionContext.class,0);
+		}
+		public TerminalNode Assign() { return getToken(SimpleJavaParser.Assign, 0); }
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public AssignContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_assign; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterAssign(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitAssign(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitAssign(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final AssignContext assign() throws RecognitionException {
+		AssignContext _localctx = new AssignContext(_ctx, getState());
+		enterRule(_localctx, 38, RULE_assign);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(245);
+			assignableExpression();
+			setState(246);
+			match(Assign);
+			setState(247);
+			expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class NewDeclarationContext extends ParserRuleContext {
+		public TerminalNode New() { return getToken(SimpleJavaParser.New, 0); }
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public ArgumentListContext argumentList() {
+			return getRuleContext(ArgumentListContext.class,0);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public NewDeclarationContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_newDeclaration; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterNewDeclaration(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitNewDeclaration(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitNewDeclaration(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final NewDeclarationContext newDeclaration() throws RecognitionException {
+		NewDeclarationContext _localctx = new NewDeclarationContext(_ctx, getState());
+		enterRule(_localctx, 40, RULE_newDeclaration);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(249);
+			match(New);
+			setState(250);
+			match(Identifier);
+			setState(251);
+			match(OpenRoundBracket);
+			setState(252);
+			argumentList();
+			setState(253);
+			match(ClosedRoundBracket);
 			}
 		}
 		catch (RecognitionException re) {
@@ -1295,16 +1646,12 @@ public class SimpleJavaParser extends Parser {
 
 	@SuppressWarnings("CheckReturnValue")
 	public static class ExpressionContext extends ParserRuleContext {
-		public List<ExpressionContext> expression() {
-			return getRuleContexts(ExpressionContext.class);
+		public UnaryExpressionContext unaryExpression() {
+			return getRuleContext(UnaryExpressionContext.class,0);
 		}
-		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+		public BinaryExpressionContext binaryExpression() {
+			return getRuleContext(BinaryExpressionContext.class,0);
 		}
-		public LiteralContext literal() {
-			return getRuleContext(LiteralContext.class,0);
-		}
-		public TerminalNode IDENTIFIER() { return getToken(SimpleJavaParser.IDENTIFIER, 0); }
 		public ExpressionContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
@@ -1325,147 +1672,26 @@ public class SimpleJavaParser extends Parser {
 	}
 
 	public final ExpressionContext expression() throws RecognitionException {
-		return expression(0);
-	}
-
-	private ExpressionContext expression(int _p) throws RecognitionException {
-		ParserRuleContext _parentctx = _ctx;
-		int _parentState = getState();
-		ExpressionContext _localctx = new ExpressionContext(_ctx, _parentState);
-		ExpressionContext _prevctx = _localctx;
-		int _startState = 36;
-		enterRecursionRule(_localctx, 36, RULE_expression, _p);
-		int _la;
+		ExpressionContext _localctx = new ExpressionContext(_ctx, getState());
+		enterRule(_localctx, 42, RULE_expression);
 		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(184);
+			setState(257);
 			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case T__27:
+			switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
 				{
-				setState(174);
-				match(T__27);
-				setState(175);
-				expression(5);
+				setState(255);
+				unaryExpression();
 				}
 				break;
-			case T__31:
+			case 2:
+				enterOuterAlt(_localctx, 2);
 				{
-				setState(176);
-				match(T__31);
-				setState(177);
-				expression(4);
+				setState(256);
+				binaryExpression();
 				}
 				break;
-			case T__5:
-				{
-				setState(178);
-				match(T__5);
-				setState(179);
-				expression(0);
-				setState(180);
-				match(T__6);
-				}
-				break;
-			case T__32:
-			case T__33:
-			case T__34:
-			case INTEGERLITERAL:
-				{
-				setState(182);
-				literal();
-				}
-				break;
-			case IDENTIFIER:
-				{
-				setState(183);
-				match(IDENTIFIER);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-			_ctx.stop = _input.LT(-1);
-			setState(197);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,15,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					if ( _parseListeners!=null ) triggerExitRuleEvent();
-					_prevctx = _localctx;
-					{
-					setState(195);
-					_errHandler.sync(this);
-					switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
-					case 1:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(186);
-						if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)");
-						setState(187);
-						_la = _input.LA(1);
-						if ( !(_la==T__18 || _la==T__19) ) {
-						_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(188);
-						expression(9);
-						}
-						break;
-					case 2:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(189);
-						if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)");
-						setState(190);
-						_la = _input.LA(1);
-						if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 132120576L) != 0)) ) {
-						_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(191);
-						expression(8);
-						}
-						break;
-					case 3:
-						{
-						_localctx = new ExpressionContext(_parentctx, _parentState);
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(192);
-						if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
-						setState(193);
-						_la = _input.LA(1);
-						if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 4160749568L) != 0)) ) {
-						_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(194);
-						expression(7);
-						}
-						break;
-					}
-					} 
-				}
-				setState(199);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,15,_ctx);
-			}
 			}
 		}
 		catch (RecognitionException re) {
@@ -1474,66 +1700,280 @@ public class SimpleJavaParser extends Parser {
 			_errHandler.recover(this, re);
 		}
 		finally {
-			unrollRecursionContexts(_parentctx);
+			exitRule();
 		}
 		return _localctx;
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class LiteralContext extends ParserRuleContext {
-		public TerminalNode INTEGERLITERAL() { return getToken(SimpleJavaParser.INTEGERLITERAL, 0); }
-		public BooleanLiteralContext booleanLiteral() {
-			return getRuleContext(BooleanLiteralContext.class,0);
+	public static class UnaryExpressionContext extends ParserRuleContext {
+		public TerminalNode This() { return getToken(SimpleJavaParser.This, 0); }
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public MemberAccessContext memberAccess() {
+			return getRuleContext(MemberAccessContext.class,0);
 		}
-		public CharLiteralContext charLiteral() {
-			return getRuleContext(CharLiteralContext.class,0);
+		public ValueContext value() {
+			return getRuleContext(ValueContext.class,0);
 		}
-		public LiteralContext(ParserRuleContext parent, int invokingState) {
+		public NotExpressionContext notExpression() {
+			return getRuleContext(NotExpressionContext.class,0);
+		}
+		public StatementExpressionContext statementExpression() {
+			return getRuleContext(StatementExpressionContext.class,0);
+		}
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public UnaryExpressionContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_literal; }
+		@Override public int getRuleIndex() { return RULE_unaryExpression; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterLiteral(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterUnaryExpression(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitLiteral(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitUnaryExpression(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitLiteral(this);
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitUnaryExpression(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final LiteralContext literal() throws RecognitionException {
-		LiteralContext _localctx = new LiteralContext(_ctx, getState());
-		enterRule(_localctx, 38, RULE_literal);
+	public final UnaryExpressionContext unaryExpression() throws RecognitionException {
+		UnaryExpressionContext _localctx = new UnaryExpressionContext(_ctx, getState());
+		enterRule(_localctx, 44, RULE_unaryExpression);
 		try {
-			setState(203);
+			setState(269);
 			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case INTEGERLITERAL:
+			switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) {
+			case 1:
 				enterOuterAlt(_localctx, 1);
 				{
-				setState(200);
-				match(INTEGERLITERAL);
+				setState(259);
+				match(This);
 				}
 				break;
-			case T__32:
-			case T__33:
+			case 2:
 				enterOuterAlt(_localctx, 2);
 				{
-				setState(201);
-				booleanLiteral();
+				setState(260);
+				match(Identifier);
 				}
 				break;
-			case T__34:
+			case 3:
 				enterOuterAlt(_localctx, 3);
 				{
-				setState(202);
-				charLiteral();
+				setState(261);
+				memberAccess();
+				}
+				break;
+			case 4:
+				enterOuterAlt(_localctx, 4);
+				{
+				setState(262);
+				value();
+				}
+				break;
+			case 5:
+				enterOuterAlt(_localctx, 5);
+				{
+				setState(263);
+				notExpression();
+				}
+				break;
+			case 6:
+				enterOuterAlt(_localctx, 6);
+				{
+				setState(264);
+				statementExpression();
+				}
+				break;
+			case 7:
+				enterOuterAlt(_localctx, 7);
+				{
+				setState(265);
+				match(OpenRoundBracket);
+				setState(266);
+				expression();
+				setState(267);
+				match(ClosedRoundBracket);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class NotExpressionContext extends ParserRuleContext {
+		public TerminalNode Not() { return getToken(SimpleJavaParser.Not, 0); }
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public NotExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_notExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterNotExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitNotExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitNotExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final NotExpressionContext notExpression() throws RecognitionException {
+		NotExpressionContext _localctx = new NotExpressionContext(_ctx, getState());
+		enterRule(_localctx, 46, RULE_notExpression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(271);
+			match(Not);
+			setState(272);
+			expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class CrementExpressionContext extends ParserRuleContext {
+		public IncrementExpressionContext incrementExpression() {
+			return getRuleContext(IncrementExpressionContext.class,0);
+		}
+		public DecrementExpressionContext decrementExpression() {
+			return getRuleContext(DecrementExpressionContext.class,0);
+		}
+		public CrementExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_crementExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterCrementExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitCrementExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitCrementExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final CrementExpressionContext crementExpression() throws RecognitionException {
+		CrementExpressionContext _localctx = new CrementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 48, RULE_crementExpression);
+		try {
+			setState(276);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(274);
+				incrementExpression();
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(275);
+				decrementExpression();
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class IncrementExpressionContext extends ParserRuleContext {
+		public PrefixIncrementExpressionContext prefixIncrementExpression() {
+			return getRuleContext(PrefixIncrementExpressionContext.class,0);
+		}
+		public SuffixIncrementExpressionContext suffixIncrementExpression() {
+			return getRuleContext(SuffixIncrementExpressionContext.class,0);
+		}
+		public IncrementExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_incrementExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterIncrementExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitIncrementExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitIncrementExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final IncrementExpressionContext incrementExpression() throws RecognitionException {
+		IncrementExpressionContext _localctx = new IncrementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 50, RULE_incrementExpression);
+		try {
+			setState(280);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case T__0:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(278);
+				prefixIncrementExpression();
+				}
+				break;
+			case This:
+			case Identifier:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(279);
+				suffixIncrementExpression();
 				}
 				break;
 			default:
@@ -1552,36 +1992,1055 @@ public class SimpleJavaParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class BooleanLiteralContext extends ParserRuleContext {
-		public BooleanLiteralContext(ParserRuleContext parent, int invokingState) {
+	public static class PrefixIncrementExpressionContext extends ParserRuleContext {
+		public AssignableExpressionContext assignableExpression() {
+			return getRuleContext(AssignableExpressionContext.class,0);
+		}
+		public PrefixIncrementExpressionContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_booleanLiteral; }
+		@Override public int getRuleIndex() { return RULE_prefixIncrementExpression; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterBooleanLiteral(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterPrefixIncrementExpression(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitBooleanLiteral(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitPrefixIncrementExpression(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitBooleanLiteral(this);
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitPrefixIncrementExpression(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final BooleanLiteralContext booleanLiteral() throws RecognitionException {
-		BooleanLiteralContext _localctx = new BooleanLiteralContext(_ctx, getState());
-		enterRule(_localctx, 40, RULE_booleanLiteral);
+	public final PrefixIncrementExpressionContext prefixIncrementExpression() throws RecognitionException {
+		PrefixIncrementExpressionContext _localctx = new PrefixIncrementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 52, RULE_prefixIncrementExpression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(282);
+			match(T__0);
+			setState(283);
+			assignableExpression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class SuffixIncrementExpressionContext extends ParserRuleContext {
+		public AssignableExpressionContext assignableExpression() {
+			return getRuleContext(AssignableExpressionContext.class,0);
+		}
+		public SuffixIncrementExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_suffixIncrementExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterSuffixIncrementExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitSuffixIncrementExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitSuffixIncrementExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final SuffixIncrementExpressionContext suffixIncrementExpression() throws RecognitionException {
+		SuffixIncrementExpressionContext _localctx = new SuffixIncrementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 54, RULE_suffixIncrementExpression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(285);
+			assignableExpression();
+			setState(286);
+			match(T__0);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class DecrementExpressionContext extends ParserRuleContext {
+		public PrefixDecrementExpressionContext prefixDecrementExpression() {
+			return getRuleContext(PrefixDecrementExpressionContext.class,0);
+		}
+		public SuffixDecrementExpressionContext suffixDecrementExpression() {
+			return getRuleContext(SuffixDecrementExpressionContext.class,0);
+		}
+		public DecrementExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_decrementExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterDecrementExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitDecrementExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitDecrementExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final DecrementExpressionContext decrementExpression() throws RecognitionException {
+		DecrementExpressionContext _localctx = new DecrementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 56, RULE_decrementExpression);
+		try {
+			setState(290);
+			_errHandler.sync(this);
+			switch (_input.LA(1)) {
+			case T__1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(288);
+				prefixDecrementExpression();
+				}
+				break;
+			case This:
+			case Identifier:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(289);
+				suffixDecrementExpression();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class PrefixDecrementExpressionContext extends ParserRuleContext {
+		public AssignableExpressionContext assignableExpression() {
+			return getRuleContext(AssignableExpressionContext.class,0);
+		}
+		public PrefixDecrementExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_prefixDecrementExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterPrefixDecrementExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitPrefixDecrementExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitPrefixDecrementExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final PrefixDecrementExpressionContext prefixDecrementExpression() throws RecognitionException {
+		PrefixDecrementExpressionContext _localctx = new PrefixDecrementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 58, RULE_prefixDecrementExpression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(292);
+			match(T__1);
+			setState(293);
+			assignableExpression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class SuffixDecrementExpressionContext extends ParserRuleContext {
+		public AssignableExpressionContext assignableExpression() {
+			return getRuleContext(AssignableExpressionContext.class,0);
+		}
+		public SuffixDecrementExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_suffixDecrementExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterSuffixDecrementExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitSuffixDecrementExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitSuffixDecrementExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final SuffixDecrementExpressionContext suffixDecrementExpression() throws RecognitionException {
+		SuffixDecrementExpressionContext _localctx = new SuffixDecrementExpressionContext(_ctx, getState());
+		enterRule(_localctx, 60, RULE_suffixDecrementExpression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(295);
+			assignableExpression();
+			setState(296);
+			match(T__1);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class AssignableExpressionContext extends ParserRuleContext {
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public MemberAccessContext memberAccess() {
+			return getRuleContext(MemberAccessContext.class,0);
+		}
+		public AssignableExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_assignableExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterAssignableExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitAssignableExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitAssignableExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final AssignableExpressionContext assignableExpression() throws RecognitionException {
+		AssignableExpressionContext _localctx = new AssignableExpressionContext(_ctx, getState());
+		enterRule(_localctx, 62, RULE_assignableExpression);
+		try {
+			setState(300);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(298);
+				match(Identifier);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(299);
+				memberAccess();
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class MemberAccessContext extends ParserRuleContext {
+		public TerminalNode This() { return getToken(SimpleJavaParser.This, 0); }
+		public List<TerminalNode> Dot() { return getTokens(SimpleJavaParser.Dot); }
+		public TerminalNode Dot(int i) {
+			return getToken(SimpleJavaParser.Dot, i);
+		}
+		public List<TerminalNode> Identifier() { return getTokens(SimpleJavaParser.Identifier); }
+		public TerminalNode Identifier(int i) {
+			return getToken(SimpleJavaParser.Identifier, i);
+		}
+		public MemberAccessContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_memberAccess; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterMemberAccess(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitMemberAccess(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitMemberAccess(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final MemberAccessContext memberAccess() throws RecognitionException {
+		MemberAccessContext _localctx = new MemberAccessContext(_ctx, getState());
+		enterRule(_localctx, 64, RULE_memberAccess);
+		int _la;
+		try {
+			int _alt;
+			setState(316);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,31,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(302);
+				match(This);
+				setState(303);
+				match(Dot);
+				setState(304);
+				match(Identifier);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(307);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+				if (_la==This) {
+					{
+					setState(305);
+					match(This);
+					setState(306);
+					match(Dot);
+					}
+				}
+
+				setState(311); 
+				_errHandler.sync(this);
+				_alt = 1;
+				do {
+					switch (_alt) {
+					case 1:
+						{
+						{
+						setState(309);
+						match(Identifier);
+						setState(310);
+						match(Dot);
+						}
+						}
+						break;
+					default:
+						throw new NoViableAltException(this);
+					}
+					setState(313); 
+					_errHandler.sync(this);
+					_alt = getInterpreter().adaptivePredict(_input,30,_ctx);
+				} while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER );
+				setState(315);
+				match(Identifier);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class BinaryExpressionContext extends ParserRuleContext {
+		public CalculationExpressionContext calculationExpression() {
+			return getRuleContext(CalculationExpressionContext.class,0);
+		}
+		public NonCalculationExpressionContext nonCalculationExpression() {
+			return getRuleContext(NonCalculationExpressionContext.class,0);
+		}
+		public BinaryExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_binaryExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterBinaryExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitBinaryExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitBinaryExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final BinaryExpressionContext binaryExpression() throws RecognitionException {
+		BinaryExpressionContext _localctx = new BinaryExpressionContext(_ctx, getState());
+		enterRule(_localctx, 66, RULE_binaryExpression);
+		try {
+			setState(320);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,32,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(318);
+				calculationExpression(0);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(319);
+				nonCalculationExpression();
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class CalculationExpressionContext extends ParserRuleContext {
+		public DotExpressionContext dotExpression() {
+			return getRuleContext(DotExpressionContext.class,0);
+		}
+		public CalculationExpressionContext calculationExpression() {
+			return getRuleContext(CalculationExpressionContext.class,0);
+		}
+		public TerminalNode LineOperator() { return getToken(SimpleJavaParser.LineOperator, 0); }
+		public CalculationExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_calculationExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterCalculationExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitCalculationExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitCalculationExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final CalculationExpressionContext calculationExpression() throws RecognitionException {
+		return calculationExpression(0);
+	}
+
+	private CalculationExpressionContext calculationExpression(int _p) throws RecognitionException {
+		ParserRuleContext _parentctx = _ctx;
+		int _parentState = getState();
+		CalculationExpressionContext _localctx = new CalculationExpressionContext(_ctx, _parentState);
+		CalculationExpressionContext _prevctx = _localctx;
+		int _startState = 68;
+		enterRecursionRule(_localctx, 68, RULE_calculationExpression, _p);
+		try {
+			int _alt;
+			enterOuterAlt(_localctx, 1);
+			{
+			{
+			setState(323);
+			dotExpression(0);
+			}
+			_ctx.stop = _input.LT(-1);
+			setState(330);
+			_errHandler.sync(this);
+			_alt = getInterpreter().adaptivePredict(_input,33,_ctx);
+			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
+				if ( _alt==1 ) {
+					if ( _parseListeners!=null ) triggerExitRuleEvent();
+					_prevctx = _localctx;
+					{
+					{
+					_localctx = new CalculationExpressionContext(_parentctx, _parentState);
+					pushNewRecursionContext(_localctx, _startState, RULE_calculationExpression);
+					setState(325);
+					if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
+					setState(326);
+					match(LineOperator);
+					setState(327);
+					dotExpression(0);
+					}
+					} 
+				}
+				setState(332);
+				_errHandler.sync(this);
+				_alt = getInterpreter().adaptivePredict(_input,33,_ctx);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			unrollRecursionContexts(_parentctx);
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class DotExpressionContext extends ParserRuleContext {
+		public DotSubtractionExpressionContext dotSubtractionExpression() {
+			return getRuleContext(DotSubtractionExpressionContext.class,0);
+		}
+		public DotExpressionContext dotExpression() {
+			return getRuleContext(DotExpressionContext.class,0);
+		}
+		public TerminalNode DotOperator() { return getToken(SimpleJavaParser.DotOperator, 0); }
+		public DotExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_dotExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterDotExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitDotExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitDotExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final DotExpressionContext dotExpression() throws RecognitionException {
+		return dotExpression(0);
+	}
+
+	private DotExpressionContext dotExpression(int _p) throws RecognitionException {
+		ParserRuleContext _parentctx = _ctx;
+		int _parentState = getState();
+		DotExpressionContext _localctx = new DotExpressionContext(_ctx, _parentState);
+		DotExpressionContext _prevctx = _localctx;
+		int _startState = 70;
+		enterRecursionRule(_localctx, 70, RULE_dotExpression, _p);
+		try {
+			int _alt;
+			enterOuterAlt(_localctx, 1);
+			{
+			{
+			setState(334);
+			dotSubtractionExpression();
+			}
+			_ctx.stop = _input.LT(-1);
+			setState(341);
+			_errHandler.sync(this);
+			_alt = getInterpreter().adaptivePredict(_input,34,_ctx);
+			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
+				if ( _alt==1 ) {
+					if ( _parseListeners!=null ) triggerExitRuleEvent();
+					_prevctx = _localctx;
+					{
+					{
+					_localctx = new DotExpressionContext(_parentctx, _parentState);
+					pushNewRecursionContext(_localctx, _startState, RULE_dotExpression);
+					setState(336);
+					if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
+					setState(337);
+					match(DotOperator);
+					setState(338);
+					dotSubtractionExpression();
+					}
+					} 
+				}
+				setState(343);
+				_errHandler.sync(this);
+				_alt = getInterpreter().adaptivePredict(_input,34,_ctx);
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			unrollRecursionContexts(_parentctx);
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class DotSubtractionExpressionContext extends ParserRuleContext {
+		public TerminalNode IntValue() { return getToken(SimpleJavaParser.IntValue, 0); }
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public MemberAccessContext memberAccess() {
+			return getRuleContext(MemberAccessContext.class,0);
+		}
+		public MethodCallContext methodCall() {
+			return getRuleContext(MethodCallContext.class,0);
+		}
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public CalculationExpressionContext calculationExpression() {
+			return getRuleContext(CalculationExpressionContext.class,0);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public DotSubtractionExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_dotSubtractionExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterDotSubtractionExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitDotSubtractionExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitDotSubtractionExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final DotSubtractionExpressionContext dotSubtractionExpression() throws RecognitionException {
+		DotSubtractionExpressionContext _localctx = new DotSubtractionExpressionContext(_ctx, getState());
+		enterRule(_localctx, 72, RULE_dotSubtractionExpression);
+		try {
+			setState(352);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,35,_ctx) ) {
+			case 1:
+				enterOuterAlt(_localctx, 1);
+				{
+				setState(344);
+				match(IntValue);
+				}
+				break;
+			case 2:
+				enterOuterAlt(_localctx, 2);
+				{
+				setState(345);
+				match(Identifier);
+				}
+				break;
+			case 3:
+				enterOuterAlt(_localctx, 3);
+				{
+				setState(346);
+				memberAccess();
+				}
+				break;
+			case 4:
+				enterOuterAlt(_localctx, 4);
+				{
+				setState(347);
+				methodCall();
+				setState(348);
+				match(OpenRoundBracket);
+				setState(349);
+				calculationExpression(0);
+				setState(350);
+				match(ClosedRoundBracket);
+				}
+				break;
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class NonCalculationExpressionContext extends ParserRuleContext {
+		public UnaryExpressionContext unaryExpression() {
+			return getRuleContext(UnaryExpressionContext.class,0);
+		}
+		public NonCalculationOperatorContext nonCalculationOperator() {
+			return getRuleContext(NonCalculationOperatorContext.class,0);
+		}
+		public ExpressionContext expression() {
+			return getRuleContext(ExpressionContext.class,0);
+		}
+		public NonCalculationExpressionContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_nonCalculationExpression; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterNonCalculationExpression(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitNonCalculationExpression(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitNonCalculationExpression(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final NonCalculationExpressionContext nonCalculationExpression() throws RecognitionException {
+		NonCalculationExpressionContext _localctx = new NonCalculationExpressionContext(_ctx, getState());
+		enterRule(_localctx, 74, RULE_nonCalculationExpression);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(354);
+			unaryExpression();
+			setState(355);
+			nonCalculationOperator();
+			setState(356);
+			expression();
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class MethodCallContext extends ParserRuleContext {
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public ArgumentListContext argumentList() {
+			return getRuleContext(ArgumentListContext.class,0);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public TargetContext target() {
+			return getRuleContext(TargetContext.class,0);
+		}
+		public List<ChainedMethodContext> chainedMethod() {
+			return getRuleContexts(ChainedMethodContext.class);
+		}
+		public ChainedMethodContext chainedMethod(int i) {
+			return getRuleContext(ChainedMethodContext.class,i);
+		}
+		public MethodCallContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_methodCall; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterMethodCall(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitMethodCall(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitMethodCall(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final MethodCallContext methodCall() throws RecognitionException {
+		MethodCallContext _localctx = new MethodCallContext(_ctx, getState());
+		enterRule(_localctx, 76, RULE_methodCall);
+		try {
+			int _alt;
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(359);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,36,_ctx) ) {
+			case 1:
+				{
+				setState(358);
+				target();
+				}
+				break;
+			}
+			setState(364);
+			_errHandler.sync(this);
+			_alt = getInterpreter().adaptivePredict(_input,37,_ctx);
+			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
+				if ( _alt==1 ) {
+					{
+					{
+					setState(361);
+					chainedMethod();
+					}
+					} 
+				}
+				setState(366);
+				_errHandler.sync(this);
+				_alt = getInterpreter().adaptivePredict(_input,37,_ctx);
+			}
+			setState(367);
+			match(Identifier);
+			setState(368);
+			match(OpenRoundBracket);
+			setState(369);
+			argumentList();
+			setState(370);
+			match(ClosedRoundBracket);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class TargetContext extends ParserRuleContext {
+		public TerminalNode Dot() { return getToken(SimpleJavaParser.Dot, 0); }
+		public TerminalNode This() { return getToken(SimpleJavaParser.This, 0); }
+		public MemberAccessContext memberAccess() {
+			return getRuleContext(MemberAccessContext.class,0);
+		}
+		public NewDeclarationContext newDeclaration() {
+			return getRuleContext(NewDeclarationContext.class,0);
+		}
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TargetContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_target; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterTarget(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitTarget(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitTarget(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final TargetContext target() throws RecognitionException {
+		TargetContext _localctx = new TargetContext(_ctx, getState());
+		enterRule(_localctx, 78, RULE_target);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(376);
+			_errHandler.sync(this);
+			switch ( getInterpreter().adaptivePredict(_input,38,_ctx) ) {
+			case 1:
+				{
+				setState(372);
+				match(This);
+				}
+				break;
+			case 2:
+				{
+				setState(373);
+				memberAccess();
+				}
+				break;
+			case 3:
+				{
+				setState(374);
+				newDeclaration();
+				}
+				break;
+			case 4:
+				{
+				setState(375);
+				match(Identifier);
+				}
+				break;
+			}
+			setState(378);
+			match(Dot);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class ChainedMethodContext extends ParserRuleContext {
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); }
+		public ArgumentListContext argumentList() {
+			return getRuleContext(ArgumentListContext.class,0);
+		}
+		public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); }
+		public TerminalNode Dot() { return getToken(SimpleJavaParser.Dot, 0); }
+		public ChainedMethodContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_chainedMethod; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterChainedMethod(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitChainedMethod(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitChainedMethod(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final ChainedMethodContext chainedMethod() throws RecognitionException {
+		ChainedMethodContext _localctx = new ChainedMethodContext(_ctx, getState());
+		enterRule(_localctx, 80, RULE_chainedMethod);
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(380);
+			match(Identifier);
+			setState(381);
+			match(OpenRoundBracket);
+			setState(382);
+			argumentList();
+			setState(383);
+			match(ClosedRoundBracket);
+			setState(384);
+			match(Dot);
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class TypeContext extends ParserRuleContext {
+		public TerminalNode Int() { return getToken(SimpleJavaParser.Int, 0); }
+		public TerminalNode Boolean() { return getToken(SimpleJavaParser.Boolean, 0); }
+		public TerminalNode Char() { return getToken(SimpleJavaParser.Char, 0); }
+		public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); }
+		public TypeContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_type; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterType(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitType(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitType(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final TypeContext type() throws RecognitionException {
+		TypeContext _localctx = new TypeContext(_ctx, getState());
+		enterRule(_localctx, 82, RULE_type);
 		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(205);
+			setState(386);
 			_la = _input.LA(1);
-			if ( !(_la==T__32 || _la==T__33) ) {
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 140737488355440L) != 0)) ) {
 			_errHandler.recoverInline(this);
 			}
 			else {
@@ -1603,38 +3062,100 @@ public class SimpleJavaParser extends Parser {
 	}
 
 	@SuppressWarnings("CheckReturnValue")
-	public static class CharLiteralContext extends ParserRuleContext {
-		public CharLiteralContext(ParserRuleContext parent, int invokingState) {
+	public static class ValueContext extends ParserRuleContext {
+		public TerminalNode IntValue() { return getToken(SimpleJavaParser.IntValue, 0); }
+		public TerminalNode BooleanValue() { return getToken(SimpleJavaParser.BooleanValue, 0); }
+		public TerminalNode CharValue() { return getToken(SimpleJavaParser.CharValue, 0); }
+		public TerminalNode NullValue() { return getToken(SimpleJavaParser.NullValue, 0); }
+		public ValueContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_charLiteral; }
+		@Override public int getRuleIndex() { return RULE_value; }
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterCharLiteral(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterValue(this);
 		}
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitCharLiteral(this);
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitValue(this);
 		}
 		@Override
 		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitCharLiteral(this);
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitValue(this);
 			else return visitor.visitChildren(this);
 		}
 	}
 
-	public final CharLiteralContext charLiteral() throws RecognitionException {
-		CharLiteralContext _localctx = new CharLiteralContext(_ctx, getState());
-		enterRule(_localctx, 42, RULE_charLiteral);
+	public final ValueContext value() throws RecognitionException {
+		ValueContext _localctx = new ValueContext(_ctx, getState());
+		enterRule(_localctx, 84, RULE_value);
+		int _la;
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(207);
-			match(T__34);
-			setState(208);
-			matchWildcard();
-			setState(209);
-			match(T__34);
+			setState(388);
+			_la = _input.LA(1);
+			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 131941395333120L) != 0)) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
+			}
+		}
+		catch (RecognitionException re) {
+			_localctx.exception = re;
+			_errHandler.reportError(this, re);
+			_errHandler.recover(this, re);
+		}
+		finally {
+			exitRule();
+		}
+		return _localctx;
+	}
+
+	@SuppressWarnings("CheckReturnValue")
+	public static class NonCalculationOperatorContext extends ParserRuleContext {
+		public TerminalNode LogicalOperator() { return getToken(SimpleJavaParser.LogicalOperator, 0); }
+		public TerminalNode ComparisonOperator() { return getToken(SimpleJavaParser.ComparisonOperator, 0); }
+		public NonCalculationOperatorContext(ParserRuleContext parent, int invokingState) {
+			super(parent, invokingState);
+		}
+		@Override public int getRuleIndex() { return RULE_nonCalculationOperator; }
+		@Override
+		public void enterRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterNonCalculationOperator(this);
+		}
+		@Override
+		public void exitRule(ParseTreeListener listener) {
+			if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitNonCalculationOperator(this);
+		}
+		@Override
+		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
+			if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor<? extends T>)visitor).visitNonCalculationOperator(this);
+			else return visitor.visitChildren(this);
+		}
+	}
+
+	public final NonCalculationOperatorContext nonCalculationOperator() throws RecognitionException {
+		NonCalculationOperatorContext _localctx = new NonCalculationOperatorContext(_ctx, getState());
+		enterRule(_localctx, 86, RULE_nonCalculationOperator);
+		int _la;
+		try {
+			enterOuterAlt(_localctx, 1);
+			{
+			setState(390);
+			_la = _input.LA(1);
+			if ( !(_la==ComparisonOperator || _la==LogicalOperator) ) {
+			_errHandler.recoverInline(this);
+			}
+			else {
+				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+				_errHandler.reportMatch(this);
+				consume();
+			}
 			}
 		}
 		catch (RecognitionException re) {
@@ -1650,152 +3171,271 @@ public class SimpleJavaParser extends Parser {
 
 	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
-		case 18:
-			return expression_sempred((ExpressionContext)_localctx, predIndex);
+		case 34:
+			return calculationExpression_sempred((CalculationExpressionContext)_localctx, predIndex);
+		case 35:
+			return dotExpression_sempred((DotExpressionContext)_localctx, predIndex);
 		}
 		return true;
 	}
-	private boolean expression_sempred(ExpressionContext _localctx, int predIndex) {
+	private boolean calculationExpression_sempred(CalculationExpressionContext _localctx, int predIndex) {
 		switch (predIndex) {
 		case 0:
-			return precpred(_ctx, 8);
+			return precpred(_ctx, 2);
+		}
+		return true;
+	}
+	private boolean dotExpression_sempred(DotExpressionContext _localctx, int predIndex) {
+		switch (predIndex) {
 		case 1:
-			return precpred(_ctx, 7);
-		case 2:
-			return precpred(_ctx, 6);
+			return precpred(_ctx, 2);
 		}
 		return true;
 	}
 
 	public static final String _serializedATN =
-		"\u0004\u0001&\u00d4\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
+		"\u0004\u00012\u0189\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"+
 		"\f\u0007\f\u0002\r\u0007\r\u0002\u000e\u0007\u000e\u0002\u000f\u0007\u000f"+
 		"\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002\u0012\u0007\u0012"+
 		"\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002\u0015\u0007\u0015"+
-		"\u0001\u0000\u0004\u0000.\b\u0000\u000b\u0000\f\u0000/\u0001\u0001\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0005\u00017\b\u0001\n\u0001"+
-		"\f\u0001:\t\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001"+
-		"\u0002\u0003\u0002A\b\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001"+
-		"\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001"+
-		"\u0004\u0001\u0004\u0003\u0004N\b\u0004\u0001\u0004\u0001\u0004\u0001"+
-		"\u0004\u0005\u0004S\b\u0004\n\u0004\f\u0004V\t\u0004\u0001\u0004\u0001"+
-		"\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005^\b"+
-		"\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0005\u0005c\b\u0005\n\u0005"+
-		"\f\u0005f\t\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006\u0001"+
-		"\u0006\u0005\u0006m\b\u0006\n\u0006\f\u0006p\t\u0006\u0001\u0007\u0001"+
-		"\u0007\u0001\u0007\u0001\b\u0001\b\u0001\t\u0001\t\u0001\n\u0001\n\u0001"+
-		"\n\u0001\n\u0001\n\u0001\n\u0003\n\u007f\b\n\u0001\u000b\u0001\u000b\u0001"+
-		"\u000b\u0001\u000b\u0003\u000b\u0085\b\u000b\u0001\u000b\u0001\u000b\u0001"+
-		"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001\u000e\u0001\u000e"+
-		"\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e"+
-		"\u0097\b\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f"+
-		"\u0001\u000f\u0001\u0010\u0001\u0010\u0003\u0010\u00a1\b\u0010\u0001\u0010"+
-		"\u0001\u0010\u0001\u0011\u0001\u0011\u0005\u0011\u00a7\b\u0011\n\u0011"+
-		"\f\u0011\u00aa\t\u0011\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012"+
-		"\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012"+
-		"\u0001\u0012\u0001\u0012\u0001\u0012\u0003\u0012\u00b9\b\u0012\u0001\u0012"+
-		"\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012"+
-		"\u0001\u0012\u0001\u0012\u0005\u0012\u00c4\b\u0012\n\u0012\f\u0012\u00c7"+
-		"\t\u0012\u0001\u0013\u0001\u0013\u0001\u0013\u0003\u0013\u00cc\b\u0013"+
-		"\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015"+
-		"\u0001\u0015\u0000\u0001$\u0016\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010"+
-		"\u0012\u0014\u0016\u0018\u001a\u001c\u001e \"$&(*\u0000\u0006\u0001\u0000"+
-		"\t\u000b\u0001\u0000\f\r\u0001\u0000\u0013\u0014\u0001\u0000\u0015\u001a"+
-		"\u0001\u0000\u001b\u001f\u0001\u0000!\"\u00d8\u0000-\u0001\u0000\u0000"+
-		"\u0000\u00021\u0001\u0000\u0000\u0000\u0004@\u0001\u0000\u0000\u0000\u0006"+
-		"B\u0001\u0000\u0000\u0000\bG\u0001\u0000\u0000\u0000\nY\u0001\u0000\u0000"+
-		"\u0000\fi\u0001\u0000\u0000\u0000\u000eq\u0001\u0000\u0000\u0000\u0010"+
-		"t\u0001\u0000\u0000\u0000\u0012v\u0001\u0000\u0000\u0000\u0014~\u0001"+
-		"\u0000\u0000\u0000\u0016\u0080\u0001\u0000\u0000\u0000\u0018\u0088\u0001"+
-		"\u0000\u0000\u0000\u001a\u008d\u0001\u0000\u0000\u0000\u001c\u008f\u0001"+
-		"\u0000\u0000\u0000\u001e\u0098\u0001\u0000\u0000\u0000 \u009e\u0001\u0000"+
-		"\u0000\u0000\"\u00a4\u0001\u0000\u0000\u0000$\u00b8\u0001\u0000\u0000"+
-		"\u0000&\u00cb\u0001\u0000\u0000\u0000(\u00cd\u0001\u0000\u0000\u0000*"+
-		"\u00cf\u0001\u0000\u0000\u0000,.\u0003\u0002\u0001\u0000-,\u0001\u0000"+
-		"\u0000\u0000./\u0001\u0000\u0000\u0000/-\u0001\u0000\u0000\u0000/0\u0001"+
-		"\u0000\u0000\u00000\u0001\u0001\u0000\u0000\u000012\u0003\u0012\t\u0000"+
-		"23\u0005\u0001\u0000\u000034\u0005%\u0000\u000048\u0005\u0002\u0000\u0000"+
-		"57\u0003\u0004\u0002\u000065\u0001\u0000\u0000\u00007:\u0001\u0000\u0000"+
-		"\u000086\u0001\u0000\u0000\u000089\u0001\u0000\u0000\u00009;\u0001\u0000"+
-		"\u0000\u0000:8\u0001\u0000\u0000\u0000;<\u0005\u0003\u0000\u0000<\u0003"+
-		"\u0001\u0000\u0000\u0000=A\u0003\u0006\u0003\u0000>A\u0003\b\u0004\u0000"+
-		"?A\u0003\n\u0005\u0000@=\u0001\u0000\u0000\u0000@>\u0001\u0000\u0000\u0000"+
-		"@?\u0001\u0000\u0000\u0000A\u0005\u0001\u0000\u0000\u0000BC\u0003\u0012"+
-		"\t\u0000CD\u0003\u0010\b\u0000DE\u0005%\u0000\u0000EF\u0005\u0004\u0000"+
-		"\u0000F\u0007\u0001\u0000\u0000\u0000GH\u0003\u0012\t\u0000HI\u0005\u0005"+
-		"\u0000\u0000IJ\u0003\u0010\b\u0000JK\u0005%\u0000\u0000KM\u0005\u0006"+
-		"\u0000\u0000LN\u0003\f\u0006\u0000ML\u0001\u0000\u0000\u0000MN\u0001\u0000"+
-		"\u0000\u0000NO\u0001\u0000\u0000\u0000OP\u0005\u0007\u0000\u0000PT\u0005"+
-		"\u0002\u0000\u0000QS\u0003\u0014\n\u0000RQ\u0001\u0000\u0000\u0000SV\u0001"+
-		"\u0000\u0000\u0000TR\u0001\u0000\u0000\u0000TU\u0001\u0000\u0000\u0000"+
-		"UW\u0001\u0000\u0000\u0000VT\u0001\u0000\u0000\u0000WX\u0005\u0003\u0000"+
-		"\u0000X\t\u0001\u0000\u0000\u0000YZ\u0003\u0012\t\u0000Z[\u0005%\u0000"+
-		"\u0000[]\u0005\u0006\u0000\u0000\\^\u0003\f\u0006\u0000]\\\u0001\u0000"+
-		"\u0000\u0000]^\u0001\u0000\u0000\u0000^_\u0001\u0000\u0000\u0000_`\u0005"+
-		"\u0007\u0000\u0000`d\u0005\u0002\u0000\u0000ac\u0003\u0014\n\u0000ba\u0001"+
-		"\u0000\u0000\u0000cf\u0001\u0000\u0000\u0000db\u0001\u0000\u0000\u0000"+
-		"de\u0001\u0000\u0000\u0000eg\u0001\u0000\u0000\u0000fd\u0001\u0000\u0000"+
-		"\u0000gh\u0005\u0003\u0000\u0000h\u000b\u0001\u0000\u0000\u0000in\u0003"+
-		"\u000e\u0007\u0000jk\u0005\b\u0000\u0000km\u0003\u000e\u0007\u0000lj\u0001"+
-		"\u0000\u0000\u0000mp\u0001\u0000\u0000\u0000nl\u0001\u0000\u0000\u0000"+
-		"no\u0001\u0000\u0000\u0000o\r\u0001\u0000\u0000\u0000pn\u0001\u0000\u0000"+
-		"\u0000qr\u0003\u0010\b\u0000rs\u0005%\u0000\u0000s\u000f\u0001\u0000\u0000"+
-		"\u0000tu\u0007\u0000\u0000\u0000u\u0011\u0001\u0000\u0000\u0000vw\u0007"+
-		"\u0001\u0000\u0000w\u0013\u0001\u0000\u0000\u0000x\u007f\u0003\u0016\u000b"+
-		"\u0000y\u007f\u0003\u0018\f\u0000z\u007f\u0003\u001c\u000e\u0000{\u007f"+
-		"\u0003\u001e\u000f\u0000|\u007f\u0003 \u0010\u0000}\u007f\u0003\"\u0011"+
-		"\u0000~x\u0001\u0000\u0000\u0000~y\u0001\u0000\u0000\u0000~z\u0001\u0000"+
-		"\u0000\u0000~{\u0001\u0000\u0000\u0000~|\u0001\u0000\u0000\u0000~}\u0001"+
-		"\u0000\u0000\u0000\u007f\u0015\u0001\u0000\u0000\u0000\u0080\u0081\u0003"+
-		"\u0010\b\u0000\u0081\u0084\u0005%\u0000\u0000\u0082\u0083\u0005\u000e"+
-		"\u0000\u0000\u0083\u0085\u0003$\u0012\u0000\u0084\u0082\u0001\u0000\u0000"+
-		"\u0000\u0084\u0085\u0001\u0000\u0000\u0000\u0085\u0086\u0001\u0000\u0000"+
-		"\u0000\u0086\u0087\u0005\u0004\u0000\u0000\u0087\u0017\u0001\u0000\u0000"+
-		"\u0000\u0088\u0089\u0003\u001a\r\u0000\u0089\u008a\u0005\u000e\u0000\u0000"+
-		"\u008a\u008b\u0003$\u0012\u0000\u008b\u008c\u0005\u0004\u0000\u0000\u008c"+
-		"\u0019\u0001\u0000\u0000\u0000\u008d\u008e\u0005%\u0000\u0000\u008e\u001b"+
-		"\u0001\u0000\u0000\u0000\u008f\u0090\u0005\u000f\u0000\u0000\u0090\u0091"+
-		"\u0005\u0006\u0000\u0000\u0091\u0092\u0003$\u0012\u0000\u0092\u0093\u0005"+
-		"\u0007\u0000\u0000\u0093\u0096\u0003\u0014\n\u0000\u0094\u0095\u0005\u0010"+
-		"\u0000\u0000\u0095\u0097\u0003\u0014\n\u0000\u0096\u0094\u0001\u0000\u0000"+
-		"\u0000\u0096\u0097\u0001\u0000\u0000\u0000\u0097\u001d\u0001\u0000\u0000"+
-		"\u0000\u0098\u0099\u0005\u0011\u0000\u0000\u0099\u009a\u0005\u0006\u0000"+
-		"\u0000\u009a\u009b\u0003$\u0012\u0000\u009b\u009c\u0005\u0007\u0000\u0000"+
-		"\u009c\u009d\u0003\u0014\n\u0000\u009d\u001f\u0001\u0000\u0000\u0000\u009e"+
-		"\u00a0\u0005\u0012\u0000\u0000\u009f\u00a1\u0003$\u0012\u0000\u00a0\u009f"+
-		"\u0001\u0000\u0000\u0000\u00a0\u00a1\u0001\u0000\u0000\u0000\u00a1\u00a2"+
-		"\u0001\u0000\u0000\u0000\u00a2\u00a3\u0005\u0004\u0000\u0000\u00a3!\u0001"+
-		"\u0000\u0000\u0000\u00a4\u00a8\u0005\u0002\u0000\u0000\u00a5\u00a7\u0003"+
-		"\u0014\n\u0000\u00a6\u00a5\u0001\u0000\u0000\u0000\u00a7\u00aa\u0001\u0000"+
-		"\u0000\u0000\u00a8\u00a6\u0001\u0000\u0000\u0000\u00a8\u00a9\u0001\u0000"+
-		"\u0000\u0000\u00a9\u00ab\u0001\u0000\u0000\u0000\u00aa\u00a8\u0001\u0000"+
-		"\u0000\u0000\u00ab\u00ac\u0005\u0003\u0000\u0000\u00ac#\u0001\u0000\u0000"+
-		"\u0000\u00ad\u00ae\u0006\u0012\uffff\uffff\u0000\u00ae\u00af\u0005\u001c"+
-		"\u0000\u0000\u00af\u00b9\u0003$\u0012\u0005\u00b0\u00b1\u0005 \u0000\u0000"+
-		"\u00b1\u00b9\u0003$\u0012\u0004\u00b2\u00b3\u0005\u0006\u0000\u0000\u00b3"+
-		"\u00b4\u0003$\u0012\u0000\u00b4\u00b5\u0005\u0007\u0000\u0000\u00b5\u00b9"+
-		"\u0001\u0000\u0000\u0000\u00b6\u00b9\u0003&\u0013\u0000\u00b7\u00b9\u0005"+
-		"%\u0000\u0000\u00b8\u00ad\u0001\u0000\u0000\u0000\u00b8\u00b0\u0001\u0000"+
-		"\u0000\u0000\u00b8\u00b2\u0001\u0000\u0000\u0000\u00b8\u00b6\u0001\u0000"+
-		"\u0000\u0000\u00b8\u00b7\u0001\u0000\u0000\u0000\u00b9\u00c5\u0001\u0000"+
-		"\u0000\u0000\u00ba\u00bb\n\b\u0000\u0000\u00bb\u00bc\u0007\u0002\u0000"+
-		"\u0000\u00bc\u00c4\u0003$\u0012\t\u00bd\u00be\n\u0007\u0000\u0000\u00be"+
-		"\u00bf\u0007\u0003\u0000\u0000\u00bf\u00c4\u0003$\u0012\b\u00c0\u00c1"+
-		"\n\u0006\u0000\u0000\u00c1\u00c2\u0007\u0004\u0000\u0000\u00c2\u00c4\u0003"+
-		"$\u0012\u0007\u00c3\u00ba\u0001\u0000\u0000\u0000\u00c3\u00bd\u0001\u0000"+
-		"\u0000\u0000\u00c3\u00c0\u0001\u0000\u0000\u0000\u00c4\u00c7\u0001\u0000"+
-		"\u0000\u0000\u00c5\u00c3\u0001\u0000\u0000\u0000\u00c5\u00c6\u0001\u0000"+
-		"\u0000\u0000\u00c6%\u0001\u0000\u0000\u0000\u00c7\u00c5\u0001\u0000\u0000"+
-		"\u0000\u00c8\u00cc\u0005$\u0000\u0000\u00c9\u00cc\u0003(\u0014\u0000\u00ca"+
-		"\u00cc\u0003*\u0015\u0000\u00cb\u00c8\u0001\u0000\u0000\u0000\u00cb\u00c9"+
-		"\u0001\u0000\u0000\u0000\u00cb\u00ca\u0001\u0000\u0000\u0000\u00cc\'\u0001"+
-		"\u0000\u0000\u0000\u00cd\u00ce\u0007\u0005\u0000\u0000\u00ce)\u0001\u0000"+
-		"\u0000\u0000\u00cf\u00d0\u0005#\u0000\u0000\u00d0\u00d1\t\u0000\u0000"+
-		"\u0000\u00d1\u00d2\u0005#\u0000\u0000\u00d2+\u0001\u0000\u0000\u0000\u0011"+
-		"/8@MT]dn~\u0084\u0096\u00a0\u00a8\u00b8\u00c3\u00c5\u00cb";
+		"\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002\u0018\u0007\u0018"+
+		"\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002\u001b\u0007\u001b"+
+		"\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0002\u001e\u0007\u001e"+
+		"\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007!\u0002\"\u0007\"\u0002"+
+		"#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007&\u0002\'\u0007\'\u0002"+
+		"(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007+\u0001\u0000\u0004\u0000"+
+		"Z\b\u0000\u000b\u0000\f\u0000[\u0001\u0001\u0003\u0001_\b\u0001\u0001"+
+		"\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0005\u0001e\b\u0001\n\u0001"+
+		"\f\u0001h\t\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001"+
+		"\u0002\u0003\u0002o\b\u0002\u0001\u0003\u0003\u0003r\b\u0003\u0001\u0003"+
+		"\u0001\u0003\u0001\u0003\u0003\u0003w\b\u0003\u0001\u0003\u0001\u0003"+
+		"\u0001\u0003\u0001\u0004\u0003\u0004}\b\u0004\u0001\u0004\u0001\u0004"+
+		"\u0001\u0004\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005"+
+		"\u0086\b\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u008a\b\u0005\u0001"+
+		"\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u008f\b\u0005\u0001\u0005\u0001"+
+		"\u0005\u0003\u0005\u0093\b\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0005"+
+		"\u0006\u0098\b\u0006\n\u0006\f\u0006\u009b\t\u0006\u0001\u0007\u0001\u0007"+
+		"\u0001\u0007\u0001\b\u0001\b\u0001\b\u0005\b\u00a3\b\b\n\b\f\b\u00a6\t"+
+		"\b\u0003\b\u00a8\b\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+
+		"\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0003\t\u00b7\b\t\u0001"+
+		"\n\u0001\n\u0005\n\u00bb\b\n\n\n\f\n\u00be\t\n\u0001\n\u0001\n\u0001\u000b"+
+		"\u0001\u000b\u0003\u000b\u00c4\b\u000b\u0001\f\u0001\f\u0001\f\u0001\f"+
+		"\u0003\f\u00ca\b\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001"+
+		"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00d6\b\u000e\u0001"+
+		"\u000e\u0001\u000e\u0003\u000e\u00da\b\u000e\u0001\u000e\u0001\u000e\u0003"+
+		"\u000e\u00de\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001"+
+		"\u000f\u0003\u000f\u00e5\b\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001"+
+		"\u0010\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0011\u0001"+
+		"\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0003\u0012\u00f4\b\u0012\u0001"+
+		"\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001"+
+		"\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0003"+
+		"\u0015\u0102\b\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001"+
+		"\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0003"+
+		"\u0016\u010e\b\u0016\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0018\u0001"+
+		"\u0018\u0003\u0018\u0115\b\u0018\u0001\u0019\u0001\u0019\u0003\u0019\u0119"+
+		"\b\u0019\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001"+
+		"\u001b\u0001\u001c\u0001\u001c\u0003\u001c\u0123\b\u001c\u0001\u001d\u0001"+
+		"\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001f\u0001"+
+		"\u001f\u0003\u001f\u012d\b\u001f\u0001 \u0001 \u0001 \u0001 \u0001 \u0003"+
+		" \u0134\b \u0001 \u0001 \u0004 \u0138\b \u000b \f \u0139\u0001 \u0003"+
+		" \u013d\b \u0001!\u0001!\u0003!\u0141\b!\u0001\"\u0001\"\u0001\"\u0001"+
+		"\"\u0001\"\u0001\"\u0005\"\u0149\b\"\n\"\f\"\u014c\t\"\u0001#\u0001#\u0001"+
+		"#\u0001#\u0001#\u0001#\u0005#\u0154\b#\n#\f#\u0157\t#\u0001$\u0001$\u0001"+
+		"$\u0001$\u0001$\u0001$\u0001$\u0001$\u0003$\u0161\b$\u0001%\u0001%\u0001"+
+		"%\u0001%\u0001&\u0003&\u0168\b&\u0001&\u0005&\u016b\b&\n&\f&\u016e\t&"+
+		"\u0001&\u0001&\u0001&\u0001&\u0001&\u0001\'\u0001\'\u0001\'\u0001\'\u0003"+
+		"\'\u0179\b\'\u0001\'\u0001\'\u0001(\u0001(\u0001(\u0001(\u0001(\u0001"+
+		"(\u0001)\u0001)\u0001*\u0001*\u0001+\u0001+\u0001+\u0000\u0002DF,\u0000"+
+		"\u0002\u0004\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c"+
+		"\u001e \"$&(*,.02468:<>@BDFHJLNPRTV\u0000\u0003\u0002\u0000\u0004\u0006"+
+		"//\u0001\u0000+.\u0001\u0000\u000b\f\u0194\u0000Y\u0001\u0000\u0000\u0000"+
+		"\u0002^\u0001\u0000\u0000\u0000\u0004n\u0001\u0000\u0000\u0000\u0006q"+
+		"\u0001\u0000\u0000\u0000\b|\u0001\u0000\u0000\u0000\n\u0092\u0001\u0000"+
+		"\u0000\u0000\f\u0094\u0001\u0000\u0000\u0000\u000e\u009c\u0001\u0000\u0000"+
+		"\u0000\u0010\u00a7\u0001\u0000\u0000\u0000\u0012\u00b6\u0001\u0000\u0000"+
+		"\u0000\u0014\u00b8\u0001\u0000\u0000\u0000\u0016\u00c1\u0001\u0000\u0000"+
+		"\u0000\u0018\u00c5\u0001\u0000\u0000\u0000\u001a\u00cb\u0001\u0000\u0000"+
+		"\u0000\u001c\u00d1\u0001\u0000\u0000\u0000\u001e\u00e2\u0001\u0000\u0000"+
+		"\u0000 \u00e6\u0001\u0000\u0000\u0000\"\u00ec\u0001\u0000\u0000\u0000"+
+		"$\u00f3\u0001\u0000\u0000\u0000&\u00f5\u0001\u0000\u0000\u0000(\u00f9"+
+		"\u0001\u0000\u0000\u0000*\u0101\u0001\u0000\u0000\u0000,\u010d\u0001\u0000"+
+		"\u0000\u0000.\u010f\u0001\u0000\u0000\u00000\u0114\u0001\u0000\u0000\u0000"+
+		"2\u0118\u0001\u0000\u0000\u00004\u011a\u0001\u0000\u0000\u00006\u011d"+
+		"\u0001\u0000\u0000\u00008\u0122\u0001\u0000\u0000\u0000:\u0124\u0001\u0000"+
+		"\u0000\u0000<\u0127\u0001\u0000\u0000\u0000>\u012c\u0001\u0000\u0000\u0000"+
+		"@\u013c\u0001\u0000\u0000\u0000B\u0140\u0001\u0000\u0000\u0000D\u0142"+
+		"\u0001\u0000\u0000\u0000F\u014d\u0001\u0000\u0000\u0000H\u0160\u0001\u0000"+
+		"\u0000\u0000J\u0162\u0001\u0000\u0000\u0000L\u0167\u0001\u0000\u0000\u0000"+
+		"N\u0178\u0001\u0000\u0000\u0000P\u017c\u0001\u0000\u0000\u0000R\u0182"+
+		"\u0001\u0000\u0000\u0000T\u0184\u0001\u0000\u0000\u0000V\u0186\u0001\u0000"+
+		"\u0000\u0000XZ\u0003\u0002\u0001\u0000YX\u0001\u0000\u0000\u0000Z[\u0001"+
+		"\u0000\u0000\u0000[Y\u0001\u0000\u0000\u0000[\\\u0001\u0000\u0000\u0000"+
+		"\\\u0001\u0001\u0000\u0000\u0000]_\u0005\u0007\u0000\u0000^]\u0001\u0000"+
+		"\u0000\u0000^_\u0001\u0000\u0000\u0000_`\u0001\u0000\u0000\u0000`a\u0005"+
+		"#\u0000\u0000ab\u0005/\u0000\u0000bf\u0005\u001f\u0000\u0000ce\u0003\u0004"+
+		"\u0002\u0000dc\u0001\u0000\u0000\u0000eh\u0001\u0000\u0000\u0000fd\u0001"+
+		"\u0000\u0000\u0000fg\u0001\u0000\u0000\u0000gi\u0001\u0000\u0000\u0000"+
+		"hf\u0001\u0000\u0000\u0000ij\u0005 \u0000\u0000j\u0003\u0001\u0000\u0000"+
+		"\u0000ko\u0003\u0006\u0003\u0000lo\u0003\b\u0004\u0000mo\u0003\n\u0005"+
+		"\u0000nk\u0001\u0000\u0000\u0000nl\u0001\u0000\u0000\u0000nm\u0001\u0000"+
+		"\u0000\u0000o\u0005\u0001\u0000\u0000\u0000pr\u0005\u0007\u0000\u0000"+
+		"qp\u0001\u0000\u0000\u0000qr\u0001\u0000\u0000\u0000rs\u0001\u0000\u0000"+
+		"\u0000st\u0005/\u0000\u0000tv\u0005\u001d\u0000\u0000uw\u0003\f\u0006"+
+		"\u0000vu\u0001\u0000\u0000\u0000vw\u0001\u0000\u0000\u0000wx\u0001\u0000"+
+		"\u0000\u0000xy\u0005\u001e\u0000\u0000yz\u0003\u0014\n\u0000z\u0007\u0001"+
+		"\u0000\u0000\u0000{}\u0005\u0007\u0000\u0000|{\u0001\u0000\u0000\u0000"+
+		"|}\u0001\u0000\u0000\u0000}~\u0001\u0000\u0000\u0000~\u007f\u0003R)\u0000"+
+		"\u007f\u0080\u0005/\u0000\u0000\u0080\u0081\u0005!\u0000\u0000\u0081\t"+
+		"\u0001\u0000\u0000\u0000\u0082\u0083\u0005\b\u0000\u0000\u0083\u0093\u0003"+
+		"\u0014\n\u0000\u0084\u0086\u0005\u0007\u0000\u0000\u0085\u0084\u0001\u0000"+
+		"\u0000\u0000\u0085\u0086\u0001\u0000\u0000\u0000\u0086\u0089\u0001\u0000"+
+		"\u0000\u0000\u0087\u008a\u0003R)\u0000\u0088\u008a\u0005\u0003\u0000\u0000"+
+		"\u0089\u0087\u0001\u0000\u0000\u0000\u0089\u0088\u0001\u0000\u0000\u0000"+
+		"\u008a\u008b\u0001\u0000\u0000\u0000\u008b\u008c\u0005/\u0000\u0000\u008c"+
+		"\u008e\u0005\u001d\u0000\u0000\u008d\u008f\u0003\f\u0006\u0000\u008e\u008d"+
+		"\u0001\u0000\u0000\u0000\u008e\u008f\u0001\u0000\u0000\u0000\u008f\u0090"+
+		"\u0001\u0000\u0000\u0000\u0090\u0091\u0005\u001e\u0000\u0000\u0091\u0093"+
+		"\u0003\u0014\n\u0000\u0092\u0082\u0001\u0000\u0000\u0000\u0092\u0085\u0001"+
+		"\u0000\u0000\u0000\u0093\u000b\u0001\u0000\u0000\u0000\u0094\u0099\u0003"+
+		"\u000e\u0007\u0000\u0095\u0096\u0005\"\u0000\u0000\u0096\u0098\u0003\u000e"+
+		"\u0007\u0000\u0097\u0095\u0001\u0000\u0000\u0000\u0098\u009b\u0001\u0000"+
+		"\u0000\u0000\u0099\u0097\u0001\u0000\u0000\u0000\u0099\u009a\u0001\u0000"+
+		"\u0000\u0000\u009a\r\u0001\u0000\u0000\u0000\u009b\u0099\u0001\u0000\u0000"+
+		"\u0000\u009c\u009d\u0003R)\u0000\u009d\u009e\u0005/\u0000\u0000\u009e"+
+		"\u000f\u0001\u0000\u0000\u0000\u009f\u00a4\u0003*\u0015\u0000\u00a0\u00a1"+
+		"\u0005\"\u0000\u0000\u00a1\u00a3\u0003*\u0015\u0000\u00a2\u00a0\u0001"+
+		"\u0000\u0000\u0000\u00a3\u00a6\u0001\u0000\u0000\u0000\u00a4\u00a2\u0001"+
+		"\u0000\u0000\u0000\u00a4\u00a5\u0001\u0000\u0000\u0000\u00a5\u00a8\u0001"+
+		"\u0000\u0000\u0000\u00a6\u00a4\u0001\u0000\u0000\u0000\u00a7\u009f\u0001"+
+		"\u0000\u0000\u0000\u00a7\u00a8\u0001\u0000\u0000\u0000\u00a8\u0011\u0001"+
+		"\u0000\u0000\u0000\u00a9\u00aa\u0003\u0016\u000b\u0000\u00aa\u00ab\u0005"+
+		"!\u0000\u0000\u00ab\u00b7\u0001\u0000\u0000\u0000\u00ac\u00ad\u0003\u0018"+
+		"\f\u0000\u00ad\u00ae\u0005!\u0000\u0000\u00ae\u00b7\u0001\u0000\u0000"+
+		"\u0000\u00af\u00b7\u0003\u0014\n\u0000\u00b0\u00b7\u0003\u001a\r\u0000"+
+		"\u00b1\u00b7\u0003\u001c\u000e\u0000\u00b2\u00b7\u0003\u001e\u000f\u0000"+
+		"\u00b3\u00b4\u0003$\u0012\u0000\u00b4\u00b5\u0005!\u0000\u0000\u00b5\u00b7"+
+		"\u0001\u0000\u0000\u0000\u00b6\u00a9\u0001\u0000\u0000\u0000\u00b6\u00ac"+
+		"\u0001\u0000\u0000\u0000\u00b6\u00af\u0001\u0000\u0000\u0000\u00b6\u00b0"+
+		"\u0001\u0000\u0000\u0000\u00b6\u00b1\u0001\u0000\u0000\u0000\u00b6\u00b2"+
+		"\u0001\u0000\u0000\u0000\u00b6\u00b3\u0001\u0000\u0000\u0000\u00b7\u0013"+
+		"\u0001\u0000\u0000\u0000\u00b8\u00bc\u0005\u001f\u0000\u0000\u00b9\u00bb"+
+		"\u0003\u0012\t\u0000\u00ba\u00b9\u0001\u0000\u0000\u0000\u00bb\u00be\u0001"+
+		"\u0000\u0000\u0000\u00bc\u00ba\u0001\u0000\u0000\u0000\u00bc\u00bd\u0001"+
+		"\u0000\u0000\u0000\u00bd\u00bf\u0001\u0000\u0000\u0000\u00be\u00bc\u0001"+
+		"\u0000\u0000\u0000\u00bf\u00c0\u0005 \u0000\u0000\u00c0\u0015\u0001\u0000"+
+		"\u0000\u0000\u00c1\u00c3\u0005)\u0000\u0000\u00c2\u00c4\u0003*\u0015\u0000"+
+		"\u00c3\u00c2\u0001\u0000\u0000\u0000\u00c3\u00c4\u0001\u0000\u0000\u0000"+
+		"\u00c4\u0017\u0001\u0000\u0000\u0000\u00c5\u00c6\u0003R)\u0000\u00c6\u00c9"+
+		"\u0005/\u0000\u0000\u00c7\u00c8\u0005\r\u0000\u0000\u00c8\u00ca\u0003"+
+		"*\u0015\u0000\u00c9\u00c7\u0001\u0000\u0000\u0000\u00c9\u00ca\u0001\u0000"+
+		"\u0000\u0000\u00ca\u0019\u0001\u0000\u0000\u0000\u00cb\u00cc\u0005%\u0000"+
+		"\u0000\u00cc\u00cd\u0005\u001d\u0000\u0000\u00cd\u00ce\u0003*\u0015\u0000"+
+		"\u00ce\u00cf\u0005\u001e\u0000\u0000\u00cf\u00d0\u0003\u0014\n\u0000\u00d0"+
+		"\u001b\u0001\u0000\u0000\u0000\u00d1\u00d2\u0005(\u0000\u0000\u00d2\u00d5"+
+		"\u0005\u001d\u0000\u0000\u00d3\u00d6\u0003$\u0012\u0000\u00d4\u00d6\u0003"+
+		"\u0018\f\u0000\u00d5\u00d3\u0001\u0000\u0000\u0000\u00d5\u00d4\u0001\u0000"+
+		"\u0000\u0000\u00d6\u00d7\u0001\u0000\u0000\u0000\u00d7\u00d9\u0005!\u0000"+
+		"\u0000\u00d8\u00da\u0003*\u0015\u0000\u00d9\u00d8\u0001\u0000\u0000\u0000"+
+		"\u00d9\u00da\u0001\u0000\u0000\u0000\u00da\u00db\u0001\u0000\u0000\u0000"+
+		"\u00db\u00dd\u0005!\u0000\u0000\u00dc\u00de\u0003$\u0012\u0000\u00dd\u00dc"+
+		"\u0001\u0000\u0000\u0000\u00dd\u00de\u0001\u0000\u0000\u0000\u00de\u00df"+
+		"\u0001\u0000\u0000\u0000\u00df\u00e0\u0005\u001e\u0000\u0000\u00e0\u00e1"+
+		"\u0003\u0012\t\u0000\u00e1\u001d\u0001\u0000\u0000\u0000\u00e2\u00e4\u0003"+
+		" \u0010\u0000\u00e3\u00e5\u0003\"\u0011\u0000\u00e4\u00e3\u0001\u0000"+
+		"\u0000\u0000\u00e4\u00e5\u0001\u0000\u0000\u0000\u00e5\u001f\u0001\u0000"+
+		"\u0000\u0000\u00e6\u00e7\u0005&\u0000\u0000\u00e7\u00e8\u0005\u001d\u0000"+
+		"\u0000\u00e8\u00e9\u0003*\u0015\u0000\u00e9\u00ea\u0005\u001e\u0000\u0000"+
+		"\u00ea\u00eb\u0003\u0012\t\u0000\u00eb!\u0001\u0000\u0000\u0000\u00ec"+
+		"\u00ed\u0005\'\u0000\u0000\u00ed\u00ee\u0003\u0012\t\u0000\u00ee#\u0001"+
+		"\u0000\u0000\u0000\u00ef\u00f4\u0003&\u0013\u0000\u00f0\u00f4\u0003(\u0014"+
+		"\u0000\u00f1\u00f4\u0003L&\u0000\u00f2\u00f4\u00030\u0018\u0000\u00f3"+
+		"\u00ef\u0001\u0000\u0000\u0000\u00f3\u00f0\u0001\u0000\u0000\u0000\u00f3"+
+		"\u00f1\u0001\u0000\u0000\u0000\u00f3\u00f2\u0001\u0000\u0000\u0000\u00f4"+
+		"%\u0001\u0000\u0000\u0000\u00f5\u00f6\u0003>\u001f\u0000\u00f6\u00f7\u0005"+
+		"\r\u0000\u0000\u00f7\u00f8\u0003*\u0015\u0000\u00f8\'\u0001\u0000\u0000"+
+		"\u0000\u00f9\u00fa\u0005*\u0000\u0000\u00fa\u00fb\u0005/\u0000\u0000\u00fb"+
+		"\u00fc\u0005\u001d\u0000\u0000\u00fc\u00fd\u0003\u0010\b\u0000\u00fd\u00fe"+
+		"\u0005\u001e\u0000\u0000\u00fe)\u0001\u0000\u0000\u0000\u00ff\u0102\u0003"+
+		",\u0016\u0000\u0100\u0102\u0003B!\u0000\u0101\u00ff\u0001\u0000\u0000"+
+		"\u0000\u0101\u0100\u0001\u0000\u0000\u0000\u0102+\u0001\u0000\u0000\u0000"+
+		"\u0103\u010e\u0005$\u0000\u0000\u0104\u010e\u0005/\u0000\u0000\u0105\u010e"+
+		"\u0003@ \u0000\u0106\u010e\u0003T*\u0000\u0107\u010e\u0003.\u0017\u0000"+
+		"\u0108\u010e\u0003$\u0012\u0000\u0109\u010a\u0005\u001d\u0000\u0000\u010a"+
+		"\u010b\u0003*\u0015\u0000\u010b\u010c\u0005\u001e\u0000\u0000\u010c\u010e"+
+		"\u0001\u0000\u0000\u0000\u010d\u0103\u0001\u0000\u0000\u0000\u010d\u0104"+
+		"\u0001\u0000\u0000\u0000\u010d\u0105\u0001\u0000\u0000\u0000\u010d\u0106"+
+		"\u0001\u0000\u0000\u0000\u010d\u0107\u0001\u0000\u0000\u0000\u010d\u0108"+
+		"\u0001\u0000\u0000\u0000\u010d\u0109\u0001\u0000\u0000\u0000\u010e-\u0001"+
+		"\u0000\u0000\u0000\u010f\u0110\u0005\u0019\u0000\u0000\u0110\u0111\u0003"+
+		"*\u0015\u0000\u0111/\u0001\u0000\u0000\u0000\u0112\u0115\u00032\u0019"+
+		"\u0000\u0113\u0115\u00038\u001c\u0000\u0114\u0112\u0001\u0000\u0000\u0000"+
+		"\u0114\u0113\u0001\u0000\u0000\u0000\u01151\u0001\u0000\u0000\u0000\u0116"+
+		"\u0119\u00034\u001a\u0000\u0117\u0119\u00036\u001b\u0000\u0118\u0116\u0001"+
+		"\u0000\u0000\u0000\u0118\u0117\u0001\u0000\u0000\u0000\u01193\u0001\u0000"+
+		"\u0000\u0000\u011a\u011b\u0005\u0001\u0000\u0000\u011b\u011c\u0003>\u001f"+
+		"\u0000\u011c5\u0001\u0000\u0000\u0000\u011d\u011e\u0003>\u001f\u0000\u011e"+
+		"\u011f\u0005\u0001\u0000\u0000\u011f7\u0001\u0000\u0000\u0000\u0120\u0123"+
+		"\u0003:\u001d\u0000\u0121\u0123\u0003<\u001e\u0000\u0122\u0120\u0001\u0000"+
+		"\u0000\u0000\u0122\u0121\u0001\u0000\u0000\u0000\u01239\u0001\u0000\u0000"+
+		"\u0000\u0124\u0125\u0005\u0002\u0000\u0000\u0125\u0126\u0003>\u001f\u0000"+
+		"\u0126;\u0001\u0000\u0000\u0000\u0127\u0128\u0003>\u001f\u0000\u0128\u0129"+
+		"\u0005\u0002\u0000\u0000\u0129=\u0001\u0000\u0000\u0000\u012a\u012d\u0005"+
+		"/\u0000\u0000\u012b\u012d\u0003@ \u0000\u012c\u012a\u0001\u0000\u0000"+
+		"\u0000\u012c\u012b\u0001\u0000\u0000\u0000\u012d?\u0001\u0000\u0000\u0000"+
+		"\u012e\u012f\u0005$\u0000\u0000\u012f\u0130\u0005\u001c\u0000\u0000\u0130"+
+		"\u013d\u0005/\u0000\u0000\u0131\u0132\u0005$\u0000\u0000\u0132\u0134\u0005"+
+		"\u001c\u0000\u0000\u0133\u0131\u0001\u0000\u0000\u0000\u0133\u0134\u0001"+
+		"\u0000\u0000\u0000\u0134\u0137\u0001\u0000\u0000\u0000\u0135\u0136\u0005"+
+		"/\u0000\u0000\u0136\u0138\u0005\u001c\u0000\u0000\u0137\u0135\u0001\u0000"+
+		"\u0000\u0000\u0138\u0139\u0001\u0000\u0000\u0000\u0139\u0137\u0001\u0000"+
+		"\u0000\u0000\u0139\u013a\u0001\u0000\u0000\u0000\u013a\u013b\u0001\u0000"+
+		"\u0000\u0000\u013b\u013d\u0005/\u0000\u0000\u013c\u012e\u0001\u0000\u0000"+
+		"\u0000\u013c\u0133\u0001\u0000\u0000\u0000\u013dA\u0001\u0000\u0000\u0000"+
+		"\u013e\u0141\u0003D\"\u0000\u013f\u0141\u0003J%\u0000\u0140\u013e\u0001"+
+		"\u0000\u0000\u0000\u0140\u013f\u0001\u0000\u0000\u0000\u0141C\u0001\u0000"+
+		"\u0000\u0000\u0142\u0143\u0006\"\uffff\uffff\u0000\u0143\u0144\u0003F"+
+		"#\u0000\u0144\u014a\u0001\u0000\u0000\u0000\u0145\u0146\n\u0002\u0000"+
+		"\u0000\u0146\u0147\u0005\n\u0000\u0000\u0147\u0149\u0003F#\u0000\u0148"+
+		"\u0145\u0001\u0000\u0000\u0000\u0149\u014c\u0001\u0000\u0000\u0000\u014a"+
+		"\u0148\u0001\u0000\u0000\u0000\u014a\u014b\u0001\u0000\u0000\u0000\u014b"+
+		"E\u0001\u0000\u0000\u0000\u014c\u014a\u0001\u0000\u0000\u0000\u014d\u014e"+
+		"\u0006#\uffff\uffff\u0000\u014e\u014f\u0003H$\u0000\u014f\u0155\u0001"+
+		"\u0000\u0000\u0000\u0150\u0151\n\u0002\u0000\u0000\u0151\u0152\u0005\t"+
+		"\u0000\u0000\u0152\u0154\u0003H$\u0000\u0153\u0150\u0001\u0000\u0000\u0000"+
+		"\u0154\u0157\u0001\u0000\u0000\u0000\u0155\u0153\u0001\u0000\u0000\u0000"+
+		"\u0155\u0156\u0001\u0000\u0000\u0000\u0156G\u0001\u0000\u0000\u0000\u0157"+
+		"\u0155\u0001\u0000\u0000\u0000\u0158\u0161\u0005,\u0000\u0000\u0159\u0161"+
+		"\u0005/\u0000\u0000\u015a\u0161\u0003@ \u0000\u015b\u015c\u0003L&\u0000"+
+		"\u015c\u015d\u0005\u001d\u0000\u0000\u015d\u015e\u0003D\"\u0000\u015e"+
+		"\u015f\u0005\u001e\u0000\u0000\u015f\u0161\u0001\u0000\u0000\u0000\u0160"+
+		"\u0158\u0001\u0000\u0000\u0000\u0160\u0159\u0001\u0000\u0000\u0000\u0160"+
+		"\u015a\u0001\u0000\u0000\u0000\u0160\u015b\u0001\u0000\u0000\u0000\u0161"+
+		"I\u0001\u0000\u0000\u0000\u0162\u0163\u0003,\u0016\u0000\u0163\u0164\u0003"+
+		"V+\u0000\u0164\u0165\u0003*\u0015\u0000\u0165K\u0001\u0000\u0000\u0000"+
+		"\u0166\u0168\u0003N\'\u0000\u0167\u0166\u0001\u0000\u0000\u0000\u0167"+
+		"\u0168\u0001\u0000\u0000\u0000\u0168\u016c\u0001\u0000\u0000\u0000\u0169"+
+		"\u016b\u0003P(\u0000\u016a\u0169\u0001\u0000\u0000\u0000\u016b\u016e\u0001"+
+		"\u0000\u0000\u0000\u016c\u016a\u0001\u0000\u0000\u0000\u016c\u016d\u0001"+
+		"\u0000\u0000\u0000\u016d\u016f\u0001\u0000\u0000\u0000\u016e\u016c\u0001"+
+		"\u0000\u0000\u0000\u016f\u0170\u0005/\u0000\u0000\u0170\u0171\u0005\u001d"+
+		"\u0000\u0000\u0171\u0172\u0003\u0010\b\u0000\u0172\u0173\u0005\u001e\u0000"+
+		"\u0000\u0173M\u0001\u0000\u0000\u0000\u0174\u0179\u0005$\u0000\u0000\u0175"+
+		"\u0179\u0003@ \u0000\u0176\u0179\u0003(\u0014\u0000\u0177\u0179\u0005"+
+		"/\u0000\u0000\u0178\u0174\u0001\u0000\u0000\u0000\u0178\u0175\u0001\u0000"+
+		"\u0000\u0000\u0178\u0176\u0001\u0000\u0000\u0000\u0178\u0177\u0001\u0000"+
+		"\u0000\u0000\u0179\u017a\u0001\u0000\u0000\u0000\u017a\u017b\u0005\u001c"+
+		"\u0000\u0000\u017bO\u0001\u0000\u0000\u0000\u017c\u017d\u0005/\u0000\u0000"+
+		"\u017d\u017e\u0005\u001d\u0000\u0000\u017e\u017f\u0003\u0010\b\u0000\u017f"+
+		"\u0180\u0005\u001e\u0000\u0000\u0180\u0181\u0005\u001c\u0000\u0000\u0181"+
+		"Q\u0001\u0000\u0000\u0000\u0182\u0183\u0007\u0000\u0000\u0000\u0183S\u0001"+
+		"\u0000\u0000\u0000\u0184\u0185\u0007\u0001\u0000\u0000\u0185U\u0001\u0000"+
+		"\u0000\u0000\u0186\u0187\u0007\u0002\u0000\u0000\u0187W\u0001\u0000\u0000"+
+		"\u0000\'[^fnqv|\u0085\u0089\u008e\u0092\u0099\u00a4\u00a7\u00b6\u00bc"+
+		"\u00c3\u00c9\u00d5\u00d9\u00dd\u00e4\u00f3\u0101\u010d\u0114\u0118\u0122"+
+		"\u012c\u0133\u0139\u013c\u0140\u014a\u0155\u0160\u0167\u016c\u0178";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
diff --git a/src/main/java/parser/generated/SimpleJavaVisitor.java b/src/main/java/parser/generated/SimpleJavaVisitor.java
index dd4ca0f..3b31f92 100644
--- a/src/main/java/parser/generated/SimpleJavaVisitor.java
+++ b/src/main/java/parser/generated/SimpleJavaVisitor.java
@@ -1,4 +1,4 @@
-// Generated from C:/Users/Johannes/Documents/Github/JavaCompiler/src/main/java/parser/SimpleJava.g4 by ANTLR 4.13.1
+// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1
 package parser.generated;
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
 
@@ -28,6 +28,12 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitMemberDeclaration(SimpleJavaParser.MemberDeclarationContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#constructorDeclaration}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#fieldDeclaration}.
 	 * @param ctx the parse tree
@@ -40,12 +46,6 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#constructorDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#parameterList}.
 	 * @param ctx the parse tree
@@ -59,17 +59,11 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitParameter(SimpleJavaParser.ParameterContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#type}.
+	 * Visit a parse tree produced by {@link SimpleJavaParser#argumentList}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitType(SimpleJavaParser.TypeContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#accessType}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAccessType(SimpleJavaParser.AccessTypeContext ctx);
+	T visitArgumentList(SimpleJavaParser.ArgumentListContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#statement}.
 	 * @param ctx the parse tree
@@ -77,35 +71,11 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitStatement(SimpleJavaParser.StatementContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#variableDeclarationStatement}.
+	 * Visit a parse tree produced by {@link SimpleJavaParser#block}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitVariableDeclarationStatement(SimpleJavaParser.VariableDeclarationStatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#assignmentStatement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitAssignmentStatement(SimpleJavaParser.AssignmentStatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#var}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitVar(SimpleJavaParser.VarContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#ifStatement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitIfStatement(SimpleJavaParser.IfStatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#whileStatement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
+	T visitBlock(SimpleJavaParser.BlockContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#returnStatement}.
 	 * @param ctx the parse tree
@@ -113,11 +83,59 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#block}.
+	 * Visit a parse tree produced by {@link SimpleJavaParser#localVariableDeclaration}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitBlock(SimpleJavaParser.BlockContext ctx);
+	T visitLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#whileStatement}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#forStatement}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitForStatement(SimpleJavaParser.ForStatementContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#ifElseStatement}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#ifStatement}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitIfStatement(SimpleJavaParser.IfStatementContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#elseStatement}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitElseStatement(SimpleJavaParser.ElseStatementContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#statementExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitStatementExpression(SimpleJavaParser.StatementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#assign}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitAssign(SimpleJavaParser.AssignContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#newDeclaration}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#expression}.
 	 * @param ctx the parse tree
@@ -125,21 +143,135 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitExpression(SimpleJavaParser.ExpressionContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#literal}.
+	 * Visit a parse tree produced by {@link SimpleJavaParser#unaryExpression}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitLiteral(SimpleJavaParser.LiteralContext ctx);
+	T visitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#booleanLiteral}.
+	 * Visit a parse tree produced by {@link SimpleJavaParser#notExpression}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitBooleanLiteral(SimpleJavaParser.BooleanLiteralContext ctx);
+	T visitNotExpression(SimpleJavaParser.NotExpressionContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#charLiteral}.
+	 * Visit a parse tree produced by {@link SimpleJavaParser#crementExpression}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitCharLiteral(SimpleJavaParser.CharLiteralContext ctx);
+	T visitCrementExpression(SimpleJavaParser.CrementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#incrementExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#prefixIncrementExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#suffixIncrementExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#decrementExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#prefixDecrementExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#suffixDecrementExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#assignableExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#memberAccess}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitMemberAccess(SimpleJavaParser.MemberAccessContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#binaryExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#calculationExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#dotExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitDotExpression(SimpleJavaParser.DotExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#dotSubtractionExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#nonCalculationExpression}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#methodCall}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitMethodCall(SimpleJavaParser.MethodCallContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#target}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitTarget(SimpleJavaParser.TargetContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#chainedMethod}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitChainedMethod(SimpleJavaParser.ChainedMethodContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#type}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitType(SimpleJavaParser.TypeContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#value}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitValue(SimpleJavaParser.ValueContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link SimpleJavaParser#nonCalculationOperator}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitNonCalculationOperator(SimpleJavaParser.NonCalculationOperatorContext ctx);
 }
\ No newline at end of file
diff --git a/src/main/java/parser/grammar/SimpleJava.g4 b/src/main/java/parser/grammar/SimpleJava.g4
new file mode 100644
index 0000000..2a63966
--- /dev/null
+++ b/src/main/java/parser/grammar/SimpleJava.g4
@@ -0,0 +1,168 @@
+grammar SimpleJava;
+
+// Programm-Konstrukte
+program: classDeclaration+;
+
+classDeclaration: AccessModifier? 'class' Identifier OpenCurlyBracket memberDeclaration* ClosedCurlyBracket;
+memberDeclaration: constructorDeclaration | fieldDeclaration | methodDeclaration;
+
+constructorDeclaration: AccessModifier? Identifier OpenRoundBracket parameterList? ClosedRoundBracket block;
+fieldDeclaration: AccessModifier? type Identifier Semicolon;
+methodDeclaration: MainMethodDeclaration block | AccessModifier? (type | Void) Identifier OpenRoundBracket parameterList? ClosedRoundBracket block;
+
+parameterList: parameter (Comma parameter)*;
+parameter: type Identifier;
+argumentList: (expression (Comma expression)*)?;
+
+// Anweisungen
+statement: returnStatement Semicolon
+         | localVariableDeclaration Semicolon
+         | block
+         | whileStatement
+         | forStatement
+         | ifElseStatement
+         | statementExpression Semicolon;
+
+block: OpenCurlyBracket statement* ClosedCurlyBracket;
+
+returnStatement: Return (expression)?;
+localVariableDeclaration: type Identifier (Assign expression)?;
+
+whileStatement: While OpenRoundBracket expression ClosedRoundBracket block;
+forStatement: For OpenRoundBracket (statementExpression | localVariableDeclaration) Semicolon (expression)? Semicolon (statementExpression)? ClosedRoundBracket statement;
+
+ifElseStatement: ifStatement elseStatement?;
+ifStatement: If OpenRoundBracket expression ClosedRoundBracket statement;
+elseStatement: Else statement;
+
+statementExpression: assign | newDeclaration | methodCall | crementExpression;
+assign: assignableExpression Assign expression;
+newDeclaration: New Identifier OpenRoundBracket argumentList ClosedRoundBracket;
+
+// Ausdrücke
+expression: unaryExpression | binaryExpression;
+
+unaryExpression: This
+               | Identifier
+               | memberAccess
+               | value
+               | notExpression
+               | statementExpression
+               | OpenRoundBracket expression ClosedRoundBracket;
+
+notExpression: Not expression;
+
+crementExpression: incrementExpression | decrementExpression;
+
+incrementExpression: prefixIncrementExpression | suffixIncrementExpression;
+prefixIncrementExpression: '++' assignableExpression;
+suffixIncrementExpression: assignableExpression '++';
+
+decrementExpression: prefixDecrementExpression | suffixDecrementExpression;
+prefixDecrementExpression: '--' assignableExpression;
+suffixDecrementExpression: assignableExpression '--';
+
+assignableExpression: Identifier | memberAccess;
+
+memberAccess: This Dot Identifier
+            | (This Dot)? (Identifier Dot)+ Identifier;
+
+binaryExpression: calculationExpression | nonCalculationExpression;
+
+calculationExpression: calculationExpression LineOperator dotExpression
+                     | dotExpression;
+
+dotExpression: dotExpression DotOperator dotSubtractionExpression
+              | dotSubtractionExpression;
+
+dotSubtractionExpression: IntValue
+                        | Identifier
+                        | memberAccess
+                        | methodCall OpenRoundBracket calculationExpression ClosedRoundBracket;
+
+nonCalculationExpression: unaryExpression nonCalculationOperator expression;
+
+// Methodenaufrufe
+methodCall: target? chainedMethod* Identifier OpenRoundBracket argumentList ClosedRoundBracket;
+target: (This | memberAccess | newDeclaration | Identifier) Dot;
+chainedMethod: Identifier OpenRoundBracket argumentList ClosedRoundBracket Dot;
+
+// Typen
+type: Int
+    | Boolean
+    | Char
+    | Identifier;
+
+Void: 'void';
+Boolean: 'boolean';
+Char: 'char';
+Int: 'int';
+
+value: IntValue
+     | BooleanValue
+     | CharValue
+     | NullValue;
+
+// Zugriffsmodifikatoren
+AccessModifier: 'public' | 'private' | 'public static' | 'private static';
+MainMethodDeclaration: 'public static void main(String[] args)';
+
+// Operatoren
+nonCalculationOperator: LogicalOperator | ComparisonOperator;
+
+DotOperator: Mult | Div | Modulo;
+LineOperator: Plus | Minus;
+ComparisonOperator: Greater | Less | GreaterEqual | LessEqual | Equal | NotEqual;
+LogicalOperator: And | Or;
+
+Assign: '=';
+Plus: '+';
+Minus: '-';
+Mult: '*';
+Modulo: '%';
+Div: '/';
+Greater: '>';
+Less: '<';
+GreaterEqual: '>=';
+LessEqual: '<=';
+Equal: '==';
+NotEqual: '!=';
+Not: '!';
+And: '&&';
+Or: '||';
+
+// Symbole
+Dot: '.';
+OpenRoundBracket: '(';
+ClosedRoundBracket: ')';
+OpenCurlyBracket: '{';
+ClosedCurlyBracket: '}';
+Semicolon: ';';
+Comma: ',';
+
+// Schlüsselwörter
+Class: 'class';
+This: 'this';
+While: 'while';
+If: 'if';
+Else: 'else';
+For: 'for';
+Return: 'return';
+New: 'new';
+
+// Werte
+CharValue: '\'' ~[\r\n]* '\'';
+IntValue: Minus? Numeric+;
+BooleanValue: 'true' | 'false';
+NullValue: 'null';
+
+// Bezeichner
+fragment Alphabetic: [a-zA-Z];
+fragment Numeric: [0-9];
+fragment ValidIdentSymbols: Alphabetic | Numeric | '$' | '_';
+Identifier: Alphabetic ValidIdentSymbols*;
+
+// Whitespaces und Kommentare ignorieren
+WS: [ \t\r\n]+ -> skip;
+InlineComment: '//' ~[\r\n]* -> skip;
+MultilineComment: '/*' .*? '*/' -> skip;
\ No newline at end of file
diff --git a/src/main/java/semantic/Scope.java b/src/main/java/semantic/Scope.java
index 7cf4cc9..60e9d2b 100644
--- a/src/main/java/semantic/Scope.java
+++ b/src/main/java/semantic/Scope.java
@@ -1,6 +1,6 @@
 package semantic;
 
-import ast.type.TypeNode;
+import oldAst.type.TypeNode;
 
 import java.util.HashMap;
 import java.util.Stack;
diff --git a/src/main/java/semantic/SemanticAnalyzer.java b/src/main/java/semantic/SemanticAnalyzer.java
index 2d95119..3bce422 100644
--- a/src/main/java/semantic/SemanticAnalyzer.java
+++ b/src/main/java/semantic/SemanticAnalyzer.java
@@ -1,26 +1,25 @@
 package semantic;
 
 
-import ast.*;
-import ast.expression.*;
-import ast.member.FieldNode;
-import ast.member.MemberNode;
+import oldAst.*;
+import oldAst.expression.*;
+import oldAst.member.FieldNode;
+import oldAst.member.MemberNode;
 
-import ast.member.MethodNode;
-import ast.parameter.ParameterListNode;
-import ast.parameter.ParameterNode;
-import ast.statement.*;
-import ast.type.ReferenceTypeNode;
-import ast.expression.This;
+import oldAst.member.MethodNode;
+import oldAst.parameter.ParameterListNode;
+import oldAst.parameter.ParameterNode;
+import oldAst.statement.*;
+import oldAst.type.ReferenceTypeNode;
+import oldAst.expression.This;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
-import ast.type.BaseTypeNode;
-import ast.type.EnumTypeNode;
-import ast.type.TypeNode;
+import oldAst.type.BaseTypeNode;
+import oldAst.type.TypeNode;
 import semantic.context.Context;
 import semantic.exeptions.AlreadyDeclearedException;
 import semantic.exeptions.NotDeclearedException;
diff --git a/src/main/java/semantic/context/ClassContext.java b/src/main/java/semantic/context/ClassContext.java
index 982866f..6b0d386 100644
--- a/src/main/java/semantic/context/ClassContext.java
+++ b/src/main/java/semantic/context/ClassContext.java
@@ -1,7 +1,7 @@
 package semantic.context;
 
-import ast.ClassNode;
-import ast.member.FieldNode;
+import oldAst.ClassNode;
+import oldAst.member.FieldNode;
 import java.util.HashMap;
 
 public class ClassContext {
diff --git a/src/main/java/semantic/context/Context.java b/src/main/java/semantic/context/Context.java
index 7006e65..31ba3de 100644
--- a/src/main/java/semantic/context/Context.java
+++ b/src/main/java/semantic/context/Context.java
@@ -1,7 +1,6 @@
 package semantic.context;
 
-import ast.ClassNode;
-import ast.ProgramNode;
+import oldAst.ProgramNode;
 import java.util.HashMap;
 
 public class Context {
diff --git a/src/main/java/semantic/context/FieldContext.java b/src/main/java/semantic/context/FieldContext.java
index 447aa4e..2dad262 100644
--- a/src/main/java/semantic/context/FieldContext.java
+++ b/src/main/java/semantic/context/FieldContext.java
@@ -1,9 +1,8 @@
 package semantic.context;
 
-import ast.member.FieldNode;
-import ast.type.AccessTypeNode;
-import ast.type.EnumAccessTypeNode;
-import ast.type.TypeNode;
+import oldAst.member.FieldNode;
+import oldAst.type.AccessTypeNode;
+import oldAst.type.TypeNode;
 
 public class FieldContext {
 
diff --git a/src/main/java/typechecker/TypeCheckResult.java b/src/main/java/typechecker/TypeCheckResult.java
index 12143b2..a06d359 100644
--- a/src/main/java/typechecker/TypeCheckResult.java
+++ b/src/main/java/typechecker/TypeCheckResult.java
@@ -1,7 +1,7 @@
 package typechecker;
 
 
-import ast.type.TypeNode;
+import oldAst.type.TypeNode;
 
 public class TypeCheckResult {
 
diff --git a/src/main/test/java/MainTest.java b/src/main/test/java/MainTest.java
index f9e848e..d4899fd 100644
--- a/src/main/test/java/MainTest.java
+++ b/src/main/test/java/MainTest.java
@@ -4,8 +4,8 @@ import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import parser.ASTBuilder;
-import ast.ClassNode;
-import ast.ProgramNode;
+import oldAst.ClassNode;
+import oldAst.ProgramNode;
 import bytecode.ByteCodeGenerator;
 
 import java.io.IOException;
diff --git a/src/test/java/semantic/Mocker.java b/src/test/java/semantic/Mocker.java
index 4c303d8..8ab9434 100644
--- a/src/test/java/semantic/Mocker.java
+++ b/src/test/java/semantic/Mocker.java
@@ -1,18 +1,17 @@
 package semantic;
 
-import ast.ClassNode;
-import ast.expression.LiteralNode;
-import ast.ProgramNode;
-import ast.expression.*;
-import ast.member.FieldNode;
-import ast.member.MemberNode;
-import ast.member.MethodNode;
-import ast.parameter.ParameterListNode;
-import ast.parameter.ParameterNode;
-import ast.statement.AssignmentStatementNode;
-import ast.statement.StatementNode;
-import ast.statement.VariableDeclarationStatementNode;
-import ast.type.*;
+import oldAst.ClassNode;
+import oldAst.expression.LiteralNode;
+import oldAst.ProgramNode;
+import oldAst.expression.*;
+import oldAst.member.FieldNode;
+import oldAst.member.MemberNode;
+import oldAst.member.MethodNode;
+import oldAst.parameter.ParameterListNode;
+import oldAst.parameter.ParameterNode;
+import oldAst.statement.AssignmentStatementNode;
+import oldAst.statement.StatementNode;
+import oldAst.type.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/semantic/SemanticTest.java b/src/test/java/semantic/SemanticTest.java
index 71604ee..cc413a2 100644
--- a/src/test/java/semantic/SemanticTest.java
+++ b/src/test/java/semantic/SemanticTest.java
@@ -1,9 +1,8 @@
 package semantic;
 
 
-import ast.*;
+import oldAst.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.assertj.core.api.MatcherAssert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import semantic.exeptions.AlreadyDeclearedException;