Merge branch 'master' of https://github.com/iComputerfreak/DerCompiler

Author: robinmaisch

Abstrakte Grammatik.txt

@@ -0,0 +1,62 @@
+Program                 ::  Ident ClassList
+ClassList               ::  Class +
+Class                   ::  ClassMember
+ClassMember             =   Method, Field MainMethod
+Field                   ::  Type Ident
+Method                  ::  ParameterList BasicBlock
+Main Method             ::  ParameterList BasicBlock
+ParameterList           ::  Parameter +
+Parameter               ::  Type Ident
+Type                    ::  BasicType Dimension
+
+StatementList           ::  Statement +
+Statement               =   IfStatement | WhileStatement | VariableDeclaration | BasicBlock | ExpressionsStatement | EmptyStatement | ReturnStatement
+IfStatement             ::  Expression Statement Statement(MayNull)
+WhileStatement          ::  Expression Statement
+VariableDeclaration     ::  Type Ident Expression
+BasicBlock              ::  Declarations StatementList
+ExpressionsStatement    ::  Expression
+EmptyStatement          ::
+ReturnStatement         ::  Expression
+
+ExpressionList          :: Expression +
+Expression              =  BinaryExpression | UnaryExpression
+
+BinaryExpression        =  AssignementExpression | LogicalOrExpression | LogicalAndExpression | EqualityExpression | UnequalityExpression | LessExpression | LessEqualExpression 
+                         | GraterEqualExpression | GreaterExpression | AddExpression | SubExpression | MultExpression | DivExpression | ModExpression 
+AssignementExpression   :: Expression Expression
+LogicalOrExpression     :: Expression Expression
+LogicalAndExpression    :: Expression Expression
+EqualityExpression      :: Expression Expression
+UnequalityExpression    :: Expression Expression
+LessExpression          :: Expression Expression
+LessEqualExpression     :: Expression Expression
+GraterEqualExpression   :: Expression Expression
+GreaterExpression       :: Expression Expression
+AddExpression           :: Expression Expression
+SubExpression           :: Expression Expression
+MultExpression          :: Expression Expression
+DivExpression           :: Expression Expression
+ModExpression           :: Expression Expression
+
+UnaryExpression         =  LogicalNotExpression | MinusExpression | PostfixExpression
+LogicalNotExpression    :: UnaryExpression
+MinusExpression         :: UnaryExpression
+PostfixExpression       =  MethodInvocation | FieldAccess | ArrayAccess | PrimaryExpression
+MethodInvocation        :: PosfixExpression Ident ArgumentList
+ArgumentList            :: Argument +
+Argument                :: ExpressionList
+FieldAccess             :: PosfixExpression Ident
+ArrayAccess             :: PosfixExpression Expression
+
+PrimaryExpression       = NullExpression | BooleanExpression | IntegerLiteral | Varaible | LocalMethodInvocation | ThisExpression | CapsuledExpression | NewObjectExpression | NewArrayExpression
+NullExpression          :: 
+BooleanExpression       :: boolean
+IntegerLiteral          :: int
+Varaible                :: Ident
+LocalMethodInvocation   :: Ident ArgumentList
+ThisExpression          :: 
+CapsuledExpression      :: Expression
+NewObjectExpression     :: Ident
+NewArrayExpression      :: Type Expression Dimension
+Dimension               :: int

src/main/java/de/dercompiler/ast/Method.java

