From e96f30fe19081bb55febd5dab0756f1395522d1f Mon Sep 17 00:00:00 2001 From: i22035 Date: Thu, 4 Jul 2024 23:39:54 +0200 Subject: [PATCH 1/2] Updated Loop Tests --- src/main/java/main/Main.java | 2 +- src/test/resources/input/endabgabeTests/Main.java | 3 ++- src/test/resources/input/endabgabeTests/working/Loops.java | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/main/Main.java b/src/main/java/main/Main.java index d4ea4d9..137e4b8 100644 --- a/src/main/java/main/Main.java +++ b/src/main/java/main/Main.java @@ -41,7 +41,7 @@ public class Main { } else { try { - CharStream codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/endabgabeTests/Person.java")); + CharStream codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/endabgabeTests/working/Loops.java")); compileFile(codeCharStream, "src/test/resources/input/endabgabeTests"); } catch (IOException e) { System.err.println("Error reading the file: " + e.getMessage()); diff --git a/src/test/resources/input/endabgabeTests/Main.java b/src/test/resources/input/endabgabeTests/Main.java index a432c63..2b2dfac 100644 --- a/src/test/resources/input/endabgabeTests/Main.java +++ b/src/test/resources/input/endabgabeTests/Main.java @@ -1,5 +1,6 @@ public class Main { public static void main(String[] args) { - Person testPerson = new Person(5); + Loops loop = new Loops(); + System.out.println(loop.For(6)); } } \ No newline at end of file diff --git a/src/test/resources/input/endabgabeTests/working/Loops.java b/src/test/resources/input/endabgabeTests/working/Loops.java index 3b4f57e..a5b3a5b 100644 --- a/src/test/resources/input/endabgabeTests/working/Loops.java +++ b/src/test/resources/input/endabgabeTests/working/Loops.java @@ -14,4 +14,11 @@ public class Loops { } return count; } + + public int For(int a) { + for(int i = 0; i < a; i++) { + + } + return i + 2; + } } \ No newline at end of file From e5dcbb8f99ddce25a8f80d366f50aecbe8fefe8f Mon Sep 17 00:00:00 2001 From: Purplumbi504 Date: Thu, 4 Jul 2024 23:41:04 +0200 Subject: [PATCH 2/2] Fixing AstBuilder For pp script --- src/main/java/parser/astBuilder/ASTBuilder.java | 6 ++++++ src/main/{resources/logs/test => java/parser/parser_pp.md} | 0 src/test/java/parser/AstBuilderTest.java | 2 +- src/test/resources/input/singleFeatureTests/For.java | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) rename src/main/{resources/logs/test => java/parser/parser_pp.md} (100%) diff --git a/src/main/java/parser/astBuilder/ASTBuilder.java b/src/main/java/parser/astBuilder/ASTBuilder.java index 05d6b7a..8b19f21 100644 --- a/src/main/java/parser/astBuilder/ASTBuilder.java +++ b/src/main/java/parser/astBuilder/ASTBuilder.java @@ -834,6 +834,12 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { * * @param ctx the dot subtraction expression context * @return the AST node for the dot subtraction expression + *//** + * Creates an ITypeNode based on the type identifier. + * It handles basic types and reference types. + * + * @param identifier the type identifier + * @return the type node */ @Override public ASTNode visitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx) { diff --git a/src/main/resources/logs/test b/src/main/java/parser/parser_pp.md similarity index 100% rename from src/main/resources/logs/test rename to src/main/java/parser/parser_pp.md diff --git a/src/test/java/parser/AstBuilderTest.java b/src/test/java/parser/AstBuilderTest.java index 26f1b07..cb72237 100644 --- a/src/test/java/parser/AstBuilderTest.java +++ b/src/test/java/parser/AstBuilderTest.java @@ -633,7 +633,7 @@ class AstBuilderTest { LocalVariableDeclarationNode forDeclaration = new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "i", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "0"))); AssignableNode assignable = new AssignableNode("i"); - IncrementNode increment = new IncrementNode(CrementType.SUFFIX, assignable); + IncrementNode increment = new IncrementNode(CrementType.PREFIX, assignable); LocalVariableDeclarationNode declaration = new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "a", null, null); diff --git a/src/test/resources/input/singleFeatureTests/For.java b/src/test/resources/input/singleFeatureTests/For.java index f8f0fd6..33d074d 100644 --- a/src/test/resources/input/singleFeatureTests/For.java +++ b/src/test/resources/input/singleFeatureTests/For.java @@ -1,7 +1,7 @@ class For{ public For(){ - for(int i = 0; i < 10; i++){ + for(int i = 0; i < 10; ++i){ int a; } }