From 9f6fc527f35be4e674607a5b397fd77ecaa18ee9 Mon Sep 17 00:00:00 2001 From: laurenz Date: Mon, 20 May 2024 15:23:07 +0200 Subject: [PATCH] Parser can do new Object(arg).method() now --- src/main/antlr/Decaf.g4 | 10 +- .../java/de/maishai/ExpressionGenerator.java | 18 +- .../java/de/maishai/StatementGenerator.java | 9 +- src/main/java/de/maishai/antlr/Decaf.interp | 3 +- .../de/maishai/antlr/DecafBaseListener.java | 12 + .../de/maishai/antlr/DecafBaseVisitor.java | 7 + .../java/de/maishai/antlr/DecafListener.java | 10 + .../java/de/maishai/antlr/DecafParser.java | 916 ++++++++++-------- .../java/de/maishai/antlr/DecafVisitor.java | 6 + 9 files changed, 556 insertions(+), 435 deletions(-) diff --git a/src/main/antlr/Decaf.g4 b/src/main/antlr/Decaf.g4 index f9587b0..f1ba2ed 100644 --- a/src/main/antlr/Decaf.g4 +++ b/src/main/antlr/Decaf.g4 @@ -34,7 +34,7 @@ stmt : 'if' '(' expr ')' block ('else' block)? #If ; stmtexpr : methCall #MethodCall - | NEW type '(' args? ')' #New + | newCall #New ; expr : expr binaryOp expr #BinaryOperation @@ -48,14 +48,18 @@ expr : expr binaryOp expr #BinaryOperation binaryOp : ADD | SUB | MUL | GT | LT | GE | LE | EQ | NE | AND | OR; unaryOp : SUB | NOT; -fieldVarAccess : (THIS '.')? (recipient '.')* id; +fieldVarAccess : ((THIS '.')|(newCall '.'))? (recipient '.')* id; assign : fieldVarAccess assignSign expr ; -methCall : (THIS '.')? (recipient '.')* methName; +methCall : ((THIS '.')|(newCall '.'))? (recipient '.')* methName; +newCall: NEW type '(' args? ')'; + recipient : methName | id; methName : id '(' args? ')'; args : expr (',' expr)*; + + literal : NUMBER | BOOLEANLITERAL | CHARLITERAL; id : IDENTIFIER; diff --git a/src/main/java/de/maishai/ExpressionGenerator.java b/src/main/java/de/maishai/ExpressionGenerator.java index de11393..92ecbc7 100644 --- a/src/main/java/de/maishai/ExpressionGenerator.java +++ b/src/main/java/de/maishai/ExpressionGenerator.java @@ -47,7 +47,7 @@ public class ExpressionGenerator extends DecafBaseVisitor { Expression recipient = null; if (ctx.fieldVarAccess().recipient() != null) { List recipientList = ctx.fieldVarAccess().recipient(); - recipient = generateRecursiveOwnerChain(recipientList, null); + recipient = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, ctx.fieldVarAccess().newCall() != null ? StatementGenerator.generateNew(ctx.fieldVarAccess().newCall()) : null); } return new FieldVarAccess(isField, recipient, ctx.fieldVarAccess().id().IDENTIFIER().getText()); } @@ -101,7 +101,7 @@ public class ExpressionGenerator extends DecafBaseVisitor { Expression recursiveOwnerChain = null; if (ctx.methCall().recipient() != null) { List recipientList = ctx.methCall().recipient(); - recursiveOwnerChain = generateRecursiveOwnerChain(recipientList, null); + recursiveOwnerChain = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, ctx.methCall().newCall() != null ? StatementGenerator.generateNew(ctx.methCall().newCall()) : null); } List args = new ArrayList<>(); if (ctx.methCall().methName().args() != null) { @@ -115,21 +115,11 @@ public class ExpressionGenerator extends DecafBaseVisitor { @Override public Expression visitNew(DecafParser.NewContext ctx) { - Type type = ASTGenerator.getType(ctx.type()); - List args = new ArrayList<>(); - if (ctx.args() != null) { - if (ctx.args() != null) { - for (var expr : ctx.args().expr()) { - Expression astExpr = expr.accept(this); - args.add(astExpr); - } - } - } - return new New(type, args); + return StatementGenerator.generateNew(ctx.newCall()); } - public static Expression generateRecursiveOwnerChain(List ctxList, FieldVarAccess recipient) { + public static Expression generateRecursiveOwnerChain(List ctxList, Expression recipient) { if (ctxList.isEmpty()) { return recipient; } diff --git a/src/main/java/de/maishai/StatementGenerator.java b/src/main/java/de/maishai/StatementGenerator.java index 5f07ab5..1beac73 100644 --- a/src/main/java/de/maishai/StatementGenerator.java +++ b/src/main/java/de/maishai/StatementGenerator.java @@ -6,6 +6,7 @@ import de.maishai.ast.Operator; import de.maishai.ast.records.Assignment; import de.maishai.ast.records.Binary; import de.maishai.ast.records.Block; +import de.maishai.ast.records.BoolLiteral; import de.maishai.ast.records.Break; import de.maishai.ast.records.Declaration; import de.maishai.ast.records.DoWhile; @@ -113,7 +114,7 @@ public class StatementGenerator extends DecafBaseVisitor> { Expression recursiveOwnerChain = null; if (ctx.methCall().recipient() != null) { List recipientList = ctx.methCall().recipient(); - recursiveOwnerChain = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, null); + recursiveOwnerChain = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, ctx.methCall().newCall() != null ? generateNew(ctx.methCall().newCall()) : null); } List args = new ArrayList<>(); if (ctx.methCall().methName().args() != null) { @@ -127,6 +128,10 @@ public class StatementGenerator extends DecafBaseVisitor> { @Override public List visitNew(DecafParser.NewContext ctx) { + return List.of( generateNew(ctx.newCall())); + } + + public static New generateNew(DecafParser.NewCallContext ctx){ Type type = ASTGenerator.getType(ctx.type()); List args = new ArrayList<>(); if (ctx.args() != null) { @@ -135,7 +140,7 @@ public class StatementGenerator extends DecafBaseVisitor> { args.add(astExpr); } } - return List.of(new New(type, args)); + return new New(type, args); } public static Expression resolveFancyAssign(DecafParser.AssignSignContext ctx, FieldVarAccess fieldVarAccess, Expression expression) { diff --git a/src/main/java/de/maishai/antlr/Decaf.interp b/src/main/java/de/maishai/antlr/Decaf.interp index 2b95733..d5adbeb 100644 --- a/src/main/java/de/maishai/antlr/Decaf.interp +++ b/src/main/java/de/maishai/antlr/Decaf.interp @@ -125,6 +125,7 @@ unaryOp fieldVarAccess assign methCall +newCall recipient methName args @@ -133,4 +134,4 @@ id atn: -[4, 1, 49, 303, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 60, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 65, 8, 0, 10, 0, 12, 0, 68, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 73, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 3, 3, 83, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 89, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 96, 8, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 114, 8, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 5, 8, 122, 8, 8, 10, 8, 12, 8, 125, 9, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 5, 10, 132, 8, 10, 10, 10, 12, 10, 135, 9, 10, 1, 10, 3, 10, 138, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 156, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 165, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 171, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 193, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 209, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 216, 8, 15, 1, 15, 1, 15, 3, 15, 220, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 233, 8, 16, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 239, 8, 16, 10, 16, 12, 16, 242, 9, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 250, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 255, 8, 19, 10, 19, 12, 19, 258, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 3, 21, 268, 8, 21, 1, 21, 1, 21, 1, 21, 5, 21, 273, 8, 21, 10, 21, 12, 21, 276, 9, 21, 1, 21, 1, 21, 1, 22, 1, 22, 3, 22, 282, 8, 22, 1, 23, 1, 23, 1, 23, 3, 23, 287, 8, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 5, 24, 294, 8, 24, 10, 24, 12, 24, 297, 9, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 0, 1, 32, 27, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 315, 0, 54, 1, 0, 0, 0, 2, 72, 1, 0, 0, 0, 4, 78, 1, 0, 0, 0, 6, 82, 1, 0, 0, 0, 8, 88, 1, 0, 0, 0, 10, 90, 1, 0, 0, 0, 12, 100, 1, 0, 0, 0, 14, 109, 1, 0, 0, 0, 16, 118, 1, 0, 0, 0, 18, 126, 1, 0, 0, 0, 20, 129, 1, 0, 0, 0, 22, 141, 1, 0, 0, 0, 24, 144, 1, 0, 0, 0, 26, 155, 1, 0, 0, 0, 28, 208, 1, 0, 0, 0, 30, 219, 1, 0, 0, 0, 32, 232, 1, 0, 0, 0, 34, 243, 1, 0, 0, 0, 36, 245, 1, 0, 0, 0, 38, 249, 1, 0, 0, 0, 40, 261, 1, 0, 0, 0, 42, 267, 1, 0, 0, 0, 44, 281, 1, 0, 0, 0, 46, 283, 1, 0, 0, 0, 48, 290, 1, 0, 0, 0, 50, 298, 1, 0, 0, 0, 52, 300, 1, 0, 0, 0, 54, 55, 5, 19, 0, 0, 55, 56, 5, 1, 0, 0, 56, 57, 3, 52, 26, 0, 57, 59, 5, 2, 0, 0, 58, 60, 3, 12, 6, 0, 59, 58, 1, 0, 0, 0, 59, 60, 1, 0, 0, 0, 60, 66, 1, 0, 0, 0, 61, 65, 3, 2, 1, 0, 62, 65, 3, 10, 5, 0, 63, 65, 3, 14, 7, 0, 64, 61, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 64, 63, 1, 0, 0, 0, 65, 68, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 66, 67, 1, 0, 0, 0, 67, 69, 1, 0, 0, 0, 68, 66, 1, 0, 0, 0, 69, 70, 5, 3, 0, 0, 70, 1, 1, 0, 0, 0, 71, 73, 5, 19, 0, 0, 72, 71, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 74, 1, 0, 0, 0, 74, 75, 3, 8, 4, 0, 75, 76, 3, 52, 26, 0, 76, 77, 5, 4, 0, 0, 77, 3, 1, 0, 0, 0, 78, 79, 7, 0, 0, 0, 79, 5, 1, 0, 0, 0, 80, 83, 3, 8, 4, 0, 81, 83, 5, 41, 0, 0, 82, 80, 1, 0, 0, 0, 82, 81, 1, 0, 0, 0, 83, 7, 1, 0, 0, 0, 84, 89, 5, 39, 0, 0, 85, 89, 5, 40, 0, 0, 86, 89, 5, 42, 0, 0, 87, 89, 3, 52, 26, 0, 88, 84, 1, 0, 0, 0, 88, 85, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 88, 87, 1, 0, 0, 0, 89, 9, 1, 0, 0, 0, 90, 91, 5, 19, 0, 0, 91, 92, 3, 6, 3, 0, 92, 93, 3, 52, 26, 0, 93, 95, 5, 5, 0, 0, 94, 96, 3, 16, 8, 0, 95, 94, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 97, 1, 0, 0, 0, 97, 98, 5, 6, 0, 0, 98, 99, 3, 20, 10, 0, 99, 11, 1, 0, 0, 0, 100, 101, 5, 19, 0, 0, 101, 102, 5, 7, 0, 0, 102, 103, 5, 41, 0, 0, 103, 104, 5, 8, 0, 0, 104, 105, 5, 5, 0, 0, 105, 106, 5, 9, 0, 0, 106, 107, 5, 6, 0, 0, 107, 108, 3, 20, 10, 0, 108, 13, 1, 0, 0, 0, 109, 110, 5, 19, 0, 0, 110, 111, 3, 52, 26, 0, 111, 113, 5, 5, 0, 0, 112, 114, 3, 16, 8, 0, 113, 112, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 116, 5, 6, 0, 0, 116, 117, 3, 20, 10, 0, 117, 15, 1, 0, 0, 0, 118, 123, 3, 18, 9, 0, 119, 120, 5, 10, 0, 0, 120, 122, 3, 18, 9, 0, 121, 119, 1, 0, 0, 0, 122, 125, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 17, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 126, 127, 3, 8, 4, 0, 127, 128, 3, 52, 26, 0, 128, 19, 1, 0, 0, 0, 129, 133, 5, 2, 0, 0, 130, 132, 3, 28, 14, 0, 131, 130, 1, 0, 0, 0, 132, 135, 1, 0, 0, 0, 133, 131, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 137, 1, 0, 0, 0, 135, 133, 1, 0, 0, 0, 136, 138, 3, 26, 13, 0, 137, 136, 1, 0, 0, 0, 137, 138, 1, 0, 0, 0, 138, 139, 1, 0, 0, 0, 139, 140, 5, 3, 0, 0, 140, 21, 1, 0, 0, 0, 141, 142, 3, 8, 4, 0, 142, 143, 3, 52, 26, 0, 143, 23, 1, 0, 0, 0, 144, 145, 3, 8, 4, 0, 145, 146, 3, 52, 26, 0, 146, 147, 5, 34, 0, 0, 147, 148, 3, 32, 16, 0, 148, 25, 1, 0, 0, 0, 149, 150, 5, 11, 0, 0, 150, 151, 3, 32, 16, 0, 151, 152, 5, 4, 0, 0, 152, 156, 1, 0, 0, 0, 153, 154, 5, 11, 0, 0, 154, 156, 5, 4, 0, 0, 155, 149, 1, 0, 0, 0, 155, 153, 1, 0, 0, 0, 156, 27, 1, 0, 0, 0, 157, 158, 5, 12, 0, 0, 158, 159, 5, 5, 0, 0, 159, 160, 3, 32, 16, 0, 160, 161, 5, 6, 0, 0, 161, 164, 3, 20, 10, 0, 162, 163, 5, 13, 0, 0, 163, 165, 3, 20, 10, 0, 164, 162, 1, 0, 0, 0, 164, 165, 1, 0, 0, 0, 165, 209, 1, 0, 0, 0, 166, 167, 5, 14, 0, 0, 167, 170, 5, 5, 0, 0, 168, 171, 3, 40, 20, 0, 169, 171, 3, 24, 12, 0, 170, 168, 1, 0, 0, 0, 170, 169, 1, 0, 0, 0, 171, 172, 1, 0, 0, 0, 172, 173, 5, 4, 0, 0, 173, 174, 3, 32, 16, 0, 174, 175, 5, 4, 0, 0, 175, 176, 3, 40, 20, 0, 176, 177, 5, 6, 0, 0, 177, 178, 3, 20, 10, 0, 178, 209, 1, 0, 0, 0, 179, 180, 5, 15, 0, 0, 180, 181, 5, 5, 0, 0, 181, 182, 3, 32, 16, 0, 182, 183, 5, 6, 0, 0, 183, 184, 3, 20, 10, 0, 184, 209, 1, 0, 0, 0, 185, 186, 5, 16, 0, 0, 186, 187, 3, 20, 10, 0, 187, 188, 5, 15, 0, 0, 188, 189, 5, 5, 0, 0, 189, 190, 3, 32, 16, 0, 190, 192, 5, 6, 0, 0, 191, 193, 5, 4, 0, 0, 192, 191, 1, 0, 0, 0, 192, 193, 1, 0, 0, 0, 193, 209, 1, 0, 0, 0, 194, 195, 5, 17, 0, 0, 195, 209, 5, 4, 0, 0, 196, 197, 3, 22, 11, 0, 197, 198, 5, 4, 0, 0, 198, 209, 1, 0, 0, 0, 199, 200, 3, 24, 12, 0, 200, 201, 5, 4, 0, 0, 201, 209, 1, 0, 0, 0, 202, 203, 3, 40, 20, 0, 203, 204, 5, 4, 0, 0, 204, 209, 1, 0, 0, 0, 205, 206, 3, 30, 15, 0, 206, 207, 5, 4, 0, 0, 207, 209, 1, 0, 0, 0, 208, 157, 1, 0, 0, 0, 208, 166, 1, 0, 0, 0, 208, 179, 1, 0, 0, 0, 208, 185, 1, 0, 0, 0, 208, 194, 1, 0, 0, 0, 208, 196, 1, 0, 0, 0, 208, 199, 1, 0, 0, 0, 208, 202, 1, 0, 0, 0, 208, 205, 1, 0, 0, 0, 209, 29, 1, 0, 0, 0, 210, 220, 3, 42, 21, 0, 211, 212, 5, 20, 0, 0, 212, 213, 3, 8, 4, 0, 213, 215, 5, 5, 0, 0, 214, 216, 3, 48, 24, 0, 215, 214, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 217, 1, 0, 0, 0, 217, 218, 5, 6, 0, 0, 218, 220, 1, 0, 0, 0, 219, 210, 1, 0, 0, 0, 219, 211, 1, 0, 0, 0, 220, 31, 1, 0, 0, 0, 221, 222, 6, 16, -1, 0, 222, 223, 3, 36, 18, 0, 223, 224, 3, 32, 16, 5, 224, 233, 1, 0, 0, 0, 225, 233, 3, 50, 25, 0, 226, 227, 5, 5, 0, 0, 227, 228, 3, 32, 16, 0, 228, 229, 5, 6, 0, 0, 229, 233, 1, 0, 0, 0, 230, 233, 3, 38, 19, 0, 231, 233, 3, 30, 15, 0, 232, 221, 1, 0, 0, 0, 232, 225, 1, 0, 0, 0, 232, 226, 1, 0, 0, 0, 232, 230, 1, 0, 0, 0, 232, 231, 1, 0, 0, 0, 233, 240, 1, 0, 0, 0, 234, 235, 10, 6, 0, 0, 235, 236, 3, 34, 17, 0, 236, 237, 3, 32, 16, 7, 237, 239, 1, 0, 0, 0, 238, 234, 1, 0, 0, 0, 239, 242, 1, 0, 0, 0, 240, 238, 1, 0, 0, 0, 240, 241, 1, 0, 0, 0, 241, 33, 1, 0, 0, 0, 242, 240, 1, 0, 0, 0, 243, 244, 7, 1, 0, 0, 244, 35, 1, 0, 0, 0, 245, 246, 7, 2, 0, 0, 246, 37, 1, 0, 0, 0, 247, 248, 5, 22, 0, 0, 248, 250, 5, 18, 0, 0, 249, 247, 1, 0, 0, 0, 249, 250, 1, 0, 0, 0, 250, 256, 1, 0, 0, 0, 251, 252, 3, 44, 22, 0, 252, 253, 5, 18, 0, 0, 253, 255, 1, 0, 0, 0, 254, 251, 1, 0, 0, 0, 255, 258, 1, 0, 0, 0, 256, 254, 1, 0, 0, 0, 256, 257, 1, 0, 0, 0, 257, 259, 1, 0, 0, 0, 258, 256, 1, 0, 0, 0, 259, 260, 3, 52, 26, 0, 260, 39, 1, 0, 0, 0, 261, 262, 3, 38, 19, 0, 262, 263, 3, 4, 2, 0, 263, 264, 3, 32, 16, 0, 264, 41, 1, 0, 0, 0, 265, 266, 5, 22, 0, 0, 266, 268, 5, 18, 0, 0, 267, 265, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 274, 1, 0, 0, 0, 269, 270, 3, 44, 22, 0, 270, 271, 5, 18, 0, 0, 271, 273, 1, 0, 0, 0, 272, 269, 1, 0, 0, 0, 273, 276, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 274, 275, 1, 0, 0, 0, 275, 277, 1, 0, 0, 0, 276, 274, 1, 0, 0, 0, 277, 278, 3, 46, 23, 0, 278, 43, 1, 0, 0, 0, 279, 282, 3, 46, 23, 0, 280, 282, 3, 52, 26, 0, 281, 279, 1, 0, 0, 0, 281, 280, 1, 0, 0, 0, 282, 45, 1, 0, 0, 0, 283, 284, 3, 52, 26, 0, 284, 286, 5, 5, 0, 0, 285, 287, 3, 48, 24, 0, 286, 285, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 288, 1, 0, 0, 0, 288, 289, 5, 6, 0, 0, 289, 47, 1, 0, 0, 0, 290, 295, 3, 32, 16, 0, 291, 292, 5, 10, 0, 0, 292, 294, 3, 32, 16, 0, 293, 291, 1, 0, 0, 0, 294, 297, 1, 0, 0, 0, 295, 293, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 49, 1, 0, 0, 0, 297, 295, 1, 0, 0, 0, 298, 299, 7, 3, 0, 0, 299, 51, 1, 0, 0, 0, 300, 301, 5, 45, 0, 0, 301, 53, 1, 0, 0, 0, 27, 59, 64, 66, 72, 82, 88, 95, 113, 123, 133, 137, 155, 164, 170, 192, 208, 215, 219, 232, 240, 249, 256, 267, 274, 281, 286, 295] \ No newline at end of file +[4, 1, 49, 312, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 62, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 67, 8, 0, 10, 0, 12, 0, 70, 9, 0, 1, 0, 1, 0, 1, 1, 3, 1, 75, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 3, 3, 85, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 91, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 98, 8, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 116, 8, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 5, 8, 124, 8, 8, 10, 8, 12, 8, 127, 9, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 5, 10, 134, 8, 10, 10, 10, 12, 10, 137, 9, 10, 1, 10, 3, 10, 140, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 158, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 167, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 173, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 195, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 211, 8, 14, 1, 15, 1, 15, 3, 15, 215, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 228, 8, 16, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 234, 8, 16, 10, 16, 12, 16, 237, 9, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 3, 19, 248, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 253, 8, 19, 10, 19, 12, 19, 256, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 3, 21, 269, 8, 21, 1, 21, 1, 21, 1, 21, 5, 21, 274, 8, 21, 10, 21, 12, 21, 277, 9, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 3, 22, 285, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 3, 23, 291, 8, 23, 1, 24, 1, 24, 1, 24, 3, 24, 296, 8, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 5, 25, 303, 8, 25, 10, 25, 12, 25, 306, 9, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 0, 1, 32, 28, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 325, 0, 56, 1, 0, 0, 0, 2, 74, 1, 0, 0, 0, 4, 80, 1, 0, 0, 0, 6, 84, 1, 0, 0, 0, 8, 90, 1, 0, 0, 0, 10, 92, 1, 0, 0, 0, 12, 102, 1, 0, 0, 0, 14, 111, 1, 0, 0, 0, 16, 120, 1, 0, 0, 0, 18, 128, 1, 0, 0, 0, 20, 131, 1, 0, 0, 0, 22, 143, 1, 0, 0, 0, 24, 146, 1, 0, 0, 0, 26, 157, 1, 0, 0, 0, 28, 210, 1, 0, 0, 0, 30, 214, 1, 0, 0, 0, 32, 227, 1, 0, 0, 0, 34, 238, 1, 0, 0, 0, 36, 240, 1, 0, 0, 0, 38, 247, 1, 0, 0, 0, 40, 259, 1, 0, 0, 0, 42, 268, 1, 0, 0, 0, 44, 280, 1, 0, 0, 0, 46, 290, 1, 0, 0, 0, 48, 292, 1, 0, 0, 0, 50, 299, 1, 0, 0, 0, 52, 307, 1, 0, 0, 0, 54, 309, 1, 0, 0, 0, 56, 57, 5, 19, 0, 0, 57, 58, 5, 1, 0, 0, 58, 59, 3, 54, 27, 0, 59, 61, 5, 2, 0, 0, 60, 62, 3, 12, 6, 0, 61, 60, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 68, 1, 0, 0, 0, 63, 67, 3, 2, 1, 0, 64, 67, 3, 10, 5, 0, 65, 67, 3, 14, 7, 0, 66, 63, 1, 0, 0, 0, 66, 64, 1, 0, 0, 0, 66, 65, 1, 0, 0, 0, 67, 70, 1, 0, 0, 0, 68, 66, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 71, 1, 0, 0, 0, 70, 68, 1, 0, 0, 0, 71, 72, 5, 3, 0, 0, 72, 1, 1, 0, 0, 0, 73, 75, 5, 19, 0, 0, 74, 73, 1, 0, 0, 0, 74, 75, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 77, 3, 8, 4, 0, 77, 78, 3, 54, 27, 0, 78, 79, 5, 4, 0, 0, 79, 3, 1, 0, 0, 0, 80, 81, 7, 0, 0, 0, 81, 5, 1, 0, 0, 0, 82, 85, 3, 8, 4, 0, 83, 85, 5, 41, 0, 0, 84, 82, 1, 0, 0, 0, 84, 83, 1, 0, 0, 0, 85, 7, 1, 0, 0, 0, 86, 91, 5, 39, 0, 0, 87, 91, 5, 40, 0, 0, 88, 91, 5, 42, 0, 0, 89, 91, 3, 54, 27, 0, 90, 86, 1, 0, 0, 0, 90, 87, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 90, 89, 1, 0, 0, 0, 91, 9, 1, 0, 0, 0, 92, 93, 5, 19, 0, 0, 93, 94, 3, 6, 3, 0, 94, 95, 3, 54, 27, 0, 95, 97, 5, 5, 0, 0, 96, 98, 3, 16, 8, 0, 97, 96, 1, 0, 0, 0, 97, 98, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 100, 5, 6, 0, 0, 100, 101, 3, 20, 10, 0, 101, 11, 1, 0, 0, 0, 102, 103, 5, 19, 0, 0, 103, 104, 5, 7, 0, 0, 104, 105, 5, 41, 0, 0, 105, 106, 5, 8, 0, 0, 106, 107, 5, 5, 0, 0, 107, 108, 5, 9, 0, 0, 108, 109, 5, 6, 0, 0, 109, 110, 3, 20, 10, 0, 110, 13, 1, 0, 0, 0, 111, 112, 5, 19, 0, 0, 112, 113, 3, 54, 27, 0, 113, 115, 5, 5, 0, 0, 114, 116, 3, 16, 8, 0, 115, 114, 1, 0, 0, 0, 115, 116, 1, 0, 0, 0, 116, 117, 1, 0, 0, 0, 117, 118, 5, 6, 0, 0, 118, 119, 3, 20, 10, 0, 119, 15, 1, 0, 0, 0, 120, 125, 3, 18, 9, 0, 121, 122, 5, 10, 0, 0, 122, 124, 3, 18, 9, 0, 123, 121, 1, 0, 0, 0, 124, 127, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 17, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 128, 129, 3, 8, 4, 0, 129, 130, 3, 54, 27, 0, 130, 19, 1, 0, 0, 0, 131, 135, 5, 2, 0, 0, 132, 134, 3, 28, 14, 0, 133, 132, 1, 0, 0, 0, 134, 137, 1, 0, 0, 0, 135, 133, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 139, 1, 0, 0, 0, 137, 135, 1, 0, 0, 0, 138, 140, 3, 26, 13, 0, 139, 138, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 142, 5, 3, 0, 0, 142, 21, 1, 0, 0, 0, 143, 144, 3, 8, 4, 0, 144, 145, 3, 54, 27, 0, 145, 23, 1, 0, 0, 0, 146, 147, 3, 8, 4, 0, 147, 148, 3, 54, 27, 0, 148, 149, 5, 34, 0, 0, 149, 150, 3, 32, 16, 0, 150, 25, 1, 0, 0, 0, 151, 152, 5, 11, 0, 0, 152, 153, 3, 32, 16, 0, 153, 154, 5, 4, 0, 0, 154, 158, 1, 0, 0, 0, 155, 156, 5, 11, 0, 0, 156, 158, 5, 4, 0, 0, 157, 151, 1, 0, 0, 0, 157, 155, 1, 0, 0, 0, 158, 27, 1, 0, 0, 0, 159, 160, 5, 12, 0, 0, 160, 161, 5, 5, 0, 0, 161, 162, 3, 32, 16, 0, 162, 163, 5, 6, 0, 0, 163, 166, 3, 20, 10, 0, 164, 165, 5, 13, 0, 0, 165, 167, 3, 20, 10, 0, 166, 164, 1, 0, 0, 0, 166, 167, 1, 0, 0, 0, 167, 211, 1, 0, 0, 0, 168, 169, 5, 14, 0, 0, 169, 172, 5, 5, 0, 0, 170, 173, 3, 40, 20, 0, 171, 173, 3, 24, 12, 0, 172, 170, 1, 0, 0, 0, 172, 171, 1, 0, 0, 0, 173, 174, 1, 0, 0, 0, 174, 175, 5, 4, 0, 0, 175, 176, 3, 32, 16, 0, 176, 177, 5, 4, 0, 0, 177, 178, 3, 40, 20, 0, 178, 179, 5, 6, 0, 0, 179, 180, 3, 20, 10, 0, 180, 211, 1, 0, 0, 0, 181, 182, 5, 15, 0, 0, 182, 183, 5, 5, 0, 0, 183, 184, 3, 32, 16, 0, 184, 185, 5, 6, 0, 0, 185, 186, 3, 20, 10, 0, 186, 211, 1, 0, 0, 0, 187, 188, 5, 16, 0, 0, 188, 189, 3, 20, 10, 0, 189, 190, 5, 15, 0, 0, 190, 191, 5, 5, 0, 0, 191, 192, 3, 32, 16, 0, 192, 194, 5, 6, 0, 0, 193, 195, 5, 4, 0, 0, 194, 193, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 211, 1, 0, 0, 0, 196, 197, 5, 17, 0, 0, 197, 211, 5, 4, 0, 0, 198, 199, 3, 22, 11, 0, 199, 200, 5, 4, 0, 0, 200, 211, 1, 0, 0, 0, 201, 202, 3, 24, 12, 0, 202, 203, 5, 4, 0, 0, 203, 211, 1, 0, 0, 0, 204, 205, 3, 40, 20, 0, 205, 206, 5, 4, 0, 0, 206, 211, 1, 0, 0, 0, 207, 208, 3, 30, 15, 0, 208, 209, 5, 4, 0, 0, 209, 211, 1, 0, 0, 0, 210, 159, 1, 0, 0, 0, 210, 168, 1, 0, 0, 0, 210, 181, 1, 0, 0, 0, 210, 187, 1, 0, 0, 0, 210, 196, 1, 0, 0, 0, 210, 198, 1, 0, 0, 0, 210, 201, 1, 0, 0, 0, 210, 204, 1, 0, 0, 0, 210, 207, 1, 0, 0, 0, 211, 29, 1, 0, 0, 0, 212, 215, 3, 42, 21, 0, 213, 215, 3, 44, 22, 0, 214, 212, 1, 0, 0, 0, 214, 213, 1, 0, 0, 0, 215, 31, 1, 0, 0, 0, 216, 217, 6, 16, -1, 0, 217, 218, 3, 36, 18, 0, 218, 219, 3, 32, 16, 5, 219, 228, 1, 0, 0, 0, 220, 228, 3, 52, 26, 0, 221, 222, 5, 5, 0, 0, 222, 223, 3, 32, 16, 0, 223, 224, 5, 6, 0, 0, 224, 228, 1, 0, 0, 0, 225, 228, 3, 38, 19, 0, 226, 228, 3, 30, 15, 0, 227, 216, 1, 0, 0, 0, 227, 220, 1, 0, 0, 0, 227, 221, 1, 0, 0, 0, 227, 225, 1, 0, 0, 0, 227, 226, 1, 0, 0, 0, 228, 235, 1, 0, 0, 0, 229, 230, 10, 6, 0, 0, 230, 231, 3, 34, 17, 0, 231, 232, 3, 32, 16, 7, 232, 234, 1, 0, 0, 0, 233, 229, 1, 0, 0, 0, 234, 237, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 33, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0, 238, 239, 7, 1, 0, 0, 239, 35, 1, 0, 0, 0, 240, 241, 7, 2, 0, 0, 241, 37, 1, 0, 0, 0, 242, 243, 5, 22, 0, 0, 243, 248, 5, 18, 0, 0, 244, 245, 3, 44, 22, 0, 245, 246, 5, 18, 0, 0, 246, 248, 1, 0, 0, 0, 247, 242, 1, 0, 0, 0, 247, 244, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 254, 1, 0, 0, 0, 249, 250, 3, 46, 23, 0, 250, 251, 5, 18, 0, 0, 251, 253, 1, 0, 0, 0, 252, 249, 1, 0, 0, 0, 253, 256, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 257, 1, 0, 0, 0, 256, 254, 1, 0, 0, 0, 257, 258, 3, 54, 27, 0, 258, 39, 1, 0, 0, 0, 259, 260, 3, 38, 19, 0, 260, 261, 3, 4, 2, 0, 261, 262, 3, 32, 16, 0, 262, 41, 1, 0, 0, 0, 263, 264, 5, 22, 0, 0, 264, 269, 5, 18, 0, 0, 265, 266, 3, 44, 22, 0, 266, 267, 5, 18, 0, 0, 267, 269, 1, 0, 0, 0, 268, 263, 1, 0, 0, 0, 268, 265, 1, 0, 0, 0, 268, 269, 1, 0, 0, 0, 269, 275, 1, 0, 0, 0, 270, 271, 3, 46, 23, 0, 271, 272, 5, 18, 0, 0, 272, 274, 1, 0, 0, 0, 273, 270, 1, 0, 0, 0, 274, 277, 1, 0, 0, 0, 275, 273, 1, 0, 0, 0, 275, 276, 1, 0, 0, 0, 276, 278, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 278, 279, 3, 48, 24, 0, 279, 43, 1, 0, 0, 0, 280, 281, 5, 20, 0, 0, 281, 282, 3, 8, 4, 0, 282, 284, 5, 5, 0, 0, 283, 285, 3, 50, 25, 0, 284, 283, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 286, 1, 0, 0, 0, 286, 287, 5, 6, 0, 0, 287, 45, 1, 0, 0, 0, 288, 291, 3, 48, 24, 0, 289, 291, 3, 54, 27, 0, 290, 288, 1, 0, 0, 0, 290, 289, 1, 0, 0, 0, 291, 47, 1, 0, 0, 0, 292, 293, 3, 54, 27, 0, 293, 295, 5, 5, 0, 0, 294, 296, 3, 50, 25, 0, 295, 294, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 298, 5, 6, 0, 0, 298, 49, 1, 0, 0, 0, 299, 304, 3, 32, 16, 0, 300, 301, 5, 10, 0, 0, 301, 303, 3, 32, 16, 0, 302, 300, 1, 0, 0, 0, 303, 306, 1, 0, 0, 0, 304, 302, 1, 0, 0, 0, 304, 305, 1, 0, 0, 0, 305, 51, 1, 0, 0, 0, 306, 304, 1, 0, 0, 0, 307, 308, 7, 3, 0, 0, 308, 53, 1, 0, 0, 0, 309, 310, 5, 45, 0, 0, 310, 55, 1, 0, 0, 0, 27, 61, 66, 68, 74, 84, 90, 97, 115, 125, 135, 139, 157, 166, 172, 194, 210, 214, 227, 235, 247, 254, 268, 275, 284, 290, 295, 304] \ No newline at end of file diff --git a/src/main/java/de/maishai/antlr/DecafBaseListener.java b/src/main/java/de/maishai/antlr/DecafBaseListener.java index c74fcc9..f675d24 100644 --- a/src/main/java/de/maishai/antlr/DecafBaseListener.java +++ b/src/main/java/de/maishai/antlr/DecafBaseListener.java @@ -444,6 +444,18 @@ public class DecafBaseListener implements DecafListener { *

