.idea/ANTLRv4ToolGrammarProperties.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ANTLRv4ToolGrammarProperties">
-    <option name="perGrammarGenerationSettings">
-      <list>
-        <PerGrammarGenerationSettings>
-          <option name="fileName" value="$PROJECT_DIR$/src/main/java/parser/grammar/SimpleJava.g4" />
-          <option name="autoGen" value="true" />
-          <option name="outputDir" value="C:\Users\janni\Desktop\NichtHaskell2.0\src\main\java" />
-          <option name="libDir" value="" />
-          <option name="encoding" value="" />
-          <option name="pkg" value="parser.generated" />
-          <option name="language" value="" />
-          <option name="generateVisitor" value="true" />
-        </PerGrammarGenerationSettings>
-      </list>
-    </option>
-  </component>
-</project>

src/main/java/ast/ASTNode.java

@@ -1,20 +1,5 @@
 package ast;
 
-import bytecode.visitor.ClassVisitor;
+public interface ASTNode { }
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public interface ASTNode {
-
-    //Todo: @BruderJohn & @i22007 Interface anwenden + geeignetetn Methodename.
-
-    /*
-    Typecheck:
-    public TypeCheckResult acceptType(SemanticVisitor visitor);
-
-    Bytecode:
-    public void accepByteCode(ClassVisitor classVisitor);
-     */
-}
 
 

src/main/java/ast/ClassNode.java

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

src/main/java/ast/block/BlockNode.java

@@ -1,15 +1,19 @@
-package ast.statements;
+package ast.block;
 
 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;
 
