Merge remote-tracking branch 'origin/master'

This commit is contained in:
Krauß, Josefine 2024-06-20 12:47:25 +02:00
commit e23d84cd09

View File

@ -34,7 +34,7 @@ public class ASTGenerator extends DecafBaseVisitor<Node> {
boolean hasMain; boolean hasMain;
if(ctx.MainMethodDecl() != null) { if(ctx.MainMethodDecl() != null) {
hasMain = true; hasMain = true;
MethodDecl mainMethod = new MethodDecl(name, "void", "main", new ParameterList(new ArrayList<>()), new BlockStatement(new ArrayList<>(), "void")); MethodDecl mainMethod = new MethodDecl(name, "void", "main", new ParameterList(new ArrayList<>()), new BlockStatement(new ArrayList<>(), null));
} else { } else {
hasMain = false; hasMain = false;
} }
@ -378,12 +378,7 @@ public class ASTGenerator extends DecafBaseVisitor<Node> {
} }
public String getReturnType(List<IStatement> statements) { public String getReturnType(List<IStatement> statements) {
for(IStatement stmt: statements) { return null;
if(stmt instanceof ReturnStatement) {
return "not";
}
}
return "void";
} }
} }