@@ -15,6 +15,7 @@ public final class Method extends ClassMember {
     private final List<Parameter> parameters;
     private final MethodRest methodRest;
     private final BasicBlock block;
+    private ClassDeclaration surrounding;
 
     // INFO: methodRest may be null
     public Method(SourcePosition position, Type type, String identifier, List<Parameter> parameters, MethodRest methodRest, BasicBlock block) {
@@ -69,4 +70,12 @@ public boolean syntaxEquals(ASTNode other) {
     public void accept(ASTNodeVisitor astNodeVisitor) {
         astNodeVisitor.visitMethod(this);
     }
+
+    public void setSurroundingClass(ClassDeclaration declaration) {
+        this.surrounding = declaration;
+    }
+
+    public ClassDeclaration getSurroundingClass() {
+        return surrounding;
+    }
 }

src/main/java/de/dercompiler/ast/Program.java

@@ -11,10 +11,12 @@
 public final class Program extends ASTNode {
 
     private final List<ClassDeclaration> classes;
+    private boolean isIndexed;
 
     public Program(SourcePosition position, List<ClassDeclaration> classes) {
         super(position);
         this.classes = classes;
+        isIndexed = false;
     }
 
     public List<ClassDeclaration> getClasses() {
@@ -38,4 +40,12 @@ public void accept(ASTNodeVisitor astNodeVisitor) {
         }
         astNodeVisitor.visitProgram(this);
     }
+
+    public boolean isIndexed() {
+        return isIndexed;
+    }
+
+    public void indexed() {
+        isIndexed = true;
+    }
 }

src/main/java/de/dercompiler/ast/expression/AbstractExpression.java

@@ -10,7 +10,7 @@
 
 public final class AddExpression extends BinaryExpression {
 
-    public AddExpression(SourcePosition position, AbstractExpression lhs, AbstractExpression rhs) {
+    public AddExpression(SourcePosition position, Expression lhs, Expression rhs) {
         super(position, lhs, rhs);
     }
 

src/main/java/de/dercompiler/ast/expression/AddExpression.java

@@ -11,21 +11,21 @@
 
 public class Arguments extends ASTNode {
 
-    private LinkedList<AbstractExpression> arguments;
+    private LinkedList<Expression> arguments;
 
     public Arguments(SourcePosition position) {
         super(position);
         this.arguments = new LinkedList<>();
     }
 
-    public Arguments(SourcePosition position, List<AbstractExpression> arguments) {
+    public Arguments(SourcePosition position, List<Expression> arguments) {
         this(position);
-        for (AbstractExpression ae : arguments) {
+        for (Expression ae : arguments) {
             this.arguments.addLast(ae);
         }
     }
 
-    public void addArgument(AbstractExpression expression) {
+    public void addArgument(Expression expression) {
         this.arguments.addLast(expression);
     }
 
@@ -35,11 +35,11 @@ public boolean syntaxEquals(ASTNode other) {
         if (other instanceof Arguments a) {
             if (a.arguments.size() != arguments.size()) return false;
             boolean result = true;
-            Iterator<AbstractExpression> itThis = arguments.iterator();
-            Iterator<AbstractExpression> itO = a.arguments.iterator();
+            Iterator<Expression> itThis = arguments.iterator();
+            Iterator<Expression> itO = a.arguments.iterator();
             while (itThis.hasNext()) {
-                AbstractExpression expThis = itThis.next();
-                AbstractExpression expO = itO.next();
+                Expression expThis = itThis.next();
+                Expression expO = itO.next();
                 result &= expThis.syntaxEquals(expO);
             }
             return result;
@@ -56,7 +56,7 @@ public int getLength() {
         return arguments.size();
     }
 
-    public AbstractExpression get(int index) {
+    public Expression get(int index) {
         return arguments.get(index);
     }
 }

src/main/java/de/dercompiler/ast/expression/Arguments.java

@@ -8,9 +8,9 @@
 
 public final class ArrayAccess extends PostfixExpression {
 
-    private AbstractExpression index;
+    private Expression index;
 
-    public ArrayAccess(SourcePosition position, AbstractExpression encapsulated, AbstractExpression index) {
+    public ArrayAccess(SourcePosition position, Expression encapsulated, Expression index) {
         super(position, encapsulated);
         this.index = index;
     }
@@ -24,7 +24,7 @@ public boolean syntaxEquals(ASTNode other) {
         return false;
     }
 
-    public AbstractExpression getIndex() {
+    public Expression getIndex() {
         return index;
     }
 

src/main/java/de/dercompiler/ast/expression/ArrayAccess.java

@@ -10,7 +10,7 @@
 
 public final class AssignmentExpression extends BinaryExpression {
 
-    public AssignmentExpression(SourcePosition position, AbstractExpression lhs, AbstractExpression rhs) {
+    public AssignmentExpression(SourcePosition position, Expression lhs, Expression rhs) {
         super(position, lhs, rhs);
     }
 

src/main/java/de/dercompiler/ast/expression/AssignmentExpression.java

@@ -5,12 +5,12 @@
 
 import de.dercompiler.lexer.token.OperatorToken;
 
-public abstract sealed class BinaryExpression extends AbstractExpression permits AssignmentExpression, AddExpression, DivisionExpression, EqualExpression, GreaterEqualExpression, GreaterExpression, LessEqualExpression, LessExpression, LogicalAndExpression, LogicalOrExpression, ModuloExpression, MultiplyExpression, SubtractExpression, NotEqualExpression {
+public abstract sealed class BinaryExpression extends Expression permits AssignmentExpression, AddExpression, DivisionExpression, EqualExpression, GreaterEqualExpression, GreaterExpression, LessEqualExpression, LessExpression, LogicalAndExpression, LogicalOrExpression, ModuloExpression, MultiplyExpression, SubtractExpression, NotEqualExpression {
 
-    private AbstractExpression lhs;
-    private AbstractExpression rhs;
+    private Expression lhs;
+    private Expression rhs;
 
-    public BinaryExpression(SourcePosition position, AbstractExpression lhs, AbstractExpression rhs) {
+    public BinaryExpression(SourcePosition position, Expression lhs, Expression rhs) {
         super(position);
         this.lhs = lhs;
         this.rhs = rhs;
@@ -20,11 +20,11 @@ protected boolean syntaxEqualLhsRhs(BinaryExpression other) {
         return lhs.syntaxEquals(other.lhs) && rhs.syntaxEquals(other.rhs);
     }
 
-    public AbstractExpression getLhs() {
+    public Expression getLhs() {
         return lhs;
     }
 
-    public AbstractExpression getRhs() {
+    public Expression getRhs() {
         return rhs;
     }
 

src/main/java/de/dercompiler/ast/expression/BinaryExpression.java

@@ -10,7 +10,7 @@
 
 public final class DivisionExpression extends BinaryExpression {
 
-    public DivisionExpression(SourcePosition position, AbstractExpression lhs, AbstractExpression rhs) {
+    public DivisionExpression(SourcePosition position, Expression lhs, Expression rhs) {
         super(position, lhs, rhs);
     }