fixed imports on records, added Enums and Interfaces

src/main/java/de/maishai/ast/Assignment.java

@@ -1,7 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Expression;
-import de.dhbw.horb.ast.Statement;
-
-public record Assignment(Location loc, Expression value) implements Statement {
-}

src/main/java/de/maishai/ast/Binary.java

@@ -1,7 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Expression;
-import de.dhbw.horb.ast.Operator;
-
-public record Binary(Expression left, Operator op, Expression right) implements Expression{
-}

src/main/java/de/maishai/ast/Break.java

@@ -1,6 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Statement;
-
-public record Break() implements Statement {
-}

src/main/java/de/maishai/ast/Continue.java

@@ -1,6 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Statement;
-
-public record Continue() implements Statement {
-}

src/main/java/de/maishai/ast/Expression.java

@@ -0,0 +1,6 @@
+package de.maishai.ast;
+
+
+
+public interface Expression extends Node {
+}

src/main/java/de/maishai/ast/Function.java

@@ -1,9 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Node;
-import de.dhbw.horb.ast.Type;
-
-import java.util.List;
-
-public record Function(Type type, String name, List<Variable> params, Block block) implements Node {
-}

src/main/java/de/maishai/ast/IfElse.java

@@ -1,7 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Expression;
-import de.dhbw.horb.ast.Statement;
-
-public record IfElse(Expression cond, Block ifBlock, Block elseBlock) implements Statement {
-}

src/main/java/de/maishai/ast/Location.java

@@ -1,6 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Expression;
-
-public record Location(String name) implements Expression {
-}

src/main/java/de/maishai/ast/Node.java

@@ -0,0 +1,4 @@
+package de.maishai.ast;
+
+public interface Node {
+}

src/main/java/de/maishai/ast/Operator.java

@@ -0,0 +1,7 @@
+package de.maishai.ast;
+
+public enum Operator {
+    ADD,
+    SUB,
+    MUL
+}

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

@@ -1,8 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Node;
-
-import java.util.List;
-
-public record Program(List<Variable> variables, List<Function> methods) implements Node {
-}

src/main/java/de/maishai/ast/Return.java

@@ -1,7 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Expression;
-import de.dhbw.horb.ast.Statement;
-
-public record Return(Expression ret) implements Statement {
-}

src/main/java/de/maishai/ast/ReturnType.java

@@ -0,0 +1,8 @@
+package de.maishai.ast;
+
+public enum ReturnType {
+    INT,
+    BOOL,
+    CHAR,
+    VOID
+}

src/main/java/de/maishai/ast/ReturnVoid.java

@@ -1,6 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Statement;
-
-public record ReturnVoid() implements Statement {
-}

src/main/java/de/maishai/ast/Statement.java

@@ -0,0 +1,3 @@
+package de.maishai.ast;
+public interface Statement extends Node  {
+}

src/main/java/de/maishai/ast/Type.java

@@ -0,0 +1,7 @@
+package de.maishai.ast;
+
+public enum Type {
+    INT,
+    BOOL,
+    CHAR
+}

src/main/java/de/maishai/ast/Variable.java

@@ -1,7 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Node;
-import de.dhbw.horb.ast.Type;
-
-public record Variable(String name, Type type) implements Node {
-}

src/main/java/de/maishai/ast/VoidFunctionCall.java

@@ -1,6 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Statement;
-
-public record VoidFunctionCall(FunctionCall expr) implements Statement {
-}

src/main/java/de/maishai/ast/While.java

@@ -1,7 +0,0 @@
-package de.maishai.ast;
-
-import de.dhbw.horb.ast.Expression;
-import de.dhbw.horb.ast.Statement;
-
-public record While(Expression cond, Block block) implements Statement {
-}

src/main/java/de/maishai/ast/records/Assignment.java

@@ -0,0 +1,8 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Expression;
+import de.maishai.ast.Statement;
+
+public record Assignment(Id loc, Expression value) implements Statement {
+}

src/main/java/de/maishai/ast/records/Binary.java

@@ -0,0 +1,8 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Expression;
+import de.maishai.ast.Operator;
+
+public record Binary(Expression left, Operator op, Expression right) implements Expression {
+}

