diff --git a/src/main/antlr/Decaf.g4 b/src/main/antlr/Decaf.g4
index 493b7d4..350b9a3 100644
--- a/src/main/antlr/Decaf.g4
+++ b/src/main/antlr/Decaf.g4
@@ -38,6 +38,7 @@ expr : expr binaryOp expr #BinaryOperation
| '(' expr ')' #Expression
| fieldVarAccess #Identifier
| stmtexpr #StatementExpressionexpr
+ | THIS #This
| NULL #Null
;
diff --git a/src/main/java/de/maishai/ExpressionGenerator.java b/src/main/java/de/maishai/ExpressionGenerator.java
index ce6a224..4190937 100644
--- a/src/main/java/de/maishai/ExpressionGenerator.java
+++ b/src/main/java/de/maishai/ExpressionGenerator.java
@@ -53,12 +53,18 @@ public class ExpressionGenerator extends DecafBaseVisitor {
}
public static Expression generateConstant(DecafParser.LiteralContext ctx) {
- if (ctx.NUMBER() != null)
+ if (ctx.NUMBER() != null) {
return new IntLiteral(Integer.valueOf(ctx.NUMBER().getText()));
- if (ctx.BOOLEANLITERAL() != null)
+ }
+ if (ctx.BOOLEANLITERAL() != null) {
return new BoolLiteral(Boolean.valueOf(ctx.BOOLEANLITERAL().getText()));
- if (ctx.CHARLITERAL() != null)
- return new CharLiteral(ctx.CHARLITERAL().getText().charAt(0));
+ }
+ if (ctx.CHARLITERAL() != null) {
+ if (ctx.CHARLITERAL().getText().length() != 3) {
+ throw new RuntimeException("Wrong format for Char literal. Good format: 'c' Bad format: " + ctx.CHARLITERAL().getText());
+ }
+ return new CharLiteral(ctx.CHARLITERAL().getText().charAt(1));
+ }
throw new RuntimeException("No literal found!");
}
@@ -93,7 +99,7 @@ public class ExpressionGenerator extends DecafBaseVisitor {
recursiveOwnerChain = generateRecursiveOwnerChain(recipientList, null);
}
List args = new ArrayList<>();
- if(ctx.methCall().methName().args() != null){
+ if (ctx.methCall().methName().args() != null) {
for (var expr : ctx.methCall().methName().args().expr()) {
Expression astExpr = expr.accept(this);
args.add(astExpr);
@@ -115,6 +121,16 @@ public class ExpressionGenerator extends DecafBaseVisitor {
return new New(type, args);
}
+ @Override
+ public Expression visitNull(DecafParser.NullContext ctx){
+ return new Null();
+ }
+
+ @Override
+ public Expression visitThis(DecafParser.ThisContext ctx){
+ return new This();
+ }
+
public static Expression generateRecursiveOwnerChain(List ctxList, FieldVarAccess recipient) {
if (ctxList.isEmpty()) {
return recipient;
diff --git a/src/main/java/de/maishai/antlr/Decaf.interp b/src/main/java/de/maishai/antlr/Decaf.interp
index 308d5ac..0cc16ed 100644
--- a/src/main/java/de/maishai/antlr/Decaf.interp
+++ b/src/main/java/de/maishai/antlr/Decaf.interp
@@ -131,4 +131,4 @@ id
atn:
-[4, 1, 49, 283, 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, 3, 1, 69, 8, 1, 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, 83, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 89, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 96, 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, 114, 8, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 5, 9, 122, 8, 9, 10, 9, 12, 9, 125, 9, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 133, 8, 11, 10, 11, 12, 11, 136, 9, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 147, 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, 3, 12, 172, 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, 3, 12, 188, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 195, 8, 13, 1, 13, 1, 13, 3, 13, 199, 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, 213, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 219, 8, 14, 10, 14, 12, 14, 222, 9, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 3, 17, 230, 8, 17, 1, 17, 1, 17, 1, 17, 5, 17, 235, 8, 17, 10, 17, 12, 17, 238, 9, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 248, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 253, 8, 19, 10, 19, 12, 19, 256, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 262, 8, 20, 1, 21, 1, 21, 1, 21, 3, 21, 267, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 5, 22, 274, 8, 22, 10, 22, 12, 22, 277, 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, 296, 0, 50, 1, 0, 0, 0, 2, 68, 1, 0, 0, 0, 4, 74, 1, 0, 0, 0, 6, 78, 1, 0, 0, 0, 8, 82, 1, 0, 0, 0, 10, 88, 1, 0, 0, 0, 12, 90, 1, 0, 0, 0, 14, 100, 1, 0, 0, 0, 16, 109, 1, 0, 0, 0, 18, 118, 1, 0, 0, 0, 20, 126, 1, 0, 0, 0, 22, 129, 1, 0, 0, 0, 24, 187, 1, 0, 0, 0, 26, 198, 1, 0, 0, 0, 28, 212, 1, 0, 0, 0, 30, 223, 1, 0, 0, 0, 32, 225, 1, 0, 0, 0, 34, 229, 1, 0, 0, 0, 36, 241, 1, 0, 0, 0, 38, 247, 1, 0, 0, 0, 40, 261, 1, 0, 0, 0, 42, 263, 1, 0, 0, 0, 44, 270, 1, 0, 0, 0, 46, 278, 1, 0, 0, 0, 48, 280, 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, 69, 5, 19, 0, 0, 68, 67, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 70, 1, 0, 0, 0, 70, 71, 3, 10, 5, 0, 71, 72, 3, 48, 24, 0, 72, 73, 5, 4, 0, 0, 73, 3, 1, 0, 0, 0, 74, 75, 3, 10, 5, 0, 75, 76, 3, 48, 24, 0, 76, 77, 5, 4, 0, 0, 77, 5, 1, 0, 0, 0, 78, 79, 7, 0, 0, 0, 79, 7, 1, 0, 0, 0, 80, 83, 3, 10, 5, 0, 81, 83, 5, 41, 0, 0, 82, 80, 1, 0, 0, 0, 82, 81, 1, 0, 0, 0, 83, 9, 1, 0, 0, 0, 84, 89, 5, 39, 0, 0, 85, 89, 5, 40, 0, 0, 86, 89, 5, 42, 0, 0, 87, 89, 3, 48, 24, 0, 88, 84, 1, 0, 0, 0, 88, 85, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 88, 87, 1, 0, 0, 0, 89, 11, 1, 0, 0, 0, 90, 91, 5, 19, 0, 0, 91, 92, 3, 8, 4, 0, 92, 93, 3, 48, 24, 0, 93, 95, 5, 5, 0, 0, 94, 96, 3, 18, 9, 0, 95, 94, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 97, 1, 0, 0, 0, 97, 98, 5, 6, 0, 0, 98, 99, 3, 22, 11, 0, 99, 13, 1, 0, 0, 0, 100, 101, 5, 19, 0, 0, 101, 102, 5, 7, 0, 0, 102, 103, 5, 41, 0, 0, 103, 104, 5, 8, 0, 0, 104, 105, 5, 5, 0, 0, 105, 106, 5, 9, 0, 0, 106, 107, 5, 6, 0, 0, 107, 108, 3, 22, 11, 0, 108, 15, 1, 0, 0, 0, 109, 110, 5, 19, 0, 0, 110, 111, 3, 48, 24, 0, 111, 113, 5, 5, 0, 0, 112, 114, 3, 18, 9, 0, 113, 112, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 116, 5, 6, 0, 0, 116, 117, 3, 22, 11, 0, 117, 17, 1, 0, 0, 0, 118, 123, 3, 20, 10, 0, 119, 120, 5, 10, 0, 0, 120, 122, 3, 20, 10, 0, 121, 119, 1, 0, 0, 0, 122, 125, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 19, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 126, 127, 3, 10, 5, 0, 127, 128, 3, 48, 24, 0, 128, 21, 1, 0, 0, 0, 129, 134, 5, 2, 0, 0, 130, 133, 3, 4, 2, 0, 131, 133, 3, 24, 12, 0, 132, 130, 1, 0, 0, 0, 132, 131, 1, 0, 0, 0, 133, 136, 1, 0, 0, 0, 134, 132, 1, 0, 0, 0, 134, 135, 1, 0, 0, 0, 135, 137, 1, 0, 0, 0, 136, 134, 1, 0, 0, 0, 137, 138, 5, 3, 0, 0, 138, 23, 1, 0, 0, 0, 139, 140, 5, 11, 0, 0, 140, 141, 5, 5, 0, 0, 141, 142, 3, 28, 14, 0, 142, 143, 5, 6, 0, 0, 143, 146, 3, 22, 11, 0, 144, 145, 5, 12, 0, 0, 145, 147, 3, 22, 11, 0, 146, 144, 1, 0, 0, 0, 146, 147, 1, 0, 0, 0, 147, 188, 1, 0, 0, 0, 148, 149, 5, 13, 0, 0, 149, 150, 5, 5, 0, 0, 150, 151, 3, 36, 18, 0, 151, 152, 5, 4, 0, 0, 152, 153, 3, 28, 14, 0, 153, 154, 5, 4, 0, 0, 154, 155, 3, 36, 18, 0, 155, 156, 5, 6, 0, 0, 156, 157, 3, 22, 11, 0, 157, 188, 1, 0, 0, 0, 158, 159, 5, 14, 0, 0, 159, 160, 5, 5, 0, 0, 160, 161, 3, 28, 14, 0, 161, 162, 5, 6, 0, 0, 162, 163, 3, 22, 11, 0, 163, 188, 1, 0, 0, 0, 164, 165, 5, 15, 0, 0, 165, 166, 3, 22, 11, 0, 166, 167, 5, 14, 0, 0, 167, 168, 5, 5, 0, 0, 168, 169, 3, 28, 14, 0, 169, 171, 5, 6, 0, 0, 170, 172, 5, 4, 0, 0, 171, 170, 1, 0, 0, 0, 171, 172, 1, 0, 0, 0, 172, 188, 1, 0, 0, 0, 173, 174, 5, 16, 0, 0, 174, 175, 3, 28, 14, 0, 175, 176, 5, 4, 0, 0, 176, 188, 1, 0, 0, 0, 177, 178, 5, 16, 0, 0, 178, 188, 5, 4, 0, 0, 179, 180, 5, 17, 0, 0, 180, 188, 5, 4, 0, 0, 181, 182, 3, 36, 18, 0, 182, 183, 5, 4, 0, 0, 183, 188, 1, 0, 0, 0, 184, 185, 3, 26, 13, 0, 185, 186, 5, 4, 0, 0, 186, 188, 1, 0, 0, 0, 187, 139, 1, 0, 0, 0, 187, 148, 1, 0, 0, 0, 187, 158, 1, 0, 0, 0, 187, 164, 1, 0, 0, 0, 187, 173, 1, 0, 0, 0, 187, 177, 1, 0, 0, 0, 187, 179, 1, 0, 0, 0, 187, 181, 1, 0, 0, 0, 187, 184, 1, 0, 0, 0, 188, 25, 1, 0, 0, 0, 189, 199, 3, 38, 19, 0, 190, 191, 5, 20, 0, 0, 191, 192, 3, 10, 5, 0, 192, 194, 5, 5, 0, 0, 193, 195, 3, 44, 22, 0, 194, 193, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 197, 5, 6, 0, 0, 197, 199, 1, 0, 0, 0, 198, 189, 1, 0, 0, 0, 198, 190, 1, 0, 0, 0, 199, 27, 1, 0, 0, 0, 200, 201, 6, 14, -1, 0, 201, 202, 3, 32, 16, 0, 202, 203, 3, 28, 14, 6, 203, 213, 1, 0, 0, 0, 204, 213, 3, 46, 23, 0, 205, 206, 5, 5, 0, 0, 206, 207, 3, 28, 14, 0, 207, 208, 5, 6, 0, 0, 208, 213, 1, 0, 0, 0, 209, 213, 3, 34, 17, 0, 210, 213, 3, 26, 13, 0, 211, 213, 5, 21, 0, 0, 212, 200, 1, 0, 0, 0, 212, 204, 1, 0, 0, 0, 212, 205, 1, 0, 0, 0, 212, 209, 1, 0, 0, 0, 212, 210, 1, 0, 0, 0, 212, 211, 1, 0, 0, 0, 213, 220, 1, 0, 0, 0, 214, 215, 10, 7, 0, 0, 215, 216, 3, 30, 15, 0, 216, 217, 3, 28, 14, 8, 217, 219, 1, 0, 0, 0, 218, 214, 1, 0, 0, 0, 219, 222, 1, 0, 0, 0, 220, 218, 1, 0, 0, 0, 220, 221, 1, 0, 0, 0, 221, 29, 1, 0, 0, 0, 222, 220, 1, 0, 0, 0, 223, 224, 7, 1, 0, 0, 224, 31, 1, 0, 0, 0, 225, 226, 7, 2, 0, 0, 226, 33, 1, 0, 0, 0, 227, 228, 5, 22, 0, 0, 228, 230, 5, 18, 0, 0, 229, 227, 1, 0, 0, 0, 229, 230, 1, 0, 0, 0, 230, 236, 1, 0, 0, 0, 231, 232, 3, 40, 20, 0, 232, 233, 5, 18, 0, 0, 233, 235, 1, 0, 0, 0, 234, 231, 1, 0, 0, 0, 235, 238, 1, 0, 0, 0, 236, 234, 1, 0, 0, 0, 236, 237, 1, 0, 0, 0, 237, 239, 1, 0, 0, 0, 238, 236, 1, 0, 0, 0, 239, 240, 3, 48, 24, 0, 240, 35, 1, 0, 0, 0, 241, 242, 3, 34, 17, 0, 242, 243, 3, 6, 3, 0, 243, 244, 3, 28, 14, 0, 244, 37, 1, 0, 0, 0, 245, 246, 5, 22, 0, 0, 246, 248, 5, 18, 0, 0, 247, 245, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 254, 1, 0, 0, 0, 249, 250, 3, 40, 20, 0, 250, 251, 5, 18, 0, 0, 251, 253, 1, 0, 0, 0, 252, 249, 1, 0, 0, 0, 253, 256, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 257, 1, 0, 0, 0, 256, 254, 1, 0, 0, 0, 257, 258, 3, 42, 21, 0, 258, 39, 1, 0, 0, 0, 259, 262, 3, 42, 21, 0, 260, 262, 3, 48, 24, 0, 261, 259, 1, 0, 0, 0, 261, 260, 1, 0, 0, 0, 262, 41, 1, 0, 0, 0, 263, 264, 3, 48, 24, 0, 264, 266, 5, 5, 0, 0, 265, 267, 3, 44, 22, 0, 266, 265, 1, 0, 0, 0, 266, 267, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 269, 5, 6, 0, 0, 269, 43, 1, 0, 0, 0, 270, 275, 3, 28, 14, 0, 271, 272, 5, 10, 0, 0, 272, 274, 3, 28, 14, 0, 273, 271, 1, 0, 0, 0, 274, 277, 1, 0, 0, 0, 275, 273, 1, 0, 0, 0, 275, 276, 1, 0, 0, 0, 276, 45, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 278, 279, 7, 3, 0, 0, 279, 47, 1, 0, 0, 0, 280, 281, 5, 45, 0, 0, 281, 49, 1, 0, 0, 0, 25, 55, 60, 62, 68, 82, 88, 95, 113, 123, 132, 134, 146, 171, 187, 194, 198, 212, 220, 229, 236, 247, 254, 261, 266, 275]
\ No newline at end of file
+[4, 1, 49, 284, 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, 3, 1, 69, 8, 1, 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, 83, 8, 4, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 89, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 96, 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, 114, 8, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 5, 9, 122, 8, 9, 10, 9, 12, 9, 125, 9, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 5, 11, 133, 8, 11, 10, 11, 12, 11, 136, 9, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 147, 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, 3, 12, 172, 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, 3, 12, 188, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 195, 8, 13, 1, 13, 1, 13, 3, 13, 199, 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, 1, 14, 3, 14, 214, 8, 14, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 220, 8, 14, 10, 14, 12, 14, 223, 9, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 3, 17, 231, 8, 17, 1, 17, 1, 17, 1, 17, 5, 17, 236, 8, 17, 10, 17, 12, 17, 239, 9, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 249, 8, 19, 1, 19, 1, 19, 1, 19, 5, 19, 254, 8, 19, 10, 19, 12, 19, 257, 9, 19, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 263, 8, 20, 1, 21, 1, 21, 1, 21, 3, 21, 268, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 5, 22, 275, 8, 22, 10, 22, 12, 22, 278, 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, 298, 0, 50, 1, 0, 0, 0, 2, 68, 1, 0, 0, 0, 4, 74, 1, 0, 0, 0, 6, 78, 1, 0, 0, 0, 8, 82, 1, 0, 0, 0, 10, 88, 1, 0, 0, 0, 12, 90, 1, 0, 0, 0, 14, 100, 1, 0, 0, 0, 16, 109, 1, 0, 0, 0, 18, 118, 1, 0, 0, 0, 20, 126, 1, 0, 0, 0, 22, 129, 1, 0, 0, 0, 24, 187, 1, 0, 0, 0, 26, 198, 1, 0, 0, 0, 28, 213, 1, 0, 0, 0, 30, 224, 1, 0, 0, 0, 32, 226, 1, 0, 0, 0, 34, 230, 1, 0, 0, 0, 36, 242, 1, 0, 0, 0, 38, 248, 1, 0, 0, 0, 40, 262, 1, 0, 0, 0, 42, 264, 1, 0, 0, 0, 44, 271, 1, 0, 0, 0, 46, 279, 1, 0, 0, 0, 48, 281, 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, 69, 5, 19, 0, 0, 68, 67, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 70, 1, 0, 0, 0, 70, 71, 3, 10, 5, 0, 71, 72, 3, 48, 24, 0, 72, 73, 5, 4, 0, 0, 73, 3, 1, 0, 0, 0, 74, 75, 3, 10, 5, 0, 75, 76, 3, 48, 24, 0, 76, 77, 5, 4, 0, 0, 77, 5, 1, 0, 0, 0, 78, 79, 7, 0, 0, 0, 79, 7, 1, 0, 0, 0, 80, 83, 3, 10, 5, 0, 81, 83, 5, 41, 0, 0, 82, 80, 1, 0, 0, 0, 82, 81, 1, 0, 0, 0, 83, 9, 1, 0, 0, 0, 84, 89, 5, 39, 0, 0, 85, 89, 5, 40, 0, 0, 86, 89, 5, 42, 0, 0, 87, 89, 3, 48, 24, 0, 88, 84, 1, 0, 0, 0, 88, 85, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 88, 87, 1, 0, 0, 0, 89, 11, 1, 0, 0, 0, 90, 91, 5, 19, 0, 0, 91, 92, 3, 8, 4, 0, 92, 93, 3, 48, 24, 0, 93, 95, 5, 5, 0, 0, 94, 96, 3, 18, 9, 0, 95, 94, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 97, 1, 0, 0, 0, 97, 98, 5, 6, 0, 0, 98, 99, 3, 22, 11, 0, 99, 13, 1, 0, 0, 0, 100, 101, 5, 19, 0, 0, 101, 102, 5, 7, 0, 0, 102, 103, 5, 41, 0, 0, 103, 104, 5, 8, 0, 0, 104, 105, 5, 5, 0, 0, 105, 106, 5, 9, 0, 0, 106, 107, 5, 6, 0, 0, 107, 108, 3, 22, 11, 0, 108, 15, 1, 0, 0, 0, 109, 110, 5, 19, 0, 0, 110, 111, 3, 48, 24, 0, 111, 113, 5, 5, 0, 0, 112, 114, 3, 18, 9, 0, 113, 112, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 116, 5, 6, 0, 0, 116, 117, 3, 22, 11, 0, 117, 17, 1, 0, 0, 0, 118, 123, 3, 20, 10, 0, 119, 120, 5, 10, 0, 0, 120, 122, 3, 20, 10, 0, 121, 119, 1, 0, 0, 0, 122, 125, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 19, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 126, 127, 3, 10, 5, 0, 127, 128, 3, 48, 24, 0, 128, 21, 1, 0, 0, 0, 129, 134, 5, 2, 0, 0, 130, 133, 3, 4, 2, 0, 131, 133, 3, 24, 12, 0, 132, 130, 1, 0, 0, 0, 132, 131, 1, 0, 0, 0, 133, 136, 1, 0, 0, 0, 134, 132, 1, 0, 0, 0, 134, 135, 1, 0, 0, 0, 135, 137, 1, 0, 0, 0, 136, 134, 1, 0, 0, 0, 137, 138, 5, 3, 0, 0, 138, 23, 1, 0, 0, 0, 139, 140, 5, 11, 0, 0, 140, 141, 5, 5, 0, 0, 141, 142, 3, 28, 14, 0, 142, 143, 5, 6, 0, 0, 143, 146, 3, 22, 11, 0, 144, 145, 5, 12, 0, 0, 145, 147, 3, 22, 11, 0, 146, 144, 1, 0, 0, 0, 146, 147, 1, 0, 0, 0, 147, 188, 1, 0, 0, 0, 148, 149, 5, 13, 0, 0, 149, 150, 5, 5, 0, 0, 150, 151, 3, 36, 18, 0, 151, 152, 5, 4, 0, 0, 152, 153, 3, 28, 14, 0, 153, 154, 5, 4, 0, 0, 154, 155, 3, 36, 18, 0, 155, 156, 5, 6, 0, 0, 156, 157, 3, 22, 11, 0, 157, 188, 1, 0, 0, 0, 158, 159, 5, 14, 0, 0, 159, 160, 5, 5, 0, 0, 160, 161, 3, 28, 14, 0, 161, 162, 5, 6, 0, 0, 162, 163, 3, 22, 11, 0, 163, 188, 1, 0, 0, 0, 164, 165, 5, 15, 0, 0, 165, 166, 3, 22, 11, 0, 166, 167, 5, 14, 0, 0, 167, 168, 5, 5, 0, 0, 168, 169, 3, 28, 14, 0, 169, 171, 5, 6, 0, 0, 170, 172, 5, 4, 0, 0, 171, 170, 1, 0, 0, 0, 171, 172, 1, 0, 0, 0, 172, 188, 1, 0, 0, 0, 173, 174, 5, 16, 0, 0, 174, 175, 3, 28, 14, 0, 175, 176, 5, 4, 0, 0, 176, 188, 1, 0, 0, 0, 177, 178, 5, 16, 0, 0, 178, 188, 5, 4, 0, 0, 179, 180, 5, 17, 0, 0, 180, 188, 5, 4, 0, 0, 181, 182, 3, 36, 18, 0, 182, 183, 5, 4, 0, 0, 183, 188, 1, 0, 0, 0, 184, 185, 3, 26, 13, 0, 185, 186, 5, 4, 0, 0, 186, 188, 1, 0, 0, 0, 187, 139, 1, 0, 0, 0, 187, 148, 1, 0, 0, 0, 187, 158, 1, 0, 0, 0, 187, 164, 1, 0, 0, 0, 187, 173, 1, 0, 0, 0, 187, 177, 1, 0, 0, 0, 187, 179, 1, 0, 0, 0, 187, 181, 1, 0, 0, 0, 187, 184, 1, 0, 0, 0, 188, 25, 1, 0, 0, 0, 189, 199, 3, 38, 19, 0, 190, 191, 5, 20, 0, 0, 191, 192, 3, 10, 5, 0, 192, 194, 5, 5, 0, 0, 193, 195, 3, 44, 22, 0, 194, 193, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 197, 5, 6, 0, 0, 197, 199, 1, 0, 0, 0, 198, 189, 1, 0, 0, 0, 198, 190, 1, 0, 0, 0, 199, 27, 1, 0, 0, 0, 200, 201, 6, 14, -1, 0, 201, 202, 3, 32, 16, 0, 202, 203, 3, 28, 14, 7, 203, 214, 1, 0, 0, 0, 204, 214, 3, 46, 23, 0, 205, 206, 5, 5, 0, 0, 206, 207, 3, 28, 14, 0, 207, 208, 5, 6, 0, 0, 208, 214, 1, 0, 0, 0, 209, 214, 3, 34, 17, 0, 210, 214, 3, 26, 13, 0, 211, 214, 5, 22, 0, 0, 212, 214, 5, 21, 0, 0, 213, 200, 1, 0, 0, 0, 213, 204, 1, 0, 0, 0, 213, 205, 1, 0, 0, 0, 213, 209, 1, 0, 0, 0, 213, 210, 1, 0, 0, 0, 213, 211, 1, 0, 0, 0, 213, 212, 1, 0, 0, 0, 214, 221, 1, 0, 0, 0, 215, 216, 10, 8, 0, 0, 216, 217, 3, 30, 15, 0, 217, 218, 3, 28, 14, 9, 218, 220, 1, 0, 0, 0, 219, 215, 1, 0, 0, 0, 220, 223, 1, 0, 0, 0, 221, 219, 1, 0, 0, 0, 221, 222, 1, 0, 0, 0, 222, 29, 1, 0, 0, 0, 223, 221, 1, 0, 0, 0, 224, 225, 7, 1, 0, 0, 225, 31, 1, 0, 0, 0, 226, 227, 7, 2, 0, 0, 227, 33, 1, 0, 0, 0, 228, 229, 5, 22, 0, 0, 229, 231, 5, 18, 0, 0, 230, 228, 1, 0, 0, 0, 230, 231, 1, 0, 0, 0, 231, 237, 1, 0, 0, 0, 232, 233, 3, 40, 20, 0, 233, 234, 5, 18, 0, 0, 234, 236, 1, 0, 0, 0, 235, 232, 1, 0, 0, 0, 236, 239, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0, 237, 238, 1, 0, 0, 0, 238, 240, 1, 0, 0, 0, 239, 237, 1, 0, 0, 0, 240, 241, 3, 48, 24, 0, 241, 35, 1, 0, 0, 0, 242, 243, 3, 34, 17, 0, 243, 244, 3, 6, 3, 0, 244, 245, 3, 28, 14, 0, 245, 37, 1, 0, 0, 0, 246, 247, 5, 22, 0, 0, 247, 249, 5, 18, 0, 0, 248, 246, 1, 0, 0, 0, 248, 249, 1, 0, 0, 0, 249, 255, 1, 0, 0, 0, 250, 251, 3, 40, 20, 0, 251, 252, 5, 18, 0, 0, 252, 254, 1, 0, 0, 0, 253, 250, 1, 0, 0, 0, 254, 257, 1, 0, 0, 0, 255, 253, 1, 0, 0, 0, 255, 256, 1, 0, 0, 0, 256, 258, 1, 0, 0, 0, 257, 255, 1, 0, 0, 0, 258, 259, 3, 42, 21, 0, 259, 39, 1, 0, 0, 0, 260, 263, 3, 42, 21, 0, 261, 263, 3, 48, 24, 0, 262, 260, 1, 0, 0, 0, 262, 261, 1, 0, 0, 0, 263, 41, 1, 0, 0, 0, 264, 265, 3, 48, 24, 0, 265, 267, 5, 5, 0, 0, 266, 268, 3, 44, 22, 0, 267, 266, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 269, 1, 0, 0, 0, 269, 270, 5, 6, 0, 0, 270, 43, 1, 0, 0, 0, 271, 276, 3, 28, 14, 0, 272, 273, 5, 10, 0, 0, 273, 275, 3, 28, 14, 0, 274, 272, 1, 0, 0, 0, 275, 278, 1, 0, 0, 0, 276, 274, 1, 0, 0, 0, 276, 277, 1, 0, 0, 0, 277, 45, 1, 0, 0, 0, 278, 276, 1, 0, 0, 0, 279, 280, 7, 3, 0, 0, 280, 47, 1, 0, 0, 0, 281, 282, 5, 45, 0, 0, 282, 49, 1, 0, 0, 0, 25, 55, 60, 62, 68, 82, 88, 95, 113, 123, 132, 134, 146, 171, 187, 194, 198, 213, 221, 230, 237, 248, 255, 262, 267, 276]
\ 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 36f1ea2..6c5611b 100644
--- a/src/main/java/de/maishai/antlr/DecafBaseListener.java
+++ b/src/main/java/de/maishai/antlr/DecafBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/Pressmium/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
+// Generated from C:/Users/laure/Documents/Dev/Compilerbau/Projekt/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
package de.maishai.antlr;
import org.antlr.v4.runtime.ParserRuleContext;
@@ -360,6 +360,18 @@ public class DecafBaseListener implements DecafListener {
* The default implementation does nothing.
*/
@Override public void exitBinaryOperation(DecafParser.BinaryOperationContext ctx) { }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation does nothing.
+ */
+ @Override public void enterThis(DecafParser.ThisContext ctx) { }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation does nothing.
+ */
+ @Override public void exitThis(DecafParser.ThisContext ctx) { }
/**
* {@inheritDoc}
*
diff --git a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
index b568a39..4969a22 100644
--- a/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
+++ b/src/main/java/de/maishai/antlr/DecafBaseVisitor.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/Pressmium/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
+// Generated from C:/Users/laure/Documents/Dev/Compilerbau/Projekt/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
package de.maishai.antlr;
import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
@@ -215,6 +215,13 @@ public class DecafBaseVisitor extends AbstractParseTreeVisitor implements
* {@link #visitChildren} on {@code ctx}.
*/
@Override public T visitBinaryOperation(DecafParser.BinaryOperationContext ctx) { return visitChildren(ctx); }
+ /**
+ * {@inheritDoc}
+ *
+ * The default implementation returns the result of calling
+ * {@link #visitChildren} on {@code ctx}.
+ */
+ @Override public T visitThis(DecafParser.ThisContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
diff --git a/src/main/java/de/maishai/antlr/DecafLexer.java b/src/main/java/de/maishai/antlr/DecafLexer.java
index bb9b7e7..47b0fd1 100644
--- a/src/main/java/de/maishai/antlr/DecafLexer.java
+++ b/src/main/java/de/maishai/antlr/DecafLexer.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/Pressmium/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
+// Generated from C:/Users/laure/Documents/Dev/Compilerbau/Projekt/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
package de.maishai.antlr;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
diff --git a/src/main/java/de/maishai/antlr/DecafListener.java b/src/main/java/de/maishai/antlr/DecafListener.java
index 57dec2a..60dce28 100644
--- a/src/main/java/de/maishai/antlr/DecafListener.java
+++ b/src/main/java/de/maishai/antlr/DecafListener.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/Pressmium/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
+// Generated from C:/Users/laure/Documents/Dev/Compilerbau/Projekt/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
package de.maishai.antlr;
import org.antlr.v4.runtime.tree.ParseTreeListener;
@@ -331,6 +331,18 @@ public interface DecafListener extends ParseTreeListener {
* @param ctx the parse tree
*/
void exitBinaryOperation(DecafParser.BinaryOperationContext ctx);
+ /**
+ * Enter a parse tree produced by the {@code This}
+ * labeled alternative in {@link DecafParser#expr}.
+ * @param ctx the parse tree
+ */
+ void enterThis(DecafParser.ThisContext ctx);
+ /**
+ * Exit a parse tree produced by the {@code This}
+ * labeled alternative in {@link DecafParser#expr}.
+ * @param ctx the parse tree
+ */
+ void exitThis(DecafParser.ThisContext ctx);
/**
* Enter a parse tree produced by the {@code StatementExpressionexpr}
* labeled alternative in {@link DecafParser#expr}.
diff --git a/src/main/java/de/maishai/antlr/DecafParser.java b/src/main/java/de/maishai/antlr/DecafParser.java
index 6b1f3e9..c08644c 100644
--- a/src/main/java/de/maishai/antlr/DecafParser.java
+++ b/src/main/java/de/maishai/antlr/DecafParser.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/Pressmium/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
+// Generated from C:/Users/laure/Documents/Dev/Compilerbau/Projekt/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
package de.maishai.antlr;
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
@@ -1580,6 +1580,24 @@ public class DecafParser extends Parser {
}
}
@SuppressWarnings("CheckReturnValue")
+ public static class ThisContext extends ExprContext {
+ public TerminalNode THIS() { return getToken(DecafParser.THIS, 0); }
+ public ThisContext(ExprContext ctx) { copyFrom(ctx); }
+ @Override
+ public void enterRule(ParseTreeListener listener) {
+ if ( listener instanceof DecafListener ) ((DecafListener)listener).enterThis(this);
+ }
+ @Override
+ public void exitRule(ParseTreeListener listener) {
+ if ( listener instanceof DecafListener ) ((DecafListener)listener).exitThis(this);
+ }
+ @Override
+ public T accept(ParseTreeVisitor extends T> visitor) {
+ if ( visitor instanceof DecafVisitor ) return ((DecafVisitor extends T>)visitor).visitThis(this);
+ else return visitor.visitChildren(this);
+ }
+ }
+ @SuppressWarnings("CheckReturnValue")
public static class StatementExpressionexprContext extends ExprContext {
public StmtexprContext stmtexpr() {
return getRuleContext(StmtexprContext.class,0);
@@ -1615,7 +1633,7 @@ public class DecafParser extends Parser {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(212);
+ setState(213);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,16,_ctx) ) {
case 1:
@@ -1627,7 +1645,7 @@ public class DecafParser extends Parser {
setState(201);
unaryOp();
setState(202);
- expr(6);
+ expr(7);
}
break;
case 2:
@@ -1672,16 +1690,25 @@ public class DecafParser extends Parser {
break;
case 6:
{
- _localctx = new NullContext(_localctx);
+ _localctx = new ThisContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
setState(211);
+ match(THIS);
+ }
+ break;
+ case 7:
+ {
+ _localctx = new NullContext(_localctx);
+ _ctx = _localctx;
+ _prevctx = _localctx;
+ setState(212);
match(NULL);
}
break;
}
_ctx.stop = _input.LT(-1);
- setState(220);
+ setState(221);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
@@ -1692,16 +1719,16 @@ public class DecafParser extends Parser {
{
_localctx = new BinaryOperationContext(new ExprContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_expr);
- setState(214);
- if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)");
setState(215);
- binaryOp();
+ if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)");
setState(216);
- expr(8);
+ binaryOp();
+ setState(217);
+ expr(9);
}
}
}
- setState(222);
+ setState(223);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,17,_ctx);
}
@@ -1757,7 +1784,7 @@ public class DecafParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(223);
+ setState(224);
_la = _input.LA(1);
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 17171480576L) != 0)) ) {
_errHandler.recoverInline(this);
@@ -1810,7 +1837,7 @@ public class DecafParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(225);
+ setState(226);
_la = _input.LA(1);
if ( !(_la==SUB || _la==NOT) ) {
_errHandler.recoverInline(this);
@@ -1872,37 +1899,37 @@ public class DecafParser extends Parser {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(229);
+ setState(230);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==THIS) {
{
- setState(227);
- match(THIS);
setState(228);
+ match(THIS);
+ setState(229);
match(T__17);
}
}
- setState(236);
+ setState(237);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
{
{
- setState(231);
- recipient();
setState(232);
+ recipient();
+ setState(233);
match(T__17);
}
}
}
- setState(238);
+ setState(239);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,19,_ctx);
}
- setState(239);
+ setState(240);
id();
}
}
@@ -1953,11 +1980,11 @@ public class DecafParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(241);
- fieldVarAccess();
setState(242);
- assignSign();
+ fieldVarAccess();
setState(243);
+ assignSign();
+ setState(244);
expr(0);
}
}
@@ -2011,37 +2038,37 @@ public class DecafParser extends Parser {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(247);
+ setState(248);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==THIS) {
{
- setState(245);
- match(THIS);
setState(246);
+ match(THIS);
+ setState(247);
match(T__17);
}
}
- setState(254);
+ setState(255);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
{
{
- setState(249);
- recipient();
setState(250);
+ recipient();
+ setState(251);
match(T__17);
}
}
}
- setState(256);
+ setState(257);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,21,_ctx);
}
- setState(257);
+ setState(258);
methName();
}
}
@@ -2087,20 +2114,20 @@ public class DecafParser extends Parser {
RecipientContext _localctx = new RecipientContext(_ctx, getState());
enterRule(_localctx, 40, RULE_recipient);
try {
- setState(261);
+ setState(262);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,22,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(259);
+ setState(260);
methName();
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(260);
+ setState(261);
id();
}
break;
@@ -2151,21 +2178,21 @@ public class DecafParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(263);
- id();
setState(264);
+ id();
+ setState(265);
match(T__4);
- setState(266);
+ setState(267);
_errHandler.sync(this);
_la = _input.LA(1);
if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 132216288968736L) != 0)) {
{
- setState(265);
+ setState(266);
args();
}
}
- setState(268);
+ setState(269);
match(T__5);
}
}
@@ -2214,21 +2241,21 @@ public class DecafParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(270);
+ setState(271);
expr(0);
- setState(275);
+ setState(276);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==T__9) {
{
{
- setState(271);
- match(T__9);
setState(272);
+ match(T__9);
+ setState(273);
expr(0);
}
}
- setState(277);
+ setState(278);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -2276,7 +2303,7 @@ public class DecafParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(278);
+ setState(279);
_la = _input.LA(1);
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 96757023244288L) != 0)) ) {
_errHandler.recoverInline(this);
@@ -2327,7 +2354,7 @@ public class DecafParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(280);
+ setState(281);
match(IDENTIFIER);
}
}
@@ -2352,13 +2379,13 @@ public class DecafParser extends Parser {
private boolean expr_sempred(ExprContext _localctx, int predIndex) {
switch (predIndex) {
case 0:
- return precpred(_ctx, 7);
+ return precpred(_ctx, 8);
}
return true;
}
public static final String _serializedATN =
- "\u0004\u00011\u011b\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
+ "\u0004\u00011\u011c\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"+
@@ -2388,32 +2415,32 @@ public class DecafParser extends Parser {
"\r\u0001\r\u0001\r\u0003\r\u00c3\b\r\u0001\r\u0001\r\u0003\r\u00c7\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"+
- "\u0003\u000e\u00d5\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
- "\u0005\u000e\u00db\b\u000e\n\u000e\f\u000e\u00de\t\u000e\u0001\u000f\u0001"+
- "\u000f\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0003\u0011\u00e6"+
- "\b\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0005\u0011\u00eb\b\u0011"+
- "\n\u0011\f\u0011\u00ee\t\u0011\u0001\u0011\u0001\u0011\u0001\u0012\u0001"+
- "\u0012\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0003\u0013\u00f8"+
- "\b\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0005\u0013\u00fd\b\u0013"+
- "\n\u0013\f\u0013\u0100\t\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001"+
- "\u0014\u0003\u0014\u0106\b\u0014\u0001\u0015\u0001\u0015\u0001\u0015\u0003"+
- "\u0015\u010b\b\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001"+
- "\u0016\u0005\u0016\u0112\b\u0016\n\u0016\f\u0016\u0115\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+,..\u0128\u00002\u0001\u0000\u0000\u0000"+
- "\u0002D\u0001\u0000\u0000\u0000\u0004J\u0001\u0000\u0000\u0000\u0006N"+
- "\u0001\u0000\u0000\u0000\bR\u0001\u0000\u0000\u0000\nX\u0001\u0000\u0000"+
+ "\u0001\u000e\u0003\u000e\u00d6\b\u000e\u0001\u000e\u0001\u000e\u0001\u000e"+
+ "\u0001\u000e\u0005\u000e\u00dc\b\u000e\n\u000e\f\u000e\u00df\t\u000e\u0001"+
+ "\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0003"+
+ "\u0011\u00e7\b\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0005\u0011\u00ec"+
+ "\b\u0011\n\u0011\f\u0011\u00ef\t\u0011\u0001\u0011\u0001\u0011\u0001\u0012"+
+ "\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0003\u0013"+
+ "\u00f9\b\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0005\u0013\u00fe\b"+
+ "\u0013\n\u0013\f\u0013\u0101\t\u0013\u0001\u0013\u0001\u0013\u0001\u0014"+
+ "\u0001\u0014\u0003\u0014\u0107\b\u0014\u0001\u0015\u0001\u0015\u0001\u0015"+
+ "\u0003\u0015\u010c\b\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016"+
+ "\u0001\u0016\u0005\u0016\u0113\b\u0016\n\u0016\f\u0016\u0116\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+,..\u012a\u00002\u0001\u0000\u0000"+
+ "\u0000\u0002D\u0001\u0000\u0000\u0000\u0004J\u0001\u0000\u0000\u0000\u0006"+
+ "N\u0001\u0000\u0000\u0000\bR\u0001\u0000\u0000\u0000\nX\u0001\u0000\u0000"+
"\u0000\fZ\u0001\u0000\u0000\u0000\u000ed\u0001\u0000\u0000\u0000\u0010"+
"m\u0001\u0000\u0000\u0000\u0012v\u0001\u0000\u0000\u0000\u0014~\u0001"+
"\u0000\u0000\u0000\u0016\u0081\u0001\u0000\u0000\u0000\u0018\u00bb\u0001"+
- "\u0000\u0000\u0000\u001a\u00c6\u0001\u0000\u0000\u0000\u001c\u00d4\u0001"+
- "\u0000\u0000\u0000\u001e\u00df\u0001\u0000\u0000\u0000 \u00e1\u0001\u0000"+
- "\u0000\u0000\"\u00e5\u0001\u0000\u0000\u0000$\u00f1\u0001\u0000\u0000"+
- "\u0000&\u00f7\u0001\u0000\u0000\u0000(\u0105\u0001\u0000\u0000\u0000*"+
- "\u0107\u0001\u0000\u0000\u0000,\u010e\u0001\u0000\u0000\u0000.\u0116\u0001"+
- "\u0000\u0000\u00000\u0118\u0001\u0000\u0000\u000023\u0005\u0013\u0000"+
+ "\u0000\u0000\u0000\u001a\u00c6\u0001\u0000\u0000\u0000\u001c\u00d5\u0001"+
+ "\u0000\u0000\u0000\u001e\u00e0\u0001\u0000\u0000\u0000 \u00e2\u0001\u0000"+
+ "\u0000\u0000\"\u00e6\u0001\u0000\u0000\u0000$\u00f2\u0001\u0000\u0000"+
+ "\u0000&\u00f8\u0001\u0000\u0000\u0000(\u0106\u0001\u0000\u0000\u0000*"+
+ "\u0108\u0001\u0000\u0000\u0000,\u010f\u0001\u0000\u0000\u0000.\u0117\u0001"+
+ "\u0000\u0000\u00000\u0119\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"+
@@ -2489,53 +2516,54 @@ public class DecafParser extends Parser {
"\u0000\u00c5\u00c7\u0001\u0000\u0000\u0000\u00c6\u00bd\u0001\u0000\u0000"+
"\u0000\u00c6\u00be\u0001\u0000\u0000\u0000\u00c7\u001b\u0001\u0000\u0000"+
"\u0000\u00c8\u00c9\u0006\u000e\uffff\uffff\u0000\u00c9\u00ca\u0003 \u0010"+
- "\u0000\u00ca\u00cb\u0003\u001c\u000e\u0006\u00cb\u00d5\u0001\u0000\u0000"+
- "\u0000\u00cc\u00d5\u0003.\u0017\u0000\u00cd\u00ce\u0005\u0005\u0000\u0000"+
+ "\u0000\u00ca\u00cb\u0003\u001c\u000e\u0007\u00cb\u00d6\u0001\u0000\u0000"+
+ "\u0000\u00cc\u00d6\u0003.\u0017\u0000\u00cd\u00ce\u0005\u0005\u0000\u0000"+
"\u00ce\u00cf\u0003\u001c\u000e\u0000\u00cf\u00d0\u0005\u0006\u0000\u0000"+
- "\u00d0\u00d5\u0001\u0000\u0000\u0000\u00d1\u00d5\u0003\"\u0011\u0000\u00d2"+
- "\u00d5\u0003\u001a\r\u0000\u00d3\u00d5\u0005\u0015\u0000\u0000\u00d4\u00c8"+
- "\u0001\u0000\u0000\u0000\u00d4\u00cc\u0001\u0000\u0000\u0000\u00d4\u00cd"+
- "\u0001\u0000\u0000\u0000\u00d4\u00d1\u0001\u0000\u0000\u0000\u00d4\u00d2"+
- "\u0001\u0000\u0000\u0000\u00d4\u00d3\u0001\u0000\u0000\u0000\u00d5\u00dc"+
- "\u0001\u0000\u0000\u0000\u00d6\u00d7\n\u0007\u0000\u0000\u00d7\u00d8\u0003"+
- "\u001e\u000f\u0000\u00d8\u00d9\u0003\u001c\u000e\b\u00d9\u00db\u0001\u0000"+
- "\u0000\u0000\u00da\u00d6\u0001\u0000\u0000\u0000\u00db\u00de\u0001\u0000"+
- "\u0000\u0000\u00dc\u00da\u0001\u0000\u0000\u0000\u00dc\u00dd\u0001\u0000"+
- "\u0000\u0000\u00dd\u001d\u0001\u0000\u0000\u0000\u00de\u00dc\u0001\u0000"+
- "\u0000\u0000\u00df\u00e0\u0007\u0001\u0000\u0000\u00e0\u001f\u0001\u0000"+
- "\u0000\u0000\u00e1\u00e2\u0007\u0002\u0000\u0000\u00e2!\u0001\u0000\u0000"+
- "\u0000\u00e3\u00e4\u0005\u0016\u0000\u0000\u00e4\u00e6\u0005\u0012\u0000"+
- "\u0000\u00e5\u00e3\u0001\u0000\u0000\u0000\u00e5\u00e6\u0001\u0000\u0000"+
- "\u0000\u00e6\u00ec\u0001\u0000\u0000\u0000\u00e7\u00e8\u0003(\u0014\u0000"+
- "\u00e8\u00e9\u0005\u0012\u0000\u0000\u00e9\u00eb\u0001\u0000\u0000\u0000"+
- "\u00ea\u00e7\u0001\u0000\u0000\u0000\u00eb\u00ee\u0001\u0000\u0000\u0000"+
- "\u00ec\u00ea\u0001\u0000\u0000\u0000\u00ec\u00ed\u0001\u0000\u0000\u0000"+
- "\u00ed\u00ef\u0001\u0000\u0000\u0000\u00ee\u00ec\u0001\u0000\u0000\u0000"+
- "\u00ef\u00f0\u00030\u0018\u0000\u00f0#\u0001\u0000\u0000\u0000\u00f1\u00f2"+
- "\u0003\"\u0011\u0000\u00f2\u00f3\u0003\u0006\u0003\u0000\u00f3\u00f4\u0003"+
- "\u001c\u000e\u0000\u00f4%\u0001\u0000\u0000\u0000\u00f5\u00f6\u0005\u0016"+
- "\u0000\u0000\u00f6\u00f8\u0005\u0012\u0000\u0000\u00f7\u00f5\u0001\u0000"+
- "\u0000\u0000\u00f7\u00f8\u0001\u0000\u0000\u0000\u00f8\u00fe\u0001\u0000"+
- "\u0000\u0000\u00f9\u00fa\u0003(\u0014\u0000\u00fa\u00fb\u0005\u0012\u0000"+
- "\u0000\u00fb\u00fd\u0001\u0000\u0000\u0000\u00fc\u00f9\u0001\u0000\u0000"+
- "\u0000\u00fd\u0100\u0001\u0000\u0000\u0000\u00fe\u00fc\u0001\u0000\u0000"+
- "\u0000\u00fe\u00ff\u0001\u0000\u0000\u0000\u00ff\u0101\u0001\u0000\u0000"+
- "\u0000\u0100\u00fe\u0001\u0000\u0000\u0000\u0101\u0102\u0003*\u0015\u0000"+
- "\u0102\'\u0001\u0000\u0000\u0000\u0103\u0106\u0003*\u0015\u0000\u0104"+
- "\u0106\u00030\u0018\u0000\u0105\u0103\u0001\u0000\u0000\u0000\u0105\u0104"+
- "\u0001\u0000\u0000\u0000\u0106)\u0001\u0000\u0000\u0000\u0107\u0108\u0003"+
- "0\u0018\u0000\u0108\u010a\u0005\u0005\u0000\u0000\u0109\u010b\u0003,\u0016"+
- "\u0000\u010a\u0109\u0001\u0000\u0000\u0000\u010a\u010b\u0001\u0000\u0000"+
- "\u0000\u010b\u010c\u0001\u0000\u0000\u0000\u010c\u010d\u0005\u0006\u0000"+
- "\u0000\u010d+\u0001\u0000\u0000\u0000\u010e\u0113\u0003\u001c\u000e\u0000"+
- "\u010f\u0110\u0005\n\u0000\u0000\u0110\u0112\u0003\u001c\u000e\u0000\u0111"+
- "\u010f\u0001\u0000\u0000\u0000\u0112\u0115\u0001\u0000\u0000\u0000\u0113"+
- "\u0111\u0001\u0000\u0000\u0000\u0113\u0114\u0001\u0000\u0000\u0000\u0114"+
- "-\u0001\u0000\u0000\u0000\u0115\u0113\u0001\u0000\u0000\u0000\u0116\u0117"+
- "\u0007\u0003\u0000\u0000\u0117/\u0001\u0000\u0000\u0000\u0118\u0119\u0005"+
- "-\u0000\u0000\u01191\u0001\u0000\u0000\u0000\u00197<>DRX_q{\u0084\u0086"+
- "\u0092\u00ab\u00bb\u00c2\u00c6\u00d4\u00dc\u00e5\u00ec\u00f7\u00fe\u0105"+
- "\u010a\u0113";
+ "\u00d0\u00d6\u0001\u0000\u0000\u0000\u00d1\u00d6\u0003\"\u0011\u0000\u00d2"+
+ "\u00d6\u0003\u001a\r\u0000\u00d3\u00d6\u0005\u0016\u0000\u0000\u00d4\u00d6"+
+ "\u0005\u0015\u0000\u0000\u00d5\u00c8\u0001\u0000\u0000\u0000\u00d5\u00cc"+
+ "\u0001\u0000\u0000\u0000\u00d5\u00cd\u0001\u0000\u0000\u0000\u00d5\u00d1"+
+ "\u0001\u0000\u0000\u0000\u00d5\u00d2\u0001\u0000\u0000\u0000\u00d5\u00d3"+
+ "\u0001\u0000\u0000\u0000\u00d5\u00d4\u0001\u0000\u0000\u0000\u00d6\u00dd"+
+ "\u0001\u0000\u0000\u0000\u00d7\u00d8\n\b\u0000\u0000\u00d8\u00d9\u0003"+
+ "\u001e\u000f\u0000\u00d9\u00da\u0003\u001c\u000e\t\u00da\u00dc\u0001\u0000"+
+ "\u0000\u0000\u00db\u00d7\u0001\u0000\u0000\u0000\u00dc\u00df\u0001\u0000"+
+ "\u0000\u0000\u00dd\u00db\u0001\u0000\u0000\u0000\u00dd\u00de\u0001\u0000"+
+ "\u0000\u0000\u00de\u001d\u0001\u0000\u0000\u0000\u00df\u00dd\u0001\u0000"+
+ "\u0000\u0000\u00e0\u00e1\u0007\u0001\u0000\u0000\u00e1\u001f\u0001\u0000"+
+ "\u0000\u0000\u00e2\u00e3\u0007\u0002\u0000\u0000\u00e3!\u0001\u0000\u0000"+
+ "\u0000\u00e4\u00e5\u0005\u0016\u0000\u0000\u00e5\u00e7\u0005\u0012\u0000"+
+ "\u0000\u00e6\u00e4\u0001\u0000\u0000\u0000\u00e6\u00e7\u0001\u0000\u0000"+
+ "\u0000\u00e7\u00ed\u0001\u0000\u0000\u0000\u00e8\u00e9\u0003(\u0014\u0000"+
+ "\u00e9\u00ea\u0005\u0012\u0000\u0000\u00ea\u00ec\u0001\u0000\u0000\u0000"+
+ "\u00eb\u00e8\u0001\u0000\u0000\u0000\u00ec\u00ef\u0001\u0000\u0000\u0000"+
+ "\u00ed\u00eb\u0001\u0000\u0000\u0000\u00ed\u00ee\u0001\u0000\u0000\u0000"+
+ "\u00ee\u00f0\u0001\u0000\u0000\u0000\u00ef\u00ed\u0001\u0000\u0000\u0000"+
+ "\u00f0\u00f1\u00030\u0018\u0000\u00f1#\u0001\u0000\u0000\u0000\u00f2\u00f3"+
+ "\u0003\"\u0011\u0000\u00f3\u00f4\u0003\u0006\u0003\u0000\u00f4\u00f5\u0003"+
+ "\u001c\u000e\u0000\u00f5%\u0001\u0000\u0000\u0000\u00f6\u00f7\u0005\u0016"+
+ "\u0000\u0000\u00f7\u00f9\u0005\u0012\u0000\u0000\u00f8\u00f6\u0001\u0000"+
+ "\u0000\u0000\u00f8\u00f9\u0001\u0000\u0000\u0000\u00f9\u00ff\u0001\u0000"+
+ "\u0000\u0000\u00fa\u00fb\u0003(\u0014\u0000\u00fb\u00fc\u0005\u0012\u0000"+
+ "\u0000\u00fc\u00fe\u0001\u0000\u0000\u0000\u00fd\u00fa\u0001\u0000\u0000"+
+ "\u0000\u00fe\u0101\u0001\u0000\u0000\u0000\u00ff\u00fd\u0001\u0000\u0000"+
+ "\u0000\u00ff\u0100\u0001\u0000\u0000\u0000\u0100\u0102\u0001\u0000\u0000"+
+ "\u0000\u0101\u00ff\u0001\u0000\u0000\u0000\u0102\u0103\u0003*\u0015\u0000"+
+ "\u0103\'\u0001\u0000\u0000\u0000\u0104\u0107\u0003*\u0015\u0000\u0105"+
+ "\u0107\u00030\u0018\u0000\u0106\u0104\u0001\u0000\u0000\u0000\u0106\u0105"+
+ "\u0001\u0000\u0000\u0000\u0107)\u0001\u0000\u0000\u0000\u0108\u0109\u0003"+
+ "0\u0018\u0000\u0109\u010b\u0005\u0005\u0000\u0000\u010a\u010c\u0003,\u0016"+
+ "\u0000\u010b\u010a\u0001\u0000\u0000\u0000\u010b\u010c\u0001\u0000\u0000"+
+ "\u0000\u010c\u010d\u0001\u0000\u0000\u0000\u010d\u010e\u0005\u0006\u0000"+
+ "\u0000\u010e+\u0001\u0000\u0000\u0000\u010f\u0114\u0003\u001c\u000e\u0000"+
+ "\u0110\u0111\u0005\n\u0000\u0000\u0111\u0113\u0003\u001c\u000e\u0000\u0112"+
+ "\u0110\u0001\u0000\u0000\u0000\u0113\u0116\u0001\u0000\u0000\u0000\u0114"+
+ "\u0112\u0001\u0000\u0000\u0000\u0114\u0115\u0001\u0000\u0000\u0000\u0115"+
+ "-\u0001\u0000\u0000\u0000\u0116\u0114\u0001\u0000\u0000\u0000\u0117\u0118"+
+ "\u0007\u0003\u0000\u0000\u0118/\u0001\u0000\u0000\u0000\u0119\u011a\u0005"+
+ "-\u0000\u0000\u011a1\u0001\u0000\u0000\u0000\u00197<>DRX_q{\u0084\u0086"+
+ "\u0092\u00ab\u00bb\u00c2\u00c6\u00d5\u00dd\u00e6\u00ed\u00f8\u00ff\u0106"+
+ "\u010b\u0114";
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 e9fca28..ba2600d 100644
--- a/src/main/java/de/maishai/antlr/DecafVisitor.java
+++ b/src/main/java/de/maishai/antlr/DecafVisitor.java
@@ -1,4 +1,4 @@
-// Generated from C:/dev/Pressmium/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
+// Generated from C:/Users/laure/Documents/Dev/Compilerbau/Projekt/CompilerULTIMATE/src/main/antlr/Decaf.g4 by ANTLR 4.13.1
package de.maishai.antlr;
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
@@ -201,6 +201,13 @@ public interface DecafVisitor extends ParseTreeVisitor {
* @return the visitor result
*/
T visitBinaryOperation(DecafParser.BinaryOperationContext ctx);
+ /**
+ * Visit a parse tree produced by the {@code This}
+ * labeled alternative in {@link DecafParser#expr}.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ T visitThis(DecafParser.ThisContext ctx);
/**
* Visit a parse tree produced by the {@code StatementExpressionexpr}
* labeled alternative in {@link DecafParser#expr}.
diff --git a/src/main/java/de/maishai/ast/records/Expression.java b/src/main/java/de/maishai/ast/records/Expression.java
index 2463f86..974c05b 100644
--- a/src/main/java/de/maishai/ast/records/Expression.java
+++ b/src/main/java/de/maishai/ast/records/Expression.java
@@ -1,5 +1,5 @@
package de.maishai.ast.records;
-public sealed interface Expression extends Node permits Binary, BoolLiteral, CharLiteral, FieldVarAccess, IntLiteral, MethodCall, New, Unary {
+public sealed interface Expression extends Node permits Binary, BoolLiteral, CharLiteral, FieldVarAccess, IntLiteral, MethodCall, New, Null, This, Unary {
}
diff --git a/src/main/java/de/maishai/ast/records/Null.java b/src/main/java/de/maishai/ast/records/Null.java
new file mode 100644
index 0000000..5d184eb
--- /dev/null
+++ b/src/main/java/de/maishai/ast/records/Null.java
@@ -0,0 +1,5 @@
+package de.maishai.ast.records;
+
+
+public record Null() implements Expression {
+}
diff --git a/src/main/java/de/maishai/ast/records/This.java b/src/main/java/de/maishai/ast/records/This.java
new file mode 100644
index 0000000..38c8cc3
--- /dev/null
+++ b/src/main/java/de/maishai/ast/records/This.java
@@ -0,0 +1,5 @@
+package de.maishai.ast.records;
+
+
+public record This() implements Expression {
+}
diff --git a/src/main/resources/AbstractSyntax/AbstractSyntax_ComplexClass.java b/src/main/resources/AbstractSyntax/AbstractSyntax_ComplexClass.java
new file mode 100644
index 0000000..6fee8c7
--- /dev/null
+++ b/src/main/resources/AbstractSyntax/AbstractSyntax_ComplexClass.java
@@ -0,0 +1,902 @@
+//public class ComplexClass {
+//
+// int x;
+// int y;
+// ComplexClass b;
+// ComplexClass c;
+//
+// public ComplexClass() {
+// this.y = 10;
+// this.x = 2;
+// int i;
+// for (i = 0; i < (this.y + 1); i = i + 1) {
+// int j;
+// for (j = 0; j < this.y; j += 1) {
+// this.x = this.x * this.x;
+// if (this.x == 100) {
+// break;
+// }
+// }
+// }
+// this.y = 2;
+// do {
+// this.y = this.y + 1;
+// } while (this.y < 10);
+//
+// int k;
+// k = 0;
+// for (k = 0; k < 10; k = k + 1) {
+// if (k == 5) {
+// return this;
+// }
+// }
+//
+// }
+//
+// public ComplexClass(int x) {
+// this.b = new ComplexClass();
+// this.c = new ComplexClass();
+// this.x = x;
+// this.b.x = 7;
+// this.b.y = 13;
+// this.c.x = this.b.getX() * this.b.y * this.b.getX('g');
+// this.c.y = 25;
+// }
+//
+// public ComplexClass(int x, int y) {
+// this.x = x;
+// this.y = y;
+// }
+//
+// public ComplexClass initComplexClass(int x) {
+// int a;
+// a = 10;
+// this.b = new ComplexClass(x);
+// this.b.x = 10 + a;
+// this.b.y = 20;
+// this.b.c.x = 20 + a;
+// if (methodCall()) {
+// this.b.getC().b.y = this.b.x;
+// }
+// return this.b;
+// }
+//
+// public ComplexClass init(int x, int y) {
+// return new ComplexClass(x, y);
+// }
+//
+// public ComplexClass(int x, int y, char z) {
+// this.x = x;
+// this.y = y;
+// }
+//
+// public int getX(char z) {
+// return this.x;
+// }
+//
+// public ComplexClass getC() {
+// return this.c;
+// }
+//
+// public int getX() {
+// return this.x;
+// }
+//
+// public boolean methodCall() {
+// return false;
+// }
+//
+//}
+
+
+import de.maishai.ast.Operator;
+import de.maishai.ast.records.*;
+import de.maishai.ast.records.Class;
+import de.maishai.typedast.Type;
+
+import java.util.List;
+
+@SuppressWarnings("DuplicateExpressions")
+public class AbstractSyntax_ComplexClass {
+ public static Program get() {
+ List declarationList = List.of(
+ new Declaration(
+ "x",
+ Type.INT
+ ),
+ new Declaration(
+ "y",
+ Type.INT
+ ),
+ new Declaration(
+ "b",
+ Type.REFERENCE("ComplexClass")
+ ),
+ new Declaration(
+ "c",
+ Type.REFERENCE("ComplexClass")
+ )
+ );
+ List methodList = getMethods();
+ List constructorList = getConstructors();
+ return new Program(
+ List.of(
+ new Class(
+ "ComplexClass",
+ declarationList,
+ methodList,
+ constructorList
+ )
+ )
+ );
+ }
+
+ private static List getConstructors() {
+ return List.of(
+ getConstructor1(),
+ getConstructor2(),
+ getConstructor3(),
+ getConstructor4()
+ );
+ }
+
+ private static Constructor getConstructor1() {
+ Block block = new Block(
+ List.of(
+ new Declaration(
+ "i",
+ Type.INT
+ ),
+ new Declaration(
+ "k",
+ Type.INT
+ )
+ ),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ new IntLiteral(10)
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"),
+ new IntLiteral(2)
+ ),
+ new For(
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "i"),
+ new IntLiteral(0)
+ ),
+ new Binary(
+ new FieldVarAccess(
+ false,
+ null,
+ "i"),
+ Operator.LT,
+ new Binary(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ Operator.ADD,
+ new IntLiteral(1)
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "i"),
+ new Binary(
+ new FieldVarAccess(
+ false,
+ null,
+ "i"),
+ Operator.ADD,
+ new IntLiteral(1)
+ )
+ ),
+ new Block(
+ List.of(
+ new Declaration(
+ "j",
+ Type.INT
+ )
+ ),
+ List.of(
+ new For(
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "j"),
+ new IntLiteral(0)
+ ),
+ new Binary(
+ new FieldVarAccess(
+ false,
+ null,
+ "j"),
+ Operator.LT,
+ new FieldVarAccess(
+ true,
+ null,
+ "y"
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "j"),
+ new Binary(
+ new FieldVarAccess(
+ false,
+ null,
+ "j"),
+ Operator.ADD,
+ new IntLiteral(1)
+ )
+ ),
+ new Block(
+ List.of(),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"),
+ new Binary(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"),
+ Operator.MUL,
+ new FieldVarAccess(
+ true,
+ null,
+ "x"
+ )
+ )
+ ),
+ new IfElse(
+ new Binary(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"),
+ Operator.EQ,
+ new IntLiteral(100)
+ ),
+ new Block(
+ List.of(),
+ List.of(
+ new Break()
+ )
+ ),
+ null
+ )
+ )
+ )
+ )
+ )
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ new IntLiteral(2)
+ ),
+ new DoWhile(
+ new Block(
+ List.of(),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ new Binary(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ Operator.ADD,
+ new IntLiteral(1)
+ )
+ )
+ )
+ ),
+ new Binary(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ Operator.LT,
+ new IntLiteral(10)
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "k"),
+ new IntLiteral(0)
+ ),
+ new For(
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "k"),
+ new IntLiteral(0)
+ ),
+ new Binary(
+ new FieldVarAccess(
+ false,
+ null,
+ "k"),
+ Operator.LT,
+ new IntLiteral(10)
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "k"),
+ new Binary(
+ new FieldVarAccess(
+ false,
+ null,
+ "k"),
+ Operator.ADD,
+ new IntLiteral(1)
+ )
+ ),
+ new Block(
+ List.of(),
+ List.of(
+ new IfElse(
+ new Binary(
+ new FieldVarAccess(
+ false,
+ null,
+ "k"),
+ Operator.EQ,
+ new IntLiteral(5)
+ ),
+ new Block(
+ List.of(),
+ List.of(
+ new Return(
+ new This()
+ )
+ )
+ ),
+ null
+ )
+ )
+ )
+ )
+ )
+ );
+ return new Constructor(
+ "ComplexClass",
+ List.of(),
+ block
+ );
+ }
+
+ private static Constructor getConstructor2() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "b"),
+ new New(
+ Type.REFERENCE("ComplexClass"),
+ List.of()
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "c"),
+ new New(
+ Type.REFERENCE("ComplexClass"),
+ List.of()
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"),
+ new FieldVarAccess(
+ false,
+ null,
+ "x"
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "x"),
+ new IntLiteral(7)
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "y"),
+ new IntLiteral(13)
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "c"),
+ "x"),
+ new Binary(
+ new Binary(
+ new MethodCall(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "getX"
+ ),
+ List.of()
+ ),
+ Operator.MUL,
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "y"
+ )
+ ),
+ Operator.MUL,
+ new MethodCall(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "getX"
+ ),
+ List.of(
+ new CharLiteral('g')
+ )
+ )
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "c"),
+ "y"),
+ new IntLiteral(25)
+ )
+ )
+ );
+ return new Constructor(
+ "ComplexClass",
+ List.of(
+ new Parameter(
+ "x",
+ Type.INT
+ )
+ ),
+ block
+ );
+ }
+
+ private static Constructor getConstructor3() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"),
+ new FieldVarAccess(
+ false,
+ null,
+ "x"
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ new FieldVarAccess(
+ false,
+ null,
+ "y"
+ )
+ )
+ )
+ );
+ return new Constructor(
+ "ComplexClass",
+ List.of(
+ new Parameter(
+ "x",
+ Type.INT
+ ),
+ new Parameter(
+ "y",
+ Type.INT
+ )
+ ),
+ block
+ );
+ }
+
+ private static Constructor getConstructor4() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"),
+ new FieldVarAccess(
+ false,
+ null,
+ "x"
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "y"),
+ new FieldVarAccess(
+ false,
+ null,
+ "y"
+ )
+ )
+ )
+ );
+ return new Constructor(
+ "ComplexClass",
+ List.of(
+ new Parameter(
+ "x",
+ Type.INT
+ ),
+ new Parameter(
+ "y",
+ Type.INT
+ ),
+ new Parameter(
+ "z",
+ Type.CHAR
+ )
+ ),
+ block
+ );
+ }
+
+ private static List getMethods() {
+ return List.of(
+ getMethod1(),
+ getMethod2(),
+ getMethod3(),
+ getMethod4(),
+ getMethod5(),
+ getMethod6()
+ );
+ }
+
+ private static Method getMethod1() {
+ Block block = new Block(
+ List.of(
+ new Declaration(
+ "a",
+ Type.INT
+ )
+ ),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ false,
+ null,
+ "a"),
+ new IntLiteral(10)
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ null,
+ "b"),
+ new New(
+ Type.REFERENCE("ComplexClass"),
+ List.of(
+ new FieldVarAccess(
+ false,
+ null,
+ "x"
+ )
+ )
+
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "x"),
+ new Binary(
+ new IntLiteral(10),
+ Operator.ADD,
+ new FieldVarAccess(
+ false,
+ null,
+ "a"
+ )
+ )
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "y"),
+ new IntLiteral(20)
+ ),
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"),
+ "c"),
+ "x"),
+ new Binary(
+ new IntLiteral(20),
+ Operator.ADD,
+ new FieldVarAccess(
+ false,
+ null,
+ "a"
+ )
+ )
+ ),
+ new IfElse(
+ new MethodCall(
+ new FieldVarAccess(
+ false,
+ null,
+ "methodCall"),
+ List.of()
+ ),
+ new Block(
+ List.of(),
+ List.of(
+ new Assignment(
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ new MethodCall(
+ new FieldVarAccess(
+ false,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"
+ ),
+ "getC"
+ ),
+ List.of()
+ ),
+ "b"),
+ "y"),
+ new FieldVarAccess(
+ true,
+ new FieldVarAccess(
+ false,
+ null,
+ "b"
+ ),
+ "x"
+ )
+ )
+ )
+ ),
+ null
+ ),
+ new Return(
+ new FieldVarAccess(
+ true,
+ null,
+ "b"
+ )
+ )
+ )
+
+ );
+ return new Method(
+ Type.REFERENCE("ComplexClass"),
+ "initComplexClass",
+ List.of(
+ new Parameter(
+ "x",
+ Type.INT
+ )
+ ),
+ block
+ );
+ }
+
+ private static Method getMethod2() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Return(
+ new New(
+ Type.REFERENCE("ComplexClass"),
+ List.of(
+ new FieldVarAccess(
+ false,
+ null,
+ "x"
+ ),
+ new FieldVarAccess(
+ false,
+ null,
+ "y"
+ )
+ )
+ )
+ )
+ )
+ );
+ return new Method(
+ Type.REFERENCE("ComplexClass"),
+ "init",
+ List.of(
+ new Parameter(
+ "x",
+ Type.INT
+ ),
+ new Parameter(
+ "y",
+ Type.INT
+ )
+ ),
+ block
+ );
+ }
+
+ private static Method getMethod3() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Return(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"
+ )
+ )
+ )
+ );
+ return new Method(
+ Type.INT,
+ "getX",
+ List.of(
+ new Parameter(
+ "z",
+ Type.CHAR
+ )
+ ),
+ block
+ );
+ }
+
+ private static Method getMethod4() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Return(
+ new FieldVarAccess(
+ true,
+ null,
+ "c"
+ )
+ )
+ )
+ );
+ return new Method(
+ Type.REFERENCE("ComplexClass"),
+ "getC",
+ List.of(),
+ block
+ );
+ }
+
+ private static Method getMethod5() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Return(
+ new FieldVarAccess(
+ true,
+ null,
+ "x"
+ )
+ )
+ )
+ );
+ return new Method(
+ Type.INT,
+ "getX",
+ List.of(),
+ block
+ );
+ }
+
+ private static Method getMethod6() {
+ Block block = new Block(
+ List.of(),
+ List.of(
+ new Return(
+ new BoolLiteral(false)
+ )
+ )
+ );
+ return new Method(
+ Type.BOOL,
+ "methodCall",
+ List.of(),
+ block
+ );
+ }
+}
diff --git a/src/main/resources/JavaTestfiles/ComplexClass.java b/src/main/resources/JavaTestfiles/ComplexClass.java
index e61f30d..f374cee 100644
--- a/src/main/resources/JavaTestfiles/ComplexClass.java
+++ b/src/main/resources/JavaTestfiles/ComplexClass.java
@@ -4,44 +4,21 @@ public class ComplexClass {
int y;
ComplexClass b;
ComplexClass c;
- public ComplexClass(int x) {
- this.x = x;
- }
- public ComplexClass(int x, int y) {
- this.x = x;
- this.y = y;
- }
- public ComplexClass initComplexClass(int x) {
- int a;
- a = 10;
- b = new ComplexClass(x);
- b.x = 10 + a;
- b.y = 20;
- b.c.x = 20 + a;
- b.c.b.y = b.x;
-
- return b;
- }
- public ComplexClass init(int x, int y) {
- return new ComplexClass(x, y);
- }
- public ComplexClass(int x) {
- this.x = x;
- int i;
- b = b.getX().c.getC();
- i = b.getX().c.getX();
- }
public ComplexClass() {
- this.x = 10;
+ this.y = 10;
+ this.x = 2;
int i;
- for (i = 0; i < (x + 1); i = i + 1) {
+ for (i = 0; i < (this.y + 1); i = i + 1) {
int j;
- for (j = 0; j < this.x; j += 1) {
+ for (j = 0; j < this.y; j += 1) {
this.x = this.x * this.x;
- break;
+ if (this.x == 100) {
+ break;
+ }
}
}
+ this.y = 2;
do {
this.y = this.y + 1;
} while (this.y < 10);
@@ -50,12 +27,44 @@ public class ComplexClass {
k = 0;
for (k = 0; k < 10; k = k + 1) {
if (k == 5) {
- return;
+ return this;
}
}
}
+ public ComplexClass(int x) {
+ this.b = new ComplexClass();
+ this.c = new ComplexClass();
+ this.x = x;
+ this.b.x = 7;
+ this.b.y = 13;
+ this.c.x = this.b.getX() * this.b.y * this.b.getX('g');
+ this.c.y = 25;
+ }
+
+ public ComplexClass(int x, int y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ public ComplexClass initComplexClass(int x) {
+ int a;
+ a = 10;
+ this.b = new ComplexClass(x);
+ this.b.x = 10 + a;
+ this.b.y = 20;
+ this.b.c.x = 20 + a;
+ if (methodCall()) {
+ this.b.getC().b.y = this.b.x;
+ }
+ return this.b;
+ }
+
+ public ComplexClass init(int x, int y) {
+ return new ComplexClass(x, y);
+ }
+
public ComplexClass(int x, int y, char z) {
this.x = x;
this.y = y;
@@ -66,16 +75,15 @@ public class ComplexClass {
}
public ComplexClass getC() {
- return c;
+ return this.c;
}
public int getX() {
- return x;
+ return this.x;
}
public boolean methodCall() {
return false;
}
-
}
diff --git a/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithConstructor.java b/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithConstructor.java
index b7dbc45..8f2946f 100644
--- a/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithConstructor.java
+++ b/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithConstructor.java
@@ -37,7 +37,8 @@ public class TypedAbstractSyntax_ClassWithConstructor {
null,
Type.REFERENCE("ClassWithField")
)
- )
+ ),
+ null
);
}
diff --git a/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithField.java b/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithField.java
index 9c39652..4abf824 100644
--- a/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithField.java
+++ b/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_ClassWithField.java
@@ -38,7 +38,8 @@ public class TypedAbstractSyntax_ClassWithField {
null,
Type.REFERENCE("ClassWithField")
)
- )
+ ),
+ null
);
}
}
\ No newline at end of file
diff --git a/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_PublicClass.java b/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_PublicClass.java
index dba4b7e..79541a2 100644
--- a/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_PublicClass.java
+++ b/src/main/resources/TypedAbstractSyntax/TypedAbstractSyntax_PublicClass.java
@@ -31,7 +31,8 @@ public class TypedAbstractSyntax_PublicClass {
null,
Type.REFERENCE("PublicClass")
)
- )
+ ),
+ null
);
}
}
\ No newline at end of file
diff --git a/src/test/java/CodegeneratorTests.java b/src/test/java/CodegeneratorTests.java
new file mode 100644
index 0000000..cc580ad
--- /dev/null
+++ b/src/test/java/CodegeneratorTests.java
@@ -0,0 +1,16 @@
+import de.maishai.Compiler;
+import de.maishai.ast.records.Program;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CodegeneratorTests {
+
+// @Test
+// public void testPublicClass() {
+// byte[] resultBytecode = Compiler.generateByteCodeArrayFromTypedAst();
+// assertEquals(AbstractSyntax_PublicClass.get(), resultBytecode);
+// }
+}
diff --git a/src/test/java/E2ETests.java b/src/test/java/E2ETests.java
index 57f34f2..8ae34ec 100644
--- a/src/test/java/E2ETests.java
+++ b/src/test/java/E2ETests.java
@@ -1,3 +1,7 @@
public class E2ETests {
+ char ZZ;
+ public E2ETests() {
+ this.ZZ = 'z';
+ }
}
diff --git a/src/test/java/ScannerParserTests.java b/src/test/java/ScannerParserTests.java
index 4e27183..20dfd7a 100644
--- a/src/test/java/ScannerParserTests.java
+++ b/src/test/java/ScannerParserTests.java
@@ -59,6 +59,6 @@ public class ScannerParserTests {
@Test
public void testComplexClass() {
Program resultAst = Compiler.generateASTFromFile(List.of("src/main/resources/JavaTestfiles/ComplexClass.java"));
- assertEquals(AbstractSyntax_ClassWithConstructorAndMethodCall.get(), resultAst);
+ assertEquals(AbstractSyntax_ComplexClass.get(), resultAst);
}
}