Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6585e67273
@ -67,7 +67,8 @@ public class ASTGenerator extends DecafBaseVisitor<Node> {
|
||||
public Node visitConstuctorDecl(DecafParser.ConstuctorDeclContext ctx) {
|
||||
String name = ctx.Identifier().getText();
|
||||
ParameterList parameterList = (ParameterList) visit(ctx.parameterList());
|
||||
return new MethodDecl("", null, name, parameterList, new BlockStatement(new ArrayList<>(), "void"));
|
||||
BlockStatement block = (BlockStatement) visitBlock(ctx.block());
|
||||
return new MethodDecl("", null, name, parameterList, block);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -282,7 +283,6 @@ public class ASTGenerator extends DecafBaseVisitor<Node> {
|
||||
}
|
||||
}
|
||||
|
||||
//todo
|
||||
@Override
|
||||
public Node visitDotSubExpr(DecafParser.DotSubExprContext ctx) {
|
||||
if (ctx.IntValue() != null) {
|
||||
@ -293,6 +293,8 @@ public class ASTGenerator extends DecafBaseVisitor<Node> {
|
||||
return new LocalVarIdentifier(identifier);
|
||||
} else if(ctx.instVar() != null) {
|
||||
return visitInstVar(ctx.instVar());
|
||||
} else if(ctx.methodCall() != null) {
|
||||
return visitMethodCall(ctx.methodCall());
|
||||
} else if(ctx.calcExpr() != null) {
|
||||
return visitCalcExpr(ctx.calcExpr());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user