The default implementation does nothing.

*/ @Override public void exitMethCall(DecafParser.MethCallContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterNewCall(DecafParser.NewCallContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitNewCall(DecafParser.NewCallContext ctx) { } /** * {@inheritDoc} * diff --git a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java index 97c3af4..f603dea 100644 --- a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java +++ b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java @@ -264,6 +264,13 @@ public class DecafBaseVisitor extends AbstractParseTreeVisitor implements * {@link #visitChildren} on {@code ctx}.

*/ @Override public T visitMethCall(DecafParser.MethCallContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitNewCall(DecafParser.NewCallContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/src/main/java/de/maishai/antlr/DecafListener.java b/src/main/java/de/maishai/antlr/DecafListener.java index 7428da8..a0e836d 100644 --- a/src/main/java/de/maishai/antlr/DecafListener.java +++ b/src/main/java/de/maishai/antlr/DecafListener.java @@ -401,6 +401,16 @@ public interface DecafListener extends ParseTreeListener { * @param ctx the parse tree */ void exitMethCall(DecafParser.MethCallContext ctx); + /** + * Enter a parse tree produced by {@link DecafParser#newCall}. + * @param ctx the parse tree + */ + void enterNewCall(DecafParser.NewCallContext ctx); + /** + * Exit a parse tree produced by {@link DecafParser#newCall}. + * @param ctx the parse tree + */ + void exitNewCall(DecafParser.NewCallContext ctx); /** * Enter a parse tree produced by {@link DecafParser#recipient}. * @param ctx the parse tree diff --git a/src/main/java/de/maishai/antlr/DecafParser.java b/src/main/java/de/maishai/antlr/DecafParser.java index 2f43cc7..6c40886 100644 --- a/src/main/java/de/maishai/antlr/DecafParser.java +++ b/src/main/java/de/maishai/antlr/DecafParser.java @@ -30,14 +30,16 @@ public class DecafParser extends Parser { RULE_params = 8, RULE_param = 9, RULE_block = 10, RULE_localVar = 11, RULE_localVarWithInitialization = 12, RULE_return = 13, RULE_stmt = 14, RULE_stmtexpr = 15, RULE_expr = 16, RULE_binaryOp = 17, RULE_unaryOp = 18, - RULE_fieldVarAccess = 19, RULE_assign = 20, RULE_methCall = 21, RULE_recipient = 22, - RULE_methName = 23, RULE_args = 24, RULE_literal = 25, RULE_id = 26; + RULE_fieldVarAccess = 19, RULE_assign = 20, RULE_methCall = 21, RULE_newCall = 22, + RULE_recipient = 23, RULE_methName = 24, RULE_args = 25, RULE_literal = 26, + RULE_id = 27; private static String[] makeRuleNames() { return new String[] { "class", "field", "assignSign", "returntype", "type", "meth", "mainmeth", "constructor", "params", "param", "block", "localVar", "localVarWithInitialization", "return", "stmt", "stmtexpr", "expr", "binaryOp", "unaryOp", "fieldVarAccess", - "assign", "methCall", "recipient", "methName", "args", "literal", "id" + "assign", "methCall", "newCall", "recipient", "methName", "args", "literal", + "id" }; } public static final String[] ruleNames = makeRuleNames(); @@ -167,57 +169,57 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(54); - match(PUBLIC); - setState(55); - match(T__0); setState(56); - id(); + match(PUBLIC); setState(57); - match(T__1); + match(T__0); + setState(58); + id(); setState(59); + match(T__1); + setState(61); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,0,_ctx) ) { case 1: { - setState(58); + setState(60); mainmeth(); } break; } - setState(66); + setState(68); _errHandler.sync(this); _la = _input.LA(1); while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686565888L) != 0)) { { - setState(64); + setState(66); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) { case 1: { - setState(61); + setState(63); field(); } break; case 2: { - setState(62); + setState(64); meth(); } break; case 3: { - setState(63); + setState(65); constructor(); } break; } } - setState(68); + setState(70); _errHandler.sync(this); _la = _input.LA(1); } - setState(69); + setState(71); match(T__2); } } @@ -267,21 +269,21 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(72); + setState(74); _errHandler.sync(this); _la = _input.LA(1); if (_la==PUBLIC) { { - setState(71); + setState(73); match(PUBLIC); } } - setState(74); - type(); - setState(75); - id(); setState(76); + type(); + setState(77); + id(); + setState(78); match(T__3); } } @@ -328,7 +330,7 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(78); + setState(80); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 257698037760L) != 0)) ) { _errHandler.recoverInline(this); @@ -380,7 +382,7 @@ public class DecafParser extends Parser { ReturntypeContext _localctx = new ReturntypeContext(_ctx, getState()); enterRule(_localctx, 6, RULE_returntype); try { - setState(82); + setState(84); _errHandler.sync(this); switch (_input.LA(1)) { case INT: @@ -389,14 +391,14 @@ public class DecafParser extends Parser { case IDENTIFIER: enterOuterAlt(_localctx, 1); { - setState(80); + setState(82); type(); } break; case VOID: enterOuterAlt(_localctx, 2); { - setState(81); + setState(83); match(VOID); } break; @@ -446,34 +448,34 @@ public class DecafParser extends Parser { TypeContext _localctx = new TypeContext(_ctx, getState()); enterRule(_localctx, 8, RULE_type); try { - setState(88); + setState(90); _errHandler.sync(this); switch (_input.LA(1)) { case INT: enterOuterAlt(_localctx, 1); { - setState(84); + setState(86); match(INT); } break; case BOOL: enterOuterAlt(_localctx, 2); { - setState(85); + setState(87); match(BOOL); } break; case CHAR: enterOuterAlt(_localctx, 3); { - setState(86); + setState(88); match(CHAR); } break; case IDENTIFIER: enterOuterAlt(_localctx, 4); { - setState(87); + setState(89); id(); } break; @@ -533,27 +535,27 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(90); - match(PUBLIC); - setState(91); - returntype(); setState(92); - id(); + match(PUBLIC); setState(93); - match(T__4); + returntype(); + setState(94); + id(); setState(95); + match(T__4); + setState(97); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686041600L) != 0)) { { - setState(94); + setState(96); params(); } } - setState(97); + setState(99); match(T__5); - setState(98); + setState(100); block(); } } @@ -600,21 +602,21 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(100); - match(PUBLIC); - setState(101); - match(T__6); setState(102); - match(VOID); + match(PUBLIC); setState(103); - match(T__7); + match(T__6); setState(104); - match(T__4); + match(VOID); setState(105); - match(T__8); + match(T__7); setState(106); - match(T__5); + match(T__4); setState(107); + match(T__8); + setState(108); + match(T__5); + setState(109); block(); } } @@ -667,25 +669,25 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(109); - match(PUBLIC); - setState(110); - id(); setState(111); - match(T__4); + match(PUBLIC); + setState(112); + id(); setState(113); + match(T__4); + setState(115); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686041600L) != 0)) { { - setState(112); + setState(114); params(); } } - setState(115); + setState(117); match(T__5); - setState(116); + setState(118); block(); } } @@ -734,21 +736,21 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(118); + setState(120); param(); - setState(123); + setState(125); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__9) { { { - setState(119); + setState(121); match(T__9); - setState(120); + setState(122); param(); } } - setState(125); + setState(127); _errHandler.sync(this); _la = _input.LA(1); } @@ -798,9 +800,9 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(126); + setState(128); type(); - setState(127); + setState(129); id(); } } @@ -852,33 +854,33 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(129); + setState(131); match(T__1); - setState(133); + setState(135); _errHandler.sync(this); _la = _input.LA(1); while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231691534336L) != 0)) { { { - setState(130); + setState(132); stmt(); } } - setState(135); + setState(137); _errHandler.sync(this); _la = _input.LA(1); } - setState(137); + setState(139); _errHandler.sync(this); _la = _input.LA(1); if (_la==T__10) { { - setState(136); + setState(138); return_(); } } - setState(139); + setState(141); match(T__2); } } @@ -926,9 +928,9 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(141); + setState(143); type(); - setState(142); + setState(144); id(); } } @@ -980,13 +982,13 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(144); - type(); - setState(145); - id(); setState(146); - match(ASSIGN); + type(); setState(147); + id(); + setState(148); + match(ASSIGN); + setState(149); expr(0); } } @@ -1029,26 +1031,26 @@ public class DecafParser extends Parser { ReturnContext _localctx = new ReturnContext(_ctx, getState()); enterRule(_localctx, 26, RULE_return); try { - setState(155); + setState(157); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(149); - match(T__10); - setState(150); - expr(0); setState(151); + match(T__10); + setState(152); + expr(0); + setState(153); match(T__3); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(153); + setState(155); match(T__10); - setState(154); + setState(156); match(T__3); } break; @@ -1284,31 +1286,31 @@ public class DecafParser extends Parser { enterRule(_localctx, 28, RULE_stmt); int _la; try { - setState(208); + setState(210); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) { case 1: _localctx = new IfContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(157); - match(T__11); - setState(158); - match(T__4); setState(159); - expr(0); + match(T__11); setState(160); - match(T__5); + match(T__4); setState(161); + expr(0); + setState(162); + match(T__5); + setState(163); block(); - setState(164); + setState(166); _errHandler.sync(this); _la = _input.LA(1); if (_la==T__12) { { - setState(162); + setState(164); match(T__12); - setState(163); + setState(165); block(); } } @@ -1319,37 +1321,37 @@ public class DecafParser extends Parser { _localctx = new ForContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(166); + setState(168); match(T__13); - setState(167); + setState(169); match(T__4); - setState(170); + setState(172); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) { case 1: { - setState(168); + setState(170); assign(); } break; case 2: { - setState(169); + setState(171); localVarWithInitialization(); } break; } - setState(172); - match(T__3); - setState(173); - expr(0); setState(174); match(T__3); setState(175); - assign(); + expr(0); setState(176); - match(T__5); + match(T__3); setState(177); + assign(); + setState(178); + match(T__5); + setState(179); block(); } break; @@ -1357,15 +1359,15 @@ public class DecafParser extends Parser { _localctx = new WhileContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(179); - match(T__14); - setState(180); - match(T__4); setState(181); - expr(0); + match(T__14); setState(182); - match(T__5); + match(T__4); setState(183); + expr(0); + setState(184); + match(T__5); + setState(185); block(); } break; @@ -1373,24 +1375,24 @@ public class DecafParser extends Parser { _localctx = new DoWhileContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(185); - match(T__15); - setState(186); - block(); setState(187); - match(T__14); + match(T__15); setState(188); - match(T__4); + block(); setState(189); - expr(0); + match(T__14); setState(190); - match(T__5); + match(T__4); + setState(191); + expr(0); setState(192); + match(T__5); + setState(194); _errHandler.sync(this); _la = _input.LA(1); if (_la==T__3) { { - setState(191); + setState(193); match(T__3); } } @@ -1401,9 +1403,9 @@ public class DecafParser extends Parser { _localctx = new BreakContext(_localctx); enterOuterAlt(_localctx, 5); { - setState(194); + setState(196); match(T__16); - setState(195); + setState(197); match(T__3); } break; @@ -1411,9 +1413,9 @@ public class DecafParser extends Parser { _localctx = new LocalVarDecContext(_localctx); enterOuterAlt(_localctx, 6); { - setState(196); + setState(198); localVar(); - setState(197); + setState(199); match(T__3); } break; @@ -1421,9 +1423,9 @@ public class DecafParser extends Parser { _localctx = new LocalVarDecWithInitializationContext(_localctx); enterOuterAlt(_localctx, 7); { - setState(199); + setState(201); localVarWithInitialization(); - setState(200); + setState(202); match(T__3); } break; @@ -1431,9 +1433,9 @@ public class DecafParser extends Parser { _localctx = new AssignmentContext(_localctx); enterOuterAlt(_localctx, 8); { - setState(202); + setState(204); assign(); - setState(203); + setState(205); match(T__3); } break; @@ -1441,9 +1443,9 @@ public class DecafParser extends Parser { _localctx = new StatementExpressionstmtContext(_localctx); enterOuterAlt(_localctx, 9); { - setState(205); + setState(207); stmtexpr(); - setState(206); + setState(208); match(T__3); } break; @@ -1474,12 +1476,8 @@ public class DecafParser extends Parser { } @SuppressWarnings("CheckReturnValue") public static class NewContext extends StmtexprContext { - public TerminalNode NEW() { return getToken(DecafParser.NEW, 0); } - public TypeContext type() { - return getRuleContext(TypeContext.class,0); - } - public ArgsContext args() { - return getRuleContext(ArgsContext.class,0); + public NewCallContext newCall() { + return getRuleContext(NewCallContext.class,0); } public NewContext(StmtexprContext ctx) { copyFrom(ctx); } @Override @@ -1520,46 +1518,26 @@ public class DecafParser extends Parser { public final StmtexprContext stmtexpr() throws RecognitionException { StmtexprContext _localctx = new StmtexprContext(_ctx, getState()); enterRule(_localctx, 30, RULE_stmtexpr); - int _la; try { - setState(219); + setState(214); _errHandler.sync(this); - switch (_input.LA(1)) { - case THIS: - case IDENTIFIER: + switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) { + case 1: _localctx = new MethodCallContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(210); + setState(212); methCall(); } break; - case NEW: + case 2: _localctx = new NewContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(211); - match(NEW); - setState(212); - type(); setState(213); - match(T__4); - setState(215); - _errHandler.sync(this); - _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216286871584L) != 0)) { - { - setState(214); - args(); - } - } - - setState(217); - match(T__5); + newCall(); } break; - default: - throw new NoViableAltException(this); } } catch (RecognitionException re) { @@ -1730,18 +1708,18 @@ public class DecafParser extends Parser { int _alt; enterOuterAlt(_localctx, 1); { - setState(232); + setState(227); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,17,_ctx) ) { case 1: { _localctx = new UnaryOperationContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(222); + setState(217); unaryOp(); - setState(223); + setState(218); expr(5); } break; @@ -1750,7 +1728,7 @@ public class DecafParser extends Parser { _localctx = new ConstantContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(225); + setState(220); literal(); } break; @@ -1759,11 +1737,11 @@ public class DecafParser extends Parser { _localctx = new ExpressionContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(226); + setState(221); match(T__4); - setState(227); + setState(222); expr(0); - setState(228); + setState(223); match(T__5); } break; @@ -1772,7 +1750,7 @@ public class DecafParser extends Parser { _localctx = new IdentifierContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(230); + setState(225); fieldVarAccess(); } break; @@ -1781,15 +1759,15 @@ public class DecafParser extends Parser { _localctx = new StatementExpressionexprContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(231); + setState(226); stmtexpr(); } break; } _ctx.stop = _input.LT(-1); - setState(240); + setState(235); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,19,_ctx); + _alt = getInterpreter().adaptivePredict(_input,18,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { if ( _parseListeners!=null ) triggerExitRuleEvent(); @@ -1798,18 +1776,18 @@ public class DecafParser extends Parser { { _localctx = new BinaryOperationContext(new ExprContext(_parentctx, _parentState)); pushNewRecursionContext(_localctx, _startState, RULE_expr); - setState(234); + setState(229); if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)"); - setState(235); + setState(230); binaryOp(); - setState(236); + setState(231); expr(7); } } } - setState(242); + setState(237); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,19,_ctx); + _alt = getInterpreter().adaptivePredict(_input,18,_ctx); } } } @@ -1863,7 +1841,7 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(243); + setState(238); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 17171480576L) != 0)) ) { _errHandler.recoverInline(this); @@ -1916,7 +1894,7 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(245); + setState(240); _la = _input.LA(1); if ( !(_la==SUB || _la==NOT) ) { _errHandler.recoverInline(this); @@ -1944,13 +1922,16 @@ public class DecafParser extends Parser { public IdContext id() { return getRuleContext(IdContext.class,0); } - public TerminalNode THIS() { return getToken(DecafParser.THIS, 0); } public List recipient() { return getRuleContexts(RecipientContext.class); } public RecipientContext recipient(int i) { return getRuleContext(RecipientContext.class,i); } + public TerminalNode THIS() { return getToken(DecafParser.THIS, 0); } + public NewCallContext newCall() { + return getRuleContext(NewCallContext.class,0); + } public FieldVarAccessContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); } @@ -1973,42 +1954,57 @@ public class DecafParser extends Parser { public final FieldVarAccessContext fieldVarAccess() throws RecognitionException { FieldVarAccessContext _localctx = new FieldVarAccessContext(_ctx, getState()); enterRule(_localctx, 38, RULE_fieldVarAccess); - int _la; try { int _alt; enterOuterAlt(_localctx, 1); { - setState(249); + setState(247); _errHandler.sync(this); - _la = _input.LA(1); - if (_la==THIS) { + switch (_input.LA(1)) { + case THIS: { - setState(247); + { + setState(242); match(THIS); - setState(248); + setState(243); match(T__17); } + } + break; + case NEW: + { + { + setState(244); + newCall(); + setState(245); + match(T__17); + } + } + break; + case IDENTIFIER: + break; + default: + break; } - - setState(256); + setState(254); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,21,_ctx); + _alt = getInterpreter().adaptivePredict(_input,20,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(251); + setState(249); recipient(); - setState(252); + setState(250); match(T__17); } } } - setState(258); + setState(256); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,21,_ctx); + _alt = getInterpreter().adaptivePredict(_input,20,_ctx); } - setState(259); + setState(257); id(); } } @@ -2059,11 +2055,11 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(261); + setState(259); fieldVarAccess(); - setState(262); + setState(260); assignSign(); - setState(263); + setState(261); expr(0); } } @@ -2083,13 +2079,16 @@ public class DecafParser extends Parser { public MethNameContext methName() { return getRuleContext(MethNameContext.class,0); } - public TerminalNode THIS() { return getToken(DecafParser.THIS, 0); } public List recipient() { return getRuleContexts(RecipientContext.class); } public RecipientContext recipient(int i) { return getRuleContext(RecipientContext.class,i); } + public TerminalNode THIS() { return getToken(DecafParser.THIS, 0); } + public NewCallContext newCall() { + return getRuleContext(NewCallContext.class,0); + } public MethCallContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); } @@ -2112,42 +2111,57 @@ public class DecafParser extends Parser { public final MethCallContext methCall() throws RecognitionException { MethCallContext _localctx = new MethCallContext(_ctx, getState()); enterRule(_localctx, 42, RULE_methCall); - int _la; try { int _alt; enterOuterAlt(_localctx, 1); { - setState(267); + setState(268); _errHandler.sync(this); - _la = _input.LA(1); - if (_la==THIS) { + switch (_input.LA(1)) { + case THIS: + { + { + setState(263); + match(THIS); + setState(264); + match(T__17); + } + } + break; + case NEW: + { { setState(265); - match(THIS); + newCall(); setState(266); match(T__17); } + } + break; + case IDENTIFIER: + break; + default: + break; } - - setState(274); + setState(275); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,23,_ctx); + _alt = getInterpreter().adaptivePredict(_input,22,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(269); - recipient(); setState(270); + recipient(); + setState(271); match(T__17); } } } - setState(276); + setState(277); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,23,_ctx); + _alt = getInterpreter().adaptivePredict(_input,22,_ctx); } - setState(277); + setState(278); methName(); } } @@ -2162,6 +2176,72 @@ public class DecafParser extends Parser { return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class NewCallContext extends ParserRuleContext { + public TerminalNode NEW() { return getToken(DecafParser.NEW, 0); } + public TypeContext type() { + return getRuleContext(TypeContext.class,0); + } + public ArgsContext args() { + return getRuleContext(ArgsContext.class,0); + } + public NewCallContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_newCall; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof DecafListener ) ((DecafListener)listener).enterNewCall(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof DecafListener ) ((DecafListener)listener).exitNewCall(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof DecafVisitor ) return ((DecafVisitor)visitor).visitNewCall(this); + else return visitor.visitChildren(this); + } + } + + public final NewCallContext newCall() throws RecognitionException { + NewCallContext _localctx = new NewCallContext(_ctx, getState()); + enterRule(_localctx, 44, RULE_newCall); + int _la; + try { + enterOuterAlt(_localctx, 1); + { + setState(280); + match(NEW); + setState(281); + type(); + setState(282); + match(T__4); + setState(284); + _errHandler.sync(this); + _la = _input.LA(1); + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216286871584L) != 0)) { + { + setState(283); + args(); + } + } + + setState(286); + match(T__5); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + @SuppressWarnings("CheckReturnValue") public static class RecipientContext extends ParserRuleContext { public MethNameContext methName() { @@ -2191,22 +2271,22 @@ public class DecafParser extends Parser { public final RecipientContext recipient() throws RecognitionException { RecipientContext _localctx = new RecipientContext(_ctx, getState()); - enterRule(_localctx, 44, RULE_recipient); + enterRule(_localctx, 46, RULE_recipient); try { - setState(281); + setState(290); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(279); + setState(288); methName(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(280); + setState(289); id(); } break; @@ -2252,26 +2332,26 @@ public class DecafParser extends Parser { public final MethNameContext methName() throws RecognitionException { MethNameContext _localctx = new MethNameContext(_ctx, getState()); - enterRule(_localctx, 46, RULE_methName); + enterRule(_localctx, 48, RULE_methName); int _la; try { enterOuterAlt(_localctx, 1); { - setState(283); + setState(292); id(); - setState(284); + setState(293); match(T__4); - setState(286); + setState(295); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216286871584L) != 0)) { { - setState(285); + setState(294); args(); } } - setState(288); + setState(297); match(T__5); } } @@ -2315,26 +2395,26 @@ public class DecafParser extends Parser { public final ArgsContext args() throws RecognitionException { ArgsContext _localctx = new ArgsContext(_ctx, getState()); - enterRule(_localctx, 48, RULE_args); + enterRule(_localctx, 50, RULE_args); int _la; try { enterOuterAlt(_localctx, 1); { - setState(290); + setState(299); expr(0); - setState(295); + setState(304); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__9) { { { - setState(291); + setState(300); match(T__9); - setState(292); + setState(301); expr(0); } } - setState(297); + setState(306); _errHandler.sync(this); _la = _input.LA(1); } @@ -2377,12 +2457,12 @@ public class DecafParser extends Parser { public final LiteralContext literal() throws RecognitionException { LiteralContext _localctx = new LiteralContext(_ctx, getState()); - enterRule(_localctx, 50, RULE_literal); + enterRule(_localctx, 52, RULE_literal); int _la; try { enterOuterAlt(_localctx, 1); { - setState(298); + setState(307); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 96757023244288L) != 0)) ) { _errHandler.recoverInline(this); @@ -2429,11 +2509,11 @@ public class DecafParser extends Parser { public final IdContext id() throws RecognitionException { IdContext _localctx = new IdContext(_ctx, getState()); - enterRule(_localctx, 52, RULE_id); + enterRule(_localctx, 54, RULE_id); try { enterOuterAlt(_localctx, 1); { - setState(300); + setState(309); match(IDENTIFIER); } } @@ -2464,7 +2544,7 @@ public class DecafParser extends Parser { } public static final String _serializedATN = - "\u0004\u00011\u012f\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ + "\u0004\u00011\u0138\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ "\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+ "\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+ "\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b\u0007\u000b\u0002"+ @@ -2472,190 +2552,196 @@ public class DecafParser extends Parser { "\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002\u0012\u0007\u0012"+ "\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002\u0015\u0007\u0015"+ "\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002\u0018\u0007\u0018"+ - "\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0001\u0000\u0001\u0000"+ - "\u0001\u0000\u0001\u0000\u0001\u0000\u0003\u0000<\b\u0000\u0001\u0000"+ - "\u0001\u0000\u0001\u0000\u0005\u0000A\b\u0000\n\u0000\f\u0000D\t\u0000"+ - "\u0001\u0000\u0001\u0000\u0001\u0001\u0003\u0001I\b\u0001\u0001\u0001"+ - "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001\u0003"+ - "\u0001\u0003\u0003\u0003S\b\u0003\u0001\u0004\u0001\u0004\u0001\u0004"+ - "\u0001\u0004\u0003\u0004Y\b\u0004\u0001\u0005\u0001\u0005\u0001\u0005"+ - "\u0001\u0005\u0001\u0005\u0003\u0005`\b\u0005\u0001\u0005\u0001\u0005"+ - "\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ - "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007"+ - "\u0001\u0007\u0001\u0007\u0003\u0007r\b\u0007\u0001\u0007\u0001\u0007"+ - "\u0001\u0007\u0001\b\u0001\b\u0001\b\u0005\bz\b\b\n\b\f\b}\t\b\u0001\t"+ - "\u0001\t\u0001\t\u0001\n\u0001\n\u0005\n\u0084\b\n\n\n\f\n\u0087\t\n\u0001"+ - "\n\u0003\n\u008a\b\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b"+ - "\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001\r\u0001"+ - "\r\u0001\r\u0001\r\u0003\r\u009c\b\r\u0001\u000e\u0001\u000e\u0001\u000e"+ - "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00a5\b\u000e"+ - "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00ab\b\u000e"+ + "\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002\u001b\u0007\u001b"+ + "\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0003\u0000"+ + ">\b\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0005\u0000C\b\u0000\n\u0000"+ + "\f\u0000F\t\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0003\u0001K\b\u0001"+ + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002"+ + "\u0001\u0003\u0001\u0003\u0003\u0003U\b\u0003\u0001\u0004\u0001\u0004"+ + "\u0001\u0004\u0001\u0004\u0003\u0004[\b\u0004\u0001\u0005\u0001\u0005"+ + "\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005b\b\u0005\u0001\u0005"+ + "\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ + "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007"+ + "\u0001\u0007\u0001\u0007\u0001\u0007\u0003\u0007t\b\u0007\u0001\u0007"+ + "\u0001\u0007\u0001\u0007\u0001\b\u0001\b\u0001\b\u0005\b|\b\b\n\b\f\b"+ + "\u007f\t\b\u0001\t\u0001\t\u0001\t\u0001\n\u0001\n\u0005\n\u0086\b\n\n"+ + "\n\f\n\u0089\t\n\u0001\n\u0003\n\u008c\b\n\u0001\n\u0001\n\u0001\u000b"+ + "\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+ + "\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003\r\u009e\b\r\u0001\u000e"+ + "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ + "\u0003\u000e\u00a7\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ + "\u0003\u000e\u00ad\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ - "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ - "\u0001\u000e\u0001\u000e\u0003\u000e\u00c1\b\u000e\u0001\u000e\u0001\u000e"+ + "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00c3\b\u000e"+ "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ "\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+ - "\u0003\u000e\u00d1\b\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f"+ - "\u0001\u000f\u0003\u000f\u00d8\b\u000f\u0001\u000f\u0001\u000f\u0003\u000f"+ - "\u00dc\b\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+ + "\u0001\u000e\u0001\u000e\u0003\u000e\u00d3\b\u000e\u0001\u000f\u0001\u000f"+ + "\u0003\u000f\u00d7\b\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+ "\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+ - "\u0003\u0010\u00e9\b\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+ - "\u0005\u0010\u00ef\b\u0010\n\u0010\f\u0010\u00f2\t\u0010\u0001\u0011\u0001"+ - "\u0011\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0003\u0013\u00fa"+ - "\b\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0005\u0013\u00ff\b\u0013"+ - "\n\u0013\f\u0013\u0102\t\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001"+ - "\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0003\u0015\u010c"+ - "\b\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0005\u0015\u0111\b\u0015"+ - "\n\u0015\f\u0015\u0114\t\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001"+ - "\u0016\u0003\u0016\u011a\b\u0016\u0001\u0017\u0001\u0017\u0001\u0017\u0003"+ - "\u0017\u011f\b\u0017\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001"+ - "\u0018\u0005\u0018\u0126\b\u0018\n\u0018\f\u0018\u0129\t\u0018\u0001\u0019"+ - "\u0001\u0019\u0001\u001a\u0001\u001a\u0001\u001a\u0000\u0001 \u001b\u0000"+ - "\u0002\u0004\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c"+ - "\u001e \"$&(*,.024\u0000\u0004\u0001\u0000\"%\u0001\u0000\u0017!\u0002"+ - "\u0000\u0017\u0017&&\u0002\u0000+,..\u013b\u00006\u0001\u0000\u0000\u0000"+ - "\u0002H\u0001\u0000\u0000\u0000\u0004N\u0001\u0000\u0000\u0000\u0006R"+ - "\u0001\u0000\u0000\u0000\bX\u0001\u0000\u0000\u0000\nZ\u0001\u0000\u0000"+ - "\u0000\fd\u0001\u0000\u0000\u0000\u000em\u0001\u0000\u0000\u0000\u0010"+ - "v\u0001\u0000\u0000\u0000\u0012~\u0001\u0000\u0000\u0000\u0014\u0081\u0001"+ - "\u0000\u0000\u0000\u0016\u008d\u0001\u0000\u0000\u0000\u0018\u0090\u0001"+ - "\u0000\u0000\u0000\u001a\u009b\u0001\u0000\u0000\u0000\u001c\u00d0\u0001"+ - "\u0000\u0000\u0000\u001e\u00db\u0001\u0000\u0000\u0000 \u00e8\u0001\u0000"+ - "\u0000\u0000\"\u00f3\u0001\u0000\u0000\u0000$\u00f5\u0001\u0000\u0000"+ - "\u0000&\u00f9\u0001\u0000\u0000\u0000(\u0105\u0001\u0000\u0000\u0000*"+ - "\u010b\u0001\u0000\u0000\u0000,\u0119\u0001\u0000\u0000\u0000.\u011b\u0001"+ - "\u0000\u0000\u00000\u0122\u0001\u0000\u0000\u00002\u012a\u0001\u0000\u0000"+ - "\u00004\u012c\u0001\u0000\u0000\u000067\u0005\u0013\u0000\u000078\u0005"+ - "\u0001\u0000\u000089\u00034\u001a\u00009;\u0005\u0002\u0000\u0000:<\u0003"+ - "\f\u0006\u0000;:\u0001\u0000\u0000\u0000;<\u0001\u0000\u0000\u0000A\u0003\n\u0005\u0000?A\u0003"+ - "\u000e\u0007\u0000@=\u0001\u0000\u0000\u0000@>\u0001\u0000\u0000\u0000"+ - "@?\u0001\u0000\u0000\u0000AD\u0001\u0000\u0000\u0000B@\u0001\u0000\u0000"+ - "\u0000BC\u0001\u0000\u0000\u0000CE\u0001\u0000\u0000\u0000DB\u0001\u0000"+ - "\u0000\u0000EF\u0005\u0003\u0000\u0000F\u0001\u0001\u0000\u0000\u0000"+ - "GI\u0005\u0013\u0000\u0000HG\u0001\u0000\u0000\u0000HI\u0001\u0000\u0000"+ - "\u0000IJ\u0001\u0000\u0000\u0000JK\u0003\b\u0004\u0000KL\u00034\u001a"+ - "\u0000LM\u0005\u0004\u0000\u0000M\u0003\u0001\u0000\u0000\u0000NO\u0007"+ - "\u0000\u0000\u0000O\u0005\u0001\u0000\u0000\u0000PS\u0003\b\u0004\u0000"+ - "QS\u0005)\u0000\u0000RP\u0001\u0000\u0000\u0000RQ\u0001\u0000\u0000\u0000"+ - "S\u0007\u0001\u0000\u0000\u0000TY\u0005\'\u0000\u0000UY\u0005(\u0000\u0000"+ - "VY\u0005*\u0000\u0000WY\u00034\u001a\u0000XT\u0001\u0000\u0000\u0000X"+ - "U\u0001\u0000\u0000\u0000XV\u0001\u0000\u0000\u0000XW\u0001\u0000\u0000"+ - "\u0000Y\t\u0001\u0000\u0000\u0000Z[\u0005\u0013\u0000\u0000[\\\u0003\u0006"+ - "\u0003\u0000\\]\u00034\u001a\u0000]_\u0005\u0005\u0000\u0000^`\u0003\u0010"+ - "\b\u0000_^\u0001\u0000\u0000\u0000_`\u0001\u0000\u0000\u0000`a\u0001\u0000"+ - "\u0000\u0000ab\u0005\u0006\u0000\u0000bc\u0003\u0014\n\u0000c\u000b\u0001"+ - "\u0000\u0000\u0000de\u0005\u0013\u0000\u0000ef\u0005\u0007\u0000\u0000"+ - "fg\u0005)\u0000\u0000gh\u0005\b\u0000\u0000hi\u0005\u0005\u0000\u0000"+ - "ij\u0005\t\u0000\u0000jk\u0005\u0006\u0000\u0000kl\u0003\u0014\n\u0000"+ - "l\r\u0001\u0000\u0000\u0000mn\u0005\u0013\u0000\u0000no\u00034\u001a\u0000"+ - "oq\u0005\u0005\u0000\u0000pr\u0003\u0010\b\u0000qp\u0001\u0000\u0000\u0000"+ - "qr\u0001\u0000\u0000\u0000rs\u0001\u0000\u0000\u0000st\u0005\u0006\u0000"+ - "\u0000tu\u0003\u0014\n\u0000u\u000f\u0001\u0000\u0000\u0000v{\u0003\u0012"+ - "\t\u0000wx\u0005\n\u0000\u0000xz\u0003\u0012\t\u0000yw\u0001\u0000\u0000"+ - "\u0000z}\u0001\u0000\u0000\u0000{y\u0001\u0000\u0000\u0000{|\u0001\u0000"+ - "\u0000\u0000|\u0011\u0001\u0000\u0000\u0000}{\u0001\u0000\u0000\u0000"+ - "~\u007f\u0003\b\u0004\u0000\u007f\u0080\u00034\u001a\u0000\u0080\u0013"+ - "\u0001\u0000\u0000\u0000\u0081\u0085\u0005\u0002\u0000\u0000\u0082\u0084"+ - "\u0003\u001c\u000e\u0000\u0083\u0082\u0001\u0000\u0000\u0000\u0084\u0087"+ - "\u0001\u0000\u0000\u0000\u0085\u0083\u0001\u0000\u0000\u0000\u0085\u0086"+ - "\u0001\u0000\u0000\u0000\u0086\u0089\u0001\u0000\u0000\u0000\u0087\u0085"+ - "\u0001\u0000\u0000\u0000\u0088\u008a\u0003\u001a\r\u0000\u0089\u0088\u0001"+ - "\u0000\u0000\u0000\u0089\u008a\u0001\u0000\u0000\u0000\u008a\u008b\u0001"+ - "\u0000\u0000\u0000\u008b\u008c\u0005\u0003\u0000\u0000\u008c\u0015\u0001"+ - "\u0000\u0000\u0000\u008d\u008e\u0003\b\u0004\u0000\u008e\u008f\u00034"+ - "\u001a\u0000\u008f\u0017\u0001\u0000\u0000\u0000\u0090\u0091\u0003\b\u0004"+ - "\u0000\u0091\u0092\u00034\u001a\u0000\u0092\u0093\u0005\"\u0000\u0000"+ - "\u0093\u0094\u0003 \u0010\u0000\u0094\u0019\u0001\u0000\u0000\u0000\u0095"+ - "\u0096\u0005\u000b\u0000\u0000\u0096\u0097\u0003 \u0010\u0000\u0097\u0098"+ - "\u0005\u0004\u0000\u0000\u0098\u009c\u0001\u0000\u0000\u0000\u0099\u009a"+ - "\u0005\u000b\u0000\u0000\u009a\u009c\u0005\u0004\u0000\u0000\u009b\u0095"+ - "\u0001\u0000\u0000\u0000\u009b\u0099\u0001\u0000\u0000\u0000\u009c\u001b"+ - "\u0001\u0000\u0000\u0000\u009d\u009e\u0005\f\u0000\u0000\u009e\u009f\u0005"+ - "\u0005\u0000\u0000\u009f\u00a0\u0003 \u0010\u0000\u00a0\u00a1\u0005\u0006"+ - "\u0000\u0000\u00a1\u00a4\u0003\u0014\n\u0000\u00a2\u00a3\u0005\r\u0000"+ - "\u0000\u00a3\u00a5\u0003\u0014\n\u0000\u00a4\u00a2\u0001\u0000\u0000\u0000"+ - "\u00a4\u00a5\u0001\u0000\u0000\u0000\u00a5\u00d1\u0001\u0000\u0000\u0000"+ - "\u00a6\u00a7\u0005\u000e\u0000\u0000\u00a7\u00aa\u0005\u0005\u0000\u0000"+ - "\u00a8\u00ab\u0003(\u0014\u0000\u00a9\u00ab\u0003\u0018\f\u0000\u00aa"+ - "\u00a8\u0001\u0000\u0000\u0000\u00aa\u00a9\u0001\u0000\u0000\u0000\u00ab"+ - "\u00ac\u0001\u0000\u0000\u0000\u00ac\u00ad\u0005\u0004\u0000\u0000\u00ad"+ - "\u00ae\u0003 \u0010\u0000\u00ae\u00af\u0005\u0004\u0000\u0000\u00af\u00b0"+ - "\u0003(\u0014\u0000\u00b0\u00b1\u0005\u0006\u0000\u0000\u00b1\u00b2\u0003"+ - "\u0014\n\u0000\u00b2\u00d1\u0001\u0000\u0000\u0000\u00b3\u00b4\u0005\u000f"+ - "\u0000\u0000\u00b4\u00b5\u0005\u0005\u0000\u0000\u00b5\u00b6\u0003 \u0010"+ - "\u0000\u00b6\u00b7\u0005\u0006\u0000\u0000\u00b7\u00b8\u0003\u0014\n\u0000"+ - "\u00b8\u00d1\u0001\u0000\u0000\u0000\u00b9\u00ba\u0005\u0010\u0000\u0000"+ - "\u00ba\u00bb\u0003\u0014\n\u0000\u00bb\u00bc\u0005\u000f\u0000\u0000\u00bc"+ - "\u00bd\u0005\u0005\u0000\u0000\u00bd\u00be\u0003 \u0010\u0000\u00be\u00c0"+ - "\u0005\u0006\u0000\u0000\u00bf\u00c1\u0005\u0004\u0000\u0000\u00c0\u00bf"+ - "\u0001\u0000\u0000\u0000\u00c0\u00c1\u0001\u0000\u0000\u0000\u00c1\u00d1"+ - "\u0001\u0000\u0000\u0000\u00c2\u00c3\u0005\u0011\u0000\u0000\u00c3\u00d1"+ - "\u0005\u0004\u0000\u0000\u00c4\u00c5\u0003\u0016\u000b\u0000\u00c5\u00c6"+ - "\u0005\u0004\u0000\u0000\u00c6\u00d1\u0001\u0000\u0000\u0000\u00c7\u00c8"+ - "\u0003\u0018\f\u0000\u00c8\u00c9\u0005\u0004\u0000\u0000\u00c9\u00d1\u0001"+ - "\u0000\u0000\u0000\u00ca\u00cb\u0003(\u0014\u0000\u00cb\u00cc\u0005\u0004"+ - "\u0000\u0000\u00cc\u00d1\u0001\u0000\u0000\u0000\u00cd\u00ce\u0003\u001e"+ - "\u000f\u0000\u00ce\u00cf\u0005\u0004\u0000\u0000\u00cf\u00d1\u0001\u0000"+ - "\u0000\u0000\u00d0\u009d\u0001\u0000\u0000\u0000\u00d0\u00a6\u0001\u0000"+ - "\u0000\u0000\u00d0\u00b3\u0001\u0000\u0000\u0000\u00d0\u00b9\u0001\u0000"+ - "\u0000\u0000\u00d0\u00c2\u0001\u0000\u0000\u0000\u00d0\u00c4\u0001\u0000"+ - "\u0000\u0000\u00d0\u00c7\u0001\u0000\u0000\u0000\u00d0\u00ca\u0001\u0000"+ - "\u0000\u0000\u00d0\u00cd\u0001\u0000\u0000\u0000\u00d1\u001d\u0001\u0000"+ - "\u0000\u0000\u00d2\u00dc\u0003*\u0015\u0000\u00d3\u00d4\u0005\u0014\u0000"+ - "\u0000\u00d4\u00d5\u0003\b\u0004\u0000\u00d5\u00d7\u0005\u0005\u0000\u0000"+ - "\u00d6\u00d8\u00030\u0018\u0000\u00d7\u00d6\u0001\u0000\u0000\u0000\u00d7"+ - "\u00d8\u0001\u0000\u0000\u0000\u00d8\u00d9\u0001\u0000\u0000\u0000\u00d9"+ - "\u00da\u0005\u0006\u0000\u0000\u00da\u00dc\u0001\u0000\u0000\u0000\u00db"+ - "\u00d2\u0001\u0000\u0000\u0000\u00db\u00d3\u0001\u0000\u0000\u0000\u00dc"+ - "\u001f\u0001\u0000\u0000\u0000\u00dd\u00de\u0006\u0010\uffff\uffff\u0000"+ - "\u00de\u00df\u0003$\u0012\u0000\u00df\u00e0\u0003 \u0010\u0005\u00e0\u00e9"+ - "\u0001\u0000\u0000\u0000\u00e1\u00e9\u00032\u0019\u0000\u00e2\u00e3\u0005"+ - "\u0005\u0000\u0000\u00e3\u00e4\u0003 \u0010\u0000\u00e4\u00e5\u0005\u0006"+ - "\u0000\u0000\u00e5\u00e9\u0001\u0000\u0000\u0000\u00e6\u00e9\u0003&\u0013"+ - "\u0000\u00e7\u00e9\u0003\u001e\u000f\u0000\u00e8\u00dd\u0001\u0000\u0000"+ - "\u0000\u00e8\u00e1\u0001\u0000\u0000\u0000\u00e8\u00e2\u0001\u0000\u0000"+ - "\u0000\u00e8\u00e6\u0001\u0000\u0000\u0000\u00e8\u00e7\u0001\u0000\u0000"+ - "\u0000\u00e9\u00f0\u0001\u0000\u0000\u0000\u00ea\u00eb\n\u0006\u0000\u0000"+ - "\u00eb\u00ec\u0003\"\u0011\u0000\u00ec\u00ed\u0003 \u0010\u0007\u00ed"+ - "\u00ef\u0001\u0000\u0000\u0000\u00ee\u00ea\u0001\u0000\u0000\u0000\u00ef"+ - "\u00f2\u0001\u0000\u0000\u0000\u00f0\u00ee\u0001\u0000\u0000\u0000\u00f0"+ - "\u00f1\u0001\u0000\u0000\u0000\u00f1!\u0001\u0000\u0000\u0000\u00f2\u00f0"+ - "\u0001\u0000\u0000\u0000\u00f3\u00f4\u0007\u0001\u0000\u0000\u00f4#\u0001"+ - "\u0000\u0000\u0000\u00f5\u00f6\u0007\u0002\u0000\u0000\u00f6%\u0001\u0000"+ - "\u0000\u0000\u00f7\u00f8\u0005\u0016\u0000\u0000\u00f8\u00fa\u0005\u0012"+ - "\u0000\u0000\u00f9\u00f7\u0001\u0000\u0000\u0000\u00f9\u00fa\u0001\u0000"+ - "\u0000\u0000\u00fa\u0100\u0001\u0000\u0000\u0000\u00fb\u00fc\u0003,\u0016"+ - "\u0000\u00fc\u00fd\u0005\u0012\u0000\u0000\u00fd\u00ff\u0001\u0000\u0000"+ - "\u0000\u00fe\u00fb\u0001\u0000\u0000\u0000\u00ff\u0102\u0001\u0000\u0000"+ - "\u0000\u0100\u00fe\u0001\u0000\u0000\u0000\u0100\u0101\u0001\u0000\u0000"+ - "\u0000\u0101\u0103\u0001\u0000\u0000\u0000\u0102\u0100\u0001\u0000\u0000"+ - "\u0000\u0103\u0104\u00034\u001a\u0000\u0104\'\u0001\u0000\u0000\u0000"+ - "\u0105\u0106\u0003&\u0013\u0000\u0106\u0107\u0003\u0004\u0002\u0000\u0107"+ - "\u0108\u0003 \u0010\u0000\u0108)\u0001\u0000\u0000\u0000\u0109\u010a\u0005"+ - "\u0016\u0000\u0000\u010a\u010c\u0005\u0012\u0000\u0000\u010b\u0109\u0001"+ - "\u0000\u0000\u0000\u010b\u010c\u0001\u0000\u0000\u0000\u010c\u0112\u0001"+ - "\u0000\u0000\u0000\u010d\u010e\u0003,\u0016\u0000\u010e\u010f\u0005\u0012"+ - "\u0000\u0000\u010f\u0111\u0001\u0000\u0000\u0000\u0110\u010d\u0001\u0000"+ - "\u0000\u0000\u0111\u0114\u0001\u0000\u0000\u0000\u0112\u0110\u0001\u0000"+ - "\u0000\u0000\u0112\u0113\u0001\u0000\u0000\u0000\u0113\u0115\u0001\u0000"+ - "\u0000\u0000\u0114\u0112\u0001\u0000\u0000\u0000\u0115\u0116\u0003.\u0017"+ - "\u0000\u0116+\u0001\u0000\u0000\u0000\u0117\u011a\u0003.\u0017\u0000\u0118"+ - "\u011a\u00034\u001a\u0000\u0119\u0117\u0001\u0000\u0000\u0000\u0119\u0118"+ - "\u0001\u0000\u0000\u0000\u011a-\u0001\u0000\u0000\u0000\u011b\u011c\u0003"+ - "4\u001a\u0000\u011c\u011e\u0005\u0005\u0000\u0000\u011d\u011f\u00030\u0018"+ - "\u0000\u011e\u011d\u0001\u0000\u0000\u0000\u011e\u011f\u0001\u0000\u0000"+ - "\u0000\u011f\u0120\u0001\u0000\u0000\u0000\u0120\u0121\u0005\u0006\u0000"+ - "\u0000\u0121/\u0001\u0000\u0000\u0000\u0122\u0127\u0003 \u0010\u0000\u0123"+ - "\u0124\u0005\n\u0000\u0000\u0124\u0126\u0003 \u0010\u0000\u0125\u0123"+ - "\u0001\u0000\u0000\u0000\u0126\u0129\u0001\u0000\u0000\u0000\u0127\u0125"+ - "\u0001\u0000\u0000\u0000\u0127\u0128\u0001\u0000\u0000\u0000\u01281\u0001"+ - "\u0000\u0000\u0000\u0129\u0127\u0001\u0000\u0000\u0000\u012a\u012b\u0007"+ - "\u0003\u0000\u0000\u012b3\u0001\u0000\u0000\u0000\u012c\u012d\u0005-\u0000"+ - "\u0000\u012d5\u0001\u0000\u0000\u0000\u001b;@BHRX_q{\u0085\u0089\u009b"+ - "\u00a4\u00aa\u00c0\u00d0\u00d7\u00db\u00e8\u00f0\u00f9\u0100\u010b\u0112"+ - "\u0119\u011e\u0127"; + "\u0001\u0010\u0003\u0010\u00e4\b\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+ + "\u0001\u0010\u0005\u0010\u00ea\b\u0010\n\u0010\f\u0010\u00ed\t\u0010\u0001"+ + "\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0001"+ + "\u0013\u0001\u0013\u0001\u0013\u0003\u0013\u00f8\b\u0013\u0001\u0013\u0001"+ + "\u0013\u0001\u0013\u0005\u0013\u00fd\b\u0013\n\u0013\f\u0013\u0100\t\u0013"+ + "\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014"+ + "\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0003\u0015"+ + "\u010d\b\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0005\u0015\u0112\b"+ + "\u0015\n\u0015\f\u0015\u0115\t\u0015\u0001\u0015\u0001\u0015\u0001\u0016"+ + "\u0001\u0016\u0001\u0016\u0001\u0016\u0003\u0016\u011d\b\u0016\u0001\u0016"+ + "\u0001\u0016\u0001\u0017\u0001\u0017\u0003\u0017\u0123\b\u0017\u0001\u0018"+ + "\u0001\u0018\u0001\u0018\u0003\u0018\u0128\b\u0018\u0001\u0018\u0001\u0018"+ + "\u0001\u0019\u0001\u0019\u0001\u0019\u0005\u0019\u012f\b\u0019\n\u0019"+ + "\f\u0019\u0132\t\u0019\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b"+ + "\u0001\u001b\u0000\u0001 \u001c\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010"+ + "\u0012\u0014\u0016\u0018\u001a\u001c\u001e \"$&(*,.0246\u0000\u0004\u0001"+ + "\u0000\"%\u0001\u0000\u0017!\u0002\u0000\u0017\u0017&&\u0002\u0000+,."+ + ".\u0145\u00008\u0001\u0000\u0000\u0000\u0002J\u0001\u0000\u0000\u0000"+ + "\u0004P\u0001\u0000\u0000\u0000\u0006T\u0001\u0000\u0000\u0000\bZ\u0001"+ + "\u0000\u0000\u0000\n\\\u0001\u0000\u0000\u0000\ff\u0001\u0000\u0000\u0000"+ + "\u000eo\u0001\u0000\u0000\u0000\u0010x\u0001\u0000\u0000\u0000\u0012\u0080"+ + "\u0001\u0000\u0000\u0000\u0014\u0083\u0001\u0000\u0000\u0000\u0016\u008f"+ + "\u0001\u0000\u0000\u0000\u0018\u0092\u0001\u0000\u0000\u0000\u001a\u009d"+ + "\u0001\u0000\u0000\u0000\u001c\u00d2\u0001\u0000\u0000\u0000\u001e\u00d6"+ + "\u0001\u0000\u0000\u0000 \u00e3\u0001\u0000\u0000\u0000\"\u00ee\u0001"+ + "\u0000\u0000\u0000$\u00f0\u0001\u0000\u0000\u0000&\u00f7\u0001\u0000\u0000"+ + "\u0000(\u0103\u0001\u0000\u0000\u0000*\u010c\u0001\u0000\u0000\u0000,"+ + "\u0118\u0001\u0000\u0000\u0000.\u0122\u0001\u0000\u0000\u00000\u0124\u0001"+ + "\u0000\u0000\u00002\u012b\u0001\u0000\u0000\u00004\u0133\u0001\u0000\u0000"+ + "\u00006\u0135\u0001\u0000\u0000\u000089\u0005\u0013\u0000\u00009:\u0005"+ + "\u0001\u0000\u0000:;\u00036\u001b\u0000;=\u0005\u0002\u0000\u0000<>\u0003"+ + "\f\u0006\u0000=<\u0001\u0000\u0000\u0000=>\u0001\u0000\u0000\u0000>D\u0001"+ + "\u0000\u0000\u0000?C\u0003\u0002\u0001\u0000@C\u0003\n\u0005\u0000AC\u0003"+ + "\u000e\u0007\u0000B?\u0001\u0000\u0000\u0000B@\u0001\u0000\u0000\u0000"+ + "BA\u0001\u0000\u0000\u0000CF\u0001\u0000\u0000\u0000DB\u0001\u0000\u0000"+ + "\u0000DE\u0001\u0000\u0000\u0000EG\u0001\u0000\u0000\u0000FD\u0001\u0000"+ + "\u0000\u0000GH\u0005\u0003\u0000\u0000H\u0001\u0001\u0000\u0000\u0000"+ + "IK\u0005\u0013\u0000\u0000JI\u0001\u0000\u0000\u0000JK\u0001\u0000\u0000"+ + "\u0000KL\u0001\u0000\u0000\u0000LM\u0003\b\u0004\u0000MN\u00036\u001b"+ + "\u0000NO\u0005\u0004\u0000\u0000O\u0003\u0001\u0000\u0000\u0000PQ\u0007"+ + "\u0000\u0000\u0000Q\u0005\u0001\u0000\u0000\u0000RU\u0003\b\u0004\u0000"+ + "SU\u0005)\u0000\u0000TR\u0001\u0000\u0000\u0000TS\u0001\u0000\u0000\u0000"+ + "U\u0007\u0001\u0000\u0000\u0000V[\u0005\'\u0000\u0000W[\u0005(\u0000\u0000"+ + "X[\u0005*\u0000\u0000Y[\u00036\u001b\u0000ZV\u0001\u0000\u0000\u0000Z"+ + "W\u0001\u0000\u0000\u0000ZX\u0001\u0000\u0000\u0000ZY\u0001\u0000\u0000"+ + "\u0000[\t\u0001\u0000\u0000\u0000\\]\u0005\u0013\u0000\u0000]^\u0003\u0006"+ + "\u0003\u0000^_\u00036\u001b\u0000_a\u0005\u0005\u0000\u0000`b\u0003\u0010"+ + "\b\u0000a`\u0001\u0000\u0000\u0000ab\u0001\u0000\u0000\u0000bc\u0001\u0000"+ + "\u0000\u0000cd\u0005\u0006\u0000\u0000de\u0003\u0014\n\u0000e\u000b\u0001"+ + "\u0000\u0000\u0000fg\u0005\u0013\u0000\u0000gh\u0005\u0007\u0000\u0000"+ + "hi\u0005)\u0000\u0000ij\u0005\b\u0000\u0000jk\u0005\u0005\u0000\u0000"+ + "kl\u0005\t\u0000\u0000lm\u0005\u0006\u0000\u0000mn\u0003\u0014\n\u0000"+ + "n\r\u0001\u0000\u0000\u0000op\u0005\u0013\u0000\u0000pq\u00036\u001b\u0000"+ + "qs\u0005\u0005\u0000\u0000rt\u0003\u0010\b\u0000sr\u0001\u0000\u0000\u0000"+ + "st\u0001\u0000\u0000\u0000tu\u0001\u0000\u0000\u0000uv\u0005\u0006\u0000"+ + "\u0000vw\u0003\u0014\n\u0000w\u000f\u0001\u0000\u0000\u0000x}\u0003\u0012"+ + "\t\u0000yz\u0005\n\u0000\u0000z|\u0003\u0012\t\u0000{y\u0001\u0000\u0000"+ + "\u0000|\u007f\u0001\u0000\u0000\u0000}{\u0001\u0000\u0000\u0000}~\u0001"+ + "\u0000\u0000\u0000~\u0011\u0001\u0000\u0000\u0000\u007f}\u0001\u0000\u0000"+ + "\u0000\u0080\u0081\u0003\b\u0004\u0000\u0081\u0082\u00036\u001b\u0000"+ + "\u0082\u0013\u0001\u0000\u0000\u0000\u0083\u0087\u0005\u0002\u0000\u0000"+ + "\u0084\u0086\u0003\u001c\u000e\u0000\u0085\u0084\u0001\u0000\u0000\u0000"+ + "\u0086\u0089\u0001\u0000\u0000\u0000\u0087\u0085\u0001\u0000\u0000\u0000"+ + "\u0087\u0088\u0001\u0000\u0000\u0000\u0088\u008b\u0001\u0000\u0000\u0000"+ + "\u0089\u0087\u0001\u0000\u0000\u0000\u008a\u008c\u0003\u001a\r\u0000\u008b"+ + "\u008a\u0001\u0000\u0000\u0000\u008b\u008c\u0001\u0000\u0000\u0000\u008c"+ + "\u008d\u0001\u0000\u0000\u0000\u008d\u008e\u0005\u0003\u0000\u0000\u008e"+ + "\u0015\u0001\u0000\u0000\u0000\u008f\u0090\u0003\b\u0004\u0000\u0090\u0091"+ + "\u00036\u001b\u0000\u0091\u0017\u0001\u0000\u0000\u0000\u0092\u0093\u0003"+ + "\b\u0004\u0000\u0093\u0094\u00036\u001b\u0000\u0094\u0095\u0005\"\u0000"+ + "\u0000\u0095\u0096\u0003 \u0010\u0000\u0096\u0019\u0001\u0000\u0000\u0000"+ + "\u0097\u0098\u0005\u000b\u0000\u0000\u0098\u0099\u0003 \u0010\u0000\u0099"+ + "\u009a\u0005\u0004\u0000\u0000\u009a\u009e\u0001\u0000\u0000\u0000\u009b"+ + "\u009c\u0005\u000b\u0000\u0000\u009c\u009e\u0005\u0004\u0000\u0000\u009d"+ + "\u0097\u0001\u0000\u0000\u0000\u009d\u009b\u0001\u0000\u0000\u0000\u009e"+ + "\u001b\u0001\u0000\u0000\u0000\u009f\u00a0\u0005\f\u0000\u0000\u00a0\u00a1"+ + "\u0005\u0005\u0000\u0000\u00a1\u00a2\u0003 \u0010\u0000\u00a2\u00a3\u0005"+ + "\u0006\u0000\u0000\u00a3\u00a6\u0003\u0014\n\u0000\u00a4\u00a5\u0005\r"+ + "\u0000\u0000\u00a5\u00a7\u0003\u0014\n\u0000\u00a6\u00a4\u0001\u0000\u0000"+ + "\u0000\u00a6\u00a7\u0001\u0000\u0000\u0000\u00a7\u00d3\u0001\u0000\u0000"+ + "\u0000\u00a8\u00a9\u0005\u000e\u0000\u0000\u00a9\u00ac\u0005\u0005\u0000"+ + "\u0000\u00aa\u00ad\u0003(\u0014\u0000\u00ab\u00ad\u0003\u0018\f\u0000"+ + "\u00ac\u00aa\u0001\u0000\u0000\u0000\u00ac\u00ab\u0001\u0000\u0000\u0000"+ + "\u00ad\u00ae\u0001\u0000\u0000\u0000\u00ae\u00af\u0005\u0004\u0000\u0000"+ + "\u00af\u00b0\u0003 \u0010\u0000\u00b0\u00b1\u0005\u0004\u0000\u0000\u00b1"+ + "\u00b2\u0003(\u0014\u0000\u00b2\u00b3\u0005\u0006\u0000\u0000\u00b3\u00b4"+ + "\u0003\u0014\n\u0000\u00b4\u00d3\u0001\u0000\u0000\u0000\u00b5\u00b6\u0005"+ + "\u000f\u0000\u0000\u00b6\u00b7\u0005\u0005\u0000\u0000\u00b7\u00b8\u0003"+ + " \u0010\u0000\u00b8\u00b9\u0005\u0006\u0000\u0000\u00b9\u00ba\u0003\u0014"+ + "\n\u0000\u00ba\u00d3\u0001\u0000\u0000\u0000\u00bb\u00bc\u0005\u0010\u0000"+ + "\u0000\u00bc\u00bd\u0003\u0014\n\u0000\u00bd\u00be\u0005\u000f\u0000\u0000"+ + "\u00be\u00bf\u0005\u0005\u0000\u0000\u00bf\u00c0\u0003 \u0010\u0000\u00c0"+ + "\u00c2\u0005\u0006\u0000\u0000\u00c1\u00c3\u0005\u0004\u0000\u0000\u00c2"+ + "\u00c1\u0001\u0000\u0000\u0000\u00c2\u00c3\u0001\u0000\u0000\u0000\u00c3"+ + "\u00d3\u0001\u0000\u0000\u0000\u00c4\u00c5\u0005\u0011\u0000\u0000\u00c5"+ + "\u00d3\u0005\u0004\u0000\u0000\u00c6\u00c7\u0003\u0016\u000b\u0000\u00c7"+ + "\u00c8\u0005\u0004\u0000\u0000\u00c8\u00d3\u0001\u0000\u0000\u0000\u00c9"+ + "\u00ca\u0003\u0018\f\u0000\u00ca\u00cb\u0005\u0004\u0000\u0000\u00cb\u00d3"+ + "\u0001\u0000\u0000\u0000\u00cc\u00cd\u0003(\u0014\u0000\u00cd\u00ce\u0005"+ + "\u0004\u0000\u0000\u00ce\u00d3\u0001\u0000\u0000\u0000\u00cf\u00d0\u0003"+ + "\u001e\u000f\u0000\u00d0\u00d1\u0005\u0004\u0000\u0000\u00d1\u00d3\u0001"+ + "\u0000\u0000\u0000\u00d2\u009f\u0001\u0000\u0000\u0000\u00d2\u00a8\u0001"+ + "\u0000\u0000\u0000\u00d2\u00b5\u0001\u0000\u0000\u0000\u00d2\u00bb\u0001"+ + "\u0000\u0000\u0000\u00d2\u00c4\u0001\u0000\u0000\u0000\u00d2\u00c6\u0001"+ + "\u0000\u0000\u0000\u00d2\u00c9\u0001\u0000\u0000\u0000\u00d2\u00cc\u0001"+ + "\u0000\u0000\u0000\u00d2\u00cf\u0001\u0000\u0000\u0000\u00d3\u001d\u0001"+ + "\u0000\u0000\u0000\u00d4\u00d7\u0003*\u0015\u0000\u00d5\u00d7\u0003,\u0016"+ + "\u0000\u00d6\u00d4\u0001\u0000\u0000\u0000\u00d6\u00d5\u0001\u0000\u0000"+ + "\u0000\u00d7\u001f\u0001\u0000\u0000\u0000\u00d8\u00d9\u0006\u0010\uffff"+ + "\uffff\u0000\u00d9\u00da\u0003$\u0012\u0000\u00da\u00db\u0003 \u0010\u0005"+ + "\u00db\u00e4\u0001\u0000\u0000\u0000\u00dc\u00e4\u00034\u001a\u0000\u00dd"+ + "\u00de\u0005\u0005\u0000\u0000\u00de\u00df\u0003 \u0010\u0000\u00df\u00e0"+ + "\u0005\u0006\u0000\u0000\u00e0\u00e4\u0001\u0000\u0000\u0000\u00e1\u00e4"+ + "\u0003&\u0013\u0000\u00e2\u00e4\u0003\u001e\u000f\u0000\u00e3\u00d8\u0001"+ + "\u0000\u0000\u0000\u00e3\u00dc\u0001\u0000\u0000\u0000\u00e3\u00dd\u0001"+ + "\u0000\u0000\u0000\u00e3\u00e1\u0001\u0000\u0000\u0000\u00e3\u00e2\u0001"+ + "\u0000\u0000\u0000\u00e4\u00eb\u0001\u0000\u0000\u0000\u00e5\u00e6\n\u0006"+ + "\u0000\u0000\u00e6\u00e7\u0003\"\u0011\u0000\u00e7\u00e8\u0003 \u0010"+ + "\u0007\u00e8\u00ea\u0001\u0000\u0000\u0000\u00e9\u00e5\u0001\u0000\u0000"+ + "\u0000\u00ea\u00ed\u0001\u0000\u0000\u0000\u00eb\u00e9\u0001\u0000\u0000"+ + "\u0000\u00eb\u00ec\u0001\u0000\u0000\u0000\u00ec!\u0001\u0000\u0000\u0000"+ + "\u00ed\u00eb\u0001\u0000\u0000\u0000\u00ee\u00ef\u0007\u0001\u0000\u0000"+ + "\u00ef#\u0001\u0000\u0000\u0000\u00f0\u00f1\u0007\u0002\u0000\u0000\u00f1"+ + "%\u0001\u0000\u0000\u0000\u00f2\u00f3\u0005\u0016\u0000\u0000\u00f3\u00f8"+ + "\u0005\u0012\u0000\u0000\u00f4\u00f5\u0003,\u0016\u0000\u00f5\u00f6\u0005"+ + "\u0012\u0000\u0000\u00f6\u00f8\u0001\u0000\u0000\u0000\u00f7\u00f2\u0001"+ + "\u0000\u0000\u0000\u00f7\u00f4\u0001\u0000\u0000\u0000\u00f7\u00f8\u0001"+ + "\u0000\u0000\u0000\u00f8\u00fe\u0001\u0000\u0000\u0000\u00f9\u00fa\u0003"+ + ".\u0017\u0000\u00fa\u00fb\u0005\u0012\u0000\u0000\u00fb\u00fd\u0001\u0000"+ + "\u0000\u0000\u00fc\u00f9\u0001\u0000\u0000\u0000\u00fd\u0100\u0001\u0000"+ + "\u0000\u0000\u00fe\u00fc\u0001\u0000\u0000\u0000\u00fe\u00ff\u0001\u0000"+ + "\u0000\u0000\u00ff\u0101\u0001\u0000\u0000\u0000\u0100\u00fe\u0001\u0000"+ + "\u0000\u0000\u0101\u0102\u00036\u001b\u0000\u0102\'\u0001\u0000\u0000"+ + "\u0000\u0103\u0104\u0003&\u0013\u0000\u0104\u0105\u0003\u0004\u0002\u0000"+ + "\u0105\u0106\u0003 \u0010\u0000\u0106)\u0001\u0000\u0000\u0000\u0107\u0108"+ + "\u0005\u0016\u0000\u0000\u0108\u010d\u0005\u0012\u0000\u0000\u0109\u010a"+ + "\u0003,\u0016\u0000\u010a\u010b\u0005\u0012\u0000\u0000\u010b\u010d\u0001"+ + "\u0000\u0000\u0000\u010c\u0107\u0001\u0000\u0000\u0000\u010c\u0109\u0001"+ + "\u0000\u0000\u0000\u010c\u010d\u0001\u0000\u0000\u0000\u010d\u0113\u0001"+ + "\u0000\u0000\u0000\u010e\u010f\u0003.\u0017\u0000\u010f\u0110\u0005\u0012"+ + "\u0000\u0000\u0110\u0112\u0001\u0000\u0000\u0000\u0111\u010e\u0001\u0000"+ + "\u0000\u0000\u0112\u0115\u0001\u0000\u0000\u0000\u0113\u0111\u0001\u0000"+ + "\u0000\u0000\u0113\u0114\u0001\u0000\u0000\u0000\u0114\u0116\u0001\u0000"+ + "\u0000\u0000\u0115\u0113\u0001\u0000\u0000\u0000\u0116\u0117\u00030\u0018"+ + "\u0000\u0117+\u0001\u0000\u0000\u0000\u0118\u0119\u0005\u0014\u0000\u0000"+ + "\u0119\u011a\u0003\b\u0004\u0000\u011a\u011c\u0005\u0005\u0000\u0000\u011b"+ + "\u011d\u00032\u0019\u0000\u011c\u011b\u0001\u0000\u0000\u0000\u011c\u011d"+ + "\u0001\u0000\u0000\u0000\u011d\u011e\u0001\u0000\u0000\u0000\u011e\u011f"+ + "\u0005\u0006\u0000\u0000\u011f-\u0001\u0000\u0000\u0000\u0120\u0123\u0003"+ + "0\u0018\u0000\u0121\u0123\u00036\u001b\u0000\u0122\u0120\u0001\u0000\u0000"+ + "\u0000\u0122\u0121\u0001\u0000\u0000\u0000\u0123/\u0001\u0000\u0000\u0000"+ + "\u0124\u0125\u00036\u001b\u0000\u0125\u0127\u0005\u0005\u0000\u0000\u0126"+ + "\u0128\u00032\u0019\u0000\u0127\u0126\u0001\u0000\u0000\u0000\u0127\u0128"+ + "\u0001\u0000\u0000\u0000\u0128\u0129\u0001\u0000\u0000\u0000\u0129\u012a"+ + "\u0005\u0006\u0000\u0000\u012a1\u0001\u0000\u0000\u0000\u012b\u0130\u0003"+ + " \u0010\u0000\u012c\u012d\u0005\n\u0000\u0000\u012d\u012f\u0003 \u0010"+ + "\u0000\u012e\u012c\u0001\u0000\u0000\u0000\u012f\u0132\u0001\u0000\u0000"+ + "\u0000\u0130\u012e\u0001\u0000\u0000\u0000\u0130\u0131\u0001\u0000\u0000"+ + "\u0000\u01313\u0001\u0000\u0000\u0000\u0132\u0130\u0001\u0000\u0000\u0000"+ + "\u0133\u0134\u0007\u0003\u0000\u0000\u01345\u0001\u0000\u0000\u0000\u0135"+ + "\u0136\u0005-\u0000\u0000\u01367\u0001\u0000\u0000\u0000\u001b=BDJTZa"+ + "s}\u0087\u008b\u009d\u00a6\u00ac\u00c2\u00d2\u00d6\u00e3\u00eb\u00f7\u00fe"+ + "\u010c\u0113\u011c\u0122\u0127\u0130"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/src/main/java/de/maishai/antlr/DecafVisitor.java b/src/main/java/de/maishai/antlr/DecafVisitor.java index b810cc6..fbaafbe 100644 --- a/src/main/java/de/maishai/antlr/DecafVisitor.java +++ b/src/main/java/de/maishai/antlr/DecafVisitor.java @@ -243,6 +243,12 @@ public interface DecafVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitMethCall(DecafParser.MethCallContext ctx); + /** + * Visit a parse tree produced by {@link DecafParser#newCall}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitNewCall(DecafParser.NewCallContext ctx); /** * Visit a parse tree produced by {@link DecafParser#recipient}. * @param ctx the parse tree