Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e23d84cd09
@ -34,7 +34,7 @@ public class ASTGenerator extends DecafBaseVisitor<Node> {
|
||||
boolean hasMain;
|
||||
if(ctx.MainMethodDecl() != null) {
|
||||
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 {
|
||||
hasMain = false;
|
||||
}
|
||||
@ -377,13 +377,8 @@ public class ASTGenerator extends DecafBaseVisitor<Node> {
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getReturnType(List<IStatement> statements){
|
||||
for(IStatement stmt: statements) {
|
||||
if(stmt instanceof ReturnStatement) {
|
||||
return "not";
|
||||
}
|
||||
}
|
||||
return "void";
|
||||
public String getReturnType(List<IStatement> statements) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user