Renaiming packages

src/main/java/ast/ClassNode.java

@@ -1,9 +1,9 @@
 package ast;
 
 import ast.type.AccessModifierNode;
-import ast.member.ConstructorNode;
-import ast.member.MemberNode;
-import ast.member.MethodNode;
+import ast.members.ConstructorNode;
+import ast.members.MemberNode;
+import ast.members.MethodNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 import visitor.Visitable;

src/main/java/ast/expressions/IExpressionNode.java

@@ -1,4 +1,4 @@
-package ast.expression;
+package ast.expressions;
 
 import ast.ASTNode;
 import ast.type.type.ITypeNode;

src/main/java/ast/expressions/binaryexpression/DotSubstractionExpressionNode.java

@@ -1,44 +0,0 @@
-package ast.expression.binaryexpression;
-
-import ast.expression.unaryexpression.MemberAccessNode;
-import ast.statement.statementexpression.methodcallstatementnexpression.MethodCallStatementExpressionNode;
-import ast.type.type.*;
-import ast.type.ValueNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class DotSubstractionExpressionNode extends BinaryExpressionNode {
-    public ValueNode value;
-    public String identifier;
-    public MemberAccessNode memberAccess;
-    public MethodCallStatementExpressionNode methodCall;
-    public CalculationExpressionNode calculationExpression;
-
-    public DotSubstractionExpressionNode(ValueNode value) {
-        this.value = value;
-    }
-
-    public DotSubstractionExpressionNode(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public DotSubstractionExpressionNode(MemberAccessNode memberAccess) {
-        this.memberAccess = memberAccess;
-    }
-
-    public DotSubstractionExpressionNode(MethodCallStatementExpressionNode methodCall, CalculationExpressionNode calculationExpression) {
-        this.methodCall = methodCall;
-        this.calculationExpression = calculationExpression;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-    @Override
-    public ITypeNode getType() {
-        return null;
-    }
-
-}

src/main/java/ast/expressions/binaryexpressions/BinaryNode.java

@@ -1,11 +1,11 @@
-package ast.expression.binaryexpression;
+package ast.expressions.binaryexpressions;
 
-import ast.expression.IExpressionNode;
+import ast.expressions.IExpressionNode;
 import ast.type.type.*;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
-public class BinaryExpressionNode implements IExpressionNode {
+public class BinaryNode implements IExpressionNode {
 
     @Override
     public TypeCheckResult accept(SemanticVisitor visitor) {

src/main/java/ast/expressions/binaryexpressions/CalculationNode.java

@@ -1,21 +1,21 @@
-package ast.expression.binaryexpression;
+package ast.expressions.binaryexpressions;
 
 import ast.type.type.*;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
-public class CalculationExpressionNode extends BinaryExpressionNode {
-    public CalculationExpressionNode calculationExpression;
+public class CalculationNode extends BinaryNode {
+    public CalculationNode calculationExpression;
     public EnumLineOperator operator;
-    public DotExpressionNode dotExpression;
+    public DotNode dotExpression;
 
-    public CalculationExpressionNode(CalculationExpressionNode calculationExpression, String operator, DotExpressionNode dotExpression) {
+    public CalculationNode(CalculationNode calculationExpression, String operator, DotNode dotExpression) {
         this.calculationExpression = calculationExpression;
         setOperator(operator);
         this.dotExpression = dotExpression;
     }
 
-    public CalculationExpressionNode(DotExpressionNode dotExpression) {
+    public CalculationNode(DotNode dotExpression) {
         this.dotExpression = dotExpression;
     }
 

src/main/java/ast/expressions/binaryexpressions/DotNode.java

@@ -1,21 +1,21 @@
-package ast.expression.binaryexpression;
+package ast.expressions.binaryexpressions;
 
 import ast.type.type.*;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
-public class DotExpressionNode extends BinaryExpressionNode {
-    public DotExpressionNode dotExpression;
+public class DotNode extends BinaryNode {
+    public DotNode dotExpression;
     public EnumDotOperator operator;
-    public DotSubstractionExpressionNode dotSubstractionExpression;
+    public DotSubstractionNode dotSubstractionExpression;
 
-    public DotExpressionNode(DotExpressionNode dotExpression, String operator, DotSubstractionExpressionNode dotSubstractionExpression) {
+    public DotNode(DotNode dotExpression, String operator, DotSubstractionNode dotSubstractionExpression) {
         this.dotExpression = dotExpression;
         setOperator(operator);
         this.dotSubstractionExpression = dotSubstractionExpression;
     }
 
-    public DotExpressionNode(DotSubstractionExpressionNode dotSubstractionExpression) {
+    public DotNode(DotSubstractionNode dotSubstractionExpression) {
         this.dotSubstractionExpression = dotSubstractionExpression;
     }
 

src/main/java/ast/expressions/binaryexpressions/DotSubstractionNode.java

@@ -0,0 +1,43 @@
+package ast.expressions.binaryexpressions;
+
+import ast.expressions.unaryexpressions.MemberAccessNode;
+import ast.type.type.*;
+import ast.type.ValueNode;
+import semantic.SemanticVisitor;
+import typechecker.TypeCheckResult;
+
+public class DotSubstractionNode extends BinaryNode {
+    public ValueNode value;
+    public String identifier;
+    public MemberAccessNode memberAccess;
+    public ast.statements.statementexpression.methodcallstatementnexpression.MethodCallStatementNode methodCall;
+    public CalculationNode calculationExpression;
+
+    public DotSubstractionNode(ValueNode value) {
+        this.value = value;
+    }
+
+    public DotSubstractionNode(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public DotSubstractionNode(MemberAccessNode memberAccess) {
+        this.memberAccess = memberAccess;
+    }
+
+    public DotSubstractionNode(ast.statements.statementexpression.methodcallstatementnexpression.MethodCallStatementNode methodCall, CalculationNode calculationExpression) {
+        this.methodCall = methodCall;
+        this.calculationExpression = calculationExpression;
+    }
+
+    @Override
+    public TypeCheckResult accept(SemanticVisitor visitor) {
+        return visitor.analyze(this);
+    }
+
+    @Override
+    public ITypeNode getType() {
+        return null;
+    }
+
+}

src/main/java/ast/expressions/binaryexpressions/EnumDotOperator.java

@@ -1,4 +1,4 @@
-package ast.expression.binaryexpression;
+package ast.expressions.binaryexpressions;
 
 public enum EnumDotOperator {
     MULT, DIV, MOD

src/main/java/ast/expressions/binaryexpressions/EnumLineOperator.java

@@ -1,4 +1,4 @@
-package ast.expression.binaryexpression;
+package ast.expressions.binaryexpressions;
 
 public enum EnumLineOperator {
     PLUS, MINUS

src/main/java/ast/expressions/binaryexpressions/EnumNonCalculationOperator.java

@@ -1,4 +1,4 @@
-package ast.expression.binaryexpression;
+package ast.expressions.binaryexpressions;
 
 public enum EnumNonCalculationOperator {
     AND, OR, GREATER, LESS, GREATER_EQUAL, LESS_EQUAL, EQUAL, NOT_EQUAL

src/main/java/ast/expressions/binaryexpressions/NonCalculationNode.java

@@ -1,17 +1,17 @@
-package ast.expression.binaryexpression;
+package ast.expressions.binaryexpressions;
 
-import ast.expression.IExpressionNode;
-import ast.expression.unaryexpression.UnaryExpressionNode;
+import ast.expressions.IExpressionNode;
+import ast.expressions.unaryexpressions.UnaryNode;
 import ast.type.type.*;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
-public class NonCalculationExpressionNode extends BinaryExpressionNode {
-    public UnaryExpressionNode unaryExpression;
+public class NonCalculationNode extends BinaryNode {
+    public UnaryNode unaryExpression;
     public EnumNonCalculationOperator operator;
     public IExpressionNode expression;
 
-    public NonCalculationExpressionNode(UnaryExpressionNode unaryExpression, String operator, IExpressionNode expression) {
+    public NonCalculationNode(UnaryNode unaryExpression, String operator, IExpressionNode expression) {
         this.unaryExpression = unaryExpression;
         setOperator(operator);
         this.expression = expression;

src/main/java/ast/expressions/unaryexpression/NotExpressionNode.java

@@ -1,13 +0,0 @@
-package ast.expression.unaryexpression;
-
-import ast.ASTNode;
-import ast.expression.IExpressionNode;
-
-public class NotExpressionNode implements ASTNode {
-    public IExpressionNode expression;
-
-    public NotExpressionNode(IExpressionNode expression) {
-        this.expression = expression;
-    }
-
-}

src/main/java/ast/expressions/unaryexpressions/MemberAccessNode.java

@@ -1,4 +1,4 @@
-package ast.expression.unaryexpression;
+package ast.expressions.unaryexpressions;
 
 import ast.ASTNode;
 

src/main/java/ast/expressions/unaryexpressions/NotNode.java

@@ -0,0 +1,13 @@
+package ast.expressions.unaryexpressions;
+
+import ast.ASTNode;
+import ast.expressions.IExpressionNode;
+
+public class NotNode implements ASTNode {
+    public IExpressionNode expression;
+
+    public NotNode(IExpressionNode expression) {
+        this.expression = expression;
+    }
+
+}

src/main/java/ast/expressions/unaryexpressions/UnaryNode.java

@@ -1,7 +1,7 @@
-package ast.expression.unaryexpression;
+package ast.expressions.unaryexpressions;
 
-import ast.expression.IExpressionNode;
-import ast.statement.IStatementNode;
+import ast.expressions.IExpressionNode;
+import ast.statements.IStatementNode;
 import ast.type.type.*;
 import ast.type.ValueNode;
 import semantic.SemanticVisitor;
@@ -9,17 +9,17 @@ import typechecker.TypeCheckResult;
 
 import java.util.Objects;
 
-public class UnaryExpressionNode implements IExpressionNode {
+public class UnaryNode implements IExpressionNode {
     public String thisExp;
     public String identifier;
     public MemberAccessNode memberAccess;
     public ValueNode value;
-    public NotExpressionNode notExpression;
+    public NotNode notExpression;
     public IStatementNode statement;
     public IExpressionNode expression;
     private ITypeNode type;
 
-    public UnaryExpressionNode(String value) {
+    public UnaryNode(String value) {
         if(Objects.equals(value, "this")) {
             this.thisExp = "this";
         } else {
@@ -27,23 +27,23 @@ public class UnaryExpressionNode implements IExpressionNode {
         }
     }
 
-    public UnaryExpressionNode(MemberAccessNode memberAccess) {
+    public UnaryNode(MemberAccessNode memberAccess) {
         this.memberAccess = memberAccess;
     }
 
-    public UnaryExpressionNode(ValueNode value) {
+    public UnaryNode(ValueNode value) {
         this.value = value;
     }
 
-    public UnaryExpressionNode(NotExpressionNode notExpression) {
+    public UnaryNode(NotNode notExpression) {
         this.notExpression = notExpression;
     }
 
-    public UnaryExpressionNode(IStatementNode statement) {
+    public UnaryNode(IStatementNode statement) {
         this.statement = statement;
     }
 
-    public UnaryExpressionNode(IExpressionNode expression) {
+    public UnaryNode(IExpressionNode expression) {
         this.expression = expression;
     }
 

src/main/java/ast/members/ConstructorNode.java

@@ -1,11 +1,8 @@
-package ast.member;
+package ast.members;
 
-import ast.block.BlockNode;
-import ast.parameter.ParameterNode;
+import ast.parameters.ParameterNode;
+import ast.statements.BlockNode;
 import ast.type.AccessModifierNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-import visitor.Visitable;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/ast/members/MainMethodNode.java

@@ -1,6 +1,6 @@
-package ast.member;
+package ast.members;
 
-import ast.block.BlockNode;
+import ast.statements.BlockNode;
 
 public class MainMethodNode extends MethodNode {
     public BlockNode block;

src/main/java/ast/members/MethodNode.java

@@ -1,7 +1,7 @@
 package ast.members;
 
-import ast.block.BlockNode;
-import ast.parameter.ParameterNode;
+import ast.parameters.ParameterNode;
+import ast.statements.BlockNode;
 import ast.type.AccessModifierNode;
 import ast.type.type.*;
 import bytecode.visitor.MethodVisitor;

src/main/java/ast/statement/ForStatementNode.java

@@ -1,31 +0,0 @@
-package ast.statement;
-
-import ast.ASTNode;
-import ast.expression.IExpressionNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class ForStatementNode implements IStatementNode {
-    public IExpressionNode statementExpressionInit;
-    public IStatementNode localVariableDeclarationInit;
-    public IExpressionNode expression;
-    public IExpressionNode statementExpression;
-
-    public ForStatementNode(IExpressionNode statementExpressionInit, IExpressionNode expression, IExpressionNode statementExpression) {
-        this.statementExpressionInit = statementExpressionInit;
-        this.expression = expression;
-        this.statementExpression = statementExpression;
-    }
-
-    public ForStatementNode(IStatementNode localVariableDeclarationInit, IExpressionNode expression, IExpressionNode statementExpression) {
-        this.localVariableDeclarationInit = localVariableDeclarationInit;
-        this.expression = expression;
-        this.statementExpression = statementExpression;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statement/WhileStatementNode.java

@@ -1,23 +0,0 @@
-package ast.statement;
-
-import ast.ASTNode;
-import ast.block.BlockNode;
-import ast.expression.IExpressionNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class WhileStatementNode implements IStatementNode {
-    public IExpressionNode expression;
-    public BlockNode block;
-
-    public WhileStatementNode(IExpressionNode expression, BlockNode block) {
-        this.expression = expression;
-        this.block = block;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statement/ifstatement/ElseStatementNode.java

@@ -1,21 +0,0 @@
-package ast.statement.ifstatement;
-
-import ast.ASTNode;
-import ast.block.BlockNode;
-import ast.statement.IStatementNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class ElseStatementNode implements IStatementNode {
-    public BlockNode block;
-
-    public ElseStatementNode(BlockNode block) {
-        this.block = block;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statement/ifstatement/IfElseStatementNode.java

@@ -1,28 +0,0 @@
-package ast.statement.ifstatement;
-
-import ast.ASTNode;
-import ast.statement.IStatementNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class IfElseStatementNode implements IStatementNode {
-    public IfStatementNode ifStatement;
-    public List<ElseStatementNode> elseStatements = new ArrayList<>();
-
-    public IfElseStatementNode(IfStatementNode ifStatement) {
-        this.ifStatement = ifStatement;
-    }
-
-    public void addElseStatement(ElseStatementNode elseStatement) {
-        elseStatements.add(elseStatement);
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statement/ifstatement/IfStatementNode.java

@@ -1,24 +0,0 @@
-package ast.statement.ifstatement;
-
-import ast.ASTNode;
-import ast.block.BlockNode;
-import ast.expression.IExpressionNode;
-import ast.statement.IStatementNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class IfStatementNode implements IStatementNode {
-    public IExpressionNode expression;
-    public BlockNode block;
-
-    public IfStatementNode(IExpressionNode expression, BlockNode block) {
-        this.expression = expression;
-        this.block = block;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statementexpressions/AssignNode.java

@@ -0,0 +1,21 @@
+package ast.statementexpressions;
+
+import ast.expressions.IExpressionNode;
+import semantic.SemanticVisitor;
+import typechecker.TypeCheckResult;
+
+public class AssignNode implements IStatementExpressionNode {
+    public AssignableNode assignable;
+    public IExpressionNode expression;
+
+    public AssignNode(AssignableNode assignable, IExpressionNode expression) {
+        this.assignable = assignable;
+        this.expression = expression;
+    }
+
+    @Override
+    public TypeCheckResult accept(SemanticVisitor visitor) {
+        return visitor.analyze(this);
+    }
+
+}

src/main/java/ast/statementexpressions/AssignStatementExpressionNode.java

@@ -1,21 +0,0 @@
-package ast.statement.statementexpression;
-
-import ast.expression.IExpressionNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class AssignStatementExpressionNode implements IStatementExpressionNode {
-    public AssignableExpressionNode assignable;
-    public IExpressionNode expression;
-
-    public AssignStatementExpressionNode(AssignableExpressionNode assignable, IExpressionNode expression) {
-        this.assignable = assignable;
-        this.expression = expression;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statementexpressions/AssignableNode.java

@@ -1,19 +1,19 @@
-package ast.statement.statementexpression;
+package ast.statementexpressions;
 
-import ast.expression.unaryexpression.MemberAccessNode;
+import ast.expressions.unaryexpressions.MemberAccessNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
-public class AssignableExpressionNode implements IStatementExpressionNode {
+public class AssignableNode implements IStatementExpressionNode {
     public String identifier;
 
     public MemberAccessNode memberAccess;
 
-    public AssignableExpressionNode(String identifier) {
+    public AssignableNode(String identifier) {
         this.identifier = identifier;
     }
 
-    public AssignableExpressionNode(MemberAccessNode memberAccess) {
+    public AssignableNode(MemberAccessNode memberAccess) {
         this.memberAccess = memberAccess;
     }
 

src/main/java/ast/statementexpressions/IStatementExpressionNode.java

@@ -1,5 +1,5 @@
-package ast.statement.statementexpression;
+package ast.statementexpressions;
 
-import ast.statement.IStatementNode;
+import ast.statements.IStatementNode;
 
 public interface IStatementExpressionNode extends IStatementNode {}

src/main/java/ast/statementexpressions/NewDeclarationNode.java

@@ -1,18 +1,17 @@
-package ast.statement.statementexpression;
+package ast.statementexpressions;
 
-import ast.ASTNode;
-import ast.expression.IExpressionNode;
+import ast.expressions.IExpressionNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class NewDeclarationStatementExpressionNode implements IStatementExpressionNode {
+public class NewDeclarationNode implements IStatementExpressionNode {
     public String identifier;
     public List<IExpressionNode> expressions = new ArrayList<>();
 
-    public NewDeclarationStatementExpressionNode(String identifier) {
+    public NewDeclarationNode(String identifier) {
         this.identifier = identifier;
     }
 

src/main/java/ast/statementexpressions/crementExpression/CrementType.java

@@ -1,5 +0,0 @@
-package ast.statement.statementexpression.crementExpression;
-
-public enum CrementType {
-    PREFIX, SUFFIX
-}

src/main/java/ast/statementexpressions/crementExpression/DecrementExpressionNode.java

@@ -1,22 +0,0 @@
-package ast.statement.statementexpression.crementExpression;
-
-import ast.ASTNode;
-import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statement.statementexpression.IStatementExpressionNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class DecrementExpressionNode implements IStatementExpressionNode {
-    public CrementType crementType;
-    public AssignableExpressionNode assignableExpression;
-
-    public DecrementExpressionNode(CrementType crementType, AssignableExpressionNode assignableExpression) {
-        this.assignableExpression = assignableExpression;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statementexpressions/crementExpression/IncrementExpressionNode.java

@@ -1,22 +0,0 @@
-package ast.statement.statementexpression.crementExpression;
-
-import ast.ASTNode;
-import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statement.statementexpression.IStatementExpressionNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class IncrementExpressionNode implements IStatementExpressionNode {
-    public CrementType crementType;
-    public AssignableExpressionNode assignableExpression;
-
-    public IncrementExpressionNode(CrementType crementType, AssignableExpressionNode assignableExpression) {
-        this.assignableExpression = assignableExpression;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

src/main/java/ast/statementexpressions/crementexpressions/CrementType.java

@@ -0,0 +1,5 @@
+package ast.statementexpressions.crementexpressions;
+
+public enum CrementType {
+    PREFIX, SUFFIX
+}

src/main/java/ast/statementexpressions/crementexpressions/DecrementNode.java

@@ -0,0 +1,21 @@
+package ast.statementexpressions.crementexpressions;
+
+import ast.statementexpressions.AssignableNode;
+import ast.statementexpressions.IStatementExpressionNode;
+import semantic.SemanticVisitor;
+import typechecker.TypeCheckResult;
+
+public class DecrementNode implements IStatementExpressionNode {
+    public CrementType crementType;
+    public AssignableNode assignableExpression;
+
+    public DecrementNode(CrementType crementType, AssignableNode assignableExpression) {
+        this.assignableExpression = assignableExpression;
+    }
+
+    @Override
+    public TypeCheckResult accept(SemanticVisitor visitor) {
+        return visitor.analyze(this);
+    }
+
+}

src/main/java/ast/statementexpressions/crementexpressions/IncrementNode.java

@@ -0,0 +1,21 @@
+package ast.statementexpressions.crementexpressions;
+
+import ast.statementexpressions.AssignableNode;
+import ast.statementexpressions.IStatementExpressionNode;
+import semantic.SemanticVisitor;
+import typechecker.TypeCheckResult;
+
+public class IncrementNode implements IStatementExpressionNode {
+    public CrementType crementType;
+    public AssignableNode assignableExpression;
+
+    public IncrementNode(CrementType crementType, AssignableNode assignableExpression) {
+        this.assignableExpression = assignableExpression;
+    }
+
+    @Override
+    public TypeCheckResult accept(SemanticVisitor visitor) {
+        return visitor.analyze(this);
+    }
+
+}

src/main/java/ast/statementexpressions/methodcallstatementnexpression/TargetNode.java

@@ -1,7 +0,0 @@
-package ast.statementexpressions.methodcallstatementnexpression;
-
-public class TargetNode {
-    String thisTarget;
-
-
-}

src/main/java/ast/statementexpressions/methodcallstatementnexpressions/ChainedMethodNode.java

@@ -1,7 +1,7 @@
-package ast.statement.statementexpression.methodcallstatementnexpression;
+package ast.statementexpressions.methodcallstatementnexpressions;
 
 import ast.ASTNode;
-import ast.expression.IExpressionNode;
+import ast.expressions.IExpressionNode;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/ast/statementexpressions/methodcallstatementnexpressions/MethodCallNode.java

@@ -1,21 +1,20 @@
-package ast.statement.statementexpression.methodcallstatementnexpression;
+package ast.statementexpressions.methodcallstatementnexpressions;
 
-import ast.ASTNode;
-import ast.expression.IExpressionNode;
-import ast.statement.statementexpression.IStatementExpressionNode;
+import ast.expressions.IExpressionNode;
+import ast.statements.IStatementNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class MethodCallStatementExpressionNode implements IStatementExpressionNode {
+public class MethodCallNode implements IStatementNode {
     public TargetNode target;
     public List<ChainedMethodNode> chainedMethods = new ArrayList<>();
     public String identifier;
     public List<IExpressionNode> expressions = new ArrayList<>();
 
-    public MethodCallStatementExpressionNode(TargetNode target, String identifier) {
+    public MethodCallNode(TargetNode target, String identifier) {
         this.target = target;
         this.identifier = identifier;
     }

src/main/java/ast/statementexpressions/methodcallstatementnexpressions/TargetNode.java

@@ -1,13 +1,13 @@
-package ast.statement.statementexpression.methodcallstatementnexpression;
+package ast.statementexpressions.methodcallstatementnexpressions;
 
 import ast.ASTNode;
-import ast.expression.unaryexpression.MemberAccessNode;
-import ast.statement.statementexpression.NewDeclarationStatementExpressionNode;
+import ast.expressions.unaryexpressions.MemberAccessNode;
+import ast.statementexpressions.NewDeclarationNode;
 
 public class TargetNode implements ASTNode {
     public Boolean thisTar;
     public MemberAccessNode memberAccess;
-    public NewDeclarationStatementExpressionNode newDeclaration;
+    public NewDeclarationNode newDeclaration;
     public String identifier;
 
     public TargetNode(Boolean thisTar) {
@@ -18,7 +18,7 @@ public class TargetNode implements ASTNode {
         this.memberAccess = memberAccess;
     }
 
-    public TargetNode(NewDeclarationStatementExpressionNode newDeclaration) {
+    public TargetNode(NewDeclarationNode newDeclaration) {
         this.newDeclaration = newDeclaration;
     }
 

src/main/java/ast/statements/BlockNode.java

@@ -1,13 +1,10 @@
-package ast.block;
+package ast.statements;
 
 import ast.ASTNode;
-import ast.statement.IStatementNode;
-import ast.statement.ReturnStatementNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 import visitor.Visitable;
 
-import java.beans.Visibility;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/ast/statements/ElseNode.java

@@ -0,0 +1,13 @@
+package ast.statements;
+
+import ast.ASTNode;
+
+public class ElseNode implements ASTNode {
+    BlockNode block;
+
+    public ElseNode(BlockNode block) {
+        this.block = block;
+    }
+
+
+}

src/main/java/ast/statements/ElseStatementNode.java

@@ -1,13 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-
-public class ElseStatementNode implements ASTNode {
-    BlockStatementNode block;
-
-    public ElseStatementNode(BlockStatementNode block) {
-        this.block = block;
-    }
-
-
-}

src/main/java/ast/statements/IStatementNode.java

@@ -1,4 +1,4 @@
-package ast.statement;
+package ast.statements;
 
 import ast.ASTNode;
 import visitor.Visitable;

src/main/java/ast/statements/IfElseNode.java

@@ -0,0 +1,22 @@
+package ast.statements;
+
+import ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class IfElseNode implements ASTNode {
+    IfNode ifStatement;
+    List<IfNode> elseIfStatements = new ArrayList<>();
+    ElseNode elseStatement;
+
+    public IfElseNode(IfNode ifStatement, ElseNode elseNode) {
+        this.ifStatement = ifStatement;
+        this.elseStatement = elseNode;
+    }
+
+    public void addElseIfStatement(IfNode elseIfStament) {
+        elseIfStatements.add(elseIfStament);
+    }
+
+}

src/main/java/ast/statements/IfElseStatementNode.java

@@ -1,22 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class IfElseStatementNode implements ASTNode {
-    IfStatementNode ifStatement;
-    List<IfStatementNode> elseIfStatements = new ArrayList<>();
-    ElseStatementNode elseStatement;
-
-    public IfElseStatementNode(IfStatementNode ifStatement, ElseStatementNode elseStatementNode) {
-        this.ifStatement = ifStatement;
-        this.elseStatement = elseStatementNode;
-    }
-
-    public void addElseIfStatement(IfStatementNode elseIfStament) {
-        elseIfStatements.add(elseIfStament);
-    }
-
-}

src/main/java/ast/statements/IfNode.java

@@ -0,0 +1,14 @@
+package ast.statements;
+
+import ast.ASTNode;
+import ast.expressions.IExpressionNode;
+
+public class IfNode implements ASTNode {
+    IExpressionNode expression;
+    BlockNode block;
+
+    public IfNode(IExpressionNode expression, BlockNode block) {
+        this.expression = expression;
+        this.block = block;
+    }
+}

src/main/java/ast/statements/IfStatementNode.java

@@ -1,14 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-import ast.expressions.ExpressionNode;
-
-public class IfStatementNode implements ASTNode {
-    ExpressionNode expression;
-    BlockStatementNode block;
-
-    public IfStatementNode(ExpressionNode expression, BlockStatementNode block) {
-        this.expression = expression;
-        this.block = block;
-    }
-}

src/main/java/ast/statements/LocalVariableDeclarationNode.java

@@ -1,6 +1,6 @@
-package ast.statement;
+package ast.statements;
 
-import ast.expression.IExpressionNode;
+import ast.expressions.IExpressionNode;
 import ast.type.type.*;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;

src/main/java/ast/statements/ReturnNode.java

@@ -1,14 +1,14 @@
-package ast.statement;
+package ast.statements;
 
-import ast.expression.IExpressionNode;
+import ast.expressions.IExpressionNode;
 import semantic.SemanticVisitor;
 import typechecker.TypeCheckResult;
 
-public class ReturnStatementNode implements IStatementNode {
+public class ReturnNode implements IStatementNode {
     public IExpressionNode expression;
     public Boolean voidReturn = false;
 
-    public ReturnStatementNode(IExpressionNode expression) {
+    public ReturnNode(IExpressionNode expression) {
         if(expression != null) {
             this.expression = expression;
         } else {

src/main/java/ast/statements/WhileNode.java

@@ -0,0 +1,14 @@
+package ast.statements;
+
+import ast.ASTNode;
+import ast.expressions.IExpressionNode;
+
+public class WhileNode extends StatementNode implements ASTNode {
+    IExpressionNode expression;
+    BlockNode block;
+
+    public WhileNode(IExpressionNode expression, BlockNode block) {
+        this.expression = expression;
+        this.block = block;
+    }
+}

src/main/java/ast/statements/WhileStatementNode.java

@@ -1,14 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-import ast.expressions.ExpressionNode;
-
-public class WhileStatementNode extends StatementNode implements ASTNode {
-    ExpressionNode expression;
-    BlockStatementNode block;
-
-    public WhileStatementNode(ExpressionNode expression, BlockStatementNode block) {
-        this.expression = expression;
-        this.block = block;
-    }
-}

src/main/java/ast/type/type/BaseType.java

@@ -25,6 +25,4 @@ public class BaseType implements ITypeNode {
             return false;
         return true;
     }
-
-
 }

src/main/java/bytecode/ClassCodeGen.java

@@ -1,9 +1,9 @@
 package bytecode;
 
 import ast.ClassNode;
-import ast.member.FieldNode;
-import ast.member.MemberNode;
-import ast.member.MethodNode;
+import ast.members.FieldNode;
+import ast.members.MemberNode;
+import ast.members.MethodNode;
 import ast.type.type.BaseType;
 import bytecode.visitor.ClassVisitor;
 import java.io.File;

src/main/java/bytecode/MethodCodeGen.java

@@ -1,7 +1,7 @@
 package bytecode;
 
-import ast.member.ConstructorNode;
-import ast.member.MethodNode;
+import ast.members.ConstructorNode;
+import ast.members.MethodNode;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
 

src/main/java/parser/astBuilder/ASTBuilder.java

@@ -1,35 +1,24 @@
 package parser.astBuilder;
 
 import ast.*;
-import ast.block.BlockNode;
-import ast.expression.*;
-import ast.expression.binaryexpression.CalculationExpressionNode;
-import ast.expression.binaryexpression.DotExpressionNode;
-import ast.expression.binaryexpression.DotSubstractionExpressionNode;
-import ast.expression.binaryexpression.NonCalculationExpressionNode;
-import ast.expression.unaryexpression.MemberAccessNode;
-import ast.expression.unaryexpression.NotExpressionNode;
-import ast.expression.unaryexpression.UnaryExpressionNode;
-import ast.member.*;
-import ast.statement.ifstatement.ElseStatementNode;
-import ast.statement.ifstatement.IfElseStatementNode;
-import ast.parameter.ParameterNode;
-import ast.statement.*;
-import ast.statement.ifstatement.IfStatementNode;
-import ast.statement.statementexpression.AssignStatementExpressionNode;
-import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statement.statementexpression.NewDeclarationStatementExpressionNode;
-import ast.statement.statementexpression.crementExpression.CrementType;
-import ast.statement.statementexpression.crementExpression.DecrementExpressionNode;
-import ast.statement.statementexpression.crementExpression.IncrementExpressionNode;
-import ast.statement.statementexpression.methodcallstatementnexpression.ChainedMethodNode;
-import ast.statement.statementexpression.methodcallstatementnexpression.MethodCallStatementExpressionNode;
-import ast.statement.statementexpression.methodcallstatementnexpression.TargetNode;
-import ast.type.*;
-import ast.type.type.*;
-import org.antlr.v4.runtime.tree.TerminalNode;
+
+import ast.expressions.IExpressionNode;
+import ast.expressions.unaryexpressions.MemberAccessNode;
+import ast.members.ConstructorNode;
+import ast.members.MemberNode;
+import ast.parameters.ParameterNode;
+import ast.statementexpressions.AssignNode;
+import ast.statementexpressions.AssignableNode;
+import ast.statementexpressions.NewDeclarationNode;
+import ast.statementexpressions.methodcallstatementnexpressions.ChainedMethodNode;
+import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode;
+import ast.statementexpressions.methodcallstatementnexpressions.TargetNode;
+import ast.statements.*;
 import parser.generated.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
     @Override
     public ASTNode visitProgram(SimpleJavaParser.ProgramContext ctx) {
@@ -52,42 +41,16 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) {
-        ConstructorNode constructorNode = new ConstructorNode(ctx.AccessModifier().getText(), ctx.Identifier().getText(), (BlockNode) visit(ctx.block()));
+        ConstructorNode constructorNode = new ConstructorNode(ctx.AccessModifier().getText(), ctx.Identifier().getText(), (BlockNode) visit(ctx.blockStatement()));
         for(SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
             constructorNode.addParameter((ParameterNode) visit(parameter));
         }
         return constructorNode;
     }
 
-    @Override
-    public ASTNode visitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx) {
-        if(ctx.MainMethodDeclaration() != null) {
-            return new MainMethodNode((BlockNode) visit(ctx.block()));
-        } else {
-            if(ctx.type() != null) {
-                MethodNode methodNode = new MethodNode(ctx.AccessModifier().getText(), createTypeNode(ctx.type().getText()), false, ctx.Identifier().getText(), (BlockNode) visit(ctx.block()));
-                for(SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
-                    methodNode.addParameter((ParameterNode) visit(parameter));
-                }
-                return methodNode;
-            } else {
-                MethodNode methodNode = new MethodNode(ctx.AccessModifier().getText(), null, true, ctx.Identifier().getText(), (BlockNode) visit(ctx.block()));
-                for(SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
-                    methodNode.addParameter((ParameterNode) visit(parameter));
-                }
-                return methodNode;
-            }
-        }
-    }
-
-    @Override
-    public ASTNode visitFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx) {
-        return new FieldNode(new AccessModifierNode(ctx.AccessModifier().getText()), createTypeNode(ctx.type().getText()), ctx.Identifier().getText());
-    }
-
     @Override
     public ASTNode visitParameter(SimpleJavaParser.ParameterContext ctx) {
-        return new ParameterNode(createTypeNode(ctx.type().getText()), ctx.Identifier().getText());
+        return new ParameterNode(new TypeNode(ctx.type().getText()), ctx.Identifier().getText());
     }
 
     @Override
@@ -96,8 +59,8 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
             return visitReturnStatement(ctx.returnStatement());
         } else if(ctx.localVariableDeclaration() != null) {
             return visitLocalVariableDeclaration(ctx.localVariableDeclaration());
-        } else if(ctx.block() != null) {
-            return visitBlock(ctx.block());
+        } else if(ctx.blockStatement() != null) {
+            return visitBlockStatement(ctx.blockStatement());
         } else if(ctx.whileStatement() != null) {
             return visitWhileStatement(ctx.whileStatement());
         } else if(ctx.forStatement() != null) {
@@ -112,58 +75,105 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx) {
-        return new ReturnStatementNode((IExpressionNode) visit(ctx.expression()));
+        return new ReturnNode((IExpressionNode) visit(ctx.expression()));
     }
 
     @Override
     public ASTNode visitLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx) {
-        return new LocalVariableDeclarationNode(createTypeNode(ctx.type().getText()), ctx.Identifier().getText(), ctx.Assign().getText(), (IExpressionNode) visit(ctx.expression()));
+        return new LocalVariableDeclarationNode(new TypeNode(ctx.type().getText()), ctx.Identifier().getText(), ctx.Assign().getText(), (ExpressionNode) visit(ctx.expression()));
     }
 
     @Override
-    public ASTNode visitBlock(SimpleJavaParser.BlockContext ctx) {
+    public ASTNode visitBlockStatement(SimpleJavaParser.BlockStatementContext ctx) {
         BlockNode blockNode = new BlockNode();
         for(SimpleJavaParser.StatementContext statement : ctx.statement()) {
             blockNode.addStatement((IStatementNode) visit(statement));
         }
-        if(!blockNode.hasReturnStatement) {
-            blockNode.addStatement(new ReturnStatementNode(null));
-        }
         return blockNode;
     }
 
     @Override
     public ASTNode visitWhileStatement(SimpleJavaParser.WhileStatementContext ctx) {
-        return new WhileStatementNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.block()));
+        return new WhileNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement()));
+    }
+
+    @Override
+    public ASTNode visitDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx) {
+        IExpressionNode condition = (IExpressionNode) visit(ctx.expression());
+        BlockNode doBlock = (BlockNode) visit(ctx.blockStatement());
+
+        WhileNode While = new WhileNode(condition, doBlock);
+        BlockNode resultBlock = new BlockNode();
+        resultBlock.addStatement((IStatementNode) doBlock);
+        resultBlock.addStatement((IStatementNode) While);
+
+        return resultBlock;
     }
 
     @Override
     public ASTNode visitForStatement(SimpleJavaParser.ForStatementContext ctx) {
+
+        List<StatementNode> statements = new ArrayList<>();
+
+        //init
         if(ctx.statementExpression(0) != null){
-            return new ForStatementNode((IExpressionNode) visit(ctx.statementExpression(0)), (IExpressionNode) visit(ctx.expression()), (IExpressionNode) visit(ctx.statementExpression(1)));
+            statements.add((StatementNode) visit(ctx.statementExpression(0)));
         } else if (ctx.localVariableDeclaration() != null) {
-            return new ForStatementNode((IStatementNode) visit(ctx.localVariableDeclaration()), (IExpressionNode) visit(ctx.expression()), (IExpressionNode) visit(ctx.statementExpression(1)));
+            statements.add((StatementNode) visit(ctx.localVariableDeclaration()));
         }
-        return null;
+
+        //condition
+        IExpressionNode condition = (IExpressionNode) visit(ctx.expression());
+
+        //ink
+        IStatementNode increment = null;
+        if(ctx.statementExpression(1) != null){
+            increment = (IStatementNode) visit(ctx.statementExpression(1));
+        }
+
+        BlockNode forBlock = (BlockNode) visit(ctx.blockStatement());
+
+        if(increment != null){
+            forBlock.addStatement((increment));
+        }
+
+        WhileNode While = new WhileNode(condition, forBlock);
+
+        statements.add(While);
+
+        BlockNode resultBlock = new BlockNode();
+        for(StatementNode statement : statements) {
+            resultBlock.addStatement((IStatementNode) statement);
+        }
+
+        return resultBlock;
     }
 
     @Override
     public ASTNode visitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx) {
-        IfElseStatementNode ifElseStatementNode =  new IfElseStatementNode((IfStatementNode) visit(ctx.ifStatement()));
-        for(SimpleJavaParser.ElseStatementContext elseStatement : ctx.elseStatement()) {
-            ifElseStatementNode.addElseStatement((ElseStatementNode) visit(elseStatement));
+        IfElseNode ifElseStatementNode =  new IfElseNode((IfNode) visit(ctx.ifStatement()),
+                (ElseNode) visit(ctx.elseStatement()));
+
+        for (SimpleJavaParser.ElseIfStatementContext elseIf : ctx.elseIfStatement()){
+            ifElseStatementNode.addElseIfStatement(((IfNode) visit(elseIf)));
         }
+
         return ifElseStatementNode;
     }
 
     @Override
     public ASTNode visitIfStatement(SimpleJavaParser.IfStatementContext ctx) {
-        return new IfStatementNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.block()));
+        return new IfNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement()));
+    }
+
+    @Override
+    public ASTNode visitElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx) {
+        return new IfNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement()));
     }
 
     @Override
     public ASTNode visitElseStatement(SimpleJavaParser.ElseStatementContext ctx) {
-        return new ElseStatementNode((BlockNode) visit(ctx.block()));
+        return new ElseNode((BlockNode) visit(ctx.blockStatement()));
     }
 
     @Override
@@ -182,21 +192,21 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitAssign(SimpleJavaParser.AssignContext ctx) {
-        return new AssignStatementExpressionNode((AssignableExpressionNode) visit(ctx.assignableExpression()), (IExpressionNode) visit(ctx.expression()));
+        return new AssignNode((AssignableNode) visit(ctx.assignableExpression()), (IExpressionNode) visit(ctx.expression()));
     }
 
     @Override
     public ASTNode visitNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx) {
-        NewDeclarationStatementExpressionNode newDeclarationStatementExpressionNode = new NewDeclarationStatementExpressionNode(ctx.Identifier().getText());
+        NewDeclarationNode newDeclarationNode = new NewDeclarationNode(ctx.Identifier().getText());
         for(SimpleJavaParser.ExpressionContext expression : ctx.argumentList().expression()) {
-            newDeclarationStatementExpressionNode.addExpression((IExpressionNode) visit(expression));
+            newDeclarationNode.addExpression((IExpressionNode) visit(expression));
         }
-        return newDeclarationStatementExpressionNode;
+        return newDeclarationNode;
     }
 
     @Override
     public ASTNode visitMethodCall(SimpleJavaParser.MethodCallContext ctx) {
-        MethodCallStatementExpressionNode methodCallStatementExpressionNode = new MethodCallStatementExpressionNode((TargetNode) visit(ctx.target()), ctx.Identifier().getText());
+        MethodCallNode methodCallStatementExpressionNode = new MethodCallNode((TargetNode) visit(ctx.target()), ctx.Identifier().getText());
         for(SimpleJavaParser.ChainedMethodContext chainedMethod : ctx.chainedMethod()) {
             methodCallStatementExpressionNode.addChainedMethod((ChainedMethodNode) visit(chainedMethod));
         }
@@ -213,7 +223,7 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
         } else if(ctx.memberAccess() != null) {
             return new TargetNode((MemberAccessNode) visit(ctx.memberAccess()));
         } else if(ctx.newDeclaration() != null) {
-            return new TargetNode((NewDeclarationStatementExpressionNode) visit(ctx.newDeclaration()));
+            return new TargetNode((NewDeclarationNode) visit(ctx.newDeclaration()));
         } else if(ctx.Identifier() != null) {
             return new TargetNode(ctx.Identifier().getText());
         }
@@ -228,188 +238,4 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
         }
         return chainedMethodNode;
     }
-
-    @Override
-    public ASTNode visitCrementExpression(SimpleJavaParser.CrementExpressionContext ctx) {
-        if(ctx.incrementExpression() != null) {
-            return visitIncrementExpression(ctx.incrementExpression());
-        } else if(ctx.decrementExpression() != null) {
-            return visitDecrementExpression(ctx.decrementExpression());
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx) {
-        if(ctx.prefixIncrementExpression() != null) {
-            return visitPrefixIncrementExpression(ctx.prefixIncrementExpression());
-        } else if(ctx.suffixIncrementExpression() != null) {
-            return visitSuffixIncrementExpression(ctx.suffixIncrementExpression());
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx) {
-        return new IncrementExpressionNode(CrementType.PREFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
-    }
-
-    @Override
-    public ASTNode visitSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx) {
-        return new IncrementExpressionNode(CrementType.SUFFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
-    }
-
-    @Override
-    public ASTNode visitDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx) {
-        if(ctx.prefixDecrementExpression() != null) {
-            return visitPrefixDecrementExpression(ctx.prefixDecrementExpression());
-        } else if(ctx.suffixDecrementExpression() != null) {
-            return visitSuffixDecrementExpression(ctx.suffixDecrementExpression());
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx) {
-        return new DecrementExpressionNode(CrementType.PREFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
-    }
-
-    @Override
-    public ASTNode visitSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx) {
-        return new DecrementExpressionNode(CrementType.SUFFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
-    }
-
-    @Override
-    public ASTNode visitExpression(SimpleJavaParser.ExpressionContext ctx) {
-        if(ctx.unaryExpression() != null) {
-            return visit(ctx.unaryExpression());
-        } else if(ctx.binaryExpression() != null) {
-            return visit(ctx.binaryExpression());
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) {
-        if(ctx.This() != null) {
-            return new UnaryExpressionNode(ctx.This().getText());
-        } else if(ctx.Identifier() != null) {
-            return new UnaryExpressionNode(ctx.Identifier().getText());
-        } else if(ctx.memberAccess() != null) {
-            return new UnaryExpressionNode((MemberAccessNode) visitMemberAccess(ctx.memberAccess()));
-        } else if(ctx.value() != null) {
-            return new UnaryExpressionNode((ValueNode) visitValue(ctx.value()));
-        } else if(ctx.notExpression() != null) {
-            return new UnaryExpressionNode((NotExpressionNode) visitNotExpression(ctx.notExpression()));
-        } else if(ctx.statementExpression() != null) {
-            return new UnaryExpressionNode((IStatementNode) visitStatementExpression(ctx.statementExpression()));
-        } else if(ctx.expression() != null) {
-            return new UnaryExpressionNode((IExpressionNode) visitExpression(ctx.expression()));
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitMemberAccess(SimpleJavaParser.MemberAccessContext ctx) {
-        MemberAccessNode memberAccessNode;
-        if(ctx.This() != null) {
-            memberAccessNode = new MemberAccessNode(true);
-        } else {
-            memberAccessNode = new MemberAccessNode(false);
-        }
-        for (TerminalNode identifierNode : ctx.Identifier()) {
-            memberAccessNode.addIdentifier(identifierNode.getText());
-        }
-        return memberAccessNode;
-    }
-
-    @Override
-    public ASTNode visitValue(SimpleJavaParser.ValueContext ctx) {
-        if(ctx.IntValue() != null) {
-            return new ValueNode(EnumValueNode.INT_VALUE, ctx.IntValue().getText());
-        } else if(ctx.BooleanValue() != null) {
-            return new ValueNode(EnumValueNode.BOOLEAN_VALUE, ctx.BooleanValue().getText());
-        } else if(ctx.CharValue() != null) {
-            return new ValueNode(EnumValueNode.CHAR_VALUE, ctx.CharValue().getText());
-        } else if(ctx.NullValue() != null) {
-            return new ValueNode(EnumValueNode.NULL_VALUE, ctx.NullValue().getText());
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitNotExpression(SimpleJavaParser.NotExpressionContext ctx) {
-        return new NotExpressionNode((IExpressionNode) visitExpression(ctx.expression()));
-    }
-
-
-    @Override
-    public ASTNode visitBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx) {
-        if(ctx.calculationExpression() != null) {
-            return visit(ctx.calculationExpression());
-        } else if(ctx.nonCalculationExpression() != null) {
-            return visit(ctx.nonCalculationExpression());
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx) {
-        if(ctx.calculationExpression() != null) {
-            return new CalculationExpressionNode((CalculationExpressionNode) visit(ctx.calculationExpression()), ctx.LineOperator().getText(), (DotExpressionNode) visit(ctx.dotExpression()));
-        } else if(ctx.dotExpression() != null) {
-            return new CalculationExpressionNode((DotExpressionNode) visit(ctx.dotExpression()));
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitDotExpression(SimpleJavaParser.DotExpressionContext ctx) {
-        if(ctx.dotExpression() != null) {
-            return new DotExpressionNode((DotExpressionNode) visit(ctx.dotExpression()), ctx.DotOperator().getText(), (DotSubstractionExpressionNode) visit(ctx.dotSubtractionExpression()));
-        } else if(ctx.dotSubtractionExpression() != null) {
-            return new DotExpressionNode((DotSubstractionExpressionNode) visit(ctx.dotSubtractionExpression()));
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx) {
-        if(ctx.IntValue() != null) {
-            return new DotSubstractionExpressionNode(new ValueNode(EnumValueNode.INT_VALUE, ctx.IntValue().getText()));
-        } else if(ctx.Identifier() != null) {
-            return new DotSubstractionExpressionNode(ctx.Identifier().getText());
-        } else if(ctx.memberAccess() != null) {
-            return new DotSubstractionExpressionNode((MemberAccessNode) visit(ctx.memberAccess()));
-        } else if(ctx.methodCall() != null && ctx.calculationExpression() != null) {
-            return new DotSubstractionExpressionNode((MethodCallStatementExpressionNode) visit(ctx.methodCall()), (CalculationExpressionNode) visit(ctx.calculationExpression()));
-        }
-        return null;
-    }
-
-    @Override
-    public ASTNode visitNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx) {
-        return new NonCalculationExpressionNode((UnaryExpressionNode) visit(ctx.unaryExpression()), ctx.nonCalculationOperator().getText(), (IExpressionNode) visit(ctx.expression()));
-    }
-
-    @Override
-    public ASTNode visitAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx) {
-        if(ctx.Identifier() != null) {
-            return new AssignableExpressionNode(ctx.Identifier().getText());
-        } else if(ctx.memberAccess() != null) {
-            return new AssignableExpressionNode((MemberAccessNode) visit(ctx.memberAccess()));
-        }
-        return null;
-    }
-
-    public ITypeNode createTypeNode(String identifier){
-        return switch (identifier) {
-            case "int" -> new BaseType(TypeEnum.INT);
-            case "boolean" -> new BaseType(TypeEnum.BOOL);
-            case "char" -> new BaseType(TypeEnum.CHAR);
-            case "void" -> new BaseType(TypeEnum.VOID);
-            default -> new ReferenceType(identifier);
-        };
-    }
-
 }

src/main/java/parser/generated/SimpleJava.tokens

@@ -1,88 +0,0 @@
-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
-'++'=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

src/main/java/parser/generated/SimpleJavaBaseListener.java

@@ -1,568 +0,0 @@
-// 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;
-import org.antlr.v4.runtime.tree.ErrorNode;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-/**
- * This class provides an empty implementation of {@link SimpleJavaListener},
- * which can be extended to create a listener which only needs to handle a subset
- * of the available methods.
- */
-@SuppressWarnings("CheckReturnValue")
-public class SimpleJavaBaseListener implements SimpleJavaListener {
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterProgram(SimpleJavaParser.ProgramContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitProgram(SimpleJavaParser.ProgramContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassDeclaration(SimpleJavaParser.ClassDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassDeclaration(SimpleJavaParser.ClassDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMemberDeclaration(SimpleJavaParser.MemberDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <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}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <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 enterParameterList(SimpleJavaParser.ParameterListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitParameterList(SimpleJavaParser.ParameterListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterParameter(SimpleJavaParser.ParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitParameter(SimpleJavaParser.ParameterContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterArgumentList(SimpleJavaParser.ArgumentListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitArgumentList(SimpleJavaParser.ArgumentListContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterStatement(SimpleJavaParser.StatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitStatement(SimpleJavaParser.StatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterBlock(SimpleJavaParser.BlockContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitBlock(SimpleJavaParser.BlockContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterReturnStatement(SimpleJavaParser.ReturnStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@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}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExpression(SimpleJavaParser.ExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExpression(SimpleJavaParser.ExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterNotExpression(SimpleJavaParser.NotExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitNotExpression(SimpleJavaParser.NotExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCrementExpression(SimpleJavaParser.CrementExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@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}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEveryRule(ParserRuleContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEveryRule(ParserRuleContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void visitTerminal(TerminalNode node) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void visitErrorNode(ErrorNode node) { }
-}

src/main/java/parser/generated/SimpleJavaBaseVisitor.java

@@ -1,323 +0,0 @@
-// 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;
-
-/**
- * This class provides an empty implementation of {@link SimpleJavaVisitor},
- * which can be extended to create a visitor which only needs to handle a subset
- * of the available methods.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-@SuppressWarnings("CheckReturnValue")
-public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements SimpleJavaVisitor<T> {
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitProgram(SimpleJavaParser.ProgramContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitClassDeclaration(SimpleJavaParser.ClassDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@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}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@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 visitParameterList(SimpleJavaParser.ParameterListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitParameter(SimpleJavaParser.ParameterContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitArgumentList(SimpleJavaParser.ArgumentListContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitStatement(SimpleJavaParser.StatementContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <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); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@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}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@Override public T visitExpression(SimpleJavaParser.ExpressionContext ctx) { return visitChildren(ctx); }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-	@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 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 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); }
-}

src/main/java/parser/generated/SimpleJavaLexer.java

@@ -1,394 +0,0 @@
-// 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;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.*;
-import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.misc.*;
-
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
-public class SimpleJavaLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION); }
-
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	public static final int
-		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"
-	};
-
-	public static String[] modeNames = {
-		"DEFAULT_MODE"
-	};
-
-	private static String[] makeRuleNames() {
-		return new String[] {
-			"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, "'++'", "'--'", "'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, "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();
-	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
-
-	/**
-	 * @deprecated Use {@link #VOCABULARY} instead.
-	 */
-	@Deprecated
-	public static final String[] tokenNames;
-	static {
-		tokenNames = new String[_SYMBOLIC_NAMES.length];
-		for (int i = 0; i < tokenNames.length; i++) {
-			tokenNames[i] = VOCABULARY.getLiteralName(i);
-			if (tokenNames[i] == null) {
-				tokenNames[i] = VOCABULARY.getSymbolicName(i);
-			}
-
-			if (tokenNames[i] == null) {
-				tokenNames[i] = "<INVALID>";
-			}
-		}
-	}
-
-	@Override
-	@Deprecated
-	public String[] getTokenNames() {
-		return tokenNames;
-	}
-
-	@Override
-
-	public Vocabulary getVocabulary() {
-		return VOCABULARY;
-	}
-
-
-	public SimpleJavaLexer(CharStream input) {
-		super(input);
-		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
-	}
-
-	@Override
-	public String getGrammarFileName() { return "SimpleJava.g4"; }
-
-	@Override
-	public String[] getRuleNames() { return ruleNames; }
-
-	@Override
-	public String getSerializedATN() { return _serializedATN; }
-
-	@Override
-	public String[] getChannelNames() { return channelNames; }
-
-	@Override
-	public String[] getModeNames() { return modeNames; }
-
-	@Override
-	public ATN getATN() { return _ATN; }
-
-	public static final String _serializedATN =
-		"\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"+
-		"\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\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"+
-		"+\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&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"+
-		"\u0000\u0000\u0000\u00009\u0001\u0000\u0000\u0000\u0000;\u0001\u0000\u0000"+
-		"\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\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 {
-		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-		}
-	}
-}

src/main/java/parser/generated/SimpleJavaLexer.tokens

@@ -1,88 +0,0 @@
-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
-'++'=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

src/main/java/parser/generated/SimpleJavaListener.java

@@ -1,450 +0,0 @@
-// 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;
-
-/**
- * This interface defines a complete listener for a parse tree produced by
- * {@link SimpleJavaParser}.
- */
-public interface SimpleJavaListener extends ParseTreeListener {
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#program}.
-	 * @param ctx the parse tree
-	 */
-	void enterProgram(SimpleJavaParser.ProgramContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#program}.
-	 * @param ctx the parse tree
-	 */
-	void exitProgram(SimpleJavaParser.ProgramContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#classDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterClassDeclaration(SimpleJavaParser.ClassDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#classDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitClassDeclaration(SimpleJavaParser.ClassDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#memberDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterMemberDeclaration(SimpleJavaParser.MemberDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#memberDeclaration}.
-	 * @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
-	 */
-	void enterFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#fieldDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#methodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#methodDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void exitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#parameterList}.
-	 * @param ctx the parse tree
-	 */
-	void enterParameterList(SimpleJavaParser.ParameterListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#parameterList}.
-	 * @param ctx the parse tree
-	 */
-	void exitParameterList(SimpleJavaParser.ParameterListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#parameter}.
-	 * @param ctx the parse tree
-	 */
-	void enterParameter(SimpleJavaParser.ParameterContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#parameter}.
-	 * @param ctx the parse tree
-	 */
-	void exitParameter(SimpleJavaParser.ParameterContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#argumentList}.
-	 * @param ctx the parse tree
-	 */
-	void enterArgumentList(SimpleJavaParser.ArgumentListContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#argumentList}.
-	 * @param ctx the parse tree
-	 */
-	void exitArgumentList(SimpleJavaParser.ArgumentListContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#statement}.
-	 * @param ctx the parse tree
-	 */
-	void enterStatement(SimpleJavaParser.StatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#statement}.
-	 * @param ctx the parse tree
-	 */
-	void exitStatement(SimpleJavaParser.StatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#block}.
-	 * @param ctx the parse tree
-	 */
-	void enterBlock(SimpleJavaParser.BlockContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#block}.
-	 * @param ctx the parse tree
-	 */
-	void exitBlock(SimpleJavaParser.BlockContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#returnStatement}.
-	 * @param ctx the parse tree
-	 */
-	void enterReturnStatement(SimpleJavaParser.ReturnStatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#returnStatement}.
-	 * @param ctx the parse tree
-	 */
-	void exitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#localVariableDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	void enterLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#localVariableDeclaration}.
-	 * @param ctx the parse tree
-	 */
-	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
-	 */
-	void enterExpression(SimpleJavaParser.ExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#expression}.
-	 * @param ctx the parse tree
-	 */
-	void exitExpression(SimpleJavaParser.ExpressionContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#unaryExpression}.
-	 * @param ctx the parse tree
-	 */
-	void enterUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#unaryExpression}.
-	 * @param ctx the parse tree
-	 */
-	void exitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#notExpression}.
-	 * @param ctx the parse tree
-	 */
-	void enterNotExpression(SimpleJavaParser.NotExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#notExpression}.
-	 * @param ctx the parse tree
-	 */
-	void exitNotExpression(SimpleJavaParser.NotExpressionContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#crementExpression}.
-	 * @param ctx the parse tree
-	 */
-	void enterCrementExpression(SimpleJavaParser.CrementExpressionContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#crementExpression}.
-	 * @param ctx the parse tree
-	 */
-	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);
-}

src/main/java/parser/generated/SimpleJavaVisitor.java

@@ -1,277 +0,0 @@
-// 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;
-
-/**
- * This interface defines a complete generic visitor for a parse tree produced
- * by {@link SimpleJavaParser}.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#program}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitProgram(SimpleJavaParser.ProgramContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#classDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitClassDeclaration(SimpleJavaParser.ClassDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#memberDeclaration}.
-	 * @param ctx the parse tree
-	 * @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
-	 * @return the visitor result
-	 */
-	T visitFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#methodDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#parameterList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitParameterList(SimpleJavaParser.ParameterListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#parameter}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitParameter(SimpleJavaParser.ParameterContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#argumentList}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitArgumentList(SimpleJavaParser.ArgumentListContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#statement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitStatement(SimpleJavaParser.StatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#block}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitBlock(SimpleJavaParser.BlockContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#returnStatement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#localVariableDeclaration}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	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
-	 * @return the visitor result
-	 */
-	T visitExpression(SimpleJavaParser.ExpressionContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#unaryExpression}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#notExpression}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitNotExpression(SimpleJavaParser.NotExpressionContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#crementExpression}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	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);
-}

src/main/java/semantic/SemanticAnalyzer.java

@@ -7,22 +7,13 @@ import java.util.List;
 import java.util.Objects;
 
 import ast.*;
-import ast.block.BlockNode;
-import ast.expression.IExpressionNode;
-import ast.expression.binaryexpression.*;
-import ast.expression.unaryexpression.UnaryExpressionNode;
-import ast.member.*;
-import ast.parameter.ParameterNode;
-import ast.statement.*;
-import ast.statement.ifstatement.ElseStatementNode;
-import ast.statement.ifstatement.IfElseStatementNode;
-import ast.statement.ifstatement.IfStatementNode;
-import ast.statement.statementexpression.AssignStatementExpressionNode;
-import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statement.statementexpression.NewDeclarationStatementExpressionNode;
-import ast.statement.statementexpression.crementExpression.DecrementExpressionNode;
-import ast.statement.statementexpression.crementExpression.IncrementExpressionNode;
-import ast.statement.statementexpression.methodcallstatementnexpression.MethodCallStatementExpressionNode;
+import ast.expressions.IExpressionNode;
+import ast.expressions.binaryexpressions.*;
+import ast.expressions.unaryexpressions.UnaryNode;
+import ast.members.*;
+import ast.parameters.ParameterNode;
+import ast.statementexpressions.AssignableNode;
+import ast.statements.*;
 import ast.type.type.*;
 import semantic.context.Context;
 import semantic.exeptions.*;
@@ -174,19 +165,19 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(IfStatementNode toCheck) {
+    public TypeCheckResult analyze(IfNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(ReturnStatementNode toCheck) {
+    public TypeCheckResult analyze(ReturnNode toCheck) {
 
         var result = toCheck.expression.accept(this);
         return new TypeCheckResult(true, result.getType());
     }
 
     @Override
-    public TypeCheckResult analyze(WhileStatementNode toCheck) {
+    public TypeCheckResult analyze(WhileNode toCheck) {
         return null;
     }
 
@@ -198,9 +189,9 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(BlockNode blockNode) {
+    public TypeCheckResult analyze(BlockNode blockStatementNode) {
         ITypeNode blockReturnType = null;
-        for (IStatementNode statementNode : blockNode.statements) {
+        for (IStatementNode statementNode : blockStatementNode.statements) {
             var result = statementNode.accept(this);
             if(result.getType() != null){
                 if(blockReturnType == null){
@@ -214,18 +205,18 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(AssignableExpressionNode toCheck) {
+    public TypeCheckResult analyze(AssignableNode toCheck) {
         return new TypeCheckResult(true, currentFields.get(toCheck.identifier));
 
     }
 
     @Override
-    public TypeCheckResult analyze(ElseStatementNode toCheck) {
+    public TypeCheckResult analyze(ElseNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(ForStatementNode toCheck) {
+    public TypeCheckResult analyze(ForNode toCheck) {
         return null;
     }
 
@@ -274,12 +265,12 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(IfElseStatementNode toCheck) {
+    public TypeCheckResult analyze(IfElseNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(MethodCallStatementExpressionNode toCheck) {
+    public TypeCheckResult analyze(ast.statements.statementexpression.methodcallstatementnexpression.MethodCallStatementNode toCheck) {
         return null;
     }
 
@@ -321,12 +312,12 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(BinaryExpressionNode toCheck) {
+    public TypeCheckResult analyze(BinaryNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(CalculationExpressionNode calcNode) {
+    public TypeCheckResult analyze(CalculationNode calcNode) {
         if (calcNode.calculationExpression != null) {
             calcNode.calculationExpression.accept(this);
         }
@@ -334,22 +325,22 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(DotExpressionNode toCheck) {
+    public TypeCheckResult analyze(DotNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(DotSubstractionExpressionNode toCheck) {
+    public TypeCheckResult analyze(DotSubstractionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(NonCalculationExpressionNode toCheck) {
+    public TypeCheckResult analyze(NonCalculationNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(UnaryExpressionNode unary) {
+    public TypeCheckResult analyze(UnaryNode unary) {
         var valid = true;
 
         if (currentScope.contains(unary.identifier)) {

src/main/java/semantic/SemanticVisitor.java

@@ -2,19 +2,17 @@ package semantic;
 
 
 import ast.*;
-import ast.block.BlockNode;
-import ast.expression.binaryexpression.*;
-import ast.expression.unaryexpression.UnaryExpressionNode;
-import ast.member.*;
-import ast.parameter.ParameterNode;
-import ast.statement.*;
-import ast.statement.ifstatement.*;
-import ast.statement.statementexpression.AssignStatementExpressionNode;
-import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statement.statementexpression.NewDeclarationStatementExpressionNode;
-import ast.statement.statementexpression.crementExpression.DecrementExpressionNode;
-import ast.statement.statementexpression.crementExpression.IncrementExpressionNode;
-import ast.statement.statementexpression.methodcallstatementnexpression.MethodCallStatementExpressionNode;
+import ast.expressions.binaryexpressions.*;
+import ast.expressions.unaryexpressions.UnaryNode;
+import ast.members.*;
+import ast.parameters.ParameterNode;
+import ast.statements.*;
+import ast.statements.ifstatement.*;
+import ast.statements.statementexpression.AssignStatementExpressionNode;
+import ast.statements.statementexpression.AssignableExpressionNode;
+import ast.statements.statementexpression.NewDeclarationStatementExpressionNode;
+import ast.statements.statementexpression.crementExpression.DecrementExpressionNode;
+import ast.statements.statementexpression.crementExpression.IncrementExpressionNode;
 import typechecker.TypeCheckResult;
 
 public interface SemanticVisitor {
@@ -27,19 +25,19 @@ public interface SemanticVisitor {
 
     TypeCheckResult analyze(FieldNode toCheck);
 
-    TypeCheckResult analyze(IfStatementNode toCheck);
+    TypeCheckResult analyze(IfNode toCheck);
 
-    TypeCheckResult analyze(ReturnStatementNode toCheck);
+    TypeCheckResult analyze(ReturnNode toCheck);
 
-    TypeCheckResult analyze(WhileStatementNode toCheck);
+    TypeCheckResult analyze(WhileNode toCheck);
 
     TypeCheckResult analyze(ParameterNode toCheck);
 
-    TypeCheckResult analyze(BlockNode toCheck);
+    TypeCheckResult analyze(ast.block.BlockStatementNode toCheck);
 
     TypeCheckResult analyze(AssignableExpressionNode toCheck);
 
-    TypeCheckResult analyze(ElseStatementNode toCheck);
+    TypeCheckResult analyze(ElseNode toCheck);
 
     TypeCheckResult analyze(ForStatementNode toCheck);
 
@@ -47,9 +45,9 @@ public interface SemanticVisitor {
 
     TypeCheckResult analyze(DecrementExpressionNode toCheck);
 
-    TypeCheckResult analyze(IfElseStatementNode toCheck);
+    TypeCheckResult analyze(IfElseNode toCheck);
 
-    TypeCheckResult analyze(MethodCallStatementExpressionNode toCheck);
+    TypeCheckResult analyze(ast.statements.statementexpression.methodcallstatementnexpression.MethodCallStatementNode toCheck);
 
     TypeCheckResult analyze(LocalVariableDeclarationNode toCheck);
 
@@ -57,16 +55,16 @@ public interface SemanticVisitor {
 
     TypeCheckResult analyze(IncrementExpressionNode toCheck);
 
-    TypeCheckResult analyze(BinaryExpressionNode toCheck);
+    TypeCheckResult analyze(BinaryNode toCheck);
 
-    TypeCheckResult analyze(CalculationExpressionNode toCheck);
+    TypeCheckResult analyze(CalculationNode toCheck);
 
-    TypeCheckResult analyze(DotExpressionNode toCheck);
+    TypeCheckResult analyze(DotNode toCheck);
 
-    TypeCheckResult analyze(DotSubstractionExpressionNode toCheck);
+    TypeCheckResult analyze(DotSubstractionNode toCheck);
 
-    TypeCheckResult analyze(NonCalculationExpressionNode toCheck);
+    TypeCheckResult analyze(NonCalculationNode toCheck);
 
-    TypeCheckResult analyze(UnaryExpressionNode toCheck);
+    TypeCheckResult analyze(UnaryNode toCheck);
 
 }

src/main/java/semantic/context/ClassContext.java

@@ -1,7 +1,7 @@
 package semantic.context;
 
 import ast.ClassNode;
-import ast.member.FieldNode;
+import ast.members.FieldNode;
 import java.util.HashMap;
 
 public class ClassContext {

src/main/java/semantic/context/FieldContext.java

@@ -1,6 +1,6 @@
 package semantic.context;
 
-import ast.member.FieldNode;
+import ast.members.FieldNode;
 import ast.type.*;
 import ast.type.type.*;
 

src/test/java/semantic/Mocker.java

@@ -1,10 +1,9 @@
 package semantic;
 
 import ast.*;
-import ast.block.BlockNode;
-import ast.member.FieldNode;
-import ast.member.MethodNode;
-import ast.parameter.ParameterNode;
+import ast.members.FieldNode;
+import ast.members.MethodNode;
+import ast.parameters.ParameterNode;
 import ast.type.AccessModifierNode;
 import ast.type.type.*;
 
@@ -43,7 +42,7 @@ public class Mocker {
         //Statements
 
         //Block
-        methodNode.block = new BlockNode();
+        methodNode.block = new ast.block.BlockStatementNode();
 
         c.members.add(methodNode);
 
@@ -58,7 +57,7 @@ public class Mocker {
         ClassNode c = new ClassNode();
 
         MethodNode methodNode = new MethodNode();
-        methodNode.block = new BlockNode();
+        methodNode.block = new ast.block.BlockStatementNode();
         methodNode.setType(new BaseType(TypeEnum.INT));
 
         methodNode.setIdentifier("testMethod");
@@ -66,7 +65,7 @@ public class Mocker {
         c.members.add(methodNode);
 
         MethodNode methodNode1 = new MethodNode();
-        methodNode1.block = new BlockNode();
+        methodNode1.block = new ast.block.BlockStatementNode();
         methodNode1.setType(new BaseType(TypeEnum.INT));
 
         methodNode1.setIdentifier("testMethod");
@@ -84,13 +83,13 @@ public class Mocker {
         ClassNode c = new ClassNode();
 
         MethodNode methodNode = new MethodNode();
-        methodNode.block = new BlockNode();
+        methodNode.block = new ast.block.BlockStatementNode();
         methodNode.setIdentifier("testMethod");
 
         c.members.add(methodNode);
 
         MethodNode methodNode1 = new MethodNode();
-        methodNode1.block = new BlockNode();
+        methodNode1.block = new ast.block.BlockStatementNode();
         methodNode1.setIdentifier("testMethod1");
 
         c.members.add(methodNode1);