diff --git a/src/main/java/de/maishai/ExpressionGenerator.java b/src/main/java/de/maishai/ExpressionGenerator.java index aeb4419..0ee44f7 100644 --- a/src/main/java/de/maishai/ExpressionGenerator.java +++ b/src/main/java/de/maishai/ExpressionGenerator.java @@ -43,10 +43,10 @@ public class ExpressionGenerator extends DecafBaseVisitor { @Override public Expression visitIdentifier(DecafParser.IdentifierContext ctx) { - boolean isField = ctx.fieldId().THIS() != null; + boolean isField = ctx.fieldVarAccess().THIS() != null; Expression recipient = null; - if (ctx.fieldId().recipient() != null) { - List recipientList = ctx.fieldId().recipient(); + if (ctx.fieldVarAccess().recipient() != null) { + List recipientList = ctx.fieldVarAccess().recipient(); recipient = generateRecursiveOwnerChain(recipientList, null); } return new FieldVarAccess(isField, recipient, ctx.getText()); diff --git a/src/main/java/de/maishai/StatementGenerator.java b/src/main/java/de/maishai/StatementGenerator.java index a0997d9..64916eb 100644 --- a/src/main/java/de/maishai/StatementGenerator.java +++ b/src/main/java/de/maishai/StatementGenerator.java @@ -67,12 +67,12 @@ public class StatementGenerator extends DecafBaseVisitor { } private Assignment generateAssign(DecafParser.AssignContext ctx) { - FieldVarAccess fieldVarAccess = generateField(ctx.fieldId()); + FieldVarAccess fieldVarAccess = generateField(ctx.fieldVarAccess()); Expression expr = resolveFancyAssign(ctx.assignSign(), fieldVarAccess, new ExpressionGenerator().visit(ctx.expr())); return new Assignment(fieldVarAccess, expr); } - private FieldVarAccess generateField(DecafParser.FieldIdContext fieldIdContext) { + private FieldVarAccess generateField(DecafParser.FieldVarAccessContext fieldIdContext) { return new FieldVarAccess(fieldIdContext.THIS() != null, ExpressionGenerator.generateRecursiveOwnerChain(fieldIdContext.recipient(), null), fieldIdContext.id().getText()); diff --git a/src/main/java/de/maishai/antlr/Decaf.interp b/src/main/java/de/maishai/antlr/Decaf.interp index 016d501..15c168b 100644 --- a/src/main/java/de/maishai/antlr/Decaf.interp +++ b/src/main/java/de/maishai/antlr/Decaf.interp @@ -127,4 +127,4 @@ id atn: -[4, 1, 47, 280, 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, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 56, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 61, 8, 0, 10, 0, 12, 0, 64, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 80, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 86, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 93, 8, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 3, 8, 108, 8, 8, 1, 8, 1, 8, 1, 8, 3, 8, 113, 8, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 5, 9, 121, 8, 9, 10, 9, 12, 9, 124, 9, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 132, 8, 11, 10, 11, 12, 11, 135, 9, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 146, 8, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 185, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 192, 8, 13, 1, 13, 1, 13, 3, 13, 196, 8, 13, 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, 210, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 216, 8, 14, 10, 14, 12, 14, 219, 9, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 3, 17, 227, 8, 17, 1, 17, 1, 17, 1, 17, 5, 17, 232, 8, 17, 10, 17, 12, 17, 235, 9, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 245, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 250, 8, 19, 10, 19, 12, 19, 253, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 259, 8, 20, 1, 21, 1, 21, 1, 21, 3, 21, 264, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 5, 22, 271, 8, 22, 10, 22, 12, 22, 274, 9, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 0, 1, 28, 25, 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, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 292, 0, 50, 1, 0, 0, 0, 2, 67, 1, 0, 0, 0, 4, 71, 1, 0, 0, 0, 6, 75, 1, 0, 0, 0, 8, 79, 1, 0, 0, 0, 10, 85, 1, 0, 0, 0, 12, 87, 1, 0, 0, 0, 14, 97, 1, 0, 0, 0, 16, 107, 1, 0, 0, 0, 18, 117, 1, 0, 0, 0, 20, 125, 1, 0, 0, 0, 22, 128, 1, 0, 0, 0, 24, 184, 1, 0, 0, 0, 26, 195, 1, 0, 0, 0, 28, 209, 1, 0, 0, 0, 30, 220, 1, 0, 0, 0, 32, 222, 1, 0, 0, 0, 34, 226, 1, 0, 0, 0, 36, 238, 1, 0, 0, 0, 38, 244, 1, 0, 0, 0, 40, 258, 1, 0, 0, 0, 42, 260, 1, 0, 0, 0, 44, 267, 1, 0, 0, 0, 46, 275, 1, 0, 0, 0, 48, 277, 1, 0, 0, 0, 50, 51, 5, 19, 0, 0, 51, 52, 5, 1, 0, 0, 52, 53, 3, 48, 24, 0, 53, 55, 5, 2, 0, 0, 54, 56, 3, 14, 7, 0, 55, 54, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 62, 1, 0, 0, 0, 57, 61, 3, 2, 1, 0, 58, 61, 3, 12, 6, 0, 59, 61, 3, 16, 8, 0, 60, 57, 1, 0, 0, 0, 60, 58, 1, 0, 0, 0, 60, 59, 1, 0, 0, 0, 61, 64, 1, 0, 0, 0, 62, 60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 65, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 65, 66, 5, 3, 0, 0, 66, 1, 1, 0, 0, 0, 67, 68, 3, 10, 5, 0, 68, 69, 3, 48, 24, 0, 69, 70, 5, 4, 0, 0, 70, 3, 1, 0, 0, 0, 71, 72, 3, 10, 5, 0, 72, 73, 3, 48, 24, 0, 73, 74, 5, 4, 0, 0, 74, 5, 1, 0, 0, 0, 75, 76, 7, 0, 0, 0, 76, 7, 1, 0, 0, 0, 77, 80, 3, 10, 5, 0, 78, 80, 5, 41, 0, 0, 79, 77, 1, 0, 0, 0, 79, 78, 1, 0, 0, 0, 80, 9, 1, 0, 0, 0, 81, 86, 5, 39, 0, 0, 82, 86, 5, 40, 0, 0, 83, 86, 5, 42, 0, 0, 84, 86, 3, 48, 24, 0, 85, 81, 1, 0, 0, 0, 85, 82, 1, 0, 0, 0, 85, 83, 1, 0, 0, 0, 85, 84, 1, 0, 0, 0, 86, 11, 1, 0, 0, 0, 87, 88, 5, 19, 0, 0, 88, 89, 3, 8, 4, 0, 89, 90, 3, 48, 24, 0, 90, 92, 5, 5, 0, 0, 91, 93, 3, 18, 9, 0, 92, 91, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 94, 1, 0, 0, 0, 94, 95, 5, 6, 0, 0, 95, 96, 3, 22, 11, 0, 96, 13, 1, 0, 0, 0, 97, 98, 5, 19, 0, 0, 98, 99, 5, 7, 0, 0, 99, 100, 5, 41, 0, 0, 100, 101, 5, 8, 0, 0, 101, 102, 5, 5, 0, 0, 102, 103, 5, 9, 0, 0, 103, 104, 5, 6, 0, 0, 104, 105, 3, 22, 11, 0, 105, 15, 1, 0, 0, 0, 106, 108, 5, 19, 0, 0, 107, 106, 1, 0, 0, 0, 107, 108, 1, 0, 0, 0, 108, 109, 1, 0, 0, 0, 109, 110, 3, 48, 24, 0, 110, 112, 5, 5, 0, 0, 111, 113, 3, 18, 9, 0, 112, 111, 1, 0, 0, 0, 112, 113, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 5, 6, 0, 0, 115, 116, 3, 22, 11, 0, 116, 17, 1, 0, 0, 0, 117, 122, 3, 20, 10, 0, 118, 119, 5, 10, 0, 0, 119, 121, 3, 20, 10, 0, 120, 118, 1, 0, 0, 0, 121, 124, 1, 0, 0, 0, 122, 120, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 19, 1, 0, 0, 0, 124, 122, 1, 0, 0, 0, 125, 126, 3, 10, 5, 0, 126, 127, 3, 48, 24, 0, 127, 21, 1, 0, 0, 0, 128, 133, 5, 2, 0, 0, 129, 132, 3, 4, 2, 0, 130, 132, 3, 24, 12, 0, 131, 129, 1, 0, 0, 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, 136, 1, 0, 0, 0, 135, 133, 1, 0, 0, 0, 136, 137, 5, 3, 0, 0, 137, 23, 1, 0, 0, 0, 138, 139, 5, 11, 0, 0, 139, 140, 5, 5, 0, 0, 140, 141, 3, 28, 14, 0, 141, 142, 5, 6, 0, 0, 142, 145, 3, 22, 11, 0, 143, 144, 5, 12, 0, 0, 144, 146, 3, 22, 11, 0, 145, 143, 1, 0, 0, 0, 145, 146, 1, 0, 0, 0, 146, 185, 1, 0, 0, 0, 147, 148, 5, 13, 0, 0, 148, 149, 5, 5, 0, 0, 149, 150, 3, 36, 18, 0, 150, 151, 5, 4, 0, 0, 151, 152, 3, 28, 14, 0, 152, 153, 5, 4, 0, 0, 153, 154, 3, 36, 18, 0, 154, 155, 5, 6, 0, 0, 155, 156, 3, 22, 11, 0, 156, 185, 1, 0, 0, 0, 157, 158, 5, 14, 0, 0, 158, 159, 5, 5, 0, 0, 159, 160, 3, 28, 14, 0, 160, 161, 5, 6, 0, 0, 161, 162, 3, 22, 11, 0, 162, 185, 1, 0, 0, 0, 163, 164, 5, 15, 0, 0, 164, 165, 3, 22, 11, 0, 165, 166, 5, 14, 0, 0, 166, 167, 5, 5, 0, 0, 167, 168, 3, 28, 14, 0, 168, 169, 5, 6, 0, 0, 169, 185, 1, 0, 0, 0, 170, 171, 5, 16, 0, 0, 171, 172, 3, 28, 14, 0, 172, 173, 5, 4, 0, 0, 173, 185, 1, 0, 0, 0, 174, 175, 5, 16, 0, 0, 175, 185, 5, 4, 0, 0, 176, 177, 5, 17, 0, 0, 177, 185, 5, 4, 0, 0, 178, 179, 3, 36, 18, 0, 179, 180, 5, 4, 0, 0, 180, 185, 1, 0, 0, 0, 181, 182, 3, 26, 13, 0, 182, 183, 5, 4, 0, 0, 183, 185, 1, 0, 0, 0, 184, 138, 1, 0, 0, 0, 184, 147, 1, 0, 0, 0, 184, 157, 1, 0, 0, 0, 184, 163, 1, 0, 0, 0, 184, 170, 1, 0, 0, 0, 184, 174, 1, 0, 0, 0, 184, 176, 1, 0, 0, 0, 184, 178, 1, 0, 0, 0, 184, 181, 1, 0, 0, 0, 185, 25, 1, 0, 0, 0, 186, 196, 3, 38, 19, 0, 187, 188, 5, 20, 0, 0, 188, 189, 3, 10, 5, 0, 189, 191, 5, 5, 0, 0, 190, 192, 3, 44, 22, 0, 191, 190, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 192, 193, 1, 0, 0, 0, 193, 194, 5, 6, 0, 0, 194, 196, 1, 0, 0, 0, 195, 186, 1, 0, 0, 0, 195, 187, 1, 0, 0, 0, 196, 27, 1, 0, 0, 0, 197, 198, 6, 14, -1, 0, 198, 199, 3, 32, 16, 0, 199, 200, 3, 28, 14, 6, 200, 210, 1, 0, 0, 0, 201, 210, 3, 46, 23, 0, 202, 203, 5, 5, 0, 0, 203, 204, 3, 28, 14, 0, 204, 205, 5, 6, 0, 0, 205, 210, 1, 0, 0, 0, 206, 210, 3, 34, 17, 0, 207, 210, 3, 26, 13, 0, 208, 210, 5, 21, 0, 0, 209, 197, 1, 0, 0, 0, 209, 201, 1, 0, 0, 0, 209, 202, 1, 0, 0, 0, 209, 206, 1, 0, 0, 0, 209, 207, 1, 0, 0, 0, 209, 208, 1, 0, 0, 0, 210, 217, 1, 0, 0, 0, 211, 212, 10, 7, 0, 0, 212, 213, 3, 30, 15, 0, 213, 214, 3, 28, 14, 8, 214, 216, 1, 0, 0, 0, 215, 211, 1, 0, 0, 0, 216, 219, 1, 0, 0, 0, 217, 215, 1, 0, 0, 0, 217, 218, 1, 0, 0, 0, 218, 29, 1, 0, 0, 0, 219, 217, 1, 0, 0, 0, 220, 221, 7, 1, 0, 0, 221, 31, 1, 0, 0, 0, 222, 223, 7, 2, 0, 0, 223, 33, 1, 0, 0, 0, 224, 225, 5, 22, 0, 0, 225, 227, 5, 18, 0, 0, 226, 224, 1, 0, 0, 0, 226, 227, 1, 0, 0, 0, 227, 233, 1, 0, 0, 0, 228, 229, 3, 40, 20, 0, 229, 230, 5, 18, 0, 0, 230, 232, 1, 0, 0, 0, 231, 228, 1, 0, 0, 0, 232, 235, 1, 0, 0, 0, 233, 231, 1, 0, 0, 0, 233, 234, 1, 0, 0, 0, 234, 236, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 236, 237, 3, 48, 24, 0, 237, 35, 1, 0, 0, 0, 238, 239, 3, 34, 17, 0, 239, 240, 3, 6, 3, 0, 240, 241, 3, 28, 14, 0, 241, 37, 1, 0, 0, 0, 242, 243, 5, 22, 0, 0, 243, 245, 5, 18, 0, 0, 244, 242, 1, 0, 0, 0, 244, 245, 1, 0, 0, 0, 245, 251, 1, 0, 0, 0, 246, 247, 3, 40, 20, 0, 247, 248, 5, 18, 0, 0, 248, 250, 1, 0, 0, 0, 249, 246, 1, 0, 0, 0, 250, 253, 1, 0, 0, 0, 251, 249, 1, 0, 0, 0, 251, 252, 1, 0, 0, 0, 252, 254, 1, 0, 0, 0, 253, 251, 1, 0, 0, 0, 254, 255, 3, 42, 21, 0, 255, 39, 1, 0, 0, 0, 256, 259, 3, 42, 21, 0, 257, 259, 3, 48, 24, 0, 258, 256, 1, 0, 0, 0, 258, 257, 1, 0, 0, 0, 259, 41, 1, 0, 0, 0, 260, 261, 3, 48, 24, 0, 261, 263, 5, 5, 0, 0, 262, 264, 3, 44, 22, 0, 263, 262, 1, 0, 0, 0, 263, 264, 1, 0, 0, 0, 264, 265, 1, 0, 0, 0, 265, 266, 5, 6, 0, 0, 266, 43, 1, 0, 0, 0, 267, 272, 3, 28, 14, 0, 268, 269, 5, 10, 0, 0, 269, 271, 3, 28, 14, 0, 270, 268, 1, 0, 0, 0, 271, 274, 1, 0, 0, 0, 272, 270, 1, 0, 0, 0, 272, 273, 1, 0, 0, 0, 273, 45, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 275, 276, 7, 3, 0, 0, 276, 47, 1, 0, 0, 0, 277, 278, 5, 45, 0, 0, 278, 49, 1, 0, 0, 0, 24, 55, 60, 62, 79, 85, 92, 107, 112, 122, 131, 133, 145, 184, 191, 195, 209, 217, 226, 233, 244, 251, 258, 263, 272] \ No newline at end of file +[4, 1, 47, 278, 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, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 56, 8, 0, 1, 0, 1, 0, 1, 0, 5, 0, 61, 8, 0, 10, 0, 12, 0, 64, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 80, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 86, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 93, 8, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 111, 8, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 5, 9, 119, 8, 9, 10, 9, 12, 9, 122, 9, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 130, 8, 11, 10, 11, 12, 11, 133, 9, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 144, 8, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 183, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 190, 8, 13, 1, 13, 1, 13, 3, 13, 194, 8, 13, 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, 208, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 214, 8, 14, 10, 14, 12, 14, 217, 9, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 3, 17, 225, 8, 17, 1, 17, 1, 17, 1, 17, 5, 17, 230, 8, 17, 10, 17, 12, 17, 233, 9, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 243, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 248, 8, 19, 10, 19, 12, 19, 251, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 257, 8, 20, 1, 21, 1, 21, 1, 21, 3, 21, 262, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 5, 22, 269, 8, 22, 10, 22, 12, 22, 272, 9, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 0, 1, 28, 25, 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, 0, 4, 1, 0, 34, 37, 1, 0, 23, 33, 2, 0, 23, 23, 38, 38, 2, 0, 43, 44, 46, 46, 289, 0, 50, 1, 0, 0, 0, 2, 67, 1, 0, 0, 0, 4, 71, 1, 0, 0, 0, 6, 75, 1, 0, 0, 0, 8, 79, 1, 0, 0, 0, 10, 85, 1, 0, 0, 0, 12, 87, 1, 0, 0, 0, 14, 97, 1, 0, 0, 0, 16, 106, 1, 0, 0, 0, 18, 115, 1, 0, 0, 0, 20, 123, 1, 0, 0, 0, 22, 126, 1, 0, 0, 0, 24, 182, 1, 0, 0, 0, 26, 193, 1, 0, 0, 0, 28, 207, 1, 0, 0, 0, 30, 218, 1, 0, 0, 0, 32, 220, 1, 0, 0, 0, 34, 224, 1, 0, 0, 0, 36, 236, 1, 0, 0, 0, 38, 242, 1, 0, 0, 0, 40, 256, 1, 0, 0, 0, 42, 258, 1, 0, 0, 0, 44, 265, 1, 0, 0, 0, 46, 273, 1, 0, 0, 0, 48, 275, 1, 0, 0, 0, 50, 51, 5, 19, 0, 0, 51, 52, 5, 1, 0, 0, 52, 53, 3, 48, 24, 0, 53, 55, 5, 2, 0, 0, 54, 56, 3, 14, 7, 0, 55, 54, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 62, 1, 0, 0, 0, 57, 61, 3, 2, 1, 0, 58, 61, 3, 12, 6, 0, 59, 61, 3, 16, 8, 0, 60, 57, 1, 0, 0, 0, 60, 58, 1, 0, 0, 0, 60, 59, 1, 0, 0, 0, 61, 64, 1, 0, 0, 0, 62, 60, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 65, 1, 0, 0, 0, 64, 62, 1, 0, 0, 0, 65, 66, 5, 3, 0, 0, 66, 1, 1, 0, 0, 0, 67, 68, 3, 10, 5, 0, 68, 69, 3, 48, 24, 0, 69, 70, 5, 4, 0, 0, 70, 3, 1, 0, 0, 0, 71, 72, 3, 10, 5, 0, 72, 73, 3, 48, 24, 0, 73, 74, 5, 4, 0, 0, 74, 5, 1, 0, 0, 0, 75, 76, 7, 0, 0, 0, 76, 7, 1, 0, 0, 0, 77, 80, 3, 10, 5, 0, 78, 80, 5, 41, 0, 0, 79, 77, 1, 0, 0, 0, 79, 78, 1, 0, 0, 0, 80, 9, 1, 0, 0, 0, 81, 86, 5, 39, 0, 0, 82, 86, 5, 40, 0, 0, 83, 86, 5, 42, 0, 0, 84, 86, 3, 48, 24, 0, 85, 81, 1, 0, 0, 0, 85, 82, 1, 0, 0, 0, 85, 83, 1, 0, 0, 0, 85, 84, 1, 0, 0, 0, 86, 11, 1, 0, 0, 0, 87, 88, 5, 19, 0, 0, 88, 89, 3, 8, 4, 0, 89, 90, 3, 48, 24, 0, 90, 92, 5, 5, 0, 0, 91, 93, 3, 18, 9, 0, 92, 91, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 94, 1, 0, 0, 0, 94, 95, 5, 6, 0, 0, 95, 96, 3, 22, 11, 0, 96, 13, 1, 0, 0, 0, 97, 98, 5, 19, 0, 0, 98, 99, 5, 7, 0, 0, 99, 100, 5, 41, 0, 0, 100, 101, 5, 8, 0, 0, 101, 102, 5, 5, 0, 0, 102, 103, 5, 9, 0, 0, 103, 104, 5, 6, 0, 0, 104, 105, 3, 22, 11, 0, 105, 15, 1, 0, 0, 0, 106, 107, 5, 19, 0, 0, 107, 108, 3, 48, 24, 0, 108, 110, 5, 5, 0, 0, 109, 111, 3, 18, 9, 0, 110, 109, 1, 0, 0, 0, 110, 111, 1, 0, 0, 0, 111, 112, 1, 0, 0, 0, 112, 113, 5, 6, 0, 0, 113, 114, 3, 22, 11, 0, 114, 17, 1, 0, 0, 0, 115, 120, 3, 20, 10, 0, 116, 117, 5, 10, 0, 0, 117, 119, 3, 20, 10, 0, 118, 116, 1, 0, 0, 0, 119, 122, 1, 0, 0, 0, 120, 118, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 19, 1, 0, 0, 0, 122, 120, 1, 0, 0, 0, 123, 124, 3, 10, 5, 0, 124, 125, 3, 48, 24, 0, 125, 21, 1, 0, 0, 0, 126, 131, 5, 2, 0, 0, 127, 130, 3, 4, 2, 0, 128, 130, 3, 24, 12, 0, 129, 127, 1, 0, 0, 0, 129, 128, 1, 0, 0, 0, 130, 133, 1, 0, 0, 0, 131, 129, 1, 0, 0, 0, 131, 132, 1, 0, 0, 0, 132, 134, 1, 0, 0, 0, 133, 131, 1, 0, 0, 0, 134, 135, 5, 3, 0, 0, 135, 23, 1, 0, 0, 0, 136, 137, 5, 11, 0, 0, 137, 138, 5, 5, 0, 0, 138, 139, 3, 28, 14, 0, 139, 140, 5, 6, 0, 0, 140, 143, 3, 22, 11, 0, 141, 142, 5, 12, 0, 0, 142, 144, 3, 22, 11, 0, 143, 141, 1, 0, 0, 0, 143, 144, 1, 0, 0, 0, 144, 183, 1, 0, 0, 0, 145, 146, 5, 13, 0, 0, 146, 147, 5, 5, 0, 0, 147, 148, 3, 36, 18, 0, 148, 149, 5, 4, 0, 0, 149, 150, 3, 28, 14, 0, 150, 151, 5, 4, 0, 0, 151, 152, 3, 36, 18, 0, 152, 153, 5, 6, 0, 0, 153, 154, 3, 22, 11, 0, 154, 183, 1, 0, 0, 0, 155, 156, 5, 14, 0, 0, 156, 157, 5, 5, 0, 0, 157, 158, 3, 28, 14, 0, 158, 159, 5, 6, 0, 0, 159, 160, 3, 22, 11, 0, 160, 183, 1, 0, 0, 0, 161, 162, 5, 15, 0, 0, 162, 163, 3, 22, 11, 0, 163, 164, 5, 14, 0, 0, 164, 165, 5, 5, 0, 0, 165, 166, 3, 28, 14, 0, 166, 167, 5, 6, 0, 0, 167, 183, 1, 0, 0, 0, 168, 169, 5, 16, 0, 0, 169, 170, 3, 28, 14, 0, 170, 171, 5, 4, 0, 0, 171, 183, 1, 0, 0, 0, 172, 173, 5, 16, 0, 0, 173, 183, 5, 4, 0, 0, 174, 175, 5, 17, 0, 0, 175, 183, 5, 4, 0, 0, 176, 177, 3, 36, 18, 0, 177, 178, 5, 4, 0, 0, 178, 183, 1, 0, 0, 0, 179, 180, 3, 26, 13, 0, 180, 181, 5, 4, 0, 0, 181, 183, 1, 0, 0, 0, 182, 136, 1, 0, 0, 0, 182, 145, 1, 0, 0, 0, 182, 155, 1, 0, 0, 0, 182, 161, 1, 0, 0, 0, 182, 168, 1, 0, 0, 0, 182, 172, 1, 0, 0, 0, 182, 174, 1, 0, 0, 0, 182, 176, 1, 0, 0, 0, 182, 179, 1, 0, 0, 0, 183, 25, 1, 0, 0, 0, 184, 194, 3, 38, 19, 0, 185, 186, 5, 20, 0, 0, 186, 187, 3, 10, 5, 0, 187, 189, 5, 5, 0, 0, 188, 190, 3, 44, 22, 0, 189, 188, 1, 0, 0, 0, 189, 190, 1, 0, 0, 0, 190, 191, 1, 0, 0, 0, 191, 192, 5, 6, 0, 0, 192, 194, 1, 0, 0, 0, 193, 184, 1, 0, 0, 0, 193, 185, 1, 0, 0, 0, 194, 27, 1, 0, 0, 0, 195, 196, 6, 14, -1, 0, 196, 197, 3, 32, 16, 0, 197, 198, 3, 28, 14, 6, 198, 208, 1, 0, 0, 0, 199, 208, 3, 46, 23, 0, 200, 201, 5, 5, 0, 0, 201, 202, 3, 28, 14, 0, 202, 203, 5, 6, 0, 0, 203, 208, 1, 0, 0, 0, 204, 208, 3, 34, 17, 0, 205, 208, 3, 26, 13, 0, 206, 208, 5, 21, 0, 0, 207, 195, 1, 0, 0, 0, 207, 199, 1, 0, 0, 0, 207, 200, 1, 0, 0, 0, 207, 204, 1, 0, 0, 0, 207, 205, 1, 0, 0, 0, 207, 206, 1, 0, 0, 0, 208, 215, 1, 0, 0, 0, 209, 210, 10, 7, 0, 0, 210, 211, 3, 30, 15, 0, 211, 212, 3, 28, 14, 8, 212, 214, 1, 0, 0, 0, 213, 209, 1, 0, 0, 0, 214, 217, 1, 0, 0, 0, 215, 213, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 29, 1, 0, 0, 0, 217, 215, 1, 0, 0, 0, 218, 219, 7, 1, 0, 0, 219, 31, 1, 0, 0, 0, 220, 221, 7, 2, 0, 0, 221, 33, 1, 0, 0, 0, 222, 223, 5, 22, 0, 0, 223, 225, 5, 18, 0, 0, 224, 222, 1, 0, 0, 0, 224, 225, 1, 0, 0, 0, 225, 231, 1, 0, 0, 0, 226, 227, 3, 40, 20, 0, 227, 228, 5, 18, 0, 0, 228, 230, 1, 0, 0, 0, 229, 226, 1, 0, 0, 0, 230, 233, 1, 0, 0, 0, 231, 229, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 234, 1, 0, 0, 0, 233, 231, 1, 0, 0, 0, 234, 235, 3, 48, 24, 0, 235, 35, 1, 0, 0, 0, 236, 237, 3, 34, 17, 0, 237, 238, 3, 6, 3, 0, 238, 239, 3, 28, 14, 0, 239, 37, 1, 0, 0, 0, 240, 241, 5, 22, 0, 0, 241, 243, 5, 18, 0, 0, 242, 240, 1, 0, 0, 0, 242, 243, 1, 0, 0, 0, 243, 249, 1, 0, 0, 0, 244, 245, 3, 40, 20, 0, 245, 246, 5, 18, 0, 0, 246, 248, 1, 0, 0, 0, 247, 244, 1, 0, 0, 0, 248, 251, 1, 0, 0, 0, 249, 247, 1, 0, 0, 0, 249, 250, 1, 0, 0, 0, 250, 252, 1, 0, 0, 0, 251, 249, 1, 0, 0, 0, 252, 253, 3, 42, 21, 0, 253, 39, 1, 0, 0, 0, 254, 257, 3, 42, 21, 0, 255, 257, 3, 48, 24, 0, 256, 254, 1, 0, 0, 0, 256, 255, 1, 0, 0, 0, 257, 41, 1, 0, 0, 0, 258, 259, 3, 48, 24, 0, 259, 261, 5, 5, 0, 0, 260, 262, 3, 44, 22, 0, 261, 260, 1, 0, 0, 0, 261, 262, 1, 0, 0, 0, 262, 263, 1, 0, 0, 0, 263, 264, 5, 6, 0, 0, 264, 43, 1, 0, 0, 0, 265, 270, 3, 28, 14, 0, 266, 267, 5, 10, 0, 0, 267, 269, 3, 28, 14, 0, 268, 266, 1, 0, 0, 0, 269, 272, 1, 0, 0, 0, 270, 268, 1, 0, 0, 0, 270, 271, 1, 0, 0, 0, 271, 45, 1, 0, 0, 0, 272, 270, 1, 0, 0, 0, 273, 274, 7, 3, 0, 0, 274, 47, 1, 0, 0, 0, 275, 276, 5, 45, 0, 0, 276, 49, 1, 0, 0, 0, 23, 55, 60, 62, 79, 85, 92, 110, 120, 129, 131, 143, 182, 189, 193, 207, 215, 224, 231, 242, 249, 256, 261, 270] \ 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 5004d31..376ad8c 100644 --- a/src/main/java/de/maishai/antlr/DecafBaseListener.java +++ b/src/main/java/de/maishai/antlr/DecafBaseListener.java @@ -401,13 +401,13 @@ public class DecafBaseListener implements DecafListener { * *

The default implementation does nothing.

*/ - @Override public void enterFieldId(DecafParser.FieldIdContext ctx) { } + @Override public void enterFieldVarAccess(DecafParser.FieldVarAccessContext ctx) { } /** * {@inheritDoc} * *

The default implementation does nothing.

*/ - @Override public void exitFieldId(DecafParser.FieldIdContext ctx) { } + @Override public void exitFieldVarAccess(DecafParser.FieldVarAccessContext ctx) { } /** * {@inheritDoc} * diff --git a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java index 073438a..aebf57c 100644 --- a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java +++ b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java @@ -242,7 +242,7 @@ public class DecafBaseVisitor extends AbstractParseTreeVisitor implements *

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

*/ - @Override public T visitFieldId(DecafParser.FieldIdContext ctx) { return visitChildren(ctx); } + @Override public T visitFieldVarAccess(DecafParser.FieldVarAccessContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/src/main/java/de/maishai/antlr/DecafLexer.interp b/src/main/java/de/maishai/antlr/DecafLexer.interp index e9f449b..8b9a023 100644 --- a/src/main/java/de/maishai/antlr/DecafLexer.interp +++ b/src/main/java/de/maishai/antlr/DecafLexer.interp @@ -155,4 +155,4 @@ mode names: DEFAULT_MODE atn: -[4, 0, 47, 288, 6, -1, 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, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 3, 42, 269, 8, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 4, 44, 276, 8, 44, 11, 44, 12, 44, 277, 1, 45, 4, 45, 281, 8, 45, 11, 45, 12, 45, 282, 1, 46, 1, 46, 1, 46, 1, 46, 0, 0, 47, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 1, 0, 4, 1, 0, 39, 39, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 3, 0, 9, 10, 13, 13, 32, 32, 290, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 1, 95, 1, 0, 0, 0, 3, 101, 1, 0, 0, 0, 5, 103, 1, 0, 0, 0, 7, 105, 1, 0, 0, 0, 9, 107, 1, 0, 0, 0, 11, 109, 1, 0, 0, 0, 13, 111, 1, 0, 0, 0, 15, 118, 1, 0, 0, 0, 17, 123, 1, 0, 0, 0, 19, 137, 1, 0, 0, 0, 21, 139, 1, 0, 0, 0, 23, 142, 1, 0, 0, 0, 25, 147, 1, 0, 0, 0, 27, 151, 1, 0, 0, 0, 29, 157, 1, 0, 0, 0, 31, 160, 1, 0, 0, 0, 33, 167, 1, 0, 0, 0, 35, 173, 1, 0, 0, 0, 37, 175, 1, 0, 0, 0, 39, 182, 1, 0, 0, 0, 41, 186, 1, 0, 0, 0, 43, 191, 1, 0, 0, 0, 45, 196, 1, 0, 0, 0, 47, 198, 1, 0, 0, 0, 49, 200, 1, 0, 0, 0, 51, 202, 1, 0, 0, 0, 53, 204, 1, 0, 0, 0, 55, 206, 1, 0, 0, 0, 57, 209, 1, 0, 0, 0, 59, 212, 1, 0, 0, 0, 61, 215, 1, 0, 0, 0, 63, 218, 1, 0, 0, 0, 65, 221, 1, 0, 0, 0, 67, 224, 1, 0, 0, 0, 69, 226, 1, 0, 0, 0, 71, 229, 1, 0, 0, 0, 73, 232, 1, 0, 0, 0, 75, 235, 1, 0, 0, 0, 77, 237, 1, 0, 0, 0, 79, 241, 1, 0, 0, 0, 81, 249, 1, 0, 0, 0, 83, 254, 1, 0, 0, 0, 85, 268, 1, 0, 0, 0, 87, 270, 1, 0, 0, 0, 89, 275, 1, 0, 0, 0, 91, 280, 1, 0, 0, 0, 93, 284, 1, 0, 0, 0, 95, 96, 5, 99, 0, 0, 96, 97, 5, 108, 0, 0, 97, 98, 5, 97, 0, 0, 98, 99, 5, 115, 0, 0, 99, 100, 5, 115, 0, 0, 100, 2, 1, 0, 0, 0, 101, 102, 5, 123, 0, 0, 102, 4, 1, 0, 0, 0, 103, 104, 5, 125, 0, 0, 104, 6, 1, 0, 0, 0, 105, 106, 5, 59, 0, 0, 106, 8, 1, 0, 0, 0, 107, 108, 5, 40, 0, 0, 108, 10, 1, 0, 0, 0, 109, 110, 5, 41, 0, 0, 110, 12, 1, 0, 0, 0, 111, 112, 5, 115, 0, 0, 112, 113, 5, 116, 0, 0, 113, 114, 5, 97, 0, 0, 114, 115, 5, 116, 0, 0, 115, 116, 5, 105, 0, 0, 116, 117, 5, 99, 0, 0, 117, 14, 1, 0, 0, 0, 118, 119, 5, 109, 0, 0, 119, 120, 5, 97, 0, 0, 120, 121, 5, 105, 0, 0, 121, 122, 5, 110, 0, 0, 122, 16, 1, 0, 0, 0, 123, 124, 5, 83, 0, 0, 124, 125, 5, 116, 0, 0, 125, 126, 5, 114, 0, 0, 126, 127, 5, 105, 0, 0, 127, 128, 5, 110, 0, 0, 128, 129, 5, 103, 0, 0, 129, 130, 5, 91, 0, 0, 130, 131, 5, 93, 0, 0, 131, 132, 5, 32, 0, 0, 132, 133, 5, 97, 0, 0, 133, 134, 5, 114, 0, 0, 134, 135, 5, 103, 0, 0, 135, 136, 5, 115, 0, 0, 136, 18, 1, 0, 0, 0, 137, 138, 5, 44, 0, 0, 138, 20, 1, 0, 0, 0, 139, 140, 5, 105, 0, 0, 140, 141, 5, 102, 0, 0, 141, 22, 1, 0, 0, 0, 142, 143, 5, 101, 0, 0, 143, 144, 5, 108, 0, 0, 144, 145, 5, 115, 0, 0, 145, 146, 5, 101, 0, 0, 146, 24, 1, 0, 0, 0, 147, 148, 5, 102, 0, 0, 148, 149, 5, 111, 0, 0, 149, 150, 5, 114, 0, 0, 150, 26, 1, 0, 0, 0, 151, 152, 5, 119, 0, 0, 152, 153, 5, 104, 0, 0, 153, 154, 5, 105, 0, 0, 154, 155, 5, 108, 0, 0, 155, 156, 5, 101, 0, 0, 156, 28, 1, 0, 0, 0, 157, 158, 5, 100, 0, 0, 158, 159, 5, 111, 0, 0, 159, 30, 1, 0, 0, 0, 160, 161, 5, 114, 0, 0, 161, 162, 5, 101, 0, 0, 162, 163, 5, 116, 0, 0, 163, 164, 5, 117, 0, 0, 164, 165, 5, 114, 0, 0, 165, 166, 5, 110, 0, 0, 166, 32, 1, 0, 0, 0, 167, 168, 5, 98, 0, 0, 168, 169, 5, 114, 0, 0, 169, 170, 5, 101, 0, 0, 170, 171, 5, 97, 0, 0, 171, 172, 5, 107, 0, 0, 172, 34, 1, 0, 0, 0, 173, 174, 5, 46, 0, 0, 174, 36, 1, 0, 0, 0, 175, 176, 5, 112, 0, 0, 176, 177, 5, 117, 0, 0, 177, 178, 5, 98, 0, 0, 178, 179, 5, 108, 0, 0, 179, 180, 5, 105, 0, 0, 180, 181, 5, 99, 0, 0, 181, 38, 1, 0, 0, 0, 182, 183, 5, 110, 0, 0, 183, 184, 5, 101, 0, 0, 184, 185, 5, 119, 0, 0, 185, 40, 1, 0, 0, 0, 186, 187, 5, 110, 0, 0, 187, 188, 5, 117, 0, 0, 188, 189, 5, 108, 0, 0, 189, 190, 5, 108, 0, 0, 190, 42, 1, 0, 0, 0, 191, 192, 5, 116, 0, 0, 192, 193, 5, 104, 0, 0, 193, 194, 5, 105, 0, 0, 194, 195, 5, 115, 0, 0, 195, 44, 1, 0, 0, 0, 196, 197, 5, 45, 0, 0, 197, 46, 1, 0, 0, 0, 198, 199, 5, 43, 0, 0, 199, 48, 1, 0, 0, 0, 200, 201, 5, 42, 0, 0, 201, 50, 1, 0, 0, 0, 202, 203, 5, 62, 0, 0, 203, 52, 1, 0, 0, 0, 204, 205, 5, 60, 0, 0, 205, 54, 1, 0, 0, 0, 206, 207, 5, 62, 0, 0, 207, 208, 5, 61, 0, 0, 208, 56, 1, 0, 0, 0, 209, 210, 5, 60, 0, 0, 210, 211, 5, 61, 0, 0, 211, 58, 1, 0, 0, 0, 212, 213, 5, 61, 0, 0, 213, 214, 5, 61, 0, 0, 214, 60, 1, 0, 0, 0, 215, 216, 5, 33, 0, 0, 216, 217, 5, 61, 0, 0, 217, 62, 1, 0, 0, 0, 218, 219, 5, 38, 0, 0, 219, 220, 5, 38, 0, 0, 220, 64, 1, 0, 0, 0, 221, 222, 5, 124, 0, 0, 222, 223, 5, 124, 0, 0, 223, 66, 1, 0, 0, 0, 224, 225, 5, 61, 0, 0, 225, 68, 1, 0, 0, 0, 226, 227, 5, 43, 0, 0, 227, 228, 5, 61, 0, 0, 228, 70, 1, 0, 0, 0, 229, 230, 5, 45, 0, 0, 230, 231, 5, 61, 0, 0, 231, 72, 1, 0, 0, 0, 232, 233, 5, 42, 0, 0, 233, 234, 5, 61, 0, 0, 234, 74, 1, 0, 0, 0, 235, 236, 5, 33, 0, 0, 236, 76, 1, 0, 0, 0, 237, 238, 5, 105, 0, 0, 238, 239, 5, 110, 0, 0, 239, 240, 5, 116, 0, 0, 240, 78, 1, 0, 0, 0, 241, 242, 5, 98, 0, 0, 242, 243, 5, 111, 0, 0, 243, 244, 5, 111, 0, 0, 244, 245, 5, 108, 0, 0, 245, 246, 5, 101, 0, 0, 246, 247, 5, 97, 0, 0, 247, 248, 5, 110, 0, 0, 248, 80, 1, 0, 0, 0, 249, 250, 5, 118, 0, 0, 250, 251, 5, 111, 0, 0, 251, 252, 5, 105, 0, 0, 252, 253, 5, 100, 0, 0, 253, 82, 1, 0, 0, 0, 254, 255, 5, 99, 0, 0, 255, 256, 5, 104, 0, 0, 256, 257, 5, 97, 0, 0, 257, 258, 5, 114, 0, 0, 258, 84, 1, 0, 0, 0, 259, 260, 5, 116, 0, 0, 260, 261, 5, 114, 0, 0, 261, 262, 5, 117, 0, 0, 262, 269, 5, 101, 0, 0, 263, 264, 5, 102, 0, 0, 264, 265, 5, 97, 0, 0, 265, 266, 5, 108, 0, 0, 266, 267, 5, 115, 0, 0, 267, 269, 5, 101, 0, 0, 268, 259, 1, 0, 0, 0, 268, 263, 1, 0, 0, 0, 269, 86, 1, 0, 0, 0, 270, 271, 7, 0, 0, 0, 271, 272, 7, 1, 0, 0, 272, 273, 7, 0, 0, 0, 273, 88, 1, 0, 0, 0, 274, 276, 7, 1, 0, 0, 275, 274, 1, 0, 0, 0, 276, 277, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 277, 278, 1, 0, 0, 0, 278, 90, 1, 0, 0, 0, 279, 281, 7, 2, 0, 0, 280, 279, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 280, 1, 0, 0, 0, 282, 283, 1, 0, 0, 0, 283, 92, 1, 0, 0, 0, 284, 285, 7, 3, 0, 0, 285, 286, 1, 0, 0, 0, 286, 287, 6, 46, 0, 0, 287, 94, 1, 0, 0, 0, 4, 0, 268, 277, 282, 1, 6, 0, 0] \ No newline at end of file +[4, 0, 47, 298, 6, -1, 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, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 3, 42, 269, 8, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 4, 44, 276, 8, 44, 11, 44, 12, 44, 277, 1, 44, 5, 44, 281, 8, 44, 10, 44, 12, 44, 284, 9, 44, 4, 44, 286, 8, 44, 11, 44, 12, 44, 287, 1, 45, 4, 45, 291, 8, 45, 11, 45, 12, 45, 292, 1, 46, 1, 46, 1, 46, 1, 46, 0, 0, 47, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 1, 0, 4, 1, 0, 39, 39, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 3, 0, 9, 10, 13, 13, 32, 32, 302, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 1, 95, 1, 0, 0, 0, 3, 101, 1, 0, 0, 0, 5, 103, 1, 0, 0, 0, 7, 105, 1, 0, 0, 0, 9, 107, 1, 0, 0, 0, 11, 109, 1, 0, 0, 0, 13, 111, 1, 0, 0, 0, 15, 118, 1, 0, 0, 0, 17, 123, 1, 0, 0, 0, 19, 137, 1, 0, 0, 0, 21, 139, 1, 0, 0, 0, 23, 142, 1, 0, 0, 0, 25, 147, 1, 0, 0, 0, 27, 151, 1, 0, 0, 0, 29, 157, 1, 0, 0, 0, 31, 160, 1, 0, 0, 0, 33, 167, 1, 0, 0, 0, 35, 173, 1, 0, 0, 0, 37, 175, 1, 0, 0, 0, 39, 182, 1, 0, 0, 0, 41, 186, 1, 0, 0, 0, 43, 191, 1, 0, 0, 0, 45, 196, 1, 0, 0, 0, 47, 198, 1, 0, 0, 0, 49, 200, 1, 0, 0, 0, 51, 202, 1, 0, 0, 0, 53, 204, 1, 0, 0, 0, 55, 206, 1, 0, 0, 0, 57, 209, 1, 0, 0, 0, 59, 212, 1, 0, 0, 0, 61, 215, 1, 0, 0, 0, 63, 218, 1, 0, 0, 0, 65, 221, 1, 0, 0, 0, 67, 224, 1, 0, 0, 0, 69, 226, 1, 0, 0, 0, 71, 229, 1, 0, 0, 0, 73, 232, 1, 0, 0, 0, 75, 235, 1, 0, 0, 0, 77, 237, 1, 0, 0, 0, 79, 241, 1, 0, 0, 0, 81, 249, 1, 0, 0, 0, 83, 254, 1, 0, 0, 0, 85, 268, 1, 0, 0, 0, 87, 270, 1, 0, 0, 0, 89, 285, 1, 0, 0, 0, 91, 290, 1, 0, 0, 0, 93, 294, 1, 0, 0, 0, 95, 96, 5, 99, 0, 0, 96, 97, 5, 108, 0, 0, 97, 98, 5, 97, 0, 0, 98, 99, 5, 115, 0, 0, 99, 100, 5, 115, 0, 0, 100, 2, 1, 0, 0, 0, 101, 102, 5, 123, 0, 0, 102, 4, 1, 0, 0, 0, 103, 104, 5, 125, 0, 0, 104, 6, 1, 0, 0, 0, 105, 106, 5, 59, 0, 0, 106, 8, 1, 0, 0, 0, 107, 108, 5, 40, 0, 0, 108, 10, 1, 0, 0, 0, 109, 110, 5, 41, 0, 0, 110, 12, 1, 0, 0, 0, 111, 112, 5, 115, 0, 0, 112, 113, 5, 116, 0, 0, 113, 114, 5, 97, 0, 0, 114, 115, 5, 116, 0, 0, 115, 116, 5, 105, 0, 0, 116, 117, 5, 99, 0, 0, 117, 14, 1, 0, 0, 0, 118, 119, 5, 109, 0, 0, 119, 120, 5, 97, 0, 0, 120, 121, 5, 105, 0, 0, 121, 122, 5, 110, 0, 0, 122, 16, 1, 0, 0, 0, 123, 124, 5, 83, 0, 0, 124, 125, 5, 116, 0, 0, 125, 126, 5, 114, 0, 0, 126, 127, 5, 105, 0, 0, 127, 128, 5, 110, 0, 0, 128, 129, 5, 103, 0, 0, 129, 130, 5, 91, 0, 0, 130, 131, 5, 93, 0, 0, 131, 132, 5, 32, 0, 0, 132, 133, 5, 97, 0, 0, 133, 134, 5, 114, 0, 0, 134, 135, 5, 103, 0, 0, 135, 136, 5, 115, 0, 0, 136, 18, 1, 0, 0, 0, 137, 138, 5, 44, 0, 0, 138, 20, 1, 0, 0, 0, 139, 140, 5, 105, 0, 0, 140, 141, 5, 102, 0, 0, 141, 22, 1, 0, 0, 0, 142, 143, 5, 101, 0, 0, 143, 144, 5, 108, 0, 0, 144, 145, 5, 115, 0, 0, 145, 146, 5, 101, 0, 0, 146, 24, 1, 0, 0, 0, 147, 148, 5, 102, 0, 0, 148, 149, 5, 111, 0, 0, 149, 150, 5, 114, 0, 0, 150, 26, 1, 0, 0, 0, 151, 152, 5, 119, 0, 0, 152, 153, 5, 104, 0, 0, 153, 154, 5, 105, 0, 0, 154, 155, 5, 108, 0, 0, 155, 156, 5, 101, 0, 0, 156, 28, 1, 0, 0, 0, 157, 158, 5, 100, 0, 0, 158, 159, 5, 111, 0, 0, 159, 30, 1, 0, 0, 0, 160, 161, 5, 114, 0, 0, 161, 162, 5, 101, 0, 0, 162, 163, 5, 116, 0, 0, 163, 164, 5, 117, 0, 0, 164, 165, 5, 114, 0, 0, 165, 166, 5, 110, 0, 0, 166, 32, 1, 0, 0, 0, 167, 168, 5, 98, 0, 0, 168, 169, 5, 114, 0, 0, 169, 170, 5, 101, 0, 0, 170, 171, 5, 97, 0, 0, 171, 172, 5, 107, 0, 0, 172, 34, 1, 0, 0, 0, 173, 174, 5, 46, 0, 0, 174, 36, 1, 0, 0, 0, 175, 176, 5, 112, 0, 0, 176, 177, 5, 117, 0, 0, 177, 178, 5, 98, 0, 0, 178, 179, 5, 108, 0, 0, 179, 180, 5, 105, 0, 0, 180, 181, 5, 99, 0, 0, 181, 38, 1, 0, 0, 0, 182, 183, 5, 110, 0, 0, 183, 184, 5, 101, 0, 0, 184, 185, 5, 119, 0, 0, 185, 40, 1, 0, 0, 0, 186, 187, 5, 110, 0, 0, 187, 188, 5, 117, 0, 0, 188, 189, 5, 108, 0, 0, 189, 190, 5, 108, 0, 0, 190, 42, 1, 0, 0, 0, 191, 192, 5, 116, 0, 0, 192, 193, 5, 104, 0, 0, 193, 194, 5, 105, 0, 0, 194, 195, 5, 115, 0, 0, 195, 44, 1, 0, 0, 0, 196, 197, 5, 45, 0, 0, 197, 46, 1, 0, 0, 0, 198, 199, 5, 43, 0, 0, 199, 48, 1, 0, 0, 0, 200, 201, 5, 42, 0, 0, 201, 50, 1, 0, 0, 0, 202, 203, 5, 62, 0, 0, 203, 52, 1, 0, 0, 0, 204, 205, 5, 60, 0, 0, 205, 54, 1, 0, 0, 0, 206, 207, 5, 62, 0, 0, 207, 208, 5, 61, 0, 0, 208, 56, 1, 0, 0, 0, 209, 210, 5, 60, 0, 0, 210, 211, 5, 61, 0, 0, 211, 58, 1, 0, 0, 0, 212, 213, 5, 61, 0, 0, 213, 214, 5, 61, 0, 0, 214, 60, 1, 0, 0, 0, 215, 216, 5, 33, 0, 0, 216, 217, 5, 61, 0, 0, 217, 62, 1, 0, 0, 0, 218, 219, 5, 38, 0, 0, 219, 220, 5, 38, 0, 0, 220, 64, 1, 0, 0, 0, 221, 222, 5, 124, 0, 0, 222, 223, 5, 124, 0, 0, 223, 66, 1, 0, 0, 0, 224, 225, 5, 61, 0, 0, 225, 68, 1, 0, 0, 0, 226, 227, 5, 43, 0, 0, 227, 228, 5, 61, 0, 0, 228, 70, 1, 0, 0, 0, 229, 230, 5, 45, 0, 0, 230, 231, 5, 61, 0, 0, 231, 72, 1, 0, 0, 0, 232, 233, 5, 42, 0, 0, 233, 234, 5, 61, 0, 0, 234, 74, 1, 0, 0, 0, 235, 236, 5, 33, 0, 0, 236, 76, 1, 0, 0, 0, 237, 238, 5, 105, 0, 0, 238, 239, 5, 110, 0, 0, 239, 240, 5, 116, 0, 0, 240, 78, 1, 0, 0, 0, 241, 242, 5, 98, 0, 0, 242, 243, 5, 111, 0, 0, 243, 244, 5, 111, 0, 0, 244, 245, 5, 108, 0, 0, 245, 246, 5, 101, 0, 0, 246, 247, 5, 97, 0, 0, 247, 248, 5, 110, 0, 0, 248, 80, 1, 0, 0, 0, 249, 250, 5, 118, 0, 0, 250, 251, 5, 111, 0, 0, 251, 252, 5, 105, 0, 0, 252, 253, 5, 100, 0, 0, 253, 82, 1, 0, 0, 0, 254, 255, 5, 99, 0, 0, 255, 256, 5, 104, 0, 0, 256, 257, 5, 97, 0, 0, 257, 258, 5, 114, 0, 0, 258, 84, 1, 0, 0, 0, 259, 260, 5, 116, 0, 0, 260, 261, 5, 114, 0, 0, 261, 262, 5, 117, 0, 0, 262, 269, 5, 101, 0, 0, 263, 264, 5, 102, 0, 0, 264, 265, 5, 97, 0, 0, 265, 266, 5, 108, 0, 0, 266, 267, 5, 115, 0, 0, 267, 269, 5, 101, 0, 0, 268, 259, 1, 0, 0, 0, 268, 263, 1, 0, 0, 0, 269, 86, 1, 0, 0, 0, 270, 271, 7, 0, 0, 0, 271, 272, 7, 1, 0, 0, 272, 273, 7, 0, 0, 0, 273, 88, 1, 0, 0, 0, 274, 276, 7, 1, 0, 0, 275, 274, 1, 0, 0, 0, 276, 277, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 277, 278, 1, 0, 0, 0, 278, 282, 1, 0, 0, 0, 279, 281, 7, 2, 0, 0, 280, 279, 1, 0, 0, 0, 281, 284, 1, 0, 0, 0, 282, 280, 1, 0, 0, 0, 282, 283, 1, 0, 0, 0, 283, 286, 1, 0, 0, 0, 284, 282, 1, 0, 0, 0, 285, 275, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 285, 1, 0, 0, 0, 287, 288, 1, 0, 0, 0, 288, 90, 1, 0, 0, 0, 289, 291, 7, 2, 0, 0, 290, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 290, 1, 0, 0, 0, 292, 293, 1, 0, 0, 0, 293, 92, 1, 0, 0, 0, 294, 295, 7, 3, 0, 0, 295, 296, 1, 0, 0, 0, 296, 297, 6, 46, 0, 0, 297, 94, 1, 0, 0, 0, 6, 0, 268, 277, 282, 287, 292, 1, 6, 0, 0] \ No newline at end of file diff --git a/src/main/java/de/maishai/antlr/DecafLexer.java b/src/main/java/de/maishai/antlr/DecafLexer.java index 079186c..f4b2ef9 100644 --- a/src/main/java/de/maishai/antlr/DecafLexer.java +++ b/src/main/java/de/maishai/antlr/DecafLexer.java @@ -123,7 +123,7 @@ public class DecafLexer extends Lexer { public ATN getATN() { return _ATN; } public static final String _serializedATN = - "\u0004\u0000/\u0120\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+ + "\u0004\u0000/\u012a\u0006\uffff\uffff\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"+ @@ -161,14 +161,15 @@ public class DecafLexer extends Lexer { "\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001(\u0001"+ "(\u0001(\u0001(\u0001(\u0001)\u0001)\u0001)\u0001)\u0001)\u0001*\u0001"+ "*\u0001*\u0001*\u0001*\u0001*\u0001*\u0001*\u0001*\u0003*\u010d\b*\u0001"+ - "+\u0001+\u0001+\u0001+\u0001,\u0004,\u0114\b,\u000b,\f,\u0115\u0001-\u0004"+ - "-\u0119\b-\u000b-\f-\u011a\u0001.\u0001.\u0001.\u0001.\u0000\u0000/\u0001"+ + "+\u0001+\u0001+\u0001+\u0001,\u0004,\u0114\b,\u000b,\f,\u0115\u0001,\u0005"+ + ",\u0119\b,\n,\f,\u011c\t,\u0004,\u011e\b,\u000b,\f,\u011f\u0001-\u0004"+ + "-\u0123\b-\u000b-\f-\u0124\u0001.\u0001.\u0001.\u0001.\u0000\u0000/\u0001"+ "\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007"+ "\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e\u001d"+ "\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015+\u0016-\u0017/"+ "\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\"E#G$I%K"+ "&M\'O(Q)S*U+W,Y-[.]/\u0001\u0000\u0004\u0001\u0000\'\'\u0002\u0000AZa"+ - "z\u0001\u000009\u0003\u0000\t\n\r\r \u0122\u0000\u0001\u0001\u0000\u0000"+ + "z\u0001\u000009\u0003\u0000\t\n\r\r \u012e\u0000\u0001\u0001\u0000\u0000"+ "\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001\u0000\u0000"+ "\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000"+ "\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000\u0000\u0000"+ @@ -209,8 +210,8 @@ public class DecafLexer extends Lexer { "\u0000K\u00eb\u0001\u0000\u0000\u0000M\u00ed\u0001\u0000\u0000\u0000O"+ "\u00f1\u0001\u0000\u0000\u0000Q\u00f9\u0001\u0000\u0000\u0000S\u00fe\u0001"+ "\u0000\u0000\u0000U\u010c\u0001\u0000\u0000\u0000W\u010e\u0001\u0000\u0000"+ - "\u0000Y\u0113\u0001\u0000\u0000\u0000[\u0118\u0001\u0000\u0000\u0000]"+ - "\u011c\u0001\u0000\u0000\u0000_`\u0005c\u0000\u0000`a\u0005l\u0000\u0000"+ + "\u0000Y\u011d\u0001\u0000\u0000\u0000[\u0122\u0001\u0000\u0000\u0000]"+ + "\u0126\u0001\u0000\u0000\u0000_`\u0005c\u0000\u0000`a\u0005l\u0000\u0000"+ "ab\u0005a\u0000\u0000bc\u0005s\u0000\u0000cd\u0005s\u0000\u0000d\u0002"+ "\u0001\u0000\u0000\u0000ef\u0005{\u0000\u0000f\u0004\u0001\u0000\u0000"+ "\u0000gh\u0005}\u0000\u0000h\u0006\u0001\u0000\u0000\u0000ij\u0005;\u0000"+ @@ -287,13 +288,19 @@ public class DecafLexer extends Lexer { "\u0000\u0000\u0110\u0111\u0007\u0000\u0000\u0000\u0111X\u0001\u0000\u0000"+ "\u0000\u0112\u0114\u0007\u0001\u0000\u0000\u0113\u0112\u0001\u0000\u0000"+ "\u0000\u0114\u0115\u0001\u0000\u0000\u0000\u0115\u0113\u0001\u0000\u0000"+ - "\u0000\u0115\u0116\u0001\u0000\u0000\u0000\u0116Z\u0001\u0000\u0000\u0000"+ - "\u0117\u0119\u0007\u0002\u0000\u0000\u0118\u0117\u0001\u0000\u0000\u0000"+ - "\u0119\u011a\u0001\u0000\u0000\u0000\u011a\u0118\u0001\u0000\u0000\u0000"+ - "\u011a\u011b\u0001\u0000\u0000\u0000\u011b\\\u0001\u0000\u0000\u0000\u011c"+ - "\u011d\u0007\u0003\u0000\u0000\u011d\u011e\u0001\u0000\u0000\u0000\u011e"+ - "\u011f\u0006.\u0000\u0000\u011f^\u0001\u0000\u0000\u0000\u0004\u0000\u010c"+ - "\u0115\u011a\u0001\u0006\u0000\u0000"; + "\u0000\u0115\u0116\u0001\u0000\u0000\u0000\u0116\u011a\u0001\u0000\u0000"+ + "\u0000\u0117\u0119\u0007\u0002\u0000\u0000\u0118\u0117\u0001\u0000\u0000"+ + "\u0000\u0119\u011c\u0001\u0000\u0000\u0000\u011a\u0118\u0001\u0000\u0000"+ + "\u0000\u011a\u011b\u0001\u0000\u0000\u0000\u011b\u011e\u0001\u0000\u0000"+ + "\u0000\u011c\u011a\u0001\u0000\u0000\u0000\u011d\u0113\u0001\u0000\u0000"+ + "\u0000\u011e\u011f\u0001\u0000\u0000\u0000\u011f\u011d\u0001\u0000\u0000"+ + "\u0000\u011f\u0120\u0001\u0000\u0000\u0000\u0120Z\u0001\u0000\u0000\u0000"+ + "\u0121\u0123\u0007\u0002\u0000\u0000\u0122\u0121\u0001\u0000\u0000\u0000"+ + "\u0123\u0124\u0001\u0000\u0000\u0000\u0124\u0122\u0001\u0000\u0000\u0000"+ + "\u0124\u0125\u0001\u0000\u0000\u0000\u0125\\\u0001\u0000\u0000\u0000\u0126"+ + "\u0127\u0007\u0003\u0000\u0000\u0127\u0128\u0001\u0000\u0000\u0000\u0128"+ + "\u0129\u0006.\u0000\u0000\u0129^\u0001\u0000\u0000\u0000\u0006\u0000\u010c"+ + "\u0115\u011a\u011f\u0124\u0001\u0006\u0000\u0000"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/src/main/java/de/maishai/antlr/DecafListener.java b/src/main/java/de/maishai/antlr/DecafListener.java index 993c502..cc3b618 100644 --- a/src/main/java/de/maishai/antlr/DecafListener.java +++ b/src/main/java/de/maishai/antlr/DecafListener.java @@ -364,15 +364,15 @@ public interface DecafListener extends ParseTreeListener { */ void exitUnaryOp(DecafParser.UnaryOpContext ctx); /** - * Enter a parse tree produced by {@link DecafParser#fieldId}. + * Enter a parse tree produced by {@link DecafParser#fieldVarAccess}. * @param ctx the parse tree */ - void enterFieldId(DecafParser.FieldIdContext ctx); + void enterFieldVarAccess(DecafParser.FieldVarAccessContext ctx); /** - * Exit a parse tree produced by {@link DecafParser#fieldId}. + * Exit a parse tree produced by {@link DecafParser#fieldVarAccess}. * @param ctx the parse tree */ - void exitFieldId(DecafParser.FieldIdContext ctx); + void exitFieldVarAccess(DecafParser.FieldVarAccessContext ctx); /** * Enter a parse tree produced by {@link DecafParser#assign}. * @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 ca9882c..4421179 100644 --- a/src/main/java/de/maishai/antlr/DecafParser.java +++ b/src/main/java/de/maishai/antlr/DecafParser.java @@ -28,15 +28,15 @@ public class DecafParser extends Parser { RULE_returntype = 4, RULE_type = 5, RULE_meth = 6, RULE_mainmeth = 7, RULE_constructor = 8, RULE_params = 9, RULE_param = 10, RULE_block = 11, RULE_stmt = 12, RULE_stmtexpr = 13, RULE_expr = 14, RULE_binaryOp = 15, - RULE_unaryOp = 16, RULE_fieldId = 17, RULE_assign = 18, RULE_methCall = 19, + RULE_unaryOp = 16, RULE_fieldVarAccess = 17, RULE_assign = 18, RULE_methCall = 19, RULE_recipient = 20, RULE_methName = 21, RULE_args = 22, RULE_literal = 23, RULE_id = 24; private static String[] makeRuleNames() { return new String[] { "class", "field", "localVar", "assignSign", "returntype", "type", "meth", "mainmeth", "constructor", "params", "param", "block", "stmt", "stmtexpr", - "expr", "binaryOp", "unaryOp", "fieldId", "assign", "methCall", "recursiveOwnerChain", - "methName", "args", "literal", "id" + "expr", "binaryOp", "unaryOp", "fieldVarAccess", "assign", "methCall", + "recipient", "methName", "args", "literal", "id" }; } public static final String[] ruleNames = makeRuleNames(); @@ -670,13 +670,13 @@ public class DecafParser extends Parser { @SuppressWarnings("CheckReturnValue") public static class ConstructorContext extends ParserRuleContext { + public TerminalNode PUBLIC() { return getToken(DecafParser.PUBLIC, 0); } public IdContext id() { return getRuleContext(IdContext.class,0); } public BlockContext block() { return getRuleContext(BlockContext.class,0); } - public TerminalNode PUBLIC() { return getToken(DecafParser.PUBLIC, 0); } public ParamsContext params() { return getRuleContext(ParamsContext.class,0); } @@ -706,33 +706,25 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { + setState(106); + match(PUBLIC); setState(107); - _errHandler.sync(this); - _la = _input.LA(1); - if (_la==PUBLIC) { - { - setState(106); - match(PUBLIC); - } - } - - setState(109); id(); - setState(110); + setState(108); match(T__4); - setState(112); + setState(110); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231686041600L) != 0)) { { - setState(111); + setState(109); params(); } } - setState(114); + setState(112); match(T__5); - setState(115); + setState(113); block(); } } @@ -781,21 +773,21 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(117); + setState(115); param(); - setState(122); + setState(120); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__9) { { { - setState(118); + setState(116); match(T__9); - setState(119); + setState(117); param(); } } - setState(124); + setState(122); _errHandler.sync(this); _la = _input.LA(1); } @@ -845,9 +837,9 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(125); + setState(123); type(); - setState(126); + setState(124); id(); } } @@ -902,35 +894,35 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(128); + setState(126); match(T__1); - setState(133); + setState(131); _errHandler.sync(this); _la = _input.LA(1); while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 41231691540480L) != 0)) { { - setState(131); + setState(129); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,9,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,8,_ctx) ) { case 1: { - setState(129); + setState(127); localVar(); } break; case 2: { - setState(130); + setState(128); stmt(); } break; } } - setState(135); + setState(133); _errHandler.sync(this); _la = _input.LA(1); } - setState(136); + setState(134); match(T__2); } } @@ -1158,31 +1150,31 @@ public class DecafParser extends Parser { enterRule(_localctx, 24, RULE_stmt); int _la; try { - setState(184); + setState(182); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,12,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) { case 1: _localctx = new IfContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(138); + setState(136); match(T__10); - setState(139); + setState(137); match(T__4); - setState(140); + setState(138); expr(0); - setState(141); + setState(139); match(T__5); - setState(142); + setState(140); block(); - setState(145); + setState(143); _errHandler.sync(this); _la = _input.LA(1); if (_la==T__11) { { - setState(143); + setState(141); match(T__11); - setState(144); + setState(142); block(); } } @@ -1193,23 +1185,23 @@ public class DecafParser extends Parser { _localctx = new ForContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(147); + setState(145); match(T__12); - setState(148); + setState(146); match(T__4); - setState(149); + setState(147); assign(); + setState(148); + match(T__3); + setState(149); + expr(0); setState(150); match(T__3); setState(151); - expr(0); - setState(152); - match(T__3); - setState(153); assign(); - setState(154); + setState(152); match(T__5); - setState(155); + setState(153); block(); } break; @@ -1217,15 +1209,15 @@ public class DecafParser extends Parser { _localctx = new WhileContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(157); + setState(155); match(T__13); - setState(158); + setState(156); match(T__4); - setState(159); + setState(157); expr(0); - setState(160); + setState(158); match(T__5); - setState(161); + setState(159); block(); } break; @@ -1233,17 +1225,17 @@ public class DecafParser extends Parser { _localctx = new DoWhileContext(_localctx); enterOuterAlt(_localctx, 4); { - setState(163); + setState(161); match(T__14); - setState(164); + setState(162); block(); - setState(165); + setState(163); match(T__13); - setState(166); + setState(164); match(T__4); - setState(167); + setState(165); expr(0); - setState(168); + setState(166); match(T__5); } break; @@ -1251,11 +1243,11 @@ public class DecafParser extends Parser { _localctx = new ReturnContext(_localctx); enterOuterAlt(_localctx, 5); { - setState(170); + setState(168); match(T__15); - setState(171); + setState(169); expr(0); - setState(172); + setState(170); match(T__3); } break; @@ -1263,9 +1255,9 @@ public class DecafParser extends Parser { _localctx = new ReturnVoidContext(_localctx); enterOuterAlt(_localctx, 6); { - setState(174); + setState(172); match(T__15); - setState(175); + setState(173); match(T__3); } break; @@ -1273,9 +1265,9 @@ public class DecafParser extends Parser { _localctx = new BreakContext(_localctx); enterOuterAlt(_localctx, 7); { - setState(176); + setState(174); match(T__16); - setState(177); + setState(175); match(T__3); } break; @@ -1283,9 +1275,9 @@ public class DecafParser extends Parser { _localctx = new AssignmentContext(_localctx); enterOuterAlt(_localctx, 8); { - setState(178); + setState(176); assign(); - setState(179); + setState(177); match(T__3); } break; @@ -1293,9 +1285,9 @@ public class DecafParser extends Parser { _localctx = new StatementExpressionstmtContext(_localctx); enterOuterAlt(_localctx, 9); { - setState(181); + setState(179); stmtexpr(); - setState(182); + setState(180); match(T__3); } break; @@ -1374,7 +1366,7 @@ public class DecafParser extends Parser { enterRule(_localctx, 26, RULE_stmtexpr); int _la; try { - setState(195); + setState(193); _errHandler.sync(this); switch (_input.LA(1)) { case THIS: @@ -1382,7 +1374,7 @@ public class DecafParser extends Parser { _localctx = new MethodCallContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(186); + setState(184); methCall(); } break; @@ -1390,23 +1382,23 @@ public class DecafParser extends Parser { _localctx = new NewContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(187); + setState(185); match(NEW); - setState(188); + setState(186); type(); - setState(189); + setState(187); match(T__4); - setState(191); + setState(189); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216288968736L) != 0)) { { - setState(190); + setState(188); args(); } } - setState(193); + setState(191); match(T__5); } break; @@ -1480,8 +1472,8 @@ public class DecafParser extends Parser { } @SuppressWarnings("CheckReturnValue") public static class IdentifierContext extends ExprContext { - public FieldIdContext fieldId() { - return getRuleContext(FieldIdContext.class,0); + public FieldVarAccessContext fieldVarAccess() { + return getRuleContext(FieldVarAccessContext.class,0); } public IdentifierContext(ExprContext ctx) { copyFrom(ctx); } @Override @@ -1600,18 +1592,18 @@ public class DecafParser extends Parser { int _alt; enterOuterAlt(_localctx, 1); { - setState(209); + setState(207); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) { case 1: { _localctx = new UnaryOperationContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(198); + setState(196); unaryOp(); - setState(199); + setState(197); expr(6); } break; @@ -1620,7 +1612,7 @@ public class DecafParser extends Parser { _localctx = new ConstantContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(201); + setState(199); literal(); } break; @@ -1629,11 +1621,11 @@ public class DecafParser extends Parser { _localctx = new ExpressionContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(202); + setState(200); match(T__4); - setState(203); + setState(201); expr(0); - setState(204); + setState(202); match(T__5); } break; @@ -1642,8 +1634,8 @@ public class DecafParser extends Parser { _localctx = new IdentifierContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(206); - fieldId(); + setState(204); + fieldVarAccess(); } break; case 5: @@ -1651,7 +1643,7 @@ public class DecafParser extends Parser { _localctx = new StatementExpressionexprContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(207); + setState(205); stmtexpr(); } break; @@ -1660,15 +1652,15 @@ public class DecafParser extends Parser { _localctx = new NullContext(_localctx); _ctx = _localctx; _prevctx = _localctx; - setState(208); + setState(206); match(NULL); } break; } _ctx.stop = _input.LT(-1); - setState(217); + setState(215); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,16,_ctx); + _alt = getInterpreter().adaptivePredict(_input,15,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { if ( _parseListeners!=null ) triggerExitRuleEvent(); @@ -1677,18 +1669,18 @@ public class DecafParser extends Parser { { _localctx = new BinaryOperationContext(new ExprContext(_parentctx, _parentState)); pushNewRecursionContext(_localctx, _startState, RULE_expr); - setState(211); + setState(209); if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)"); - setState(212); + setState(210); binaryOp(); - setState(213); + setState(211); expr(8); } } } - setState(219); + setState(217); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,16,_ctx); + _alt = getInterpreter().adaptivePredict(_input,15,_ctx); } } } @@ -1742,7 +1734,7 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(220); + setState(218); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 17171480576L) != 0)) ) { _errHandler.recoverInline(this); @@ -1795,7 +1787,7 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(222); + setState(220); _la = _input.LA(1); if ( !(_la==SUB || _la==NOT) ) { _errHandler.recoverInline(this); @@ -1819,7 +1811,7 @@ public class DecafParser extends Parser { } @SuppressWarnings("CheckReturnValue") - public static class FieldIdContext extends ParserRuleContext { + public static class FieldVarAccessContext extends ParserRuleContext { public IdContext id() { return getRuleContext(IdContext.class,0); } @@ -1830,64 +1822,64 @@ public class DecafParser extends Parser { public RecipientContext recipient(int i) { return getRuleContext(RecipientContext.class,i); } - public FieldIdContext(ParserRuleContext parent, int invokingState) { + public FieldVarAccessContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); } - @Override public int getRuleIndex() { return RULE_fieldId; } + @Override public int getRuleIndex() { return RULE_fieldVarAccess; } @Override public void enterRule(ParseTreeListener listener) { - if ( listener instanceof DecafListener ) ((DecafListener)listener).enterFieldId(this); + if ( listener instanceof DecafListener ) ((DecafListener)listener).enterFieldVarAccess(this); } @Override public void exitRule(ParseTreeListener listener) { - if ( listener instanceof DecafListener ) ((DecafListener)listener).exitFieldId(this); + if ( listener instanceof DecafListener ) ((DecafListener)listener).exitFieldVarAccess(this); } @Override public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof DecafVisitor ) return ((DecafVisitor)visitor).visitFieldId(this); + if ( visitor instanceof DecafVisitor ) return ((DecafVisitor)visitor).visitFieldVarAccess(this); else return visitor.visitChildren(this); } } - public final FieldIdContext fieldId() throws RecognitionException { - FieldIdContext _localctx = new FieldIdContext(_ctx, getState()); - enterRule(_localctx, 34, RULE_fieldId); + public final FieldVarAccessContext fieldVarAccess() throws RecognitionException { + FieldVarAccessContext _localctx = new FieldVarAccessContext(_ctx, getState()); + enterRule(_localctx, 34, RULE_fieldVarAccess); int _la; try { int _alt; enterOuterAlt(_localctx, 1); { - setState(226); + setState(224); _errHandler.sync(this); _la = _input.LA(1); if (_la==THIS) { { - setState(224); + setState(222); match(THIS); - setState(225); + setState(223); match(T__17); } } - setState(233); + setState(231); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,18,_ctx); + _alt = getInterpreter().adaptivePredict(_input,17,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(228); + setState(226); recipient(); - setState(229); + setState(227); match(T__17); } } } - setState(235); + setState(233); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,18,_ctx); + _alt = getInterpreter().adaptivePredict(_input,17,_ctx); } - setState(236); + setState(234); id(); } } @@ -1904,8 +1896,8 @@ public class DecafParser extends Parser { @SuppressWarnings("CheckReturnValue") public static class AssignContext extends ParserRuleContext { - public FieldIdContext fieldId() { - return getRuleContext(FieldIdContext.class,0); + public FieldVarAccessContext fieldVarAccess() { + return getRuleContext(FieldVarAccessContext.class,0); } public AssignSignContext assignSign() { return getRuleContext(AssignSignContext.class,0); @@ -1938,11 +1930,11 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(238); - fieldId(); - setState(239); + setState(236); + fieldVarAccess(); + setState(237); assignSign(); - setState(240); + setState(238); expr(0); } } @@ -1996,37 +1988,37 @@ public class DecafParser extends Parser { int _alt; enterOuterAlt(_localctx, 1); { - setState(244); + setState(242); _errHandler.sync(this); _la = _input.LA(1); if (_la==THIS) { { - setState(242); + setState(240); match(THIS); - setState(243); + setState(241); match(T__17); } } - setState(251); + setState(249); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,20,_ctx); + _alt = getInterpreter().adaptivePredict(_input,19,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(246); + setState(244); recipient(); - setState(247); + setState(245); match(T__17); } } } - setState(253); + setState(251); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,20,_ctx); + _alt = getInterpreter().adaptivePredict(_input,19,_ctx); } - setState(254); + setState(252); methName(); } } @@ -2072,20 +2064,20 @@ public class DecafParser extends Parser { RecipientContext _localctx = new RecipientContext(_ctx, getState()); enterRule(_localctx, 40, RULE_recipient); try { - setState(258); + setState(256); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,21,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(256); + setState(254); methName(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(257); + setState(255); id(); } break; @@ -2136,21 +2128,21 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(260); + setState(258); id(); - setState(261); + setState(259); match(T__4); - setState(263); + setState(261); _errHandler.sync(this); _la = _input.LA(1); if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216288968736L) != 0)) { { - setState(262); + setState(260); args(); } } - setState(265); + setState(263); match(T__5); } } @@ -2199,21 +2191,21 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(267); + setState(265); expr(0); - setState(272); + setState(270); _errHandler.sync(this); _la = _input.LA(1); while (_la==T__9) { { { - setState(268); + setState(266); match(T__9); - setState(269); + setState(267); expr(0); } } - setState(274); + setState(272); _errHandler.sync(this); _la = _input.LA(1); } @@ -2261,7 +2253,7 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(275); + setState(273); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 96757023244288L) != 0)) ) { _errHandler.recoverInline(this); @@ -2312,7 +2304,7 @@ public class DecafParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(277); + setState(275); match(IDENTIFIER); } } @@ -2343,7 +2335,7 @@ public class DecafParser extends Parser { } public static final String _serializedATN = - "\u0004\u0001/\u0118\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ + "\u0004\u0001/\u0116\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"+ @@ -2360,164 +2352,162 @@ public class DecafParser extends Parser { "\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0003\u0006]\b"+ "\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0001"+ "\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001"+ - "\u0007\u0001\b\u0003\bl\b\b\u0001\b\u0001\b\u0001\b\u0003\bq\b\b\u0001"+ - "\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0005\ty\b\t\n\t\f\t|\t\t\u0001"+ - "\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0005\u000b\u0084"+ - "\b\u000b\n\u000b\f\u000b\u0087\t\u000b\u0001\u000b\u0001\u000b\u0001\f"+ - "\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f\u0092\b\f\u0001"+ + "\u0007\u0001\b\u0001\b\u0001\b\u0001\b\u0003\bo\b\b\u0001\b\u0001\b\u0001"+ + "\b\u0001\t\u0001\t\u0001\t\u0005\tw\b\t\n\t\f\tz\t\t\u0001\n\u0001\n\u0001"+ + "\n\u0001\u000b\u0001\u000b\u0001\u000b\u0005\u000b\u0082\b\u000b\n\u000b"+ + "\f\u000b\u0085\t\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001\f\u0001\f"+ + "\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f\u0090\b\f\u0001\f\u0001\f\u0001"+ "\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+ "\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+ "\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+ - "\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001"+ - "\f\u0003\f\u00b9\b\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003\r\u00c0"+ - "\b\r\u0001\r\u0001\r\u0003\r\u00c4\b\r\u0001\u000e\u0001\u000e\u0001\u000e"+ + "\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f\u00b7"+ + "\b\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0003\r\u00be\b\r\u0001\r"+ + "\u0001\r\u0003\r\u00c2\b\r\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\u00d2\b\u000e\u0001\u000e"+ - "\u0001\u000e\u0001\u000e\u0001\u000e\u0005\u000e\u00d8\b\u000e\n\u000e"+ - "\f\u000e\u00db\t\u000e\u0001\u000f\u0001\u000f\u0001\u0010\u0001\u0010"+ - "\u0001\u0011\u0001\u0011\u0003\u0011\u00e3\b\u0011\u0001\u0011\u0001\u0011"+ - "\u0001\u0011\u0005\u0011\u00e8\b\u0011\n\u0011\f\u0011\u00eb\t\u0011\u0001"+ - "\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001"+ - "\u0013\u0001\u0013\u0003\u0013\u00f5\b\u0013\u0001\u0013\u0001\u0013\u0001"+ - "\u0013\u0005\u0013\u00fa\b\u0013\n\u0013\f\u0013\u00fd\t\u0013\u0001\u0013"+ - "\u0001\u0013\u0001\u0014\u0001\u0014\u0003\u0014\u0103\b\u0014\u0001\u0015"+ - "\u0001\u0015\u0001\u0015\u0003\u0015\u0108\b\u0015\u0001\u0015\u0001\u0015"+ - "\u0001\u0016\u0001\u0016\u0001\u0016\u0005\u0016\u010f\b\u0016\n\u0016"+ - "\f\u0016\u0112\t\u0016\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018"+ - "\u0001\u0018\u0000\u0001\u001c\u0019\u0000\u0002\u0004\u0006\b\n\f\u000e"+ - "\u0010\u0012\u0014\u0016\u0018\u001a\u001c\u001e \"$&(*,.0\u0000\u0004"+ - "\u0001\u0000\"%\u0001\u0000\u0017!\u0002\u0000\u0017\u0017&&\u0002\u0000"+ - "+,..\u0124\u00002\u0001\u0000\u0000\u0000\u0002C\u0001\u0000\u0000\u0000"+ - "\u0004G\u0001\u0000\u0000\u0000\u0006K\u0001\u0000\u0000\u0000\bO\u0001"+ - "\u0000\u0000\u0000\nU\u0001\u0000\u0000\u0000\fW\u0001\u0000\u0000\u0000"+ - "\u000ea\u0001\u0000\u0000\u0000\u0010k\u0001\u0000\u0000\u0000\u0012u"+ - "\u0001\u0000\u0000\u0000\u0014}\u0001\u0000\u0000\u0000\u0016\u0080\u0001"+ - "\u0000\u0000\u0000\u0018\u00b8\u0001\u0000\u0000\u0000\u001a\u00c3\u0001"+ - "\u0000\u0000\u0000\u001c\u00d1\u0001\u0000\u0000\u0000\u001e\u00dc\u0001"+ - "\u0000\u0000\u0000 \u00de\u0001\u0000\u0000\u0000\"\u00e2\u0001\u0000"+ - "\u0000\u0000$\u00ee\u0001\u0000\u0000\u0000&\u00f4\u0001\u0000\u0000\u0000"+ - "(\u0102\u0001\u0000\u0000\u0000*\u0104\u0001\u0000\u0000\u0000,\u010b"+ - "\u0001\u0000\u0000\u0000.\u0113\u0001\u0000\u0000\u00000\u0115\u0001\u0000"+ - "\u0000\u000023\u0005\u0013\u0000\u000034\u0005\u0001\u0000\u000045\u0003"+ - "0\u0018\u000057\u0005\u0002\u0000\u000068\u0003\u000e\u0007\u000076\u0001"+ - "\u0000\u0000\u000078\u0001\u0000\u0000\u00008>\u0001\u0000\u0000\u0000"+ - "9=\u0003\u0002\u0001\u0000:=\u0003\f\u0006\u0000;=\u0003\u0010\b\u0000"+ - "<9\u0001\u0000\u0000\u0000<:\u0001\u0000\u0000\u0000<;\u0001\u0000\u0000"+ - "\u0000=@\u0001\u0000\u0000\u0000><\u0001\u0000\u0000\u0000>?\u0001\u0000"+ - "\u0000\u0000?A\u0001\u0000\u0000\u0000@>\u0001\u0000\u0000\u0000AB\u0005"+ - "\u0003\u0000\u0000B\u0001\u0001\u0000\u0000\u0000CD\u0003\n\u0005\u0000"+ - "DE\u00030\u0018\u0000EF\u0005\u0004\u0000\u0000F\u0003\u0001\u0000\u0000"+ - "\u0000GH\u0003\n\u0005\u0000HI\u00030\u0018\u0000IJ\u0005\u0004\u0000"+ - "\u0000J\u0005\u0001\u0000\u0000\u0000KL\u0007\u0000\u0000\u0000L\u0007"+ - "\u0001\u0000\u0000\u0000MP\u0003\n\u0005\u0000NP\u0005)\u0000\u0000OM"+ - "\u0001\u0000\u0000\u0000ON\u0001\u0000\u0000\u0000P\t\u0001\u0000\u0000"+ - "\u0000QV\u0005\'\u0000\u0000RV\u0005(\u0000\u0000SV\u0005*\u0000\u0000"+ - "TV\u00030\u0018\u0000UQ\u0001\u0000\u0000\u0000UR\u0001\u0000\u0000\u0000"+ - "US\u0001\u0000\u0000\u0000UT\u0001\u0000\u0000\u0000V\u000b\u0001\u0000"+ - "\u0000\u0000WX\u0005\u0013\u0000\u0000XY\u0003\b\u0004\u0000YZ\u00030"+ - "\u0018\u0000Z\\\u0005\u0005\u0000\u0000[]\u0003\u0012\t\u0000\\[\u0001"+ - "\u0000\u0000\u0000\\]\u0001\u0000\u0000\u0000]^\u0001\u0000\u0000\u0000"+ - "^_\u0005\u0006\u0000\u0000_`\u0003\u0016\u000b\u0000`\r\u0001\u0000\u0000"+ - "\u0000ab\u0005\u0013\u0000\u0000bc\u0005\u0007\u0000\u0000cd\u0005)\u0000"+ - "\u0000de\u0005\b\u0000\u0000ef\u0005\u0005\u0000\u0000fg\u0005\t\u0000"+ - "\u0000gh\u0005\u0006\u0000\u0000hi\u0003\u0016\u000b\u0000i\u000f\u0001"+ - "\u0000\u0000\u0000jl\u0005\u0013\u0000\u0000kj\u0001\u0000\u0000\u0000"+ - "kl\u0001\u0000\u0000\u0000lm\u0001\u0000\u0000\u0000mn\u00030\u0018\u0000"+ - "np\u0005\u0005\u0000\u0000oq\u0003\u0012\t\u0000po\u0001\u0000\u0000\u0000"+ - "pq\u0001\u0000\u0000\u0000qr\u0001\u0000\u0000\u0000rs\u0005\u0006\u0000"+ - "\u0000st\u0003\u0016\u000b\u0000t\u0011\u0001\u0000\u0000\u0000uz\u0003"+ - "\u0014\n\u0000vw\u0005\n\u0000\u0000wy\u0003\u0014\n\u0000xv\u0001\u0000"+ - "\u0000\u0000y|\u0001\u0000\u0000\u0000zx\u0001\u0000\u0000\u0000z{\u0001"+ - "\u0000\u0000\u0000{\u0013\u0001\u0000\u0000\u0000|z\u0001\u0000\u0000"+ - "\u0000}~\u0003\n\u0005\u0000~\u007f\u00030\u0018\u0000\u007f\u0015\u0001"+ - "\u0000\u0000\u0000\u0080\u0085\u0005\u0002\u0000\u0000\u0081\u0084\u0003"+ - "\u0004\u0002\u0000\u0082\u0084\u0003\u0018\f\u0000\u0083\u0081\u0001\u0000"+ - "\u0000\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\u0088\u0001\u0000\u0000\u0000\u0087\u0085\u0001\u0000"+ - "\u0000\u0000\u0088\u0089\u0005\u0003\u0000\u0000\u0089\u0017\u0001\u0000"+ - "\u0000\u0000\u008a\u008b\u0005\u000b\u0000\u0000\u008b\u008c\u0005\u0005"+ - "\u0000\u0000\u008c\u008d\u0003\u001c\u000e\u0000\u008d\u008e\u0005\u0006"+ - "\u0000\u0000\u008e\u0091\u0003\u0016\u000b\u0000\u008f\u0090\u0005\f\u0000"+ - "\u0000\u0090\u0092\u0003\u0016\u000b\u0000\u0091\u008f\u0001\u0000\u0000"+ - "\u0000\u0091\u0092\u0001\u0000\u0000\u0000\u0092\u00b9\u0001\u0000\u0000"+ - "\u0000\u0093\u0094\u0005\r\u0000\u0000\u0094\u0095\u0005\u0005\u0000\u0000"+ - "\u0095\u0096\u0003$\u0012\u0000\u0096\u0097\u0005\u0004\u0000\u0000\u0097"+ - "\u0098\u0003\u001c\u000e\u0000\u0098\u0099\u0005\u0004\u0000\u0000\u0099"+ - "\u009a\u0003$\u0012\u0000\u009a\u009b\u0005\u0006\u0000\u0000\u009b\u009c"+ - "\u0003\u0016\u000b\u0000\u009c\u00b9\u0001\u0000\u0000\u0000\u009d\u009e"+ - "\u0005\u000e\u0000\u0000\u009e\u009f\u0005\u0005\u0000\u0000\u009f\u00a0"+ - "\u0003\u001c\u000e\u0000\u00a0\u00a1\u0005\u0006\u0000\u0000\u00a1\u00a2"+ - "\u0003\u0016\u000b\u0000\u00a2\u00b9\u0001\u0000\u0000\u0000\u00a3\u00a4"+ - "\u0005\u000f\u0000\u0000\u00a4\u00a5\u0003\u0016\u000b\u0000\u00a5\u00a6"+ - "\u0005\u000e\u0000\u0000\u00a6\u00a7\u0005\u0005\u0000\u0000\u00a7\u00a8"+ - "\u0003\u001c\u000e\u0000\u00a8\u00a9\u0005\u0006\u0000\u0000\u00a9\u00b9"+ - "\u0001\u0000\u0000\u0000\u00aa\u00ab\u0005\u0010\u0000\u0000\u00ab\u00ac"+ - "\u0003\u001c\u000e\u0000\u00ac\u00ad\u0005\u0004\u0000\u0000\u00ad\u00b9"+ - "\u0001\u0000\u0000\u0000\u00ae\u00af\u0005\u0010\u0000\u0000\u00af\u00b9"+ - "\u0005\u0004\u0000\u0000\u00b0\u00b1\u0005\u0011\u0000\u0000\u00b1\u00b9"+ - "\u0005\u0004\u0000\u0000\u00b2\u00b3\u0003$\u0012\u0000\u00b3\u00b4\u0005"+ - "\u0004\u0000\u0000\u00b4\u00b9\u0001\u0000\u0000\u0000\u00b5\u00b6\u0003"+ - "\u001a\r\u0000\u00b6\u00b7\u0005\u0004\u0000\u0000\u00b7\u00b9\u0001\u0000"+ - "\u0000\u0000\u00b8\u008a\u0001\u0000\u0000\u0000\u00b8\u0093\u0001\u0000"+ - "\u0000\u0000\u00b8\u009d\u0001\u0000\u0000\u0000\u00b8\u00a3\u0001\u0000"+ - "\u0000\u0000\u00b8\u00aa\u0001\u0000\u0000\u0000\u00b8\u00ae\u0001\u0000"+ - "\u0000\u0000\u00b8\u00b0\u0001\u0000\u0000\u0000\u00b8\u00b2\u0001\u0000"+ - "\u0000\u0000\u00b8\u00b5\u0001\u0000\u0000\u0000\u00b9\u0019\u0001\u0000"+ - "\u0000\u0000\u00ba\u00c4\u0003&\u0013\u0000\u00bb\u00bc\u0005\u0014\u0000"+ - "\u0000\u00bc\u00bd\u0003\n\u0005\u0000\u00bd\u00bf\u0005\u0005\u0000\u0000"+ - "\u00be\u00c0\u0003,\u0016\u0000\u00bf\u00be\u0001\u0000\u0000\u0000\u00bf"+ - "\u00c0\u0001\u0000\u0000\u0000\u00c0\u00c1\u0001\u0000\u0000\u0000\u00c1"+ - "\u00c2\u0005\u0006\u0000\u0000\u00c2\u00c4\u0001\u0000\u0000\u0000\u00c3"+ - "\u00ba\u0001\u0000\u0000\u0000\u00c3\u00bb\u0001\u0000\u0000\u0000\u00c4"+ - "\u001b\u0001\u0000\u0000\u0000\u00c5\u00c6\u0006\u000e\uffff\uffff\u0000"+ - "\u00c6\u00c7\u0003 \u0010\u0000\u00c7\u00c8\u0003\u001c\u000e\u0006\u00c8"+ - "\u00d2\u0001\u0000\u0000\u0000\u00c9\u00d2\u0003.\u0017\u0000\u00ca\u00cb"+ - "\u0005\u0005\u0000\u0000\u00cb\u00cc\u0003\u001c\u000e\u0000\u00cc\u00cd"+ - "\u0005\u0006\u0000\u0000\u00cd\u00d2\u0001\u0000\u0000\u0000\u00ce\u00d2"+ - "\u0003\"\u0011\u0000\u00cf\u00d2\u0003\u001a\r\u0000\u00d0\u00d2\u0005"+ - "\u0015\u0000\u0000\u00d1\u00c5\u0001\u0000\u0000\u0000\u00d1\u00c9\u0001"+ - "\u0000\u0000\u0000\u00d1\u00ca\u0001\u0000\u0000\u0000\u00d1\u00ce\u0001"+ - "\u0000\u0000\u0000\u00d1\u00cf\u0001\u0000\u0000\u0000\u00d1\u00d0\u0001"+ - "\u0000\u0000\u0000\u00d2\u00d9\u0001\u0000\u0000\u0000\u00d3\u00d4\n\u0007"+ - "\u0000\u0000\u00d4\u00d5\u0003\u001e\u000f\u0000\u00d5\u00d6\u0003\u001c"+ - "\u000e\b\u00d6\u00d8\u0001\u0000\u0000\u0000\u00d7\u00d3\u0001\u0000\u0000"+ - "\u0000\u00d8\u00db\u0001\u0000\u0000\u0000\u00d9\u00d7\u0001\u0000\u0000"+ - "\u0000\u00d9\u00da\u0001\u0000\u0000\u0000\u00da\u001d\u0001\u0000\u0000"+ - "\u0000\u00db\u00d9\u0001\u0000\u0000\u0000\u00dc\u00dd\u0007\u0001\u0000"+ - "\u0000\u00dd\u001f\u0001\u0000\u0000\u0000\u00de\u00df\u0007\u0002\u0000"+ - "\u0000\u00df!\u0001\u0000\u0000\u0000\u00e0\u00e1\u0005\u0016\u0000\u0000"+ - "\u00e1\u00e3\u0005\u0012\u0000\u0000\u00e2\u00e0\u0001\u0000\u0000\u0000"+ - "\u00e2\u00e3\u0001\u0000\u0000\u0000\u00e3\u00e9\u0001\u0000\u0000\u0000"+ - "\u00e4\u00e5\u0003(\u0014\u0000\u00e5\u00e6\u0005\u0012\u0000\u0000\u00e6"+ - "\u00e8\u0001\u0000\u0000\u0000\u00e7\u00e4\u0001\u0000\u0000\u0000\u00e8"+ - "\u00eb\u0001\u0000\u0000\u0000\u00e9\u00e7\u0001\u0000\u0000\u0000\u00e9"+ - "\u00ea\u0001\u0000\u0000\u0000\u00ea\u00ec\u0001\u0000\u0000\u0000\u00eb"+ - "\u00e9\u0001\u0000\u0000\u0000\u00ec\u00ed\u00030\u0018\u0000\u00ed#\u0001"+ - "\u0000\u0000\u0000\u00ee\u00ef\u0003\"\u0011\u0000\u00ef\u00f0\u0003\u0006"+ - "\u0003\u0000\u00f0\u00f1\u0003\u001c\u000e\u0000\u00f1%\u0001\u0000\u0000"+ - "\u0000\u00f2\u00f3\u0005\u0016\u0000\u0000\u00f3\u00f5\u0005\u0012\u0000"+ - "\u0000\u00f4\u00f2\u0001\u0000\u0000\u0000\u00f4\u00f5\u0001\u0000\u0000"+ - "\u0000\u00f5\u00fb\u0001\u0000\u0000\u0000\u00f6\u00f7\u0003(\u0014\u0000"+ - "\u00f7\u00f8\u0005\u0012\u0000\u0000\u00f8\u00fa\u0001\u0000\u0000\u0000"+ - "\u00f9\u00f6\u0001\u0000\u0000\u0000\u00fa\u00fd\u0001\u0000\u0000\u0000"+ - "\u00fb\u00f9\u0001\u0000\u0000\u0000\u00fb\u00fc\u0001\u0000\u0000\u0000"+ - "\u00fc\u00fe\u0001\u0000\u0000\u0000\u00fd\u00fb\u0001\u0000\u0000\u0000"+ - "\u00fe\u00ff\u0003*\u0015\u0000\u00ff\'\u0001\u0000\u0000\u0000\u0100"+ - "\u0103\u0003*\u0015\u0000\u0101\u0103\u00030\u0018\u0000\u0102\u0100\u0001"+ - "\u0000\u0000\u0000\u0102\u0101\u0001\u0000\u0000\u0000\u0103)\u0001\u0000"+ - "\u0000\u0000\u0104\u0105\u00030\u0018\u0000\u0105\u0107\u0005\u0005\u0000"+ - "\u0000\u0106\u0108\u0003,\u0016\u0000\u0107\u0106\u0001\u0000\u0000\u0000"+ - "\u0107\u0108\u0001\u0000\u0000\u0000\u0108\u0109\u0001\u0000\u0000\u0000"+ - "\u0109\u010a\u0005\u0006\u0000\u0000\u010a+\u0001\u0000\u0000\u0000\u010b"+ - "\u0110\u0003\u001c\u000e\u0000\u010c\u010d\u0005\n\u0000\u0000\u010d\u010f"+ - "\u0003\u001c\u000e\u0000\u010e\u010c\u0001\u0000\u0000\u0000\u010f\u0112"+ - "\u0001\u0000\u0000\u0000\u0110\u010e\u0001\u0000\u0000\u0000\u0110\u0111"+ - "\u0001\u0000\u0000\u0000\u0111-\u0001\u0000\u0000\u0000\u0112\u0110\u0001"+ - "\u0000\u0000\u0000\u0113\u0114\u0007\u0003\u0000\u0000\u0114/\u0001\u0000"+ - "\u0000\u0000\u0115\u0116\u0005-\u0000\u0000\u01161\u0001\u0000\u0000\u0000"+ - "\u00187<>OU\\kpz\u0083\u0085\u0091\u00b8\u00bf\u00c3\u00d1\u00d9\u00e2"+ - "\u00e9\u00f4\u00fb\u0102\u0107\u0110"; + "\u0001\u000e\u0001\u000e\u0003\u000e\u00d0\b\u000e\u0001\u000e\u0001\u000e"+ + "\u0001\u000e\u0001\u000e\u0005\u000e\u00d6\b\u000e\n\u000e\f\u000e\u00d9"+ + "\t\u000e\u0001\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0011\u0001"+ + "\u0011\u0003\u0011\u00e1\b\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0005"+ + "\u0011\u00e6\b\u0011\n\u0011\f\u0011\u00e9\t\u0011\u0001\u0011\u0001\u0011"+ + "\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013"+ + "\u0003\u0013\u00f3\b\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0005\u0013"+ + "\u00f8\b\u0013\n\u0013\f\u0013\u00fb\t\u0013\u0001\u0013\u0001\u0013\u0001"+ + "\u0014\u0001\u0014\u0003\u0014\u0101\b\u0014\u0001\u0015\u0001\u0015\u0001"+ + "\u0015\u0003\u0015\u0106\b\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001"+ + "\u0016\u0001\u0016\u0005\u0016\u010d\b\u0016\n\u0016\f\u0016\u0110\t\u0016"+ + "\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0018\u0000\u0001"+ + "\u001c\u0019\u0000\u0002\u0004\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016"+ + "\u0018\u001a\u001c\u001e \"$&(*,.0\u0000\u0004\u0001\u0000\"%\u0001\u0000"+ + "\u0017!\u0002\u0000\u0017\u0017&&\u0002\u0000+,..\u0121\u00002\u0001\u0000"+ + "\u0000\u0000\u0002C\u0001\u0000\u0000\u0000\u0004G\u0001\u0000\u0000\u0000"+ + "\u0006K\u0001\u0000\u0000\u0000\bO\u0001\u0000\u0000\u0000\nU\u0001\u0000"+ + "\u0000\u0000\fW\u0001\u0000\u0000\u0000\u000ea\u0001\u0000\u0000\u0000"+ + "\u0010j\u0001\u0000\u0000\u0000\u0012s\u0001\u0000\u0000\u0000\u0014{"+ + "\u0001\u0000\u0000\u0000\u0016~\u0001\u0000\u0000\u0000\u0018\u00b6\u0001"+ + "\u0000\u0000\u0000\u001a\u00c1\u0001\u0000\u0000\u0000\u001c\u00cf\u0001"+ + "\u0000\u0000\u0000\u001e\u00da\u0001\u0000\u0000\u0000 \u00dc\u0001\u0000"+ + "\u0000\u0000\"\u00e0\u0001\u0000\u0000\u0000$\u00ec\u0001\u0000\u0000"+ + "\u0000&\u00f2\u0001\u0000\u0000\u0000(\u0100\u0001\u0000\u0000\u0000*"+ + "\u0102\u0001\u0000\u0000\u0000,\u0109\u0001\u0000\u0000\u0000.\u0111\u0001"+ + "\u0000\u0000\u00000\u0113\u0001\u0000\u0000\u000023\u0005\u0013\u0000"+ + "\u000034\u0005\u0001\u0000\u000045\u00030\u0018\u000057\u0005\u0002\u0000"+ + "\u000068\u0003\u000e\u0007\u000076\u0001\u0000\u0000\u000078\u0001\u0000"+ + "\u0000\u00008>\u0001\u0000\u0000\u00009=\u0003\u0002\u0001\u0000:=\u0003"+ + "\f\u0006\u0000;=\u0003\u0010\b\u0000<9\u0001\u0000\u0000\u0000<:\u0001"+ + "\u0000\u0000\u0000<;\u0001\u0000\u0000\u0000=@\u0001\u0000\u0000\u0000"+ + "><\u0001\u0000\u0000\u0000>?\u0001\u0000\u0000\u0000?A\u0001\u0000\u0000"+ + "\u0000@>\u0001\u0000\u0000\u0000AB\u0005\u0003\u0000\u0000B\u0001\u0001"+ + "\u0000\u0000\u0000CD\u0003\n\u0005\u0000DE\u00030\u0018\u0000EF\u0005"+ + "\u0004\u0000\u0000F\u0003\u0001\u0000\u0000\u0000GH\u0003\n\u0005\u0000"+ + "HI\u00030\u0018\u0000IJ\u0005\u0004\u0000\u0000J\u0005\u0001\u0000\u0000"+ + "\u0000KL\u0007\u0000\u0000\u0000L\u0007\u0001\u0000\u0000\u0000MP\u0003"+ + "\n\u0005\u0000NP\u0005)\u0000\u0000OM\u0001\u0000\u0000\u0000ON\u0001"+ + "\u0000\u0000\u0000P\t\u0001\u0000\u0000\u0000QV\u0005\'\u0000\u0000RV"+ + "\u0005(\u0000\u0000SV\u0005*\u0000\u0000TV\u00030\u0018\u0000UQ\u0001"+ + "\u0000\u0000\u0000UR\u0001\u0000\u0000\u0000US\u0001\u0000\u0000\u0000"+ + "UT\u0001\u0000\u0000\u0000V\u000b\u0001\u0000\u0000\u0000WX\u0005\u0013"+ + "\u0000\u0000XY\u0003\b\u0004\u0000YZ\u00030\u0018\u0000Z\\\u0005\u0005"+ + "\u0000\u0000[]\u0003\u0012\t\u0000\\[\u0001\u0000\u0000\u0000\\]\u0001"+ + "\u0000\u0000\u0000]^\u0001\u0000\u0000\u0000^_\u0005\u0006\u0000\u0000"+ + "_`\u0003\u0016\u000b\u0000`\r\u0001\u0000\u0000\u0000ab\u0005\u0013\u0000"+ + "\u0000bc\u0005\u0007\u0000\u0000cd\u0005)\u0000\u0000de\u0005\b\u0000"+ + "\u0000ef\u0005\u0005\u0000\u0000fg\u0005\t\u0000\u0000gh\u0005\u0006\u0000"+ + "\u0000hi\u0003\u0016\u000b\u0000i\u000f\u0001\u0000\u0000\u0000jk\u0005"+ + "\u0013\u0000\u0000kl\u00030\u0018\u0000ln\u0005\u0005\u0000\u0000mo\u0003"+ + "\u0012\t\u0000nm\u0001\u0000\u0000\u0000no\u0001\u0000\u0000\u0000op\u0001"+ + "\u0000\u0000\u0000pq\u0005\u0006\u0000\u0000qr\u0003\u0016\u000b\u0000"+ + "r\u0011\u0001\u0000\u0000\u0000sx\u0003\u0014\n\u0000tu\u0005\n\u0000"+ + "\u0000uw\u0003\u0014\n\u0000vt\u0001\u0000\u0000\u0000wz\u0001\u0000\u0000"+ + "\u0000xv\u0001\u0000\u0000\u0000xy\u0001\u0000\u0000\u0000y\u0013\u0001"+ + "\u0000\u0000\u0000zx\u0001\u0000\u0000\u0000{|\u0003\n\u0005\u0000|}\u0003"+ + "0\u0018\u0000}\u0015\u0001\u0000\u0000\u0000~\u0083\u0005\u0002\u0000"+ + "\u0000\u007f\u0082\u0003\u0004\u0002\u0000\u0080\u0082\u0003\u0018\f\u0000"+ + "\u0081\u007f\u0001\u0000\u0000\u0000\u0081\u0080\u0001\u0000\u0000\u0000"+ + "\u0082\u0085\u0001\u0000\u0000\u0000\u0083\u0081\u0001\u0000\u0000\u0000"+ + "\u0083\u0084\u0001\u0000\u0000\u0000\u0084\u0086\u0001\u0000\u0000\u0000"+ + "\u0085\u0083\u0001\u0000\u0000\u0000\u0086\u0087\u0005\u0003\u0000\u0000"+ + "\u0087\u0017\u0001\u0000\u0000\u0000\u0088\u0089\u0005\u000b\u0000\u0000"+ + "\u0089\u008a\u0005\u0005\u0000\u0000\u008a\u008b\u0003\u001c\u000e\u0000"+ + "\u008b\u008c\u0005\u0006\u0000\u0000\u008c\u008f\u0003\u0016\u000b\u0000"+ + "\u008d\u008e\u0005\f\u0000\u0000\u008e\u0090\u0003\u0016\u000b\u0000\u008f"+ + "\u008d\u0001\u0000\u0000\u0000\u008f\u0090\u0001\u0000\u0000\u0000\u0090"+ + "\u00b7\u0001\u0000\u0000\u0000\u0091\u0092\u0005\r\u0000\u0000\u0092\u0093"+ + "\u0005\u0005\u0000\u0000\u0093\u0094\u0003$\u0012\u0000\u0094\u0095\u0005"+ + "\u0004\u0000\u0000\u0095\u0096\u0003\u001c\u000e\u0000\u0096\u0097\u0005"+ + "\u0004\u0000\u0000\u0097\u0098\u0003$\u0012\u0000\u0098\u0099\u0005\u0006"+ + "\u0000\u0000\u0099\u009a\u0003\u0016\u000b\u0000\u009a\u00b7\u0001\u0000"+ + "\u0000\u0000\u009b\u009c\u0005\u000e\u0000\u0000\u009c\u009d\u0005\u0005"+ + "\u0000\u0000\u009d\u009e\u0003\u001c\u000e\u0000\u009e\u009f\u0005\u0006"+ + "\u0000\u0000\u009f\u00a0\u0003\u0016\u000b\u0000\u00a0\u00b7\u0001\u0000"+ + "\u0000\u0000\u00a1\u00a2\u0005\u000f\u0000\u0000\u00a2\u00a3\u0003\u0016"+ + "\u000b\u0000\u00a3\u00a4\u0005\u000e\u0000\u0000\u00a4\u00a5\u0005\u0005"+ + "\u0000\u0000\u00a5\u00a6\u0003\u001c\u000e\u0000\u00a6\u00a7\u0005\u0006"+ + "\u0000\u0000\u00a7\u00b7\u0001\u0000\u0000\u0000\u00a8\u00a9\u0005\u0010"+ + "\u0000\u0000\u00a9\u00aa\u0003\u001c\u000e\u0000\u00aa\u00ab\u0005\u0004"+ + "\u0000\u0000\u00ab\u00b7\u0001\u0000\u0000\u0000\u00ac\u00ad\u0005\u0010"+ + "\u0000\u0000\u00ad\u00b7\u0005\u0004\u0000\u0000\u00ae\u00af\u0005\u0011"+ + "\u0000\u0000\u00af\u00b7\u0005\u0004\u0000\u0000\u00b0\u00b1\u0003$\u0012"+ + "\u0000\u00b1\u00b2\u0005\u0004\u0000\u0000\u00b2\u00b7\u0001\u0000\u0000"+ + "\u0000\u00b3\u00b4\u0003\u001a\r\u0000\u00b4\u00b5\u0005\u0004\u0000\u0000"+ + "\u00b5\u00b7\u0001\u0000\u0000\u0000\u00b6\u0088\u0001\u0000\u0000\u0000"+ + "\u00b6\u0091\u0001\u0000\u0000\u0000\u00b6\u009b\u0001\u0000\u0000\u0000"+ + "\u00b6\u00a1\u0001\u0000\u0000\u0000\u00b6\u00a8\u0001\u0000\u0000\u0000"+ + "\u00b6\u00ac\u0001\u0000\u0000\u0000\u00b6\u00ae\u0001\u0000\u0000\u0000"+ + "\u00b6\u00b0\u0001\u0000\u0000\u0000\u00b6\u00b3\u0001\u0000\u0000\u0000"+ + "\u00b7\u0019\u0001\u0000\u0000\u0000\u00b8\u00c2\u0003&\u0013\u0000\u00b9"+ + "\u00ba\u0005\u0014\u0000\u0000\u00ba\u00bb\u0003\n\u0005\u0000\u00bb\u00bd"+ + "\u0005\u0005\u0000\u0000\u00bc\u00be\u0003,\u0016\u0000\u00bd\u00bc\u0001"+ + "\u0000\u0000\u0000\u00bd\u00be\u0001\u0000\u0000\u0000\u00be\u00bf\u0001"+ + "\u0000\u0000\u0000\u00bf\u00c0\u0005\u0006\u0000\u0000\u00c0\u00c2\u0001"+ + "\u0000\u0000\u0000\u00c1\u00b8\u0001\u0000\u0000\u0000\u00c1\u00b9\u0001"+ + "\u0000\u0000\u0000\u00c2\u001b\u0001\u0000\u0000\u0000\u00c3\u00c4\u0006"+ + "\u000e\uffff\uffff\u0000\u00c4\u00c5\u0003 \u0010\u0000\u00c5\u00c6\u0003"+ + "\u001c\u000e\u0006\u00c6\u00d0\u0001\u0000\u0000\u0000\u00c7\u00d0\u0003"+ + ".\u0017\u0000\u00c8\u00c9\u0005\u0005\u0000\u0000\u00c9\u00ca\u0003\u001c"+ + "\u000e\u0000\u00ca\u00cb\u0005\u0006\u0000\u0000\u00cb\u00d0\u0001\u0000"+ + "\u0000\u0000\u00cc\u00d0\u0003\"\u0011\u0000\u00cd\u00d0\u0003\u001a\r"+ + "\u0000\u00ce\u00d0\u0005\u0015\u0000\u0000\u00cf\u00c3\u0001\u0000\u0000"+ + "\u0000\u00cf\u00c7\u0001\u0000\u0000\u0000\u00cf\u00c8\u0001\u0000\u0000"+ + "\u0000\u00cf\u00cc\u0001\u0000\u0000\u0000\u00cf\u00cd\u0001\u0000\u0000"+ + "\u0000\u00cf\u00ce\u0001\u0000\u0000\u0000\u00d0\u00d7\u0001\u0000\u0000"+ + "\u0000\u00d1\u00d2\n\u0007\u0000\u0000\u00d2\u00d3\u0003\u001e\u000f\u0000"+ + "\u00d3\u00d4\u0003\u001c\u000e\b\u00d4\u00d6\u0001\u0000\u0000\u0000\u00d5"+ + "\u00d1\u0001\u0000\u0000\u0000\u00d6\u00d9\u0001\u0000\u0000\u0000\u00d7"+ + "\u00d5\u0001\u0000\u0000\u0000\u00d7\u00d8\u0001\u0000\u0000\u0000\u00d8"+ + "\u001d\u0001\u0000\u0000\u0000\u00d9\u00d7\u0001\u0000\u0000\u0000\u00da"+ + "\u00db\u0007\u0001\u0000\u0000\u00db\u001f\u0001\u0000\u0000\u0000\u00dc"+ + "\u00dd\u0007\u0002\u0000\u0000\u00dd!\u0001\u0000\u0000\u0000\u00de\u00df"+ + "\u0005\u0016\u0000\u0000\u00df\u00e1\u0005\u0012\u0000\u0000\u00e0\u00de"+ + "\u0001\u0000\u0000\u0000\u00e0\u00e1\u0001\u0000\u0000\u0000\u00e1\u00e7"+ + "\u0001\u0000\u0000\u0000\u00e2\u00e3\u0003(\u0014\u0000\u00e3\u00e4\u0005"+ + "\u0012\u0000\u0000\u00e4\u00e6\u0001\u0000\u0000\u0000\u00e5\u00e2\u0001"+ + "\u0000\u0000\u0000\u00e6\u00e9\u0001\u0000\u0000\u0000\u00e7\u00e5\u0001"+ + "\u0000\u0000\u0000\u00e7\u00e8\u0001\u0000\u0000\u0000\u00e8\u00ea\u0001"+ + "\u0000\u0000\u0000\u00e9\u00e7\u0001\u0000\u0000\u0000\u00ea\u00eb\u0003"+ + "0\u0018\u0000\u00eb#\u0001\u0000\u0000\u0000\u00ec\u00ed\u0003\"\u0011"+ + "\u0000\u00ed\u00ee\u0003\u0006\u0003\u0000\u00ee\u00ef\u0003\u001c\u000e"+ + "\u0000\u00ef%\u0001\u0000\u0000\u0000\u00f0\u00f1\u0005\u0016\u0000\u0000"+ + "\u00f1\u00f3\u0005\u0012\u0000\u0000\u00f2\u00f0\u0001\u0000\u0000\u0000"+ + "\u00f2\u00f3\u0001\u0000\u0000\u0000\u00f3\u00f9\u0001\u0000\u0000\u0000"+ + "\u00f4\u00f5\u0003(\u0014\u0000\u00f5\u00f6\u0005\u0012\u0000\u0000\u00f6"+ + "\u00f8\u0001\u0000\u0000\u0000\u00f7\u00f4\u0001\u0000\u0000\u0000\u00f8"+ + "\u00fb\u0001\u0000\u0000\u0000\u00f9\u00f7\u0001\u0000\u0000\u0000\u00f9"+ + "\u00fa\u0001\u0000\u0000\u0000\u00fa\u00fc\u0001\u0000\u0000\u0000\u00fb"+ + "\u00f9\u0001\u0000\u0000\u0000\u00fc\u00fd\u0003*\u0015\u0000\u00fd\'"+ + "\u0001\u0000\u0000\u0000\u00fe\u0101\u0003*\u0015\u0000\u00ff\u0101\u0003"+ + "0\u0018\u0000\u0100\u00fe\u0001\u0000\u0000\u0000\u0100\u00ff\u0001\u0000"+ + "\u0000\u0000\u0101)\u0001\u0000\u0000\u0000\u0102\u0103\u00030\u0018\u0000"+ + "\u0103\u0105\u0005\u0005\u0000\u0000\u0104\u0106\u0003,\u0016\u0000\u0105"+ + "\u0104\u0001\u0000\u0000\u0000\u0105\u0106\u0001\u0000\u0000\u0000\u0106"+ + "\u0107\u0001\u0000\u0000\u0000\u0107\u0108\u0005\u0006\u0000\u0000\u0108"+ + "+\u0001\u0000\u0000\u0000\u0109\u010e\u0003\u001c\u000e\u0000\u010a\u010b"+ + "\u0005\n\u0000\u0000\u010b\u010d\u0003\u001c\u000e\u0000\u010c\u010a\u0001"+ + "\u0000\u0000\u0000\u010d\u0110\u0001\u0000\u0000\u0000\u010e\u010c\u0001"+ + "\u0000\u0000\u0000\u010e\u010f\u0001\u0000\u0000\u0000\u010f-\u0001\u0000"+ + "\u0000\u0000\u0110\u010e\u0001\u0000\u0000\u0000\u0111\u0112\u0007\u0003"+ + "\u0000\u0000\u0112/\u0001\u0000\u0000\u0000\u0113\u0114\u0005-\u0000\u0000"+ + "\u01141\u0001\u0000\u0000\u0000\u00177<>OU\\nx\u0081\u0083\u008f\u00b6"+ + "\u00bd\u00c1\u00cf\u00d7\u00e0\u00e7\u00f2\u00f9\u0100\u0105\u010e"; 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 f17b6ba..c8c3510 100644 --- a/src/main/java/de/maishai/antlr/DecafVisitor.java +++ b/src/main/java/de/maishai/antlr/DecafVisitor.java @@ -221,11 +221,11 @@ public interface DecafVisitor extends ParseTreeVisitor { */ T visitUnaryOp(DecafParser.UnaryOpContext ctx); /** - * Visit a parse tree produced by {@link DecafParser#fieldId}. + * Visit a parse tree produced by {@link DecafParser#fieldVarAccess}. * @param ctx the parse tree * @return the visitor result */ - T visitFieldId(DecafParser.FieldIdContext ctx); + T visitFieldVarAccess(DecafParser.FieldVarAccessContext ctx); /** * Visit a parse tree produced by {@link DecafParser#assign}. * @param ctx the parse tree diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedAssignment.java b/src/main/java/de/maishai/typedast/typedclass/TypedAssignment.java index 593adf0..a53f1b1 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedAssignment.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedAssignment.java @@ -15,7 +15,7 @@ import java.util.Map; public class TypedAssignment implements TypedStatement { private String varName; private TypedExpression value; - + private Type type; @Override public Type typeCheck(Map localVar, Map classes) { if (!localVar.containsKey(varName)) { @@ -26,10 +26,18 @@ public class TypedAssignment implements TypedStatement { Type typeRight = value.typeCheck(localVar, classes); if (typeLeft.equals(typeRight) ) { + type = typeLeft; return typeLeft; } throw new RuntimeException("type of left not equals with type of right"); } + // int y = 5; + // int x = (y + 5 + z); + //TypedAssignment([ + // localVar("x", "int"), + // localVar("y","int") + // ], + // "int") @Override public TypedNode convertToTypedAST(Map localVar, Map classes, de.maishai.ast.records.Node unTypedAST) { diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedBinary.java b/src/main/java/de/maishai/typedast/typedclass/TypedBinary.java index b3c0235..8260f8f 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedBinary.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedBinary.java @@ -13,11 +13,13 @@ public class TypedBinary implements TypedExpression { private TypedExpression left; private Operator op; private TypedExpression right; + private Type type; @Override public Type typeCheck(Map localVar, Map classes) { if(op == Operator.ADD || op == Operator.SUB || op == Operator.MUL) { if (left.typeCheck(localVar, classes) == Type.INT && right.typeCheck(localVar, classes) == Type.INT) { + type = Type.INT; return Type.INT; } else { throw new RuntimeException("Type mismatch"); @@ -25,6 +27,7 @@ public class TypedBinary implements TypedExpression { }else if(op == Operator.GT || op == Operator.LT || op == Operator.GE || op == Operator.LE || op == Operator.EQ || op == Operator.NE || op == Operator.AND || op == Operator.OR) { if (left.typeCheck(localVar, classes) == Type.INT && right.typeCheck(localVar, classes) == Type.INT) { + type = Type.BOOL; return Type.BOOL; } else { throw new RuntimeException("Type mismatch"); @@ -32,6 +35,7 @@ public class TypedBinary implements TypedExpression { } else if (op == Operator.AND || op == Operator.OR) { if (left.typeCheck(localVar, classes) == Type.BOOL && right.typeCheck(localVar, classes) == Type.BOOL) { + type = Type.BOOL; return Type.BOOL; } else { throw new RuntimeException("Type mismatch"); diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedBlock.java b/src/main/java/de/maishai/typedast/typedclass/TypedBlock.java index 935e536..27f0454 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedBlock.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedBlock.java @@ -17,6 +17,22 @@ public class TypedBlock implements TypedNode { private List vars; private List stmts; + + + public TypedBlock unTypedBlockToTypedBlock(Block unTypedBlock) { + TypedBlock typedBlock = new TypedBlock(); + + for (Declaration var : unTypedBlock.localVariables()) { + TypedLocalVariable typedVar = new TypedLocalVariable(); + typedVar.setName(var.name()); + typedVar.setType(var.type()); + typedBlock.getVars().add(typedVar); + } + + typedBlock.getStmts().add((TypedStatement) unTypedBlock.stmts()); + + return typedBlock; + } @Override public Type typeCheck(Map localVar, Map classes) { Type typeOfLastStmt = Type.VOID; diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedBoolLiteral.java b/src/main/java/de/maishai/typedast/typedclass/TypedBoolLiteral.java index 92c79ed..ce6d4bc 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedBoolLiteral.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedBoolLiteral.java @@ -11,9 +11,10 @@ import java.util.Map; public class TypedBoolLiteral implements TypedExpression { private Boolean value; - + private Type type; @Override public Type typeCheck(Map localVar, Map classes) { + type = Type.BOOL; return Type.BOOL; } diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedClass.java b/src/main/java/de/maishai/typedast/typedclass/TypedClass.java index 4af9288..aeea51e 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedClass.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedClass.java @@ -1,8 +1,11 @@ package de.maishai.typedast.typedclass; +import de.maishai.ast.records.*; +import de.maishai.ast.records.Class; import de.maishai.typedast.CodeGenUtils; import de.maishai.typedast.TypedNode; import de.maishai.typedast.Type; +import de.maishai.typedast.TypedStatement; import lombok.Data; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; @@ -14,7 +17,6 @@ import java.util.Map; @Data public class TypedClass implements TypedNode { - private Boolean isPublic; private String className; private List typedFields; private List typedMethods; @@ -49,17 +51,26 @@ public class TypedClass implements TypedNode { @Override public TypedNode convertToTypedAST(Map localVar, Map classes, de.maishai.ast.records.Node unTypedAST) { TypedClass typedClass = new TypedClass(); + Class c = (Class) unTypedAST; - for (TypedField field : typedFields) { - typedClass.getTypedFields().add((TypedField) field.convertToTypedAST(localVar, classes, unTypedAST)); + for (Declaration field : c.fieldDeclarations()) { + TypedField typedField = new TypedField(); + typedClass.getTypedFields().add(typedField.unTypedFieldToTypedField(field)); } - for (TypedConstructor constructor : typedConstructors) { - typedClass.getTypedConstructors().add((TypedConstructor) constructor.convertToTypedAST(localVar, classes, unTypedAST)); + for (Constructor constructor : c.constructors()) { + TypedConstructor typedConstructor = new TypedConstructor(); + typedClass.getTypedConstructors().add(typedConstructor.unTypedContructorToTypedConstructor(constructor)); } - for (TypedMethod method : typedMethods) { - typedClass.getTypedMethods().add((TypedMethod) method.convertToTypedAST(localVar, classes, unTypedAST)); + for(Constructor constructor : c.constructors()){ + TypedConstructor typedConstructor = new TypedConstructor(); + typedClass.getTypedConstructors().add(typedConstructor.unTypedContructorToTypedConstructor(constructor)); + } + + for (Method method : c.methods()) { + TypedMethod typedMethod = new TypedMethod(); + typedClass.getTypedMethods().add(typedMethod.unTypedMethodToTypedMethod(method)); } return typedClass; diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java b/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java index 7b6d861..0a5e9fc 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java @@ -43,6 +43,28 @@ public class TypedConstructor implements TypedNode { return Type.VOID; } + public TypedConstructor unTypedContructorToTypedConstructor(de.maishai.ast.records.Constructor unTypedConstructor) { + TypedConstructor typedConstructor = new TypedConstructor(); + typedConstructor.setName(unTypedConstructor.className()); + + if (unTypedConstructor.params().isEmpty()) { + typedConstructor.setTypedParameters(null); + } else { + + for (Parameter param : unTypedConstructor.params()) { + TypedParameter typedParam = new TypedParameter(); + typedParam.setParaName(param.name()); + typedParam.setType(param.type()); + typedConstructor.getTypedParameters().add(typedParam); + } + + } + Block block = unTypedConstructor.block(); + TypedBlock typedBlock = new TypedBlock(); + typedConstructor.setTypedBlock(typedBlock.unTypedBlockToTypedBlock(block)); + return typedConstructor; + } + @Override public TypedNode convertToTypedAST(Map localVar, Map classes, de.maishai.ast.records.Node unTypedAST) { Constructor untyped = (Constructor) unTypedAST; diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedField.java b/src/main/java/de/maishai/typedast/typedclass/TypedField.java index 411a800..c0810ae 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedField.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedField.java @@ -18,6 +18,14 @@ public class TypedField implements TypedNode { private String varName; private Type type; + + public TypedField unTypedFieldToTypedField(Declaration declaration){ + TypedField typedField = new TypedField(); + typedField.setType(declaration.type()); + typedField.setVarName(declaration.name()); + return typedField; + } + @Override public Type typeCheck(Map localVar, Map classes) { if (localVar.containsKey(varName)) { diff --git a/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java b/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java index c23f5e2..cbfdf3b 100644 --- a/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java +++ b/src/main/java/de/maishai/typedast/typedclass/TypedMethod.java @@ -19,9 +19,23 @@ public class TypedMethod implements TypedNode { private List typedParameters; private TypedBlock typedBlock; + public TypedMethod unTypedMethodToTypedMethod(Method unTypedMethod) { + TypedMethod typedMethod = new TypedMethod(); + typedMethod.setName(unTypedMethod.methodName()); + + for(Parameter parameter : unTypedMethod.params()){ + TypedParameter typedParameter = new TypedParameter(); + typedParameter.setParaName(parameter.name()); + typedParameter.setType(parameter.type()); + typedParameters.add(typedParameter); + } + TypedBlock block = new TypedBlock(); + typedMethod.setTypedBlock(block.unTypedBlockToTypedBlock(unTypedMethod.block())); + return typedMethod; + } @Override public Type typeCheck(Map localVar, Map classes) { - if(localVar.containsKey(name)) { + if(localVar.containsKey(name)) { throw new RuntimeException("Method " + name + " already exists"); } localVar.put(name, returnType);