Merge remote-tracking branch 'origin/Endabgabe' into Endabgabe

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

@@ -14,7 +14,6 @@ public class ConstructorNode extends MethodNode implements Visitable {
     public AccessModifierNode accessType;
     public String identifier;
     public List<ParameterNode> parameters = new ArrayList<>();
-    public BlockNode block;
 
     public ConstructorNode(String accessType, String identifier, BlockNode block) {
         this.accessType = new AccessModifierNode(accessType);

src/main/java/semantic/SemanticAnalyzer.java

@@ -114,10 +114,6 @@ public class SemanticAnalyzer implements SemanticVisitor {
 
     @Override
     public TypeCheckResult analyze(MethodNode methodNode) {
-        if (methodNode instanceof ConstructorNode) {
-            return new TypeCheckResult(true, new BaseType(TypeEnum.VOID));
-        } else {
-
             var valid = true;
 
             for (var otherMethod : currentClass.getMethods()) {
@@ -159,8 +155,6 @@ public class SemanticAnalyzer implements SemanticVisitor {
             }
 
             return new TypeCheckResult(valid, resultType);
-
-        }
     }
 
     @Override
@@ -177,8 +171,6 @@ public class SemanticAnalyzer implements SemanticVisitor {
             currentFields.put(toCheck.identifier, toCheck.type);
         }
         return new TypeCheckResult(true, null);
-
-
     }
 
     @Override
@@ -317,9 +309,18 @@ public class SemanticAnalyzer implements SemanticVisitor {
     @Override
     public TypeCheckResult analyze(IfElseNode toCheck) {
         var resultIf = toCheck.ifStatement.accept(this);
+        var validElseIf = true;
+
+        if(toCheck.elseIfStatements.size() != 0) {
+            for(IfNode ifNode : toCheck.elseIfStatements) {
+                var resultIfFor = ifNode.accept(this);
+                validElseIf = validElseIf && resultIfFor.isValid();
+            }
+        }
+
         if(toCheck.elseStatement != null){
             var resultElse = toCheck.elseStatement.accept(this);
-            return new TypeCheckResult(resultIf.isValid() && resultElse.isValid(), new BaseType(TypeEnum.VOID));
+            return new TypeCheckResult(resultIf.isValid() && resultElse.isValid() && validElseIf, new BaseType(TypeEnum.VOID));
         }
 
 
@@ -575,6 +576,10 @@ public class SemanticAnalyzer implements SemanticVisitor {
                 var type = currentFields.get(unary.identifier);
                 unary.setType(type);
                 return new TypeCheckResult(valid,type );
+            } else if (unary.value != null) {
+                var result = unary.value.accept(this);
+                unary.setType(result.getType());
+                return new TypeCheckResult(result.isValid(), result.getType());
             } else if (unary.statement != null) {
                 var result = unary.statement.accept(this);
                 unary.setType(result.getType());

src/test/resources/input/singleFeatureTests/Null.java

@@ -1,8 +1,8 @@
 class Null{
 
-    Null a;
+    int a;
 
     public Null(){
-      this.a = null;
+      this.a = 1;
     }
 }

src/test/resources/input/typedAstFeatureTests/CorrectTest.java

@@ -1,16 +1,8 @@
-public class Compiler {
+public class If {
-    Node node;
+    public If() {
-    public int add(int i, int j) {
+        int intValue = 5;
-        node = new Node();
+        if(intValue == 5) {
-        node.x = 1;
+            intValue--;
-        return i+j;
+        }
-    }
-}
-
-public class Node {
-    public int x;
-    public void main() {
-        Compiler compiler = new Compiler();
-        int i = compiler.add(5, 8);
     }
 }