src/main/java/de/maishai/ast/records/Block.java

@@ -1,7 +1,9 @@
-package de.maishai.ast;
+package de.maishai.ast.records;
 
-import de.dhbw.horb.ast.Node;
-import de.dhbw.horb.ast.Statement;
+
+
+import de.maishai.ast.Node;
+import de.maishai.ast.Statement;
 
 import java.util.List;
 

src/main/java/de/maishai/ast/records/BoolConstant.java

@@ -1,6 +1,7 @@
-package de.maishai.ast;
+package de.maishai.ast.records;
 
-import de.dhbw.horb.ast.Expression;
+
+import de.maishai.ast.Expression;
 
 public record BoolConstant(Boolean value) implements Expression {
 }

src/main/java/de/maishai/ast/records/Break.java

@@ -0,0 +1,7 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Statement;
+
+public record Break() implements Statement {
+}

src/main/java/de/maishai/ast/records/Class.java

@@ -0,0 +1,8 @@
+package de.maishai.ast.records;
+
+import de.maishai.ast.Node;
+
+import java.util.List;
+
+public record Class(Id id ,List<Variable> variables, List<Method> methods) implements Node {
+}

src/main/java/de/maishai/ast/records/Continue.java

@@ -0,0 +1,7 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Statement;
+
+public record Continue() implements Statement {
+}

src/main/java/de/maishai/ast/records/FunctionCall.java

@@ -1,7 +1,9 @@
-package de.maishai.ast;
+package de.maishai.ast.records;
 
-import de.dhbw.horb.ast.Expression;
-import de.dhbw.horb.ast.Statement;
+
+
+import de.maishai.ast.Expression;
+import de.maishai.ast.Statement;
 
 import java.util.List;
 

src/main/java/de/maishai/ast/records/Id.java

@@ -0,0 +1,7 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Expression;
+
+public record Id(String name) implements Expression {
+}

src/main/java/de/maishai/ast/records/IfElse.java

@@ -0,0 +1,6 @@
+package de.maishai.ast.records;
+
+import de.maishai.ast.Expression;
+import de.maishai.ast.Statement;
+public record IfElse(Expression cond, Block ifBlock, Block elseBlock) implements Statement {
+}

src/main/java/de/maishai/ast/records/IntConstant.java

@@ -1,6 +1,7 @@
-package de.maishai.ast;
+package de.maishai.ast.records;
 
-import de.dhbw.horb.ast.Expression;
+
+import de.maishai.ast.Expression;
 
 public record IntConstant(Integer value) implements Expression {
 }

src/main/java/de/maishai/ast/records/Method.java

@@ -0,0 +1,11 @@
+package de.maishai.ast.records;
+
+
+
+import de.maishai.ast.Node;
+import de.maishai.ast.ReturnType;
+
+import java.util.List;
+
+public record Method(ReturnType type, Id id, List<Parameter> params, Block block) implements Node {
+}

src/main/java/de/maishai/ast/records/Parameter.java

@@ -0,0 +1,8 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Node;
+import de.maishai.ast.Type;
+
+public record Parameter(String name, Type type) implements Node {
+}

src/main/java/de/maishai/ast/records/Program.java

@@ -0,0 +1,9 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Node;
+
+import java.util.List;
+
+public record Program(List<Class> variables, List<Method> methods) implements Node {
+}

src/main/java/de/maishai/ast/records/Return.java

@@ -0,0 +1,8 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Expression;
+import de.maishai.ast.Statement;
+
+public record Return(Expression ret) implements Statement {
+}

src/main/java/de/maishai/ast/records/ReturnVoid.java

@@ -0,0 +1,7 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Statement;
+
+public record ReturnVoid() implements Statement {
+}

src/main/java/de/maishai/ast/records/Variable.java

@@ -0,0 +1,8 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Node;
+import de.maishai.ast.Type;
+
+public record Variable(String name, Type type) implements Node {
+}

src/main/java/de/maishai/ast/records/While.java

@@ -0,0 +1,8 @@
+package de.maishai.ast.records;
+
+
+import de.maishai.ast.Expression;
+import de.maishai.ast.Statement;
+
+public record While(Expression cond, Block block) implements Statement {
+}