-public class BlockNode implements IStatementNode, Visitable {
+public class BlockNode implements ASTNode, Visitable {
     public List<IStatementNode> statements = new ArrayList<>();
+    public Boolean hasReturnStatement = false;
 
     public BlockNode() {}
 

src/main/java/ast/expression/IExpressionNode.java

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

src/main/java/ast/expression/binaryexpression/BinaryExpressionNode.java

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

src/main/java/ast/expression/binaryexpression/CalculationExpressionNode.java

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

src/main/java/ast/expression/binaryexpression/DotExpressionNode.java

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

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

@@ -0,0 +1,44 @@
+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/expression/binaryexpression/EnumDotOperator.java

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

src/main/java/ast/expression/binaryexpression/EnumLineOperator.java

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

src/main/java/ast/expression/binaryexpression/EnumNonCalculationOperator.java

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

src/main/java/ast/expression/binaryexpression/NonCalculationExpressionNode.java

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

src/main/java/ast/expression/unaryexpression/MemberAccessNode.java

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

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

@@ -0,0 +1,13 @@
+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/expression/unaryexpression/UnaryExpressionNode.java

@@ -1,7 +1,7 @@
-package ast.expressions.unaryexpressions;
+package ast.expression.unaryexpression;
 
-import ast.expressions.IExpressionNode;
+import ast.expression.IExpressionNode;
-import ast.statements.IStatementNode;
+import ast.statement.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 UnaryNode implements IExpressionNode {
+public class UnaryExpressionNode implements IExpressionNode {
     public String thisExp;
     public String identifier;
     public MemberAccessNode memberAccess;
     public ValueNode value;
-    public NotNode notExpression;
+    public NotExpressionNode notExpression;
     public IStatementNode statement;
     public IExpressionNode expression;
     private ITypeNode type;
 
-    public UnaryNode(String value) {
+    public UnaryExpressionNode(String value) {
         if(Objects.equals(value, "this")) {
             this.thisExp = "this";
         } else {
@@ -27,23 +27,23 @@ public class UnaryNode implements IExpressionNode {
         }
     }
 
-    public UnaryNode(MemberAccessNode memberAccess) {
+    public UnaryExpressionNode(MemberAccessNode memberAccess) {
         this.memberAccess = memberAccess;
     }
 
-    public UnaryNode(ValueNode value) {
+    public UnaryExpressionNode(ValueNode value) {
         this.value = value;
     }
 
-    public UnaryNode(NotNode notExpression) {
+    public UnaryExpressionNode(NotExpressionNode notExpression) {
         this.notExpression = notExpression;
     }
 
-    public UnaryNode(IStatementNode statement) {
+    public UnaryExpressionNode(IStatementNode statement) {
         this.statement = statement;
     }
 
-    public UnaryNode(IExpressionNode expression) {
+    public UnaryExpressionNode(IExpressionNode expression) {
         this.expression = expression;
     }
 

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

@@ -1,44 +0,0 @@
-package ast.expressions.binaryexpressions;
-
-import ast.expressions.unaryexpressions.MemberAccessNode;
-import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode;
-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 MethodCallNode 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(MethodCallNode 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/unaryexpressions/NotNode.java

@@ -1,13 +0,0 @@
-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/member/ConstructorNode.java

@@ -1,8 +1,11 @@
-package ast.members;
+package ast.member;
 
-import ast.parameters.ParameterNode;
+import ast.block.BlockNode;
-import ast.statements.BlockNode;
+import ast.parameter.ParameterNode;
 import ast.type.AccessModifierNode;
+import semantic.SemanticVisitor;
+import typechecker.TypeCheckResult;
+import visitor.Visitable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,17 +14,17 @@ public class ConstructorNode extends MethodNode  {
     public AccessModifierNode accessType;
     public String identifier;
     public List<ParameterNode> parameters = new ArrayList<>();
-    public BlockNode block;
+    public BlockNode body;
 
     public ConstructorNode(AccessModifierNode accessType, String identifier) {
         this.accessType = accessType;
         this.identifier = identifier;
     }
 
-    public ConstructorNode(String accessType, String identifier, BlockNode block) {
+    public ConstructorNode(String accessType, String identifier, BlockNode body) {
         this.accessType = new AccessModifierNode(accessType);
         this.identifier = identifier;
-        this.block = block;
+        this.body = body;
     }
 
     public void addParameter(ParameterNode parameterNode) {

src/main/java/ast/member/FieldNode.java

@@ -1,4 +1,4 @@
-package ast.members;
+package ast.member;
 
 import ast.type.AccessModifierNode;
 import ast.type.type.ITypeNode;

src/main/java/ast/member/MainMethodNode.java

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

src/main/java/ast/member/MemberNode.java

@@ -1,4 +1,4 @@
-package ast.members;
+package ast.member;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;

src/main/java/ast/member/MethodNode.java

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

src/main/java/ast/parameter/ParameterNode.java

@@ -1,4 +1,4 @@
-package ast.parameters;
+package ast.parameter;
 
 import ast.ASTNode;
 import ast.type.type.*;

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

@@ -0,0 +1,31 @@
+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/IStatementNode.java

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

src/main/java/ast/statement/LocalVariableDeclarationNode.java

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

src/main/java/ast/statement/ReturnStatementNode.java

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

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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,24 @@
+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/statement/statementexpression/AssignStatementExpressionNode.java

@@ -0,0 +1,21 @@
+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/statement/statementexpression/AssignableExpressionNode.java

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

src/main/java/ast/statement/statementexpression/IStatementExpressionNode.java

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

src/main/java/ast/statement/statementexpression/NewDeclarationStatementExpressionNode.java

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

src/main/java/ast/statement/statementexpression/crementExpression/CrementType.java

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

src/main/java/ast/statement/statementexpression/crementExpression/DecrementExpressionNode.java

@@ -0,0 +1,22 @@
+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/statement/statementexpression/crementExpression/IncrementExpressionNode.java

@@ -0,0 +1,22 @@
+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/statement/statementexpression/methodcallstatementnexpression/ChainedMethodNode.java

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

src/main/java/ast/statement/statementexpression/methodcallstatementnexpression/MethodCallStatementExpressionNode.java

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

src/main/java/ast/statement/statementexpression/methodcallstatementnexpression/TargetNode.java

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

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

@@ -1,21 +0,0 @@
-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/IStatementExpressionNode.java

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

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

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

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

@@ -1,22 +0,0 @@
-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.crementType = crementType;
-        this.assignableExpression = assignableExpression;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

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

@@ -1,22 +0,0 @@
-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.crementType = crementType;
-        this.assignableExpression = assignableExpression;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return visitor.analyze(this);
-    }
-
-}

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

@@ -1,19 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class ElseNode implements IStatementNode {
-    BlockNode block;
-
-    public ElseNode(BlockNode block) {
-        this.block = block;
-    }
-
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return null;
-    }
-}

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

@@ -1,28 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class IfElseNode implements IStatementNode {
-    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);
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return null;
-    }
-}

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

@@ -1,21 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-import ast.expressions.IExpressionNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class IfNode implements IStatementNode {
-    IExpressionNode expression;
-    BlockNode block;
-
-    public IfNode(IExpressionNode expression, BlockNode block) {
-        this.expression = expression;
-        this.block = block;
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return null;
-    }
-}

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

@@ -1,26 +0,0 @@
-package ast.statements;
-
-import ast.ASTNode;
-import ast.expressions.IExpressionNode;
-import semantic.SemanticVisitor;
-import typechecker.TypeCheckResult;
-
-public class WhileNode implements IStatementNode {
-    IExpressionNode expression;
-    BlockNode block;
-
-    public WhileNode(IExpressionNode expression, BlockNode block) {
-        this.expression = expression;
-        this.block = block;
-    }
-
-    public void test() {
-        return;
-
-    }
-
-    @Override
-    public TypeCheckResult accept(SemanticVisitor visitor) {
-        return null;
-    }
-}

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

@@ -25,4 +25,6 @@ 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.members.FieldNode;
+import ast.member.FieldNode;
-import ast.members.MemberNode;
+import ast.member.MemberNode;
-import ast.members.MethodNode;
+import ast.member.MethodNode;
 import ast.type.type.BaseType;
 import bytecode.visitor.ClassVisitor;
 

src/main/java/bytecode/MethodCodeGen.java

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

src/main/java/bytecode/visitor/ClassVisitor.java

@@ -1,7 +1,7 @@
 package bytecode.visitor;
 
 import ast.ClassNode;
-import ast.members.FieldNode;
+import ast.member.FieldNode;
 
 public interface ClassVisitor {
     void visit(ClassNode classNode);

src/main/java/bytecode/visitor/MethodVisitor.java

@@ -1,7 +1,7 @@
 package bytecode.visitor;
 
-import ast.members.ConstructorNode;
+import ast.member.ConstructorNode;
-import ast.members.MethodNode;
+import ast.member.MethodNode;
 
 public interface MethodVisitor {
     void visit(ConstructorNode constructorNode);

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

@@ -1,37 +1,35 @@
 package parser.astBuilder;
 
 import ast.*;
-
+import ast.block.BlockNode;
-import ast.expressions.IExpressionNode;
+import ast.expression.*;
-import ast.expressions.binaryexpressions.CalculationNode;
+import ast.expression.binaryexpression.CalculationExpressionNode;
-import ast.expressions.binaryexpressions.DotNode;
+import ast.expression.binaryexpression.DotExpressionNode;
-import ast.expressions.binaryexpressions.DotSubstractionNode;
+import ast.expression.binaryexpression.DotSubstractionExpressionNode;
-import ast.expressions.binaryexpressions.NonCalculationNode;
+import ast.expression.binaryexpression.NonCalculationExpressionNode;
-import ast.expressions.unaryexpressions.MemberAccessNode;
+import ast.expression.unaryexpression.MemberAccessNode;
-import ast.expressions.unaryexpressions.NotNode;
+import ast.expression.unaryexpression.NotExpressionNode;
-import ast.expressions.unaryexpressions.UnaryNode;
+import ast.expression.unaryexpression.UnaryExpressionNode;
-import ast.members.*;
+import ast.member.*;
-import ast.parameters.ParameterNode;
+import ast.statement.ifstatement.ElseStatementNode;
-import ast.statementexpressions.AssignNode;
+import ast.statement.ifstatement.IfElseStatementNode;
-import ast.statementexpressions.AssignableNode;
+import ast.parameter.ParameterNode;
-import ast.statementexpressions.NewDeclarationNode;
+import ast.statement.*;
-import ast.statementexpressions.crementexpressions.CrementType;
+import ast.statement.ifstatement.IfStatementNode;
-import ast.statementexpressions.crementexpressions.DecrementNode;
+import ast.statement.statementexpression.AssignStatementExpressionNode;
-import ast.statementexpressions.crementexpressions.IncrementNode;
+import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statementexpressions.methodcallstatementnexpressions.ChainedMethodNode;
+import ast.statement.statementexpression.NewDeclarationStatementExpressionNode;
-import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode;
+import ast.statement.statementexpression.crementExpression.CrementType;
-import ast.statementexpressions.methodcallstatementnexpressions.TargetNode;
+import ast.statement.statementexpression.crementExpression.DecrementExpressionNode;
-import ast.statements.*;
+import ast.statement.statementexpression.crementExpression.IncrementExpressionNode;
-import ast.type.AccessModifierNode;
+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 ast.type.EnumValueNode;
-import ast.type.ValueNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import parser.generated.*;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
     @Override
     public ASTNode visitProgram(SimpleJavaParser.ProgramContext ctx) {
@@ -54,39 +52,29 @@ 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.blockStatement()));
+        ConstructorNode constructorNode = new ConstructorNode(ctx.AccessModifier().getText(), ctx.Identifier().getText(), (BlockNode) visit(ctx.block()));
-        if(ctx.parameterList() != null) {
+        for (SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
-            for(SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
+            constructorNode.addParameter((ParameterNode) visit(parameter));
-                constructorNode.addParameter((ParameterNode) visit(parameter));
-            }
         }
-        constructorNode.block.addStatement(new ReturnNode(null));
         return constructorNode;
     }
 
     @Override
     public ASTNode visitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx) {
-        if(ctx.MainMethodDeclaration() != null) {
+        if (ctx.MainMethodDeclaration() != null) {
-            MainMethodNode mainMethod = new MainMethodNode((BlockNode) visit(ctx.blockStatement()));
+            return new MainMethodNode((BlockNode) visit(ctx.block()));
-            mainMethod.block.addStatement(new ReturnNode(null));
-            return mainMethod;
         } else {
-            if(ctx.type() != null) {
+            if (ctx.type() != null) {
-                MethodNode methodNode = new MethodNode(ctx.AccessModifier().getText(), createTypeNode(ctx.type().getText()), false, ctx.Identifier().getText(), (BlockNode) visit(ctx.blockStatement()));
+                MethodNode methodNode = new MethodNode(ctx.AccessModifier().getText(), createTypeNode(ctx.type().getText()), false, ctx.Identifier().getText(), (BlockNode) visit(ctx.block()));
-                if(ctx.parameterList() != null) {
+                for (SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
-                    for(SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
+                    methodNode.addParameter((ParameterNode) visit(parameter));
-                        methodNode.addParameter((ParameterNode) visit(parameter));
-                    }
                 }
                 return methodNode;
             } else {
-                MethodNode methodNode = new MethodNode(ctx.AccessModifier().getText(), null, true, ctx.Identifier().getText(), (BlockNode) visit(ctx.blockStatement()));
+                MethodNode methodNode = new MethodNode(ctx.AccessModifier().getText(), null, true, ctx.Identifier().getText(), (BlockNode) visit(ctx.block()));
-                if(ctx.parameterList() != null) {
+                for (SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
-                    for(SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) {
+                    methodNode.addParameter((ParameterNode) visit(parameter));
-                        methodNode.addParameter((ParameterNode) visit(parameter));
-                    }
                 }
-                methodNode.block.addStatement(new ReturnNode(null));
                 return methodNode;
             }
         }
@@ -104,21 +92,19 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitStatement(SimpleJavaParser.StatementContext ctx) {
-        if(ctx.returnStatement() != null) {
+        if (ctx.returnStatement() != null) {
             return visitReturnStatement(ctx.returnStatement());
-        } else if(ctx.localVariableDeclaration() != null) {
+        } else if (ctx.localVariableDeclaration() != null) {
             return visitLocalVariableDeclaration(ctx.localVariableDeclaration());
-        } else if(ctx.blockStatement() != null) {
+        } else if (ctx.block() != null) {
-            return visitBlockStatement(ctx.blockStatement());
+            return visitBlock(ctx.block());
-        } else if(ctx.whileStatement() != null) {
+        } else if (ctx.whileStatement() != null) {
             return visitWhileStatement(ctx.whileStatement());
-        } else if(ctx.doWhileStatement() != null) {
+        } else if (ctx.forStatement() != null) {
-            return visitDoWhileStatement(ctx.doWhileStatement());
-        } else if(ctx.forStatement() != null) {
             return visitForStatement(ctx.forStatement());
-        } else if(ctx.ifElseStatement() != null) {
+        } else if (ctx.ifElseStatement() != null) {
             return visitIfElseStatement(ctx.ifElseStatement());
-        } else if(ctx.statementExpression() != null) {
+        } else if (ctx.statementExpression() != null) {
             return visitStatementExpression(ctx.statementExpression());
         }
         return null;
@@ -126,7 +112,7 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx) {
-        return new ReturnNode((IExpressionNode) visit(ctx.expression()));
+        return new ReturnStatementNode((IExpressionNode) visit(ctx.expression()));
     }
 
     @Override
@@ -135,109 +121,60 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
     }
 
     @Override
-    public ASTNode visitBlockStatement(SimpleJavaParser.BlockStatementContext ctx) {
+    public ASTNode visitBlock(SimpleJavaParser.BlockContext ctx) {
         BlockNode blockNode = new BlockNode();
-        for(SimpleJavaParser.StatementContext statement : ctx.statement()) {
+        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 WhileNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement()));
+        return new WhileStatementNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.block()));
-    }
-
-    @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) {
-
+        if (ctx.statementExpression(0) != null) {
-        List<IStatementNode> statements = new ArrayList<>();
+            return new ForStatementNode((IExpressionNode) visit(ctx.statementExpression(0)), (IExpressionNode) visit(ctx.expression()), (IExpressionNode) visit(ctx.statementExpression(1)));
-
+        } else if (ctx.localVariableDeclaration() != null) {
-        //init
+            return new ForStatementNode((IStatementNode) visit(ctx.localVariableDeclaration()), (IExpressionNode) visit(ctx.expression()), (IExpressionNode) visit(ctx.statementExpression(1)));
-        int i = 0;
-        if(ctx.localVariableDeclaration() != null) {
-            statements.add((IStatementNode) visit(ctx.localVariableDeclaration()));
-        } else if(ctx.statementExpression(i) != null){
-            statements.add((IStatementNode) visit(ctx.statementExpression(i)));
-            i++;
         }
-
+        return null;
-        //condition
-        IExpressionNode condition = (IExpressionNode) visit(ctx.expression());
-
-        //ink
-        IStatementNode crement = null;
-        if(ctx.statementExpression(i) != null){
-            crement = (IStatementNode) visit(ctx.statementExpression(i));
-        }
-
-        BlockNode forBlock = (BlockNode) visit(ctx.blockStatement());
-
-        if(crement != null){
-            forBlock.addStatement((crement));
-        }
-
-        WhileNode While = new WhileNode(condition, forBlock);
-
-        statements.add(While);
-
-        BlockNode resultBlock = new BlockNode();
-        for(IStatementNode statement : statements) {
-            resultBlock.addStatement((IStatementNode) statement);
-        }
-
-        return resultBlock;
     }
 
     @Override
     public ASTNode visitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx) {
-        IfElseNode ifElseStatementNode =  new IfElseNode((IfNode) visit(ctx.ifStatement()),
+        IfElseStatementNode ifElseStatementNode = new IfElseStatementNode((IfStatementNode) visit(ctx.ifStatement()));
-                (ElseNode) visit(ctx.elseStatement()));
+        for (SimpleJavaParser.ElseStatementContext elseStatement : ctx.elseStatement()) {
-
+            ifElseStatementNode.addElseStatement((ElseStatementNode) visit(elseStatement));
-        for (SimpleJavaParser.ElseIfStatementContext elseIf : ctx.elseIfStatement()){
-            ifElseStatementNode.addElseIfStatement(((IfNode) visit(elseIf)));
         }
-
         return ifElseStatementNode;
     }
 
     @Override
     public ASTNode visitIfStatement(SimpleJavaParser.IfStatementContext ctx) {
-        return new IfNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement()));
+        return new IfStatementNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.block()));
-    }
-
-    @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 ElseNode((BlockNode) visit(ctx.blockStatement()));
+        return new ElseStatementNode((BlockNode) visit(ctx.block()));
     }
 
     @Override
     public ASTNode visitStatementExpression(SimpleJavaParser.StatementExpressionContext ctx) {
-        if(ctx.assign() != null) {
+        if (ctx.assign() != null) {
             return visitAssign(ctx.assign());
-        } else if(ctx.newDeclaration() != null) {
+        } else if (ctx.newDeclaration() != null) {
             return visitNewDeclaration(ctx.newDeclaration());
-        } else if(ctx.methodCall() != null) {
+        } else if (ctx.methodCall() != null) {
             return visitMethodCall(ctx.methodCall());
-        } else if(ctx.crementExpression() != null) {
+        } else if (ctx.crementExpression() != null) {
             return visitCrementExpression(ctx.crementExpression());
         }
         return null;
@@ -245,25 +182,25 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitAssign(SimpleJavaParser.AssignContext ctx) {
-        return new AssignNode((AssignableNode) visit(ctx.assignableExpression()), (IExpressionNode) visit(ctx.expression()));
+        return new AssignStatementExpressionNode((AssignableExpressionNode) visit(ctx.assignableExpression()), (IExpressionNode) visit(ctx.expression()));
     }
 
     @Override
     public ASTNode visitNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx) {
-        NewDeclarationNode newDeclarationNode = new NewDeclarationNode(ctx.Identifier().getText());
+        NewDeclarationStatementExpressionNode newDeclarationStatementExpressionNode = new NewDeclarationStatementExpressionNode(ctx.Identifier().getText());
-        for(SimpleJavaParser.ExpressionContext expression : ctx.argumentList().expression()) {
+        for (SimpleJavaParser.ExpressionContext expression : ctx.argumentList().expression()) {
-            newDeclarationNode.addExpression((IExpressionNode) visit(expression));
+            newDeclarationStatementExpressionNode.addExpression((IExpressionNode) visit(expression));
         }
-        return newDeclarationNode;
+        return newDeclarationStatementExpressionNode;
     }
 
     @Override
     public ASTNode visitMethodCall(SimpleJavaParser.MethodCallContext ctx) {
-        MethodCallNode methodCallStatementExpressionNode = new MethodCallNode((TargetNode) visit(ctx.target()), ctx.Identifier().getText());
+        MethodCallStatementExpressionNode methodCallStatementExpressionNode = new MethodCallStatementExpressionNode((TargetNode) visit(ctx.target()), ctx.Identifier().getText());
-        for(SimpleJavaParser.ChainedMethodContext chainedMethod : ctx.chainedMethod()) {
+        for (SimpleJavaParser.ChainedMethodContext chainedMethod : ctx.chainedMethod()) {
             methodCallStatementExpressionNode.addChainedMethod((ChainedMethodNode) visit(chainedMethod));
         }
-        for(SimpleJavaParser.ExpressionContext expression : ctx.argumentList().expression()) {
+        for (SimpleJavaParser.ExpressionContext expression : ctx.argumentList().expression()) {
             methodCallStatementExpressionNode.addExpression((IExpressionNode) visit(expression));
         }
         return methodCallStatementExpressionNode;
@@ -271,13 +208,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitTarget(SimpleJavaParser.TargetContext ctx) {
-        if(ctx.This() != null) {
+        if (ctx.This() != null) {
             return new TargetNode(true);
-        } else if(ctx.memberAccess() != null) {
+        } else if (ctx.memberAccess() != null) {
             return new TargetNode((MemberAccessNode) visit(ctx.memberAccess()));
-        } else if(ctx.newDeclaration() != null) {
+        } else if (ctx.newDeclaration() != null) {
-            return new TargetNode((NewDeclarationNode) visit(ctx.newDeclaration()));
+            return new TargetNode((NewDeclarationStatementExpressionNode) visit(ctx.newDeclaration()));
-        } else if(ctx.Identifier() != null) {
+        } else if (ctx.Identifier() != null) {
             return new TargetNode(ctx.Identifier().getText());
         }
         return null;
@@ -286,7 +223,7 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
     @Override
     public ASTNode visitChainedMethod(SimpleJavaParser.ChainedMethodContext ctx) {
         ChainedMethodNode chainedMethodNode = new ChainedMethodNode(ctx.Identifier().getText());
-        for(SimpleJavaParser.ExpressionContext expression : ctx.argumentList().expression()) {
+        for (SimpleJavaParser.ExpressionContext expression : ctx.argumentList().expression()) {
             chainedMethodNode.addExpression((IExpressionNode) visit(expression));
         }
         return chainedMethodNode;
@@ -294,9 +231,9 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitCrementExpression(SimpleJavaParser.CrementExpressionContext ctx) {
-        if(ctx.incrementExpression() != null) {
+        if (ctx.incrementExpression() != null) {
             return visitIncrementExpression(ctx.incrementExpression());
-        } else if(ctx.decrementExpression() != null) {
+        } else if (ctx.decrementExpression() != null) {
             return visitDecrementExpression(ctx.decrementExpression());
         }
         return null;
@@ -304,9 +241,9 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx) {
-        if(ctx.prefixIncrementExpression() != null) {
+        if (ctx.prefixIncrementExpression() != null) {
             return visitPrefixIncrementExpression(ctx.prefixIncrementExpression());
-        } else if(ctx.suffixIncrementExpression() != null) {
+        } else if (ctx.suffixIncrementExpression() != null) {
             return visitSuffixIncrementExpression(ctx.suffixIncrementExpression());
         }
         return null;
@@ -314,19 +251,19 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx) {
-        return new IncrementNode(CrementType.PREFIX, (AssignableNode) visit(ctx.assignableExpression()));
+        return new IncrementExpressionNode(CrementType.PREFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
     }
 
     @Override
     public ASTNode visitSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx) {
-        return new IncrementNode(CrementType.SUFFIX, (AssignableNode) visit(ctx.assignableExpression()));
+        return new IncrementExpressionNode(CrementType.SUFFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
     }
 
     @Override
     public ASTNode visitDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx) {
-        if(ctx.prefixDecrementExpression() != null) {
+        if (ctx.prefixDecrementExpression() != null) {
             return visitPrefixDecrementExpression(ctx.prefixDecrementExpression());
-        } else if(ctx.suffixDecrementExpression() != null) {
+        } else if (ctx.suffixDecrementExpression() != null) {
             return visitSuffixDecrementExpression(ctx.suffixDecrementExpression());
         }
         return null;
@@ -334,19 +271,19 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx) {
-        return new DecrementNode(CrementType.PREFIX, (AssignableNode) visit(ctx.assignableExpression()));
+        return new DecrementExpressionNode(CrementType.PREFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
     }
 
     @Override
     public ASTNode visitSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx) {
-        return new DecrementNode(CrementType.SUFFIX, (AssignableNode) visit(ctx.assignableExpression()));
+        return new DecrementExpressionNode(CrementType.SUFFIX, (AssignableExpressionNode) visit(ctx.assignableExpression()));
     }
 
     @Override
     public ASTNode visitExpression(SimpleJavaParser.ExpressionContext ctx) {
-        if(ctx.unaryExpression() != null) {
+        if (ctx.unaryExpression() != null) {
             return visit(ctx.unaryExpression());
-        } else if(ctx.binaryExpression() != null) {
+        } else if (ctx.binaryExpression() != null) {
             return visit(ctx.binaryExpression());
         }
         return null;
@@ -354,20 +291,20 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) {
-        if(ctx.This() != null) {
+        if (ctx.This() != null) {
-            return new UnaryNode(ctx.This().getText());
+            return new UnaryExpressionNode(ctx.This().getText());
-        } else if(ctx.Identifier() != null) {
+        } else if (ctx.Identifier() != null) {
-            return new UnaryNode(ctx.Identifier().getText());
+            return new UnaryExpressionNode(ctx.Identifier().getText());
-        } else if(ctx.memberAccess() != null) {
+        } else if (ctx.memberAccess() != null) {
-            return new UnaryNode((MemberAccessNode) visitMemberAccess(ctx.memberAccess()));
+            return new UnaryExpressionNode((MemberAccessNode) visitMemberAccess(ctx.memberAccess()));
-        } else if(ctx.value() != null) {
+        } else if (ctx.value() != null) {
-            return new UnaryNode((ValueNode) visitValue(ctx.value()));
+            return new UnaryExpressionNode((ValueNode) visitValue(ctx.value()));
-        } else if(ctx.notExpression() != null) {
+        } else if (ctx.notExpression() != null) {
-            return new UnaryNode((NotNode) visitNotExpression(ctx.notExpression()));
+            return new UnaryExpressionNode((NotExpressionNode) visitNotExpression(ctx.notExpression()));
-        } else if(ctx.statementExpression() != null) {
+        } else if (ctx.statementExpression() != null) {
-            return new UnaryNode((IStatementNode) visitStatementExpression(ctx.statementExpression()));
+            return new UnaryExpressionNode((IStatementNode) visitStatementExpression(ctx.statementExpression()));
-        } else if(ctx.expression() != null) {
+        } else if (ctx.expression() != null) {
-            return new UnaryNode((IExpressionNode) visitExpression(ctx.expression()));
+            return new UnaryExpressionNode((IExpressionNode) visitExpression(ctx.expression()));
         }
         return null;
     }
@@ -375,7 +312,7 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
     @Override
     public ASTNode visitMemberAccess(SimpleJavaParser.MemberAccessContext ctx) {
         MemberAccessNode memberAccessNode;
-        if(ctx.This() != null) {
+        if (ctx.This() != null) {
             memberAccessNode = new MemberAccessNode(true);
         } else {
             memberAccessNode = new MemberAccessNode(false);
@@ -388,13 +325,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitValue(SimpleJavaParser.ValueContext ctx) {
-        if(ctx.IntValue() != null) {
+        if (ctx.IntValue() != null) {
             return new ValueNode(EnumValueNode.INT_VALUE, ctx.IntValue().getText());
-        } else if(ctx.BooleanValue() != null) {
+        } else if (ctx.BooleanValue() != null) {
             return new ValueNode(EnumValueNode.BOOLEAN_VALUE, ctx.BooleanValue().getText());
-        } else if(ctx.CharValue() != null) {
+        } else if (ctx.CharValue() != null) {
             return new ValueNode(EnumValueNode.CHAR_VALUE, ctx.CharValue().getText());
-        } else if(ctx.NullValue() != null) {
+        } else if (ctx.NullValue() != null) {
             return new ValueNode(EnumValueNode.NULL_VALUE, ctx.NullValue().getText());
         }
         return null;
@@ -402,15 +339,15 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitNotExpression(SimpleJavaParser.NotExpressionContext ctx) {
-        return new NotNode((IExpressionNode) visitExpression(ctx.expression()));
+        return new NotExpressionNode((IExpressionNode) visitExpression(ctx.expression()));
     }
 
 
     @Override
     public ASTNode visitBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx) {
-        if(ctx.calculationExpression() != null) {
+        if (ctx.calculationExpression() != null) {
             return visit(ctx.calculationExpression());
-        } else if(ctx.nonCalculationExpression() != null) {
+        } else if (ctx.nonCalculationExpression() != null) {
             return visit(ctx.nonCalculationExpression());
         }
         return null;
@@ -418,54 +355,54 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
 
     @Override
     public ASTNode visitCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx) {
-        if(ctx.calculationExpression() != null) {
+        if (ctx.calculationExpression() != null) {
-            return new CalculationNode((CalculationNode) visit(ctx.calculationExpression()), ctx.LineOperator().getText(), (DotNode) visit(ctx.dotExpression()));
+            return new CalculationExpressionNode((CalculationExpressionNode) visit(ctx.calculationExpression()), ctx.LineOperator().getText(), (DotExpressionNode) visit(ctx.dotExpression()));
-        } else if(ctx.dotExpression() != null) {
+        } else if (ctx.dotExpression() != null) {
-            return new CalculationNode((DotNode) visit(ctx.dotExpression()));
+            return new CalculationExpressionNode((DotExpressionNode) visit(ctx.dotExpression()));
         }
         return null;
     }
 
     @Override
     public ASTNode visitDotExpression(SimpleJavaParser.DotExpressionContext ctx) {
-        if(ctx.dotExpression() != null) {
+        if (ctx.dotExpression() != null) {
-            return new DotNode((DotNode) visit(ctx.dotExpression()), ctx.DotOperator().getText(), (DotSubstractionNode) visit(ctx.dotSubtractionExpression()));
+            return new DotExpressionNode((DotExpressionNode) visit(ctx.dotExpression()), ctx.DotOperator().getText(), (DotSubstractionExpressionNode) visit(ctx.dotSubtractionExpression()));
-        } else if(ctx.dotSubtractionExpression() != null) {
+        } else if (ctx.dotSubtractionExpression() != null) {
-            return new DotNode((DotSubstractionNode) visit(ctx.dotSubtractionExpression()));
+            return new DotExpressionNode((DotSubstractionExpressionNode) visit(ctx.dotSubtractionExpression()));
         }
         return null;
     }
 
     @Override
     public ASTNode visitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx) {
-        if(ctx.IntValue() != null) {
+        if (ctx.IntValue() != null) {
-            return new DotSubstractionNode(new ValueNode(EnumValueNode.INT_VALUE, ctx.IntValue().getText()));
+            return new DotSubstractionExpressionNode(new ValueNode(EnumValueNode.INT_VALUE, ctx.IntValue().getText()));
-        } else if(ctx.Identifier() != null) {
+        } else if (ctx.Identifier() != null) {
-            return new DotSubstractionNode(ctx.Identifier().getText());
+            return new DotSubstractionExpressionNode(ctx.Identifier().getText());
-        } else if(ctx.memberAccess() != null) {
+        } else if (ctx.memberAccess() != null) {
-            return new DotSubstractionNode((MemberAccessNode) visit(ctx.memberAccess()));
+            return new DotSubstractionExpressionNode((MemberAccessNode) visit(ctx.memberAccess()));
-        } else if(ctx.methodCall() != null && ctx.calculationExpression() != null) {
+        } else if (ctx.methodCall() != null && ctx.calculationExpression() != null) {
-            return new DotSubstractionNode((MethodCallNode) visit(ctx.methodCall()), (CalculationNode) visit(ctx.calculationExpression()));
+            return new DotSubstractionExpressionNode((MethodCallStatementExpressionNode) visit(ctx.methodCall()), (CalculationExpressionNode) visit(ctx.calculationExpression()));
         }
         return null;
     }
 
     @Override
     public ASTNode visitNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx) {
-        return new NonCalculationNode((UnaryNode) visit(ctx.unaryExpression()), ctx.nonCalculationOperator().getText(), (IExpressionNode) visit(ctx.expression()));
+        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) {
+        if (ctx.Identifier() != null) {
-            return new AssignableNode(ctx.Identifier().getText());
+            return new AssignableExpressionNode(ctx.Identifier().getText());
-        } else if(ctx.memberAccess() != null) {
+        } else if (ctx.memberAccess() != null) {
-            return new AssignableNode((MemberAccessNode) visit(ctx.memberAccess()));
+            return new AssignableExpressionNode((MemberAccessNode) visit(ctx.memberAccess()));
         }
         return null;
     }
 
-    public ITypeNode createTypeNode(String identifier){
+    public ITypeNode createTypeNode(String identifier) {
         return switch (identifier) {
             case "int" -> new BaseType(TypeEnum.INT);
             case "boolean" -> new BaseType(TypeEnum.BOOL);
@@ -476,4 +413,3 @@ public class ASTBuilder extends SimpleJavaBaseVisitor<ASTNode> {
     }
 
 }
-

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

@@ -35,20 +35,19 @@ Comma=34
 Class=35
 This=36
 While=37
-Do=38
+If=38
-If=39
+Else=39
-Else=40
+For=40
-For=41
+Return=41
-Return=42
+New=42
-New=43
+CharValue=43
-CharValue=44
+IntValue=44
-IntValue=45
+BooleanValue=45
-BooleanValue=46
+NullValue=46
-NullValue=47
+Identifier=47
-Identifier=48
+WS=48
-WS=49
+InlineComment=49
-InlineComment=50
+MultilineComment=50
-MultilineComment=51
 '++'=1
 '--'=2
 'void'=3
@@ -81,10 +80,9 @@ MultilineComment=51
 'class'=35
 'this'=36
 'while'=37
-'do'=38
+'if'=38
-'if'=39
+'else'=39
-'else'=40
+'for'=40
-'for'=41
+'return'=41
-'return'=42
+'new'=42
-'new'=43
+'null'=46
-'null'=47

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

@@ -137,13 +137,13 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterBlockStatement(SimpleJavaParser.BlockStatementContext ctx) { }
+	@Override public void enterBlock(SimpleJavaParser.BlockContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitBlockStatement(SimpleJavaParser.BlockStatementContext ctx) { }
+	@Override public void exitBlock(SimpleJavaParser.BlockContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -180,18 +180,6 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 * <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 enterDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -228,18 +216,6 @@ public class SimpleJavaBaseListener implements SimpleJavaListener {
 	 * <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 enterElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

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

@@ -88,7 +88,7 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitBlockStatement(SimpleJavaParser.BlockStatementContext ctx) { return visitChildren(ctx); }
+	@Override public T visitBlock(SimpleJavaParser.BlockContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -110,13 +110,6 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * {@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 visitDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
@@ -138,13 +131,6 @@ public class SimpleJavaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implem
 	 * {@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 visitElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *

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

@@ -23,9 +23,9 @@ public class SimpleJavaLexer extends Lexer {
 		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, 
-		Do=38, If=39, Else=40, For=41, Return=42, New=43, CharValue=44, IntValue=45, 
+		If=38, Else=39, For=40, Return=41, New=42, CharValue=43, IntValue=44, 
-		BooleanValue=46, NullValue=47, Identifier=48, WS=49, InlineComment=50, 
+		BooleanValue=45, NullValue=46, Identifier=47, WS=48, InlineComment=49, 
-		MultilineComment=51;
+		MultilineComment=50;
 	public static String[] channelNames = {
 		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
@@ -42,9 +42,9 @@ public class SimpleJavaLexer extends Lexer {
 			"GreaterEqual", "LessEqual", "Equal", "NotEqual", "Not", "And", "Or", 
 			"Dot", "OpenRoundBracket", "ClosedRoundBracket", "OpenCurlyBracket", 
 			"ClosedCurlyBracket", "Semicolon", "Comma", "Class", "This", "While", 
-			"Do", "If", "Else", "For", "Return", "New", "CharValue", "IntValue", 
+			"If", "Else", "For", "Return", "New", "CharValue", "IntValue", "BooleanValue", 
-			"BooleanValue", "NullValue", "Alphabetic", "Numeric", "ValidIdentSymbols", 
+			"NullValue", "Alphabetic", "Numeric", "ValidIdentSymbols", "Identifier", 
-			"Identifier", "WS", "InlineComment", "MultilineComment"
+			"WS", "InlineComment", "MultilineComment"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
@@ -55,8 +55,8 @@ public class SimpleJavaLexer extends Lexer {
 			"'public static void main(String[] args)'", null, null, null, null, "'='", 
 			"'+'", "'-'", "'*'", "'%'", "'/'", "'>'", "'<'", "'>='", "'<='", "'=='", 
 			"'!='", "'!'", "'&&'", "'||'", "'.'", "'('", "')'", "'{'", "'}'", "';'", 
-			"','", "'class'", "'this'", "'while'", "'do'", "'if'", "'else'", "'for'", 
+			"','", "'class'", "'this'", "'while'", "'if'", "'else'", "'for'", "'return'", 
-			"'return'", "'new'", null, null, null, "'null'"
+			"'new'", null, null, null, "'null'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -68,9 +68,8 @@ public class SimpleJavaLexer extends Lexer {
 			"Greater", "Less", "GreaterEqual", "LessEqual", "Equal", "NotEqual", 
 			"Not", "And", "Or", "Dot", "OpenRoundBracket", "ClosedRoundBracket", 
 			"OpenCurlyBracket", "ClosedCurlyBracket", "Semicolon", "Comma", "Class", 
-			"This", "While", "Do", "If", "Else", "For", "Return", "New", "CharValue", 
+			"This", "While", "If", "Else", "For", "Return", "New", "CharValue", "IntValue", 
-			"IntValue", "BooleanValue", "NullValue", "Identifier", "WS", "InlineComment", 
+			"BooleanValue", "NullValue", "Identifier", "WS", "InlineComment", "MultilineComment"
-			"MultilineComment"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -132,7 +131,7 @@ public class SimpleJavaLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\u0004\u00003\u019d\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
+		"\u0004\u00002\u0198\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
 		"\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+
 		"\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+
 		"\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+
@@ -146,246 +145,244 @@ public class SimpleJavaLexer extends Lexer {
 		"!\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\u00025\u0007"+
+		"0\u00021\u00071\u00022\u00072\u00023\u00073\u00024\u00074\u0001\u0000"+
-		"5\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001"+
+		"\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002"+
-		"\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003"+
+		"\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\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004"+
+		"\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005"+
-		"\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006"+
+		"\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\u0001\u0006\u0003\u0006\u00b2\b\u0006\u0001\u0007\u0001\u0007"+
+		"\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\u0007\u0001\b\u0001\b\u0001\b\u0003\b\u00de\b\b\u0001\t\u0001\t"+
+		"\u0001\b\u0001\b\u0001\b\u0003\b\u00dc\b\b\u0001\t\u0001\t\u0003\t\u00e0"+
-		"\u0003\t\u00e2\b\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0003"+
+		"\b\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0003\n\u00e8\b\n"+
-		"\n\u00ea\b\n\u0001\u000b\u0001\u000b\u0003\u000b\u00ee\b\u000b\u0001\f"+
+		"\u0001\u000b\u0001\u000b\u0003\u000b\u00ec\b\u000b\u0001\f\u0001\f\u0001"+
-		"\u0001\f\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f"+
+		"\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0001\u0010"+
-		"\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012"+
+		"\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0013"+
-		"\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015"+
+		"\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015"+
-		"\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017"+
+		"\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017"+
-		"\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019"+
+		"\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019"+
-		"\u0001\u0019\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b"+
+		"\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001c"+
-		"\u0001\u001c\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e"+
+		"\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001f"+
-		"\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001!\u0001!\u0001\"\u0001\"\u0001"+
+		"\u0001\u001f\u0001 \u0001 \u0001!\u0001!\u0001\"\u0001\"\u0001\"\u0001"+
-		"\"\u0001\"\u0001\"\u0001\"\u0001#\u0001#\u0001#\u0001#\u0001#\u0001$\u0001"+
+		"\"\u0001\"\u0001\"\u0001#\u0001#\u0001#\u0001#\u0001#\u0001$\u0001$\u0001"+
-		"$\u0001$\u0001$\u0001$\u0001$\u0001%\u0001%\u0001%\u0001&\u0001&\u0001"+
+		"$\u0001$\u0001$\u0001$\u0001%\u0001%\u0001%\u0001&\u0001&\u0001&\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"+
-		"*\u0001*\u0001+\u0001+\u0005+\u014f\b+\n+\f+\u0152\t+\u0001+\u0001+\u0001"+
+		"\b*\n*\f*\u014d\t*\u0001*\u0001*\u0001+\u0003+\u0152\b+\u0001+\u0004+"+
-		",\u0003,\u0157\b,\u0001,\u0004,\u015a\b,\u000b,\f,\u015b\u0001-\u0001"+
+		"\u0155\b+\u000b+\f+\u0156\u0001,\u0001,\u0001,\u0001,\u0001,\u0001,\u0001"+
-		"-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0003-\u0167\b-\u0001"+
+		",\u0001,\u0001,\u0003,\u0162\b,\u0001-\u0001-\u0001-\u0001-\u0001-\u0001"+
-		".\u0001.\u0001.\u0001.\u0001.\u0001/\u0001/\u00010\u00010\u00011\u0001"+
+		".\u0001.\u0001/\u0001/\u00010\u00010\u00010\u00030\u0170\b0\u00011\u0001"+
-		"1\u00011\u00031\u0175\b1\u00012\u00012\u00052\u0179\b2\n2\f2\u017c\t2"+
+		"1\u00051\u0174\b1\n1\f1\u0177\t1\u00012\u00042\u017a\b2\u000b2\f2\u017b"+
-		"\u00013\u00043\u017f\b3\u000b3\f3\u0180\u00013\u00013\u00014\u00014\u0001"+
+		"\u00012\u00012\u00013\u00013\u00013\u00013\u00053\u0184\b3\n3\f3\u0187"+
-		"4\u00014\u00054\u0189\b4\n4\f4\u018c\t4\u00014\u00014\u00015\u00015\u0001"+
+		"\t3\u00013\u00013\u00014\u00014\u00014\u00014\u00054\u018f\b4\n4\f4\u0192"+
-		"5\u00015\u00055\u0194\b5\n5\f5\u0197\t5\u00015\u00015\u00015\u00015\u0001"+
+		"\t4\u00014\u00014\u00014\u00014\u00014\u0001\u0190\u00005\u0001\u0001"+
-		"5\u0001\u0195\u00006\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t"+
+		"\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007\u000f"+
-		"\u0005\u000b\u0006\r\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f"+
+		"\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e\u001d\u000f"+
-		"\u0019\r\u001b\u000e\u001d\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014"+
+		"\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015+\u0016-\u0017/\u0018"+
-		")\u0015+\u0016-\u0017/\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e"+
+		"1\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\"E#G$I%K&M\'O("+
-		"=\u001f? A!C\"E#G$I%K&M\'O(Q)S*U+W,Y-[.]/_\u0000a\u0000c\u0000e0g1i2k"+
+		"Q)S*U+W,Y-[.]\u0000_\u0000a\u0000c/e0g1i2\u0001\u0000\u0005\u0002\u0000"+
-		"3\u0001\u0000\u0005\u0002\u0000\n\n\r\r\u0002\u0000AZaz\u0001\u000009"+
+		"\n\n\r\r\u0002\u0000AZaz\u0001\u000009\u0002\u0000$$__\u0003\u0000\t\n"+
-		"\u0002\u0000$$__\u0003\u0000\t\n\r\r  \u01af\u0000\u0001\u0001\u0000\u0000"+
+		"\r\r  \u01aa\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000"+
-		"\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001\u0000\u0000"+
+		"\u0000\u0000\u0000\u0005\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000"+
-		"\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000"+
-		"\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000\u0000\u0000"+
+		"\u0000\u0000\r\u0001\u0000\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000"+
-		"\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000\u0000\u0000\u0000"+
+		"\u0000\u0011\u0001\u0000\u0000\u0000\u0000\u0013\u0001\u0000\u0000\u0000"+
-		"\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000\u0000\u0000\u0000"+
+		"\u0000\u0015\u0001\u0000\u0000\u0000\u0000\u0017\u0001\u0000\u0000\u0000"+
-		"\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000\u0000\u0000\u0000"+
+		"\u0000\u0019\u0001\u0000\u0000\u0000\u0000\u001b\u0001\u0000\u0000\u0000"+
-		"\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000\u0000\u0000\u0000"+
+		"\u0000\u001d\u0001\u0000\u0000\u0000\u0000\u001f\u0001\u0000\u0000\u0000"+
-		"\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000\u0000\u0000#\u0001"+
+		"\u0000!\u0001\u0000\u0000\u0000\u0000#\u0001\u0000\u0000\u0000\u0000%"+
-		"\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000\'\u0001\u0000"+
+		"\u0001\u0000\u0000\u0000\u0000\'\u0001\u0000\u0000\u0000\u0000)\u0001"+
-		"\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0000\u0000+\u0001\u0000\u0000\u0000\u0000-\u0001\u0000\u0000"+
-		"\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000\u0000\u00001"+
+		"\u0000\u0000/\u0001\u0000\u0000\u0000\u00001\u0001\u0000\u0000\u0000\u0000"+
-		"\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u00005\u0001\u0000"+
+		"3\u0001\u0000\u0000\u0000\u00005\u0001\u0000\u0000\u0000\u00007\u0001"+
-		"\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0000\u00009\u0001\u0000\u0000\u0000\u0000;\u0001\u0000\u0000"+
-		"\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000\u0000\u0000?"+
+		"\u0000\u0000=\u0001\u0000\u0000\u0000\u0000?\u0001\u0000\u0000\u0000\u0000"+
-		"\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000C\u0001\u0000"+
+		"A\u0001\u0000\u0000\u0000\u0000C\u0001\u0000\u0000\u0000\u0000E\u0001"+
-		"\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0000\u0000G\u0001\u0000\u0000\u0000\u0000I\u0001\u0000\u0000"+
-		"\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000\u0000\u0000M"+
+		"\u0000\u0000K\u0001\u0000\u0000\u0000\u0000M\u0001\u0000\u0000\u0000\u0000"+
-		"\u0001\u0000\u0000\u0000\u0000O\u0001\u0000\u0000\u0000\u0000Q\u0001\u0000"+
+		"O\u0001\u0000\u0000\u0000\u0000Q\u0001\u0000\u0000\u0000\u0000S\u0001"+
-		"\u0000\u0000\u0000S\u0001\u0000\u0000\u0000\u0000U\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0000\u0000U\u0001\u0000\u0000\u0000\u0000W\u0001\u0000\u0000"+
-		"\u0000W\u0001\u0000\u0000\u0000\u0000Y\u0001\u0000\u0000\u0000\u0000["+
+		"\u0000\u0000Y\u0001\u0000\u0000\u0000\u0000[\u0001\u0000\u0000\u0000\u0000"+
-		"\u0001\u0000\u0000\u0000\u0000]\u0001\u0000\u0000\u0000\u0000e\u0001\u0000"+
+		"c\u0001\u0000\u0000\u0000\u0000e\u0001\u0000\u0000\u0000\u0000g\u0001"+
-		"\u0000\u0000\u0000g\u0001\u0000\u0000\u0000\u0000i\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0000\u0000i\u0001\u0000\u0000\u0000\u0001k\u0001\u0000\u0000"+
-		"\u0000k\u0001\u0000\u0000\u0000\u0001m\u0001\u0000\u0000\u0000\u0003p"+
+		"\u0000\u0003n\u0001\u0000\u0000\u0000\u0005q\u0001\u0000\u0000\u0000\u0007"+
-		"\u0001\u0000\u0000\u0000\u0005s\u0001\u0000\u0000\u0000\u0007x\u0001\u0000"+
+		"v\u0001\u0000\u0000\u0000\t~\u0001\u0000\u0000\u0000\u000b\u0083\u0001"+
-		"\u0000\u0000\t\u0080\u0001\u0000\u0000\u0000\u000b\u0085\u0001\u0000\u0000"+
+		"\u0000\u0000\u0000\r\u00af\u0001\u0000\u0000\u0000\u000f\u00b1\u0001\u0000"+
-		"\u0000\r\u00b1\u0001\u0000\u0000\u0000\u000f\u00b3\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0011\u00db\u0001\u0000\u0000\u0000\u0013\u00df\u0001\u0000"+
-		"\u0011\u00dd\u0001\u0000\u0000\u0000\u0013\u00e1\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0015\u00e7\u0001\u0000\u0000\u0000\u0017\u00eb\u0001\u0000"+
-		"\u0015\u00e9\u0001\u0000\u0000\u0000\u0017\u00ed\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u0019\u00ed\u0001\u0000\u0000\u0000\u001b\u00ef\u0001\u0000"+
-		"\u0019\u00ef\u0001\u0000\u0000\u0000\u001b\u00f1\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000\u001d\u00f1\u0001\u0000\u0000\u0000\u001f\u00f3\u0001\u0000"+
-		"\u001d\u00f3\u0001\u0000\u0000\u0000\u001f\u00f5\u0001\u0000\u0000\u0000"+
+		"\u0000\u0000!\u00f5\u0001\u0000\u0000\u0000#\u00f7\u0001\u0000\u0000\u0000"+
-		"!\u00f7\u0001\u0000\u0000\u0000#\u00f9\u0001\u0000\u0000\u0000%\u00fb"+
+		"%\u00f9\u0001\u0000\u0000\u0000\'\u00fb\u0001\u0000\u0000\u0000)\u00fd"+
-		"\u0001\u0000\u0000\u0000\'\u00fd\u0001\u0000\u0000\u0000)\u00ff\u0001"+
+		"\u0001\u0000\u0000\u0000+\u0100\u0001\u0000\u0000\u0000-\u0103\u0001\u0000"+
-		"\u0000\u0000\u0000+\u0102\u0001\u0000\u0000\u0000-\u0105\u0001\u0000\u0000"+
+		"\u0000\u0000/\u0106\u0001\u0000\u0000\u00001\u0109\u0001\u0000\u0000\u0000"+
-		"\u0000/\u0108\u0001\u0000\u0000\u00001\u010b\u0001\u0000\u0000\u00003"+
+		"3\u010b\u0001\u0000\u0000\u00005\u010e\u0001\u0000\u0000\u00007\u0111"+
-		"\u010d\u0001\u0000\u0000\u00005\u0110\u0001\u0000\u0000\u00007\u0113\u0001"+
+		"\u0001\u0000\u0000\u00009\u0113\u0001\u0000\u0000\u0000;\u0115\u0001\u0000"+
-		"\u0000\u0000\u00009\u0115\u0001\u0000\u0000\u0000;\u0117\u0001\u0000\u0000"+
+		"\u0000\u0000=\u0117\u0001\u0000\u0000\u0000?\u0119\u0001\u0000\u0000\u0000"+
-		"\u0000=\u0119\u0001\u0000\u0000\u0000?\u011b\u0001\u0000\u0000\u0000A"+
+		"A\u011b\u0001\u0000\u0000\u0000C\u011d\u0001\u0000\u0000\u0000E\u011f"+
-		"\u011d\u0001\u0000\u0000\u0000C\u011f\u0001\u0000\u0000\u0000E\u0121\u0001"+
+		"\u0001\u0000\u0000\u0000G\u0125\u0001\u0000\u0000\u0000I\u012a\u0001\u0000"+
-		"\u0000\u0000\u0000G\u0127\u0001\u0000\u0000\u0000I\u012c\u0001\u0000\u0000"+
+		"\u0000\u0000K\u0130\u0001\u0000\u0000\u0000M\u0133\u0001\u0000\u0000\u0000"+
-		"\u0000K\u0132\u0001\u0000\u0000\u0000M\u0135\u0001\u0000\u0000\u0000O"+
+		"O\u0138\u0001\u0000\u0000\u0000Q\u013c\u0001\u0000\u0000\u0000S\u0143"+
-		"\u0138\u0001\u0000\u0000\u0000Q\u013d\u0001\u0000\u0000\u0000S\u0141\u0001"+
+		"\u0001\u0000\u0000\u0000U\u0147\u0001\u0000\u0000\u0000W\u0151\u0001\u0000"+
-		"\u0000\u0000\u0000U\u0148\u0001\u0000\u0000\u0000W\u014c\u0001\u0000\u0000"+
+		"\u0000\u0000Y\u0161\u0001\u0000\u0000\u0000[\u0163\u0001\u0000\u0000\u0000"+
-		"\u0000Y\u0156\u0001\u0000\u0000\u0000[\u0166\u0001\u0000\u0000\u0000]"+
+		"]\u0168\u0001\u0000\u0000\u0000_\u016a\u0001\u0000\u0000\u0000a\u016f"+
-		"\u0168\u0001\u0000\u0000\u0000_\u016d\u0001\u0000\u0000\u0000a\u016f\u0001"+
+		"\u0001\u0000\u0000\u0000c\u0171\u0001\u0000\u0000\u0000e\u0179\u0001\u0000"+
-		"\u0000\u0000\u0000c\u0174\u0001\u0000\u0000\u0000e\u0176\u0001\u0000\u0000"+
+		"\u0000\u0000g\u017f\u0001\u0000\u0000\u0000i\u018a\u0001\u0000\u0000\u0000"+
-		"\u0000g\u017e\u0001\u0000\u0000\u0000i\u0184\u0001\u0000\u0000\u0000k"+
+		"kl\u0005+\u0000\u0000lm\u0005+\u0000\u0000m\u0002\u0001\u0000\u0000\u0000"+
-		"\u018f\u0001\u0000\u0000\u0000mn\u0005+\u0000\u0000no\u0005+\u0000\u0000"+
+		"no\u0005-\u0000\u0000op\u0005-\u0000\u0000p\u0004\u0001\u0000\u0000\u0000"+
-		"o\u0002\u0001\u0000\u0000\u0000pq\u0005-\u0000\u0000qr\u0005-\u0000\u0000"+
+		"qr\u0005v\u0000\u0000rs\u0005o\u0000\u0000st\u0005i\u0000\u0000tu\u0005"+
-		"r\u0004\u0001\u0000\u0000\u0000st\u0005v\u0000\u0000tu\u0005o\u0000\u0000"+
+		"d\u0000\u0000u\u0006\u0001\u0000\u0000\u0000vw\u0005b\u0000\u0000wx\u0005"+
-		"uv\u0005i\u0000\u0000vw\u0005d\u0000\u0000w\u0006\u0001\u0000\u0000\u0000"+
+		"o\u0000\u0000xy\u0005o\u0000\u0000yz\u0005l\u0000\u0000z{\u0005e\u0000"+
-		"xy\u0005b\u0000\u0000yz\u0005o\u0000\u0000z{\u0005o\u0000\u0000{|\u0005"+
+		"\u0000{|\u0005a\u0000\u0000|}\u0005n\u0000\u0000}\b\u0001\u0000\u0000"+
-		"l\u0000\u0000|}\u0005e\u0000\u0000}~\u0005a\u0000\u0000~\u007f\u0005n"+
+		"\u0000~\u007f\u0005c\u0000\u0000\u007f\u0080\u0005h\u0000\u0000\u0080"+
-		"\u0000\u0000\u007f\b\u0001\u0000\u0000\u0000\u0080\u0081\u0005c\u0000"+
+		"\u0081\u0005a\u0000\u0000\u0081\u0082\u0005r\u0000\u0000\u0082\n\u0001"+
-		"\u0000\u0081\u0082\u0005h\u0000\u0000\u0082\u0083\u0005a\u0000\u0000\u0083"+
+		"\u0000\u0000\u0000\u0083\u0084\u0005i\u0000\u0000\u0084\u0085\u0005n\u0000"+
-		"\u0084\u0005r\u0000\u0000\u0084\n\u0001\u0000\u0000\u0000\u0085\u0086"+
+		"\u0000\u0085\u0086\u0005t\u0000\u0000\u0086\f\u0001\u0000\u0000\u0000"+
-		"\u0005i\u0000\u0000\u0086\u0087\u0005n\u0000\u0000\u0087\u0088\u0005t"+
+		"\u0087\u0088\u0005p\u0000\u0000\u0088\u0089\u0005u\u0000\u0000\u0089\u008a"+
-		"\u0000\u0000\u0088\f\u0001\u0000\u0000\u0000\u0089\u008a\u0005p\u0000"+
+		"\u0005b\u0000\u0000\u008a\u008b\u0005l\u0000\u0000\u008b\u008c\u0005i"+
-		"\u0000\u008a\u008b\u0005u\u0000\u0000\u008b\u008c\u0005b\u0000\u0000\u008c"+
+		"\u0000\u0000\u008c\u00b0\u0005c\u0000\u0000\u008d\u008e\u0005p\u0000\u0000"+
-		"\u008d\u0005l\u0000\u0000\u008d\u008e\u0005i\u0000\u0000\u008e\u00b2\u0005"+
+		"\u008e\u008f\u0005r\u0000\u0000\u008f\u0090\u0005i\u0000\u0000\u0090\u0091"+
-		"c\u0000\u0000\u008f\u0090\u0005p\u0000\u0000\u0090\u0091\u0005r\u0000"+
+		"\u0005v\u0000\u0000\u0091\u0092\u0005a\u0000\u0000\u0092\u0093\u0005t"+
-		"\u0000\u0091\u0092\u0005i\u0000\u0000\u0092\u0093\u0005v\u0000\u0000\u0093"+
+		"\u0000\u0000\u0093\u00b0\u0005e\u0000\u0000\u0094\u0095\u0005p\u0000\u0000"+
-		"\u0094\u0005a\u0000\u0000\u0094\u0095\u0005t\u0000\u0000\u0095\u00b2\u0005"+
+		"\u0095\u0096\u0005u\u0000\u0000\u0096\u0097\u0005b\u0000\u0000\u0097\u0098"+
-		"e\u0000\u0000\u0096\u0097\u0005p\u0000\u0000\u0097\u0098\u0005u\u0000"+
+		"\u0005l\u0000\u0000\u0098\u0099\u0005i\u0000\u0000\u0099\u009a\u0005c"+
-		"\u0000\u0098\u0099\u0005b\u0000\u0000\u0099\u009a\u0005l\u0000\u0000\u009a"+
+		"\u0000\u0000\u009a\u009b\u0005 \u0000\u0000\u009b\u009c\u0005s\u0000\u0000"+
-		"\u009b\u0005i\u0000\u0000\u009b\u009c\u0005c\u0000\u0000\u009c\u009d\u0005"+
+		"\u009c\u009d\u0005t\u0000\u0000\u009d\u009e\u0005a\u0000\u0000\u009e\u009f"+
-		" \u0000\u0000\u009d\u009e\u0005s\u0000\u0000\u009e\u009f\u0005t\u0000"+
+		"\u0005t\u0000\u0000\u009f\u00a0\u0005i\u0000\u0000\u00a0\u00b0\u0005c"+
-		"\u0000\u009f\u00a0\u0005a\u0000\u0000\u00a0\u00a1\u0005t\u0000\u0000\u00a1"+
+		"\u0000\u0000\u00a1\u00a2\u0005p\u0000\u0000\u00a2\u00a3\u0005r\u0000\u0000"+
-		"\u00a2\u0005i\u0000\u0000\u00a2\u00b2\u0005c\u0000\u0000\u00a3\u00a4\u0005"+
+		"\u00a3\u00a4\u0005i\u0000\u0000\u00a4\u00a5\u0005v\u0000\u0000\u00a5\u00a6"+
-		"p\u0000\u0000\u00a4\u00a5\u0005r\u0000\u0000\u00a5\u00a6\u0005i\u0000"+
+		"\u0005a\u0000\u0000\u00a6\u00a7\u0005t\u0000\u0000\u00a7\u00a8\u0005e"+
-		"\u0000\u00a6\u00a7\u0005v\u0000\u0000\u00a7\u00a8\u0005a\u0000\u0000\u00a8"+
+		"\u0000\u0000\u00a8\u00a9\u0005 \u0000\u0000\u00a9\u00aa\u0005s\u0000\u0000"+
-		"\u00a9\u0005t\u0000\u0000\u00a9\u00aa\u0005e\u0000\u0000\u00aa\u00ab\u0005"+
+		"\u00aa\u00ab\u0005t\u0000\u0000\u00ab\u00ac\u0005a\u0000\u0000\u00ac\u00ad"+
-		" \u0000\u0000\u00ab\u00ac\u0005s\u0000\u0000\u00ac\u00ad\u0005t\u0000"+
+		"\u0005t\u0000\u0000\u00ad\u00ae\u0005i\u0000\u0000\u00ae\u00b0\u0005c"+
-		"\u0000\u00ad\u00ae\u0005a\u0000\u0000\u00ae\u00af\u0005t\u0000\u0000\u00af"+
+		"\u0000\u0000\u00af\u0087\u0001\u0000\u0000\u0000\u00af\u008d\u0001\u0000"+
-		"\u00b0\u0005i\u0000\u0000\u00b0\u00b2\u0005c\u0000\u0000\u00b1\u0089\u0001"+
+		"\u0000\u0000\u00af\u0094\u0001\u0000\u0000\u0000\u00af\u00a1\u0001\u0000"+
-		"\u0000\u0000\u0000\u00b1\u008f\u0001\u0000\u0000\u0000\u00b1\u0096\u0001"+
+		"\u0000\u0000\u00b0\u000e\u0001\u0000\u0000\u0000\u00b1\u00b2\u0005p\u0000"+
-		"\u0000\u0000\u0000\u00b1\u00a3\u0001\u0000\u0000\u0000\u00b2\u000e\u0001"+
+		"\u0000\u00b2\u00b3\u0005u\u0000\u0000\u00b3\u00b4\u0005b\u0000\u0000\u00b4"+
-		"\u0000\u0000\u0000\u00b3\u00b4\u0005p\u0000\u0000\u00b4\u00b5\u0005u\u0000"+
+		"\u00b5\u0005l\u0000\u0000\u00b5\u00b6\u0005i\u0000\u0000\u00b6\u00b7\u0005"+
-		"\u0000\u00b5\u00b6\u0005b\u0000\u0000\u00b6\u00b7\u0005l\u0000\u0000\u00b7"+
+		"c\u0000\u0000\u00b7\u00b8\u0005 \u0000\u0000\u00b8\u00b9\u0005s\u0000"+
-		"\u00b8\u0005i\u0000\u0000\u00b8\u00b9\u0005c\u0000\u0000\u00b9\u00ba\u0005"+
+		"\u0000\u00b9\u00ba\u0005t\u0000\u0000\u00ba\u00bb\u0005a\u0000\u0000\u00bb"+
-		" \u0000\u0000\u00ba\u00bb\u0005s\u0000\u0000\u00bb\u00bc\u0005t\u0000"+
+		"\u00bc\u0005t\u0000\u0000\u00bc\u00bd\u0005i\u0000\u0000\u00bd\u00be\u0005"+
-		"\u0000\u00bc\u00bd\u0005a\u0000\u0000\u00bd\u00be\u0005t\u0000\u0000\u00be"+
+		"c\u0000\u0000\u00be\u00bf\u0005 \u0000\u0000\u00bf\u00c0\u0005v\u0000"+
-		"\u00bf\u0005i\u0000\u0000\u00bf\u00c0\u0005c\u0000\u0000\u00c0\u00c1\u0005"+
+		"\u0000\u00c0\u00c1\u0005o\u0000\u0000\u00c1\u00c2\u0005i\u0000\u0000\u00c2"+
-		" \u0000\u0000\u00c1\u00c2\u0005v\u0000\u0000\u00c2\u00c3\u0005o\u0000"+
+		"\u00c3\u0005d\u0000\u0000\u00c3\u00c4\u0005 \u0000\u0000\u00c4\u00c5\u0005"+
-		"\u0000\u00c3\u00c4\u0005i\u0000\u0000\u00c4\u00c5\u0005d\u0000\u0000\u00c5"+
+		"m\u0000\u0000\u00c5\u00c6\u0005a\u0000\u0000\u00c6\u00c7\u0005i\u0000"+
-		"\u00c6\u0005 \u0000\u0000\u00c6\u00c7\u0005m\u0000\u0000\u00c7\u00c8\u0005"+
+		"\u0000\u00c7\u00c8\u0005n\u0000\u0000\u00c8\u00c9\u0005(\u0000\u0000\u00c9"+
-		"a\u0000\u0000\u00c8\u00c9\u0005i\u0000\u0000\u00c9\u00ca\u0005n\u0000"+
+		"\u00ca\u0005S\u0000\u0000\u00ca\u00cb\u0005t\u0000\u0000\u00cb\u00cc\u0005"+
-		"\u0000\u00ca\u00cb\u0005(\u0000\u0000\u00cb\u00cc\u0005S\u0000\u0000\u00cc"+
+		"r\u0000\u0000\u00cc\u00cd\u0005i\u0000\u0000\u00cd\u00ce\u0005n\u0000"+
-		"\u00cd\u0005t\u0000\u0000\u00cd\u00ce\u0005r\u0000\u0000\u00ce\u00cf\u0005"+
+		"\u0000\u00ce\u00cf\u0005g\u0000\u0000\u00cf\u00d0\u0005[\u0000\u0000\u00d0"+
-		"i\u0000\u0000\u00cf\u00d0\u0005n\u0000\u0000\u00d0\u00d1\u0005g\u0000"+
+		"\u00d1\u0005]\u0000\u0000\u00d1\u00d2\u0005 \u0000\u0000\u00d2\u00d3\u0005"+
-		"\u0000\u00d1\u00d2\u0005[\u0000\u0000\u00d2\u00d3\u0005]\u0000\u0000\u00d3"+
+		"a\u0000\u0000\u00d3\u00d4\u0005r\u0000\u0000\u00d4\u00d5\u0005g\u0000"+
-		"\u00d4\u0005 \u0000\u0000\u00d4\u00d5\u0005a\u0000\u0000\u00d5\u00d6\u0005"+
+		"\u0000\u00d5\u00d6\u0005s\u0000\u0000\u00d6\u00d7\u0005)\u0000\u0000\u00d7"+
-		"r\u0000\u0000\u00d6\u00d7\u0005g\u0000\u0000\u00d7\u00d8\u0005s\u0000"+
+		"\u0010\u0001\u0000\u0000\u0000\u00d8\u00dc\u0003\u001f\u000f\u0000\u00d9"+
-		"\u0000\u00d8\u00d9\u0005)\u0000\u0000\u00d9\u0010\u0001\u0000\u0000\u0000"+
+		"\u00dc\u0003#\u0011\u0000\u00da\u00dc\u0003!\u0010\u0000\u00db\u00d8\u0001"+
-		"\u00da\u00de\u0003\u001f\u000f\u0000\u00db\u00de\u0003#\u0011\u0000\u00dc"+
+		"\u0000\u0000\u0000\u00db\u00d9\u0001\u0000\u0000\u0000\u00db\u00da\u0001"+
-		"\u00de\u0003!\u0010\u0000\u00dd\u00da\u0001\u0000\u0000\u0000\u00dd\u00db"+
+		"\u0000\u0000\u0000\u00dc\u0012\u0001\u0000\u0000\u0000\u00dd\u00e0\u0003"+
-		"\u0001\u0000\u0000\u0000\u00dd\u00dc\u0001\u0000\u0000\u0000\u00de\u0012"+
+		"\u001b\r\u0000\u00de\u00e0\u0003\u001d\u000e\u0000\u00df\u00dd\u0001\u0000"+
-		"\u0001\u0000\u0000\u0000\u00df\u00e2\u0003\u001b\r\u0000\u00e0\u00e2\u0003"+
+		"\u0000\u0000\u00df\u00de\u0001\u0000\u0000\u0000\u00e0\u0014\u0001\u0000"+
-		"\u001d\u000e\u0000\u00e1\u00df\u0001\u0000\u0000\u0000\u00e1\u00e0\u0001"+
+		"\u0000\u0000\u00e1\u00e8\u0003%\u0012\u0000\u00e2\u00e8\u0003\'\u0013"+
-		"\u0000\u0000\u0000\u00e2\u0014\u0001\u0000\u0000\u0000\u00e3\u00ea\u0003"+
+		"\u0000\u00e3\u00e8\u0003)\u0014\u0000\u00e4\u00e8\u0003+\u0015\u0000\u00e5"+
-		"%\u0012\u0000\u00e4\u00ea\u0003\'\u0013\u0000\u00e5\u00ea\u0003)\u0014"+
+		"\u00e8\u0003-\u0016\u0000\u00e6\u00e8\u0003/\u0017\u0000\u00e7\u00e1\u0001"+
-		"\u0000\u00e6\u00ea\u0003+\u0015\u0000\u00e7\u00ea\u0003-\u0016\u0000\u00e8"+
+		"\u0000\u0000\u0000\u00e7\u00e2\u0001\u0000\u0000\u0000\u00e7\u00e3\u0001"+
-		"\u00ea\u0003/\u0017\u0000\u00e9\u00e3\u0001\u0000\u0000\u0000\u00e9\u00e4"+
+		"\u0000\u0000\u0000\u00e7\u00e4\u0001\u0000\u0000\u0000\u00e7\u00e5\u0001"+
-		"\u0001\u0000\u0000\u0000\u00e9\u00e5\u0001\u0000\u0000\u0000\u00e9\u00e6"+
+		"\u0000\u0000\u0000\u00e7\u00e6\u0001\u0000\u0000\u0000\u00e8\u0016\u0001"+
-		"\u0001\u0000\u0000\u0000\u00e9\u00e7\u0001\u0000\u0000\u0000\u00e9\u00e8"+
+		"\u0000\u0000\u0000\u00e9\u00ec\u00033\u0019\u0000\u00ea\u00ec\u00035\u001a"+
-		"\u0001\u0000\u0000\u0000\u00ea\u0016\u0001\u0000\u0000\u0000\u00eb\u00ee"+
+		"\u0000\u00eb\u00e9\u0001\u0000\u0000\u0000\u00eb\u00ea\u0001\u0000\u0000"+
-		"\u00033\u0019\u0000\u00ec\u00ee\u00035\u001a\u0000\u00ed\u00eb\u0001\u0000"+
+		"\u0000\u00ec\u0018\u0001\u0000\u0000\u0000\u00ed\u00ee\u0005=\u0000\u0000"+
-		"\u0000\u0000\u00ed\u00ec\u0001\u0000\u0000\u0000\u00ee\u0018\u0001\u0000"+
+		"\u00ee\u001a\u0001\u0000\u0000\u0000\u00ef\u00f0\u0005+\u0000\u0000\u00f0"+
-		"\u0000\u0000\u00ef\u00f0\u0005=\u0000\u0000\u00f0\u001a\u0001\u0000\u0000"+
+		"\u001c\u0001\u0000\u0000\u0000\u00f1\u00f2\u0005-\u0000\u0000\u00f2\u001e"+
-		"\u0000\u00f1\u00f2\u0005+\u0000\u0000\u00f2\u001c\u0001\u0000\u0000\u0000"+
+		"\u0001\u0000\u0000\u0000\u00f3\u00f4\u0005*\u0000\u0000\u00f4 \u0001\u0000"+
-		"\u00f3\u00f4\u0005-\u0000\u0000\u00f4\u001e\u0001\u0000\u0000\u0000\u00f5"+
+		"\u0000\u0000\u00f5\u00f6\u0005%\u0000\u0000\u00f6\"\u0001\u0000\u0000"+
-		"\u00f6\u0005*\u0000\u0000\u00f6 \u0001\u0000\u0000\u0000\u00f7\u00f8\u0005"+
+		"\u0000\u00f7\u00f8\u0005/\u0000\u0000\u00f8$\u0001\u0000\u0000\u0000\u00f9"+
-		"%\u0000\u0000\u00f8\"\u0001\u0000\u0000\u0000\u00f9\u00fa\u0005/\u0000"+
+		"\u00fa\u0005>\u0000\u0000\u00fa&\u0001\u0000\u0000\u0000\u00fb\u00fc\u0005"+
-		"\u0000\u00fa$\u0001\u0000\u0000\u0000\u00fb\u00fc\u0005>\u0000\u0000\u00fc"+
+		"<\u0000\u0000\u00fc(\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005>\u0000"+
-		"&\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005<\u0000\u0000\u00fe(\u0001"+
+		"\u0000\u00fe\u00ff\u0005=\u0000\u0000\u00ff*\u0001\u0000\u0000\u0000\u0100"+
-		"\u0000\u0000\u0000\u00ff\u0100\u0005>\u0000\u0000\u0100\u0101\u0005=\u0000"+
+		"\u0101\u0005<\u0000\u0000\u0101\u0102\u0005=\u0000\u0000\u0102,\u0001"+
-		"\u0000\u0101*\u0001\u0000\u0000\u0000\u0102\u0103\u0005<\u0000\u0000\u0103"+
+		"\u0000\u0000\u0000\u0103\u0104\u0005=\u0000\u0000\u0104\u0105\u0005=\u0000"+
-		"\u0104\u0005=\u0000\u0000\u0104,\u0001\u0000\u0000\u0000\u0105\u0106\u0005"+
+		"\u0000\u0105.\u0001\u0000\u0000\u0000\u0106\u0107\u0005!\u0000\u0000\u0107"+
-		"=\u0000\u0000\u0106\u0107\u0005=\u0000\u0000\u0107.\u0001\u0000\u0000"+
+		"\u0108\u0005=\u0000\u0000\u01080\u0001\u0000\u0000\u0000\u0109\u010a\u0005"+
-		"\u0000\u0108\u0109\u0005!\u0000\u0000\u0109\u010a\u0005=\u0000\u0000\u010a"+
+		"!\u0000\u0000\u010a2\u0001\u0000\u0000\u0000\u010b\u010c\u0005&\u0000"+
-		"0\u0001\u0000\u0000\u0000\u010b\u010c\u0005!\u0000\u0000\u010c2\u0001"+
+		"\u0000\u010c\u010d\u0005&\u0000\u0000\u010d4\u0001\u0000\u0000\u0000\u010e"+
-		"\u0000\u0000\u0000\u010d\u010e\u0005&\u0000\u0000\u010e\u010f\u0005&\u0000"+
+		"\u010f\u0005|\u0000\u0000\u010f\u0110\u0005|\u0000\u0000\u01106\u0001"+
-		"\u0000\u010f4\u0001\u0000\u0000\u0000\u0110\u0111\u0005|\u0000\u0000\u0111"+
+		"\u0000\u0000\u0000\u0111\u0112\u0005.\u0000\u0000\u01128\u0001\u0000\u0000"+
-		"\u0112\u0005|\u0000\u0000\u01126\u0001\u0000\u0000\u0000\u0113\u0114\u0005"+
+		"\u0000\u0113\u0114\u0005(\u0000\u0000\u0114:\u0001\u0000\u0000\u0000\u0115"+
-		".\u0000\u0000\u01148\u0001\u0000\u0000\u0000\u0115\u0116\u0005(\u0000"+
+		"\u0116\u0005)\u0000\u0000\u0116<\u0001\u0000\u0000\u0000\u0117\u0118\u0005"+
-		"\u0000\u0116:\u0001\u0000\u0000\u0000\u0117\u0118\u0005)\u0000\u0000\u0118"+
+		"{\u0000\u0000\u0118>\u0001\u0000\u0000\u0000\u0119\u011a\u0005}\u0000"+
-		"<\u0001\u0000\u0000\u0000\u0119\u011a\u0005{\u0000\u0000\u011a>\u0001"+
+		"\u0000\u011a@\u0001\u0000\u0000\u0000\u011b\u011c\u0005;\u0000\u0000\u011c"+
-		"\u0000\u0000\u0000\u011b\u011c\u0005}\u0000\u0000\u011c@\u0001\u0000\u0000"+
+		"B\u0001\u0000\u0000\u0000\u011d\u011e\u0005,\u0000\u0000\u011eD\u0001"+
-		"\u0000\u011d\u011e\u0005;\u0000\u0000\u011eB\u0001\u0000\u0000\u0000\u011f"+
+		"\u0000\u0000\u0000\u011f\u0120\u0005c\u0000\u0000\u0120\u0121\u0005l\u0000"+
-		"\u0120\u0005,\u0000\u0000\u0120D\u0001\u0000\u0000\u0000\u0121\u0122\u0005"+
+		"\u0000\u0121\u0122\u0005a\u0000\u0000\u0122\u0123\u0005s\u0000\u0000\u0123"+
-		"c\u0000\u0000\u0122\u0123\u0005l\u0000\u0000\u0123\u0124\u0005a\u0000"+
+		"\u0124\u0005s\u0000\u0000\u0124F\u0001\u0000\u0000\u0000\u0125\u0126\u0005"+
-		"\u0000\u0124\u0125\u0005s\u0000\u0000\u0125\u0126\u0005s\u0000\u0000\u0126"+
+		"t\u0000\u0000\u0126\u0127\u0005h\u0000\u0000\u0127\u0128\u0005i\u0000"+
-		"F\u0001\u0000\u0000\u0000\u0127\u0128\u0005t\u0000\u0000\u0128\u0129\u0005"+
+		"\u0000\u0128\u0129\u0005s\u0000\u0000\u0129H\u0001\u0000\u0000\u0000\u012a"+
-		"h\u0000\u0000\u0129\u012a\u0005i\u0000\u0000\u012a\u012b\u0005s\u0000"+
+		"\u012b\u0005w\u0000\u0000\u012b\u012c\u0005h\u0000\u0000\u012c\u012d\u0005"+
-		"\u0000\u012bH\u0001\u0000\u0000\u0000\u012c\u012d\u0005w\u0000\u0000\u012d"+
+		"i\u0000\u0000\u012d\u012e\u0005l\u0000\u0000\u012e\u012f\u0005e\u0000"+
-		"\u012e\u0005h\u0000\u0000\u012e\u012f\u0005i\u0000\u0000\u012f\u0130\u0005"+
+		"\u0000\u012fJ\u0001\u0000\u0000\u0000\u0130\u0131\u0005i\u0000\u0000\u0131"+
-		"l\u0000\u0000\u0130\u0131\u0005e\u0000\u0000\u0131J\u0001\u0000\u0000"+
+		"\u0132\u0005f\u0000\u0000\u0132L\u0001\u0000\u0000\u0000\u0133\u0134\u0005"+
-		"\u0000\u0132\u0133\u0005d\u0000\u0000\u0133\u0134\u0005o\u0000\u0000\u0134"+
+		"e\u0000\u0000\u0134\u0135\u0005l\u0000\u0000\u0135\u0136\u0005s\u0000"+
-		"L\u0001\u0000\u0000\u0000\u0135\u0136\u0005i\u0000\u0000\u0136\u0137\u0005"+
+		"\u0000\u0136\u0137\u0005e\u0000\u0000\u0137N\u0001\u0000\u0000\u0000\u0138"+
-		"f\u0000\u0000\u0137N\u0001\u0000\u0000\u0000\u0138\u0139\u0005e\u0000"+
+		"\u0139\u0005f\u0000\u0000\u0139\u013a\u0005o\u0000\u0000\u013a\u013b\u0005"+
-		"\u0000\u0139\u013a\u0005l\u0000\u0000\u013a\u013b\u0005s\u0000\u0000\u013b"+
+		"r\u0000\u0000\u013bP\u0001\u0000\u0000\u0000\u013c\u013d\u0005r\u0000"+
-		"\u013c\u0005e\u0000\u0000\u013cP\u0001\u0000\u0000\u0000\u013d\u013e\u0005"+
+		"\u0000\u013d\u013e\u0005e\u0000\u0000\u013e\u013f\u0005t\u0000\u0000\u013f"+
-		"f\u0000\u0000\u013e\u013f\u0005o\u0000\u0000\u013f\u0140\u0005r\u0000"+
+		"\u0140\u0005u\u0000\u0000\u0140\u0141\u0005r\u0000\u0000\u0141\u0142\u0005"+
-		"\u0000\u0140R\u0001\u0000\u0000\u0000\u0141\u0142\u0005r\u0000\u0000\u0142"+
+		"n\u0000\u0000\u0142R\u0001\u0000\u0000\u0000\u0143\u0144\u0005n\u0000"+
-		"\u0143\u0005e\u0000\u0000\u0143\u0144\u0005t\u0000\u0000\u0144\u0145\u0005"+
+		"\u0000\u0144\u0145\u0005e\u0000\u0000\u0145\u0146\u0005w\u0000\u0000\u0146"+
-		"u\u0000\u0000\u0145\u0146\u0005r\u0000\u0000\u0146\u0147\u0005n\u0000"+
+		"T\u0001\u0000\u0000\u0000\u0147\u014b\u0005\'\u0000\u0000\u0148\u014a"+
-		"\u0000\u0147T\u0001\u0000\u0000\u0000\u0148\u0149\u0005n\u0000\u0000\u0149"+
+		"\b\u0000\u0000\u0000\u0149\u0148\u0001\u0000\u0000\u0000\u014a\u014d\u0001"+
-		"\u014a\u0005e\u0000\u0000\u014a\u014b\u0005w\u0000\u0000\u014bV\u0001"+
+		"\u0000\u0000\u0000\u014b\u0149\u0001\u0000\u0000\u0000\u014b\u014c\u0001"+
-		"\u0000\u0000\u0000\u014c\u0150\u0005\'\u0000\u0000\u014d\u014f\b\u0000"+
+		"\u0000\u0000\u0000\u014c\u014e\u0001\u0000\u0000\u0000\u014d\u014b\u0001"+
-		"\u0000\u0000\u014e\u014d\u0001\u0000\u0000\u0000\u014f\u0152\u0001\u0000"+
+		"\u0000\u0000\u0000\u014e\u014f\u0005\'\u0000\u0000\u014fV\u0001\u0000"+
-		"\u0000\u0000\u0150\u014e\u0001\u0000\u0000\u0000\u0150\u0151\u0001\u0000"+
+		"\u0000\u0000\u0150\u0152\u0003\u001d\u000e\u0000\u0151\u0150\u0001\u0000"+
-		"\u0000\u0000\u0151\u0153\u0001\u0000\u0000\u0000\u0152\u0150\u0001\u0000"+
+		"\u0000\u0000\u0151\u0152\u0001\u0000\u0000\u0000\u0152\u0154\u0001\u0000"+
-		"\u0000\u0000\u0153\u0154\u0005\'\u0000\u0000\u0154X\u0001\u0000\u0000"+
+		"\u0000\u0000\u0153\u0155\u0003_/\u0000\u0154\u0153\u0001\u0000\u0000\u0000"+
-		"\u0000\u0155\u0157\u0003\u001d\u000e\u0000\u0156\u0155\u0001\u0000\u0000"+
+		"\u0155\u0156\u0001\u0000\u0000\u0000\u0156\u0154\u0001\u0000\u0000\u0000"+
-		"\u0000\u0156\u0157\u0001\u0000\u0000\u0000\u0157\u0159\u0001\u0000\u0000"+
+		"\u0156\u0157\u0001\u0000\u0000\u0000\u0157X\u0001\u0000\u0000\u0000\u0158"+
-		"\u0000\u0158\u015a\u0003a0\u0000\u0159\u0158\u0001\u0000\u0000\u0000\u015a"+
+		"\u0159\u0005t\u0000\u0000\u0159\u015a\u0005r\u0000\u0000\u015a\u015b\u0005"+
-		"\u015b\u0001\u0000\u0000\u0000\u015b\u0159\u0001\u0000\u0000\u0000\u015b"+
+		"u\u0000\u0000\u015b\u0162\u0005e\u0000\u0000\u015c\u015d\u0005f\u0000"+
-		"\u015c\u0001\u0000\u0000\u0000\u015cZ\u0001\u0000\u0000\u0000\u015d\u015e"+
+		"\u0000\u015d\u015e\u0005a\u0000\u0000\u015e\u015f\u0005l\u0000\u0000\u015f"+
-		"\u0005t\u0000\u0000\u015e\u015f\u0005r\u0000\u0000\u015f\u0160\u0005u"+
+		"\u0160\u0005s\u0000\u0000\u0160\u0162\u0005e\u0000\u0000\u0161\u0158\u0001"+
-		"\u0000\u0000\u0160\u0167\u0005e\u0000\u0000\u0161\u0162\u0005f\u0000\u0000"+
+		"\u0000\u0000\u0000\u0161\u015c\u0001\u0000\u0000\u0000\u0162Z\u0001\u0000"+
-		"\u0162\u0163\u0005a\u0000\u0000\u0163\u0164\u0005l\u0000\u0000\u0164\u0165"+
+		"\u0000\u0000\u0163\u0164\u0005n\u0000\u0000\u0164\u0165\u0005u\u0000\u0000"+
-		"\u0005s\u0000\u0000\u0165\u0167\u0005e\u0000\u0000\u0166\u015d\u0001\u0000"+
+		"\u0165\u0166\u0005l\u0000\u0000\u0166\u0167\u0005l\u0000\u0000\u0167\\"+
-		"\u0000\u0000\u0166\u0161\u0001\u0000\u0000\u0000\u0167\\\u0001\u0000\u0000"+
+		"\u0001\u0000\u0000\u0000\u0168\u0169\u0007\u0001\u0000\u0000\u0169^\u0001"+
-		"\u0000\u0168\u0169\u0005n\u0000\u0000\u0169\u016a\u0005u\u0000\u0000\u016a"+
+		"\u0000\u0000\u0000\u016a\u016b\u0007\u0002\u0000\u0000\u016b`\u0001\u0000"+
-		"\u016b\u0005l\u0000\u0000\u016b\u016c\u0005l\u0000\u0000\u016c^\u0001"+
+		"\u0000\u0000\u016c\u0170\u0003].\u0000\u016d\u0170\u0003_/\u0000\u016e"+
-		"\u0000\u0000\u0000\u016d\u016e\u0007\u0001\u0000\u0000\u016e`\u0001\u0000"+
+		"\u0170\u0007\u0003\u0000\u0000\u016f\u016c\u0001\u0000\u0000\u0000\u016f"+
-		"\u0000\u0000\u016f\u0170\u0007\u0002\u0000\u0000\u0170b\u0001\u0000\u0000"+
+		"\u016d\u0001\u0000\u0000\u0000\u016f\u016e\u0001\u0000\u0000\u0000\u0170"+
-		"\u0000\u0171\u0175\u0003_/\u0000\u0172\u0175\u0003a0\u0000\u0173\u0175"+
+		"b\u0001\u0000\u0000\u0000\u0171\u0175\u0003].\u0000\u0172\u0174\u0003"+
-		"\u0007\u0003\u0000\u0000\u0174\u0171\u0001\u0000\u0000\u0000\u0174\u0172"+
+		"a0\u0000\u0173\u0172\u0001\u0000\u0000\u0000\u0174\u0177\u0001\u0000\u0000"+
-		"\u0001\u0000\u0000\u0000\u0174\u0173\u0001\u0000\u0000\u0000\u0175d\u0001"+
+		"\u0000\u0175\u0173\u0001\u0000\u0000\u0000\u0175\u0176\u0001\u0000\u0000"+
-		"\u0000\u0000\u0000\u0176\u017a\u0003_/\u0000\u0177\u0179\u0003c1\u0000"+
+		"\u0000\u0176d\u0001\u0000\u0000\u0000\u0177\u0175\u0001\u0000\u0000\u0000"+
-		"\u0178\u0177\u0001\u0000\u0000\u0000\u0179\u017c\u0001\u0000\u0000\u0000"+
+		"\u0178\u017a\u0007\u0004\u0000\u0000\u0179\u0178\u0001\u0000\u0000\u0000"+
-		"\u017a\u0178\u0001\u0000\u0000\u0000\u017a\u017b\u0001\u0000\u0000\u0000"+
+		"\u017a\u017b\u0001\u0000\u0000\u0000\u017b\u0179\u0001\u0000\u0000\u0000"+
-		"\u017bf\u0001\u0000\u0000\u0000\u017c\u017a\u0001\u0000\u0000\u0000\u017d"+
+		"\u017b\u017c\u0001\u0000\u0000\u0000\u017c\u017d\u0001\u0000\u0000\u0000"+
-		"\u017f\u0007\u0004\u0000\u0000\u017e\u017d\u0001\u0000\u0000\u0000\u017f"+
+		"\u017d\u017e\u00062\u0000\u0000\u017ef\u0001\u0000\u0000\u0000\u017f\u0180"+
-		"\u0180\u0001\u0000\u0000\u0000\u0180\u017e\u0001\u0000\u0000\u0000\u0180"+
+		"\u0005/\u0000\u0000\u0180\u0181\u0005/\u0000\u0000\u0181\u0185\u0001\u0000"+
-		"\u0181\u0001\u0000\u0000\u0000\u0181\u0182\u0001\u0000\u0000\u0000\u0182"+
+		"\u0000\u0000\u0182\u0184\b\u0000\u0000\u0000\u0183\u0182\u0001\u0000\u0000"+
-		"\u0183\u00063\u0000\u0000\u0183h\u0001\u0000\u0000\u0000\u0184\u0185\u0005"+
+		"\u0000\u0184\u0187\u0001\u0000\u0000\u0000\u0185\u0183\u0001\u0000\u0000"+
-		"/\u0000\u0000\u0185\u0186\u0005/\u0000\u0000\u0186\u018a\u0001\u0000\u0000"+
+		"\u0000\u0185\u0186\u0001\u0000\u0000\u0000\u0186\u0188\u0001\u0000\u0000"+
-		"\u0000\u0187\u0189\b\u0000\u0000\u0000\u0188\u0187\u0001\u0000\u0000\u0000"+
+		"\u0000\u0187\u0185\u0001\u0000\u0000\u0000\u0188\u0189\u00063\u0000\u0000"+
-		"\u0189\u018c\u0001\u0000\u0000\u0000\u018a\u0188\u0001\u0000\u0000\u0000"+
+		"\u0189h\u0001\u0000\u0000\u0000\u018a\u018b\u0005/\u0000\u0000\u018b\u018c"+
-		"\u018a\u018b\u0001\u0000\u0000\u0000\u018b\u018d\u0001\u0000\u0000\u0000"+
+		"\u0005*\u0000\u0000\u018c\u0190\u0001\u0000\u0000\u0000\u018d\u018f\t"+
-		"\u018c\u018a\u0001\u0000\u0000\u0000\u018d\u018e\u00064\u0000\u0000\u018e"+
+		"\u0000\u0000\u0000\u018e\u018d\u0001\u0000\u0000\u0000\u018f\u0192\u0001"+
-		"j\u0001\u0000\u0000\u0000\u018f\u0190\u0005/\u0000\u0000\u0190\u0191\u0005"+
+		"\u0000\u0000\u0000\u0190\u0191\u0001\u0000\u0000\u0000\u0190\u018e\u0001"+
-		"*\u0000\u0000\u0191\u0195\u0001\u0000\u0000\u0000\u0192\u0194\t\u0000"+
+		"\u0000\u0000\u0000\u0191\u0193\u0001\u0000\u0000\u0000\u0192\u0190\u0001"+
-		"\u0000\u0000\u0193\u0192\u0001\u0000\u0000\u0000\u0194\u0197\u0001\u0000"+
+		"\u0000\u0000\u0000\u0193\u0194\u0005*\u0000\u0000\u0194\u0195\u0005/\u0000"+
-		"\u0000\u0000\u0195\u0196\u0001\u0000\u0000\u0000\u0195\u0193\u0001\u0000"+
+		"\u0000\u0195\u0196\u0001\u0000\u0000\u0000\u0196\u0197\u00064\u0000\u0000"+
-		"\u0000\u0000\u0196\u0198\u0001\u0000\u0000\u0000\u0197\u0195\u0001\u0000"+
+		"\u0197j\u0001\u0000\u0000\u0000\u000f\u0000\u00af\u00db\u00df\u00e7\u00eb"+
-		"\u0000\u0000\u0198\u0199\u0005*\u0000\u0000\u0199\u019a\u0005/\u0000\u0000"+
+		"\u014b\u0151\u0156\u0161\u016f\u0175\u017b\u0185\u0190\u0001\u0006\u0000"+
-		"\u019a\u019b\u0001\u0000\u0000\u0000\u019b\u019c\u00065\u0000\u0000\u019c"+
+		"\u0000";
-		"l\u0001\u0000\u0000\u0000\u000f\u0000\u00b1\u00dd\u00e1\u00e9\u00ed\u0150"+
-		"\u0156\u015b\u0166\u0174\u017a\u0180\u018a\u0195\u0001\u0006\u0000\u0000";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {

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

@@ -35,20 +35,19 @@ Comma=34
 Class=35
 This=36
 While=37
-Do=38
+If=38
-If=39
+Else=39
-Else=40
+For=40
-For=41
+Return=41
-Return=42
+New=42
-New=43
+CharValue=43
-CharValue=44
+IntValue=44
-IntValue=45
+BooleanValue=45
-BooleanValue=46
+NullValue=46
-NullValue=47
+Identifier=47
-Identifier=48
+WS=48
-WS=49
+InlineComment=49
-InlineComment=50
+MultilineComment=50
-MultilineComment=51
 '++'=1
 '--'=2
 'void'=3
@@ -81,10 +80,9 @@ MultilineComment=51
 'class'=35
 'this'=36
 'while'=37
-'do'=38
+'if'=38
-'if'=39
+'else'=39
-'else'=40
+'for'=40
-'for'=41
+'return'=41
-'return'=42
+'new'=42
-'new'=43
+'null'=46
-'null'=47

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

@@ -108,15 +108,15 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 */
 	void exitStatement(SimpleJavaParser.StatementContext ctx);
 	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#blockStatement}.
+	 * Enter a parse tree produced by {@link SimpleJavaParser#block}.
 	 * @param ctx the parse tree
 	 */
-	void enterBlockStatement(SimpleJavaParser.BlockStatementContext ctx);
+	void enterBlock(SimpleJavaParser.BlockContext ctx);
 	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#blockStatement}.
+	 * Exit a parse tree produced by {@link SimpleJavaParser#block}.
 	 * @param ctx the parse tree
 	 */
-	void exitBlockStatement(SimpleJavaParser.BlockStatementContext ctx);
+	void exitBlock(SimpleJavaParser.BlockContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#returnStatement}.
 	 * @param ctx the parse tree
@@ -147,16 +147,6 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#doWhileStatement}.
-	 * @param ctx the parse tree
-	 */
-	void enterDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#doWhileStatement}.
-	 * @param ctx the parse tree
-	 */
-	void exitDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#forStatement}.
 	 * @param ctx the parse tree
@@ -187,16 +177,6 @@ public interface SimpleJavaListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitIfStatement(SimpleJavaParser.IfStatementContext ctx);
-	/**
-	 * Enter a parse tree produced by {@link SimpleJavaParser#elseIfStatement}.
-	 * @param ctx the parse tree
-	 */
-	void enterElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx);
-	/**
-	 * Exit a parse tree produced by {@link SimpleJavaParser#elseIfStatement}.
-	 * @param ctx the parse tree
-	 */
-	void exitElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link SimpleJavaParser#elseStatement}.
 	 * @param ctx the parse tree

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

@@ -71,11 +71,11 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 */
 	T visitStatement(SimpleJavaParser.StatementContext ctx);
 	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#blockStatement}.
+	 * Visit a parse tree produced by {@link SimpleJavaParser#block}.
 	 * @param ctx the parse tree
 	 * @return the visitor result
 	 */
-	T visitBlockStatement(SimpleJavaParser.BlockStatementContext ctx);
+	T visitBlock(SimpleJavaParser.BlockContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#returnStatement}.
 	 * @param ctx the parse tree
@@ -94,12 +94,6 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitWhileStatement(SimpleJavaParser.WhileStatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#doWhileStatement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#forStatement}.
 	 * @param ctx the parse tree
@@ -118,12 +112,6 @@ public interface SimpleJavaVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitIfStatement(SimpleJavaParser.IfStatementContext ctx);
-	/**
-	 * Visit a parse tree produced by {@link SimpleJavaParser#elseIfStatement}.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	T visitElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link SimpleJavaParser#elseStatement}.
 	 * @param ctx the parse tree

src/main/java/parser/grammar/SimpleJava.g4

@@ -6,9 +6,9 @@ program: classDeclaration+;
 classDeclaration: AccessModifier? 'class' Identifier OpenCurlyBracket memberDeclaration* ClosedCurlyBracket;
 memberDeclaration: constructorDeclaration | fieldDeclaration | methodDeclaration;
 
-constructorDeclaration: AccessModifier? Identifier OpenRoundBracket parameterList? ClosedRoundBracket blockStatement;
+constructorDeclaration: AccessModifier? Identifier OpenRoundBracket parameterList? ClosedRoundBracket block;
 fieldDeclaration: AccessModifier? type Identifier Semicolon;
-methodDeclaration: MainMethodDeclaration blockStatement | AccessModifier? (type | Void) Identifier OpenRoundBracket parameterList? ClosedRoundBracket blockStatement;
+methodDeclaration: MainMethodDeclaration block | AccessModifier? (type | Void) Identifier OpenRoundBracket parameterList? ClosedRoundBracket block;
 
 parameterList: parameter (Comma parameter)*;
 parameter: type Identifier;
@@ -17,26 +17,23 @@ argumentList: (expression (Comma expression)*)?;
 // Anweisungen
 statement: returnStatement Semicolon
          | localVariableDeclaration Semicolon
-         | blockStatement
+         | block
          | whileStatement
-         | doWhileStatement
          | forStatement
          | ifElseStatement
          | statementExpression Semicolon;
 
-blockStatement: OpenCurlyBracket statement* ClosedCurlyBracket;
+block: OpenCurlyBracket statement* ClosedCurlyBracket;
 
 returnStatement: Return (expression)?;
 localVariableDeclaration: type Identifier (Assign expression)?;
 
-whileStatement: While OpenRoundBracket expression ClosedRoundBracket blockStatement;
+whileStatement: While OpenRoundBracket expression ClosedRoundBracket block;
-doWhileStatement: Do blockStatement While OpenRoundBracket expression ClosedRoundBracket Semicolon;
+forStatement: For OpenRoundBracket (statementExpression | localVariableDeclaration) Semicolon (expression)? Semicolon (statementExpression)? ClosedRoundBracket block;
-forStatement: For OpenRoundBracket (statementExpression | localVariableDeclaration) Semicolon (expression)? Semicolon (statementExpression)? ClosedRoundBracket blockStatement;
 
-ifElseStatement: ifStatement elseIfStatement* elseStatement?;
+ifElseStatement: ifStatement elseStatement*;
-ifStatement: If OpenRoundBracket expression ClosedRoundBracket blockStatement;
+ifStatement: If OpenRoundBracket expression ClosedRoundBracket block;
-elseIfStatement: Else If OpenRoundBracket expression ClosedRoundBracket blockStatement;
+elseStatement: Else block;
-elseStatement: Else blockStatement;
 
 statementExpression: assign | newDeclaration | methodCall | crementExpression;
 assign: assignableExpression Assign expression;
@@ -147,7 +144,6 @@ Comma: ',';
 Class: 'class';
 This: 'this';
 While: 'while';
-Do: 'do';
 If: 'if';
 Else: 'else';
 For: 'for';

src/main/java/semantic/SemanticAnalyzer.java

@@ -7,21 +7,22 @@ import java.util.List;
 import java.util.Objects;
 
 import ast.*;
-import ast.expressions.IExpressionNode;
+import ast.block.BlockNode;
-import ast.expressions.binaryexpressions.*;
+import ast.expression.IExpressionNode;
-import ast.expressions.unaryexpressions.UnaryNode;
+import ast.expression.binaryexpression.*;
-import ast.members.ConstructorNode;
+import ast.expression.unaryexpression.UnaryExpressionNode;
-import ast.members.FieldNode;
+import ast.member.*;
-import ast.members.MemberNode;
+import ast.parameter.ParameterNode;
-import ast.members.MethodNode;
+import ast.statement.*;
-import ast.parameters.ParameterNode;
+import ast.statement.ifstatement.ElseStatementNode;
-import ast.statementexpressions.AssignNode;
+import ast.statement.ifstatement.IfElseStatementNode;
-import ast.statementexpressions.AssignableNode;
+import ast.statement.ifstatement.IfStatementNode;
-import ast.statementexpressions.NewDeclarationNode;
+import ast.statement.statementexpression.AssignStatementExpressionNode;
-import ast.statementexpressions.crementexpressions.DecrementNode;
+import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statementexpressions.crementexpressions.IncrementNode;
+import ast.statement.statementexpression.NewDeclarationStatementExpressionNode;
-import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode;
+import ast.statement.statementexpression.crementExpression.DecrementExpressionNode;
-import ast.statements.*;
+import ast.statement.statementexpression.crementExpression.IncrementExpressionNode;
+import ast.statement.statementexpression.methodcallstatementnexpression.MethodCallStatementExpressionNode;
 import ast.type.type.*;
 import semantic.context.Context;
 import semantic.exceptions.*;
@@ -173,12 +174,12 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(IfNode toCheck) {
+    public TypeCheckResult analyze(IfStatementNode toCheck) {
         return new TypeCheckResult(true, null);
     }
 
     @Override
-    public TypeCheckResult analyze(ReturnNode toCheck) {
+    public TypeCheckResult analyze(ReturnStatementNode toCheck) {
 
         if(toCheck.expression != null){
             var result = toCheck.expression.accept(this);
@@ -190,7 +191,7 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(WhileNode toCheck) {
+    public TypeCheckResult analyze(WhileStatementNode toCheck) {
         return null;
     }
 
@@ -218,24 +219,24 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(AssignableNode toCheck) {
+    public TypeCheckResult analyze(AssignableExpressionNode toCheck) {
         return new TypeCheckResult(true, currentFields.get(toCheck.identifier));
 
     }
 
     @Override
-    public TypeCheckResult analyze(ElseNode toCheck) {
+    public TypeCheckResult analyze(ElseStatementNode toCheck) {
         return null;
     }
 
-    /*@Override
+    @Override
-    public TypeCheckResult analyze(ForNode toCheck) {
+    public TypeCheckResult analyze(ForStatementNode toCheck) {
         return null;
-    }*/
+    }
 
     @Override
-    public TypeCheckResult analyze(AssignNode toCheck) {
+    public TypeCheckResult analyze(AssignStatementExpressionNode toCheck) {
-        AssignableNode assignable = toCheck.assignable;
+        AssignableExpressionNode assignable = toCheck.assignable;
         var oldNullType = currentNullType;
         currentNullType = currentFields.get(toCheck.assignable.identifier);
         IExpressionNode rExpression = toCheck.expression;
@@ -273,17 +274,17 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(DecrementNode toCheck) {
+    public TypeCheckResult analyze(DecrementExpressionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(IfElseNode toCheck) {
+    public TypeCheckResult analyze(IfElseStatementNode toCheck) {
         return new TypeCheckResult(true, null);
     }
 
     @Override
-    public TypeCheckResult analyze(MethodCallNode toCheck) {
+    public TypeCheckResult analyze(MethodCallStatementExpressionNode toCheck) {
         return null;
     }
 
@@ -315,22 +316,22 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(NewDeclarationNode toCheck) {
+    public TypeCheckResult analyze(NewDeclarationStatementExpressionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(IncrementNode toCheck) {
+    public TypeCheckResult analyze(IncrementExpressionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(BinaryNode toCheck) {
+    public TypeCheckResult analyze(BinaryExpressionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(CalculationNode calcNode) {
+    public TypeCheckResult analyze(CalculationExpressionNode calcNode) {
         if (calcNode.calculationExpression != null) {
             calcNode.calculationExpression.accept(this);
         }
@@ -338,22 +339,22 @@ public class SemanticAnalyzer implements SemanticVisitor {
     }
 
     @Override
-    public TypeCheckResult analyze(DotNode toCheck) {
+    public TypeCheckResult analyze(DotExpressionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(DotSubstractionNode toCheck) {
+    public TypeCheckResult analyze(DotSubstractionExpressionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(NonCalculationNode toCheck) {
+    public TypeCheckResult analyze(NonCalculationExpressionNode toCheck) {
         return null;
     }
 
     @Override
-    public TypeCheckResult analyze(UnaryNode unary) {
+    public TypeCheckResult analyze(UnaryExpressionNode unary) {
         var valid = true;
 
         if (currentScope.contains(unary.identifier)) {

src/main/java/semantic/SemanticVisitor.java

@@ -1,17 +1,20 @@
 package semantic;
 
+
 import ast.*;
-import ast.expressions.binaryexpressions.*;
+import ast.block.BlockNode;
-import ast.expressions.unaryexpressions.UnaryNode;
+import ast.expression.binaryexpression.*;
-import ast.members.*;
+import ast.expression.unaryexpression.UnaryExpressionNode;
-import ast.parameters.ParameterNode;
+import ast.member.*;
-import ast.statementexpressions.AssignNode;
+import ast.parameter.ParameterNode;
-import ast.statementexpressions.AssignableNode;
+import ast.statement.*;
-import ast.statementexpressions.NewDeclarationNode;
+import ast.statement.ifstatement.*;
-import ast.statementexpressions.crementexpressions.DecrementNode;
+import ast.statement.statementexpression.AssignStatementExpressionNode;
-import ast.statementexpressions.crementexpressions.IncrementNode;
+import ast.statement.statementexpression.AssignableExpressionNode;
-import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode;
+import ast.statement.statementexpression.NewDeclarationStatementExpressionNode;
-import ast.statements.*;
+import ast.statement.statementexpression.crementExpression.DecrementExpressionNode;
+import ast.statement.statementexpression.crementExpression.IncrementExpressionNode;
+import ast.statement.statementexpression.methodcallstatementnexpression.MethodCallStatementExpressionNode;
 import typechecker.TypeCheckResult;
 
 public interface SemanticVisitor {
@@ -24,46 +27,46 @@ public interface SemanticVisitor {
 
     TypeCheckResult analyze(FieldNode toCheck);
 
-    TypeCheckResult analyze(IfNode toCheck);
+    TypeCheckResult analyze(IfStatementNode toCheck);
 
-    TypeCheckResult analyze(ReturnNode toCheck);
+    TypeCheckResult analyze(ReturnStatementNode toCheck);
 
-    TypeCheckResult analyze(WhileNode toCheck);
+    TypeCheckResult analyze(WhileStatementNode toCheck);
 
     TypeCheckResult analyze(ParameterNode toCheck);
 
     TypeCheckResult analyze(BlockNode toCheck);
 
-    TypeCheckResult analyze(AssignableNode toCheck);
+    TypeCheckResult analyze(AssignableExpressionNode toCheck);
 
-    TypeCheckResult analyze(ElseNode toCheck);
+    TypeCheckResult analyze(ElseStatementNode toCheck);
 
-    //TypeCheckResult analyze(ForNode toCheck);
+    TypeCheckResult analyze(ForStatementNode toCheck);
 
-    TypeCheckResult analyze(AssignNode toCheck);
+    TypeCheckResult analyze(AssignStatementExpressionNode toCheck);
 
-    TypeCheckResult analyze(DecrementNode toCheck);
+    TypeCheckResult analyze(DecrementExpressionNode toCheck);
 
-    TypeCheckResult analyze(IfElseNode toCheck);
+    TypeCheckResult analyze(IfElseStatementNode toCheck);
 
-    TypeCheckResult analyze(MethodCallNode toCheck);
+    TypeCheckResult analyze(MethodCallStatementExpressionNode toCheck);
 
     TypeCheckResult analyze(LocalVariableDeclarationNode toCheck);
 
-    TypeCheckResult analyze(NewDeclarationNode toCheck);
+    TypeCheckResult analyze(NewDeclarationStatementExpressionNode toCheck);
 
-    TypeCheckResult analyze(IncrementNode toCheck);
+    TypeCheckResult analyze(IncrementExpressionNode toCheck);
 
-    TypeCheckResult analyze(BinaryNode toCheck);
+    TypeCheckResult analyze(BinaryExpressionNode toCheck);
 
-    TypeCheckResult analyze(CalculationNode toCheck);
+    TypeCheckResult analyze(CalculationExpressionNode toCheck);
 
-    TypeCheckResult analyze(DotNode toCheck);
+    TypeCheckResult analyze(DotExpressionNode toCheck);
 
-    TypeCheckResult analyze(DotSubstractionNode toCheck);
+    TypeCheckResult analyze(DotSubstractionExpressionNode toCheck);
 
-    TypeCheckResult analyze(NonCalculationNode toCheck);
+    TypeCheckResult analyze(NonCalculationExpressionNode toCheck);
 
-    TypeCheckResult analyze(UnaryNode toCheck);
+    TypeCheckResult analyze(UnaryExpressionNode toCheck);
 
 }

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

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

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

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

src/main/resources/input/CompilerInput.java

@@ -1,14 +1,16 @@
-public class Compiler {
+public class CompilerInput {
-    public int add(int i, int j) {
+
-        return i+j;
+    public int a;
-    }
+
-}
+    public static int testMethod(char x){
-
+        return 0;
-public class Node {
+    }
-    public void main() {
+
-        Compiler compiler = new Compiler();
+    public class Test {
-        int i = compiler.add(5, 8);
+
-        return i;
+        public static int testMethod(char x, int a){
+            return 0;
+        }
     }
 }
 

src/test/java/semantic/Mocker.java

@@ -1,102 +0,0 @@
-package semantic;
-
-import ast.*;
-import ast.members.FieldNode;
-import ast.members.MethodNode;
-import ast.parameters.ParameterNode;
-import ast.type.AccessModifierNode;
-import ast.type.type.*;
-
-public class Mocker {
-
-    public static ASTNode mockTwoSameFields(){
-        ProgramNode p = new ProgramNode();
-
-        ClassNode c = new ClassNode();
-        c.identifier = "testClass";
-
-        FieldNode f1 = new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a");
-
-        c.members.add(f1);
-
-        FieldNode f2 = new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a");
-
-        c.members.add(f2);
-
-        p.classes.add(c);
-        return p;
-    }
-
-    public static ASTNode mockSimpleMethod(){
-        ProgramNode p = new ProgramNode();
-
-        ClassNode c = new ClassNode();
-
-        MethodNode methodNode = new MethodNode();
-
-        //Parameter
-        ParameterNode parameterNode = new ParameterNode(new BaseType(TypeEnum.INT), "a");
-
-        methodNode.addParameter(parameterNode);
-
-        //Statements
-
-        //Block
-        methodNode.block = new ast.statements.BlockNode();
-
-        c.members.add(methodNode);
-
-        p.classes.add(c);
-
-        return p;
-    }
-
-    public static ASTNode mockTwoSameMethods(){
-        ProgramNode p = new ProgramNode();
-
-        ClassNode c = new ClassNode();
-
-        MethodNode methodNode = new MethodNode();
-        methodNode.block = new ast.statements.BlockNode();
-        methodNode.setType(new BaseType(TypeEnum.INT));
-
-        methodNode.setIdentifier("testMethod");
-
-        c.members.add(methodNode);
-
-        MethodNode methodNode1 = new MethodNode();
-        methodNode1.block = new ast.statements.BlockNode();
-        methodNode1.setType(new BaseType(TypeEnum.INT));
-
-        methodNode1.setIdentifier("testMethod");
-
-        c.members.add(methodNode1);
-
-        p.classes.add(c);
-
-        return p;
-    }
-
-    public static ASTNode mockTwoDifferentMethods(){
-        ProgramNode p = new ProgramNode();
-
-        ClassNode c = new ClassNode();
-
-        MethodNode methodNode = new MethodNode();
-        methodNode.block = new ast.statements.BlockNode();
-        methodNode.setIdentifier("testMethod");
-
-        c.members.add(methodNode);
-
-        MethodNode methodNode1 = new MethodNode();
-        methodNode1.block = new ast.statements.BlockNode();
-        methodNode1.setIdentifier("testMethod1");
-
-        c.members.add(methodNode1);
-
-        p.classes.add(c);
-
-        return p;
-    }
-
-}