From f4cf250de042dae75a217de0e7d8787ae85e44dd Mon Sep 17 00:00:00 2001 From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com> Date: Thu, 24 Apr 2025 16:44:03 +0200 Subject: [PATCH] Remove ElementBuilder -> will become a Printer in a different package later. --- src/dev/peerat/parser/ElementBuilder.java | 48 ------------------ src/dev/peerat/parser/java/Annotation.java | 30 +---------- .../peerat/parser/java/AnnotationClass.java | 19 ------- src/dev/peerat/parser/java/Class.java | 23 --------- src/dev/peerat/parser/java/Enumeration.java | 19 ------- src/dev/peerat/parser/java/Function.java | 38 +------------- src/dev/peerat/parser/java/Import.java | 5 -- src/dev/peerat/parser/java/Interface.java | 19 ------- src/dev/peerat/parser/java/JavaElement.java | 3 +- src/dev/peerat/parser/java/JavaFile.java | 19 ------- src/dev/peerat/parser/java/Variable.java | 19 ------- .../parser/java/builder/JavaBuilder.java | 2 +- .../java/builder/JavaFunctionBuilder.java | 4 +- .../java/builder/JavaOperationBuilder.java | 9 +--- .../parser/java/builder/JavaValueBuilder.java | 5 -- .../java/operation/AssignOperation.java | 8 --- .../parser/java/operation/BreakOperation.java | 6 --- .../parser/java/operation/CatchOperation.java | 5 -- .../java/operation/ContinueOperation.java | 6 --- .../parser/java/operation/DoOperation.java | 5 -- .../parser/java/operation/ElseOperation.java | 5 -- .../java/operation/FinallyOperation.java | 5 -- .../parser/java/operation/ForOperation.java | 5 -- .../java/operation/ForeachOperation.java | 5 -- .../parser/java/operation/IfOperation.java | 5 -- .../java/{ => operation}/Operation.java | 5 +- .../parser/java/operation/OperationBag.java | 3 +- .../java/operation/ReturnOperation.java | 6 --- .../java/operation/SwitchOperation.java | 5 -- .../java/operation/SynchronizedOperation.java | 5 -- .../parser/java/operation/ThrowOperation.java | 7 --- .../parser/java/operation/TryOperation.java | 5 -- .../parser/java/operation/WhileOperation.java | 5 -- .../peerat/parser/java/tree/ClassTree.java | 3 +- .../parser/java/tree/OperationTree.java | 2 +- .../parser/java/value/ArrayAccessValue.java | 9 ++-- .../peerat/parser/java/value/ArrayValue.java | 8 --- src/dev/peerat/parser/java/value/BiValue.java | 7 --- .../peerat/parser/java/value/CastValue.java | 9 ++-- .../parser/java/value/InstanceValue.java | 9 ---- .../peerat/parser/java/value/LambdaValue.java | 9 +--- .../parser/java/value/MethodCallValue.java | 10 ---- .../parser/java/value/ModifierValue.java | 6 --- .../peerat/parser/java/value/StaticValue.java | 8 +-- .../peerat/parser/java/value/TriValue.java | 10 ---- .../java/value/VariableAccessValue.java | 6 --- .../operation/JavaOperationVisitor.java | 2 +- .../value/JavaArrayAccessValueVisitor.java | 50 +++++++++++++++++++ .../peerat/parser/java/OperationTests.java | 2 +- .../peerat/parser/java/ValueTypesTests.java | 3 -- .../parser/java/element/BaseElementTests.java | 2 +- .../operation/AssignOperationTest.java | 2 +- .../element/operation/LoopOperationTests.java | 2 +- .../TryCatchFinallyOperationTest.java | 2 +- .../java/element/value/TypeOfValuesTests.java | 2 +- .../java/element/value/ValueInCondition.java | 2 +- 56 files changed, 85 insertions(+), 438 deletions(-) delete mode 100644 src/dev/peerat/parser/ElementBuilder.java rename src/dev/peerat/parser/java/{ => operation}/Operation.java (67%) create mode 100644 src/dev/peerat/parser/java/visitor/value/JavaArrayAccessValueVisitor.java diff --git a/src/dev/peerat/parser/ElementBuilder.java b/src/dev/peerat/parser/ElementBuilder.java deleted file mode 100644 index 04c4c94..0000000 --- a/src/dev/peerat/parser/ElementBuilder.java +++ /dev/null @@ -1,48 +0,0 @@ -package dev.peerat.parser; - -import java.io.BufferedWriter; -import java.util.LinkedList; -import java.util.List; - -public interface ElementBuilder{ - - void build(Builder builder) throws Exception; - - public static class Builder{ - - private List tokens; - - public Builder(){ - this.tokens = new LinkedList<>(); - this.tokens.add(new Token(1,1,"", TokenType.GROUP)); - } - - public void append(Token token){ - if(token == null) throw new NullPointerException(); - this.tokens.add(token); - } - - public void append(String value){ - Token last = tokens.get(tokens.size()-1); - append(new Token(last.getLineNumber(), last.getCharacterNumber()+last.getValue().length(), value, TokenType.GROUP)); - } - - public void build(BufferedWriter writer) throws Exception{ - int character = 1; - int line = 1; - for(Token token : tokens){ - while(line < token.getLineNumber()){ - writer.write("\n"); - line++; - } - while(character < token.getCharacterNumber()){ - writer.write(" "); - character++; - } - - writer.write(token.getValue()); - character+=token.getValue().length(); - } - } - } -} \ No newline at end of file diff --git a/src/dev/peerat/parser/java/Annotation.java b/src/dev/peerat/parser/java/Annotation.java index e84f97f..335a35f 100644 --- a/src/dev/peerat/parser/java/Annotation.java +++ b/src/dev/peerat/parser/java/Annotation.java @@ -2,7 +2,7 @@ package dev.peerat.parser.java; import java.util.List; import java.util.Map; -import java.util.Map.Entry; +import java.util.function.BiFunction; import java.util.function.Function; import dev.peerat.parser.Token; @@ -50,15 +50,6 @@ public class Annotation extends JavaElement{ return false; } - @Override - public void build(Builder builder) throws Exception{ - if(annotations != null){ - for(Annotation annotation : this.annotations){ - annotation.build(builder); - } - } - } - @Override public E find(Function finder){ if(annotations != null){ @@ -100,24 +91,6 @@ public class Annotation extends JavaElement{ return this.values; } - @Override - public void build(Builder builder) throws Exception{ - System.out.println("build annotation "+name+" | "+values); - builder.append(name); - if(values != null && values.size() > 0){ - builder.append("("); - for(Entry entry : values.entrySet()){ - if(entry.getKey() != null){ - builder.append(entry.getKey()); - builder.append("="); - } - entry.getValue().build(builder); - builder.append(","); //replace by iterator splitter method - } - builder.append(")"); - } - } - @Override public E find(Function finder){ if(this.values != null){ @@ -150,4 +123,5 @@ public class Annotation extends JavaElement{ return bag; } + } diff --git a/src/dev/peerat/parser/java/AnnotationClass.java b/src/dev/peerat/parser/java/AnnotationClass.java index 7a992a1..46b0672 100644 --- a/src/dev/peerat/parser/java/AnnotationClass.java +++ b/src/dev/peerat/parser/java/AnnotationClass.java @@ -41,25 +41,6 @@ public class AnnotationClass extends ClassBase{ return this.elements; } - @Override - public void build(Builder builder) throws Exception{ - super.build(builder); - - builder.append("@interface"); - builder.append(getName()); - if(extend != null){ - builder.append(" extends "); - builder.append(extend); - } - builder.append("{"); - if(elements != null){ - for(JavaElement element : this.elements){ - element.build(builder); - } - } - builder.append("}"); - } - @Override public E find(java.util.function.Function finder){ E annotation = super.find(finder); diff --git a/src/dev/peerat/parser/java/Class.java b/src/dev/peerat/parser/java/Class.java index c15edaa..e4f33af 100644 --- a/src/dev/peerat/parser/java/Class.java +++ b/src/dev/peerat/parser/java/Class.java @@ -52,29 +52,6 @@ public class Class extends ClassBase{ return this.elements; } - @Override - public void build(Builder builder) throws Exception{ - super.build(builder); - - builder.append("class "); - builder.append(getName()); - if(extend != null){ - builder.append(" extends "); - builder.append(extend); - } - if(implement != null){ - builder.append(" implements "); - builder.append(implement); - } - builder.append("{"); - if(elements != null){ - for(JavaElement element : this.elements){ - element.build(builder); - } - } - builder.append("}"); - } - @Override public E find(java.util.function.Function finder){ E annotation = super.find(finder); diff --git a/src/dev/peerat/parser/java/Enumeration.java b/src/dev/peerat/parser/java/Enumeration.java index 5e7c8aa..b11ba94 100644 --- a/src/dev/peerat/parser/java/Enumeration.java +++ b/src/dev/peerat/parser/java/Enumeration.java @@ -46,25 +46,6 @@ public class Enumeration extends ClassBase{ return this.elements; } - @Override - public void build(Builder builder) throws Exception{ - super.build(builder); - - builder.append("enum"); - builder.append(getName()); - if(extend != null){ - builder.append(" extends "); - builder.append(extend); - } - builder.append("{"); - if(elements != null){ - for(JavaElement element : this.elements){ - element.build(builder); - } - } - builder.append("}"); - } - @Override public E find(java.util.function.Function finder){ E annotation = super.find(finder); diff --git a/src/dev/peerat/parser/java/Function.java b/src/dev/peerat/parser/java/Function.java index 5c2b821..014584b 100644 --- a/src/dev/peerat/parser/java/Function.java +++ b/src/dev/peerat/parser/java/Function.java @@ -7,8 +7,9 @@ import java.util.List; import dev.peerat.parser.Token; import dev.peerat.parser.TokenType; import dev.peerat.parser.java.Annotation.Annotable; -import dev.peerat.parser.java.Operation.OperationContainer; import dev.peerat.parser.java.Variable.VariableContainer; +import dev.peerat.parser.java.operation.Operation; +import dev.peerat.parser.java.operation.Operation.OperationContainer; import dev.peerat.parser.java.value.Value; import dev.peerat.parser.java.value.Value.ValueContainer; import dev.peerat.parser.java.visitor.JavaVisitor; @@ -97,41 +98,6 @@ public class Function extends Annotable implements VariableContainer, OperationC return this.elements; } - @Override - public void build(Builder builder) throws Exception{ - super.build(builder); - String mod = Modifier.toString(this.mod); - builder.append(new Token(type.getLineNumber(), type.getCharacterNumber()-(mod.length()+1), mod, TokenType.GROUP)); - builder.append(" "); - if(generic != null){ - builder.append(generic); - builder.append(" "); - } - builder.append(type); - builder.append(" "); - builder.append(name); - builder.append("("); - if(parameters != null){ - for(Variable param : this.parameters){ - param.build(builder); - } - } - builder.append(")"); - if(throwables != null){ - builder.append("throws"); - for(Token token : throwables){ - builder.append(token); - } - } - builder.append("{"); - if(elements != null){ - for(JavaElement content : this.elements){ - content.build(builder); - } - } - builder.append("}"); - } - @Override public E find(java.util.function.Function finder){ E annotation = super.find(finder); diff --git a/src/dev/peerat/parser/java/Import.java b/src/dev/peerat/parser/java/Import.java index 4cd78c8..d91f3d6 100644 --- a/src/dev/peerat/parser/java/Import.java +++ b/src/dev/peerat/parser/java/Import.java @@ -25,11 +25,6 @@ public class Import extends JavaElement{ return this.value; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; diff --git a/src/dev/peerat/parser/java/Interface.java b/src/dev/peerat/parser/java/Interface.java index a4dda1f..2cc1617 100644 --- a/src/dev/peerat/parser/java/Interface.java +++ b/src/dev/peerat/parser/java/Interface.java @@ -46,25 +46,6 @@ public class Interface extends ClassBase{ return this.elements; } - @Override - public void build(Builder builder) throws Exception{ - super.build(builder); - - builder.append("interface"); - builder.append(getName()); - if(extend != null){ - builder.append(" extends "); - builder.append(extend); - } - builder.append("{"); - if(elements != null){ - for(JavaElement element : this.elements){ - element.build(builder); - } - } - builder.append("}"); - } - @Override public E find(java.util.function.Function finder){ E annotation = super.find(finder); diff --git a/src/dev/peerat/parser/java/JavaElement.java b/src/dev/peerat/parser/java/JavaElement.java index af747b1..0eca21e 100644 --- a/src/dev/peerat/parser/java/JavaElement.java +++ b/src/dev/peerat/parser/java/JavaElement.java @@ -3,11 +3,10 @@ package dev.peerat.parser.java; import java.util.List; import java.util.function.Function; -import dev.peerat.parser.ElementBuilder; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; -public abstract class JavaElement implements ElementBuilder{ +public abstract class JavaElement{ public abstract E find(Function finder); diff --git a/src/dev/peerat/parser/java/JavaFile.java b/src/dev/peerat/parser/java/JavaFile.java index afcb86f..79a544e 100644 --- a/src/dev/peerat/parser/java/JavaFile.java +++ b/src/dev/peerat/parser/java/JavaFile.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import dev.peerat.parser.Bag; import dev.peerat.parser.Token; import dev.peerat.parser.java.Annotation.AnnotableBuffer; import dev.peerat.parser.java.visitor.JavaVisitor; @@ -66,24 +65,6 @@ public class JavaFile extends JavaElement implements ClassContainer, AnnotableBu return list; } - @Override - public void build(Builder builder) throws Exception { - builder.append("package "); - builder.append(pack); - builder.append(";"); - - for(Import imp : imports){ - builder.append("import "); - if(imp.isStatic()) builder.append("static "); - builder.append(imp.getValue()); - } - - mainClazz.build(builder); - for(ClassBase clazz : subClazz){ - clazz.build(builder); - } - } - @Override public E find(Function finder){ if(finder.apply(mainClazz)) return (E) mainClazz; diff --git a/src/dev/peerat/parser/java/Variable.java b/src/dev/peerat/parser/java/Variable.java index fa3485f..1a01e59 100644 --- a/src/dev/peerat/parser/java/Variable.java +++ b/src/dev/peerat/parser/java/Variable.java @@ -1,11 +1,9 @@ package dev.peerat.parser.java; -import java.lang.reflect.Modifier; import java.util.List; import java.util.function.Function; import dev.peerat.parser.Token; -import dev.peerat.parser.TokenType; import dev.peerat.parser.java.Annotation.Annotable; import dev.peerat.parser.java.value.Value; import dev.peerat.parser.java.visitor.JavaVisitor; @@ -66,24 +64,7 @@ public class Variable extends Annotable{ public Value getValue(){ return this.value; } - - @Override - public void build(Builder builder) throws Exception{ - super.build(builder); - String mod = Modifier.toString(this.mod); - builder.append(new Token(type.getLineNumber(), type.getCharacterNumber()-(mod.length()+1), mod, TokenType.GROUP)); - builder.append(" "); - builder.append(type); - if(elips) builder.append("..."); - builder.append(" "); - builder.append(name); - if(value != null){ - builder.append("="); - value.build(builder); - } - } - @Override public E find(Function finder){ E annotation = super.find(finder); diff --git a/src/dev/peerat/parser/java/builder/JavaBuilder.java b/src/dev/peerat/parser/java/builder/JavaBuilder.java index 65c8fa2..adf413e 100644 --- a/src/dev/peerat/parser/java/builder/JavaBuilder.java +++ b/src/dev/peerat/parser/java/builder/JavaBuilder.java @@ -1,7 +1,7 @@ package dev.peerat.parser.java.builder; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; +import dev.peerat.parser.java.operation.Operation; import dev.peerat.parser.java.value.Value; public abstract class JavaBuilder{ diff --git a/src/dev/peerat/parser/java/builder/JavaFunctionBuilder.java b/src/dev/peerat/parser/java/builder/JavaFunctionBuilder.java index 5da320a..950cbce 100644 --- a/src/dev/peerat/parser/java/builder/JavaFunctionBuilder.java +++ b/src/dev/peerat/parser/java/builder/JavaFunctionBuilder.java @@ -105,8 +105,8 @@ public class JavaFunctionBuilder extends JavaModifiableBuilder{ JavaOperationBuilder.this.operation = operation; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; diff --git a/src/dev/peerat/parser/java/builder/JavaValueBuilder.java b/src/dev/peerat/parser/java/builder/JavaValueBuilder.java index 56075a7..e4e8289 100644 --- a/src/dev/peerat/parser/java/builder/JavaValueBuilder.java +++ b/src/dev/peerat/parser/java/builder/JavaValueBuilder.java @@ -127,11 +127,6 @@ public class JavaValueBuilder extends JavaBuilder{ JavaValueBuilder.this.value = value; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; diff --git a/src/dev/peerat/parser/java/operation/AssignOperation.java b/src/dev/peerat/parser/java/operation/AssignOperation.java index a56e0f1..2b83a90 100644 --- a/src/dev/peerat/parser/java/operation/AssignOperation.java +++ b/src/dev/peerat/parser/java/operation/AssignOperation.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.function.Function; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.value.Value; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; @@ -27,13 +26,6 @@ public class AssignOperation extends Operation{ return right; } - @Override - public void build(Builder builder) throws Exception{ - left.build(builder); - builder.append("="); - right.build(builder); - } - @Override public E find(Function finder){ return finder.apply(left) ? (E)left : finder.apply(right) ? (E)right : null; diff --git a/src/dev/peerat/parser/java/operation/BreakOperation.java b/src/dev/peerat/parser/java/operation/BreakOperation.java index 836b07c..8bc015c 100644 --- a/src/dev/peerat/parser/java/operation/BreakOperation.java +++ b/src/dev/peerat/parser/java/operation/BreakOperation.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.function.Function; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; @@ -12,11 +11,6 @@ public class BreakOperation extends Operation{ public BreakOperation(){} - @Override - public void build(Builder builder) throws Exception{ - builder.append("break;"); - } - @Override public E find(Function finder){ return null; diff --git a/src/dev/peerat/parser/java/operation/CatchOperation.java b/src/dev/peerat/parser/java/operation/CatchOperation.java index 6db042b..606a435 100644 --- a/src/dev/peerat/parser/java/operation/CatchOperation.java +++ b/src/dev/peerat/parser/java/operation/CatchOperation.java @@ -25,11 +25,6 @@ public class CatchOperation extends OperationBag{ return this.name; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/ContinueOperation.java b/src/dev/peerat/parser/java/operation/ContinueOperation.java index 0e301d9..a9f9ec3 100644 --- a/src/dev/peerat/parser/java/operation/ContinueOperation.java +++ b/src/dev/peerat/parser/java/operation/ContinueOperation.java @@ -4,17 +4,11 @@ import java.util.List; import java.util.function.Function; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; public class ContinueOperation extends Operation{ - @Override - public void build(Builder builder) throws Exception{ - builder.append("continue;"); - } - @Override public E find(Function finder){ return null; diff --git a/src/dev/peerat/parser/java/operation/DoOperation.java b/src/dev/peerat/parser/java/operation/DoOperation.java index 862f1af..a663365 100644 --- a/src/dev/peerat/parser/java/operation/DoOperation.java +++ b/src/dev/peerat/parser/java/operation/DoOperation.java @@ -5,11 +5,6 @@ import dev.peerat.parser.visitor.VisitorBag; public class DoOperation extends OperationBag{ - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/ElseOperation.java b/src/dev/peerat/parser/java/operation/ElseOperation.java index 0e07fb8..d200684 100644 --- a/src/dev/peerat/parser/java/operation/ElseOperation.java +++ b/src/dev/peerat/parser/java/operation/ElseOperation.java @@ -5,11 +5,6 @@ import dev.peerat.parser.visitor.VisitorBag; public class ElseOperation extends OperationBag{ - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/FinallyOperation.java b/src/dev/peerat/parser/java/operation/FinallyOperation.java index 4d0f793..c0b39d4 100644 --- a/src/dev/peerat/parser/java/operation/FinallyOperation.java +++ b/src/dev/peerat/parser/java/operation/FinallyOperation.java @@ -5,11 +5,6 @@ import dev.peerat.parser.visitor.VisitorBag; public class FinallyOperation extends OperationBag{ - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/ForOperation.java b/src/dev/peerat/parser/java/operation/ForOperation.java index c33bfd5..0153ab9 100644 --- a/src/dev/peerat/parser/java/operation/ForOperation.java +++ b/src/dev/peerat/parser/java/operation/ForOperation.java @@ -89,11 +89,6 @@ public class ForOperation extends OperationBag{ super.findAll(finder, list); } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/ForeachOperation.java b/src/dev/peerat/parser/java/operation/ForeachOperation.java index 9363c0b..cafe545 100644 --- a/src/dev/peerat/parser/java/operation/ForeachOperation.java +++ b/src/dev/peerat/parser/java/operation/ForeachOperation.java @@ -48,11 +48,6 @@ public class ForeachOperation extends OperationBag{ super.findAll(finder, list); } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/IfOperation.java b/src/dev/peerat/parser/java/operation/IfOperation.java index 3397c75..9bb59e5 100644 --- a/src/dev/peerat/parser/java/operation/IfOperation.java +++ b/src/dev/peerat/parser/java/operation/IfOperation.java @@ -34,11 +34,6 @@ public class IfOperation extends OperationBag{ super.findAll(finder, list); } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/Operation.java b/src/dev/peerat/parser/java/operation/Operation.java similarity index 67% rename from src/dev/peerat/parser/java/Operation.java rename to src/dev/peerat/parser/java/operation/Operation.java index 6d2a00a..c4b4193 100644 --- a/src/dev/peerat/parser/java/Operation.java +++ b/src/dev/peerat/parser/java/operation/Operation.java @@ -1,4 +1,6 @@ -package dev.peerat.parser.java; +package dev.peerat.parser.java.operation; + +import dev.peerat.parser.java.JavaElement; public abstract class Operation extends JavaElement{ @@ -9,6 +11,5 @@ public abstract class Operation extends JavaElement{ } public Operation(){} - } diff --git a/src/dev/peerat/parser/java/operation/OperationBag.java b/src/dev/peerat/parser/java/operation/OperationBag.java index dfc24cb..8cd9ba7 100644 --- a/src/dev/peerat/parser/java/operation/OperationBag.java +++ b/src/dev/peerat/parser/java/operation/OperationBag.java @@ -5,10 +5,9 @@ import java.util.List; import java.util.function.Function; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.Variable; -import dev.peerat.parser.java.Operation.OperationContainer; import dev.peerat.parser.java.Variable.VariableContainer; +import dev.peerat.parser.java.operation.Operation.OperationContainer; import dev.peerat.parser.java.value.Value; import dev.peerat.parser.java.value.Value.ValueContainer; import dev.peerat.parser.java.visitor.JavaVisitor; diff --git a/src/dev/peerat/parser/java/operation/ReturnOperation.java b/src/dev/peerat/parser/java/operation/ReturnOperation.java index d31cc30..61d2292 100644 --- a/src/dev/peerat/parser/java/operation/ReturnOperation.java +++ b/src/dev/peerat/parser/java/operation/ReturnOperation.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.function.Function; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.value.Value; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; @@ -21,11 +20,6 @@ public class ReturnOperation extends Operation{ return this.value; } - @Override - public void build(Builder builder) throws Exception { - value.build(builder); - } - @Override public E find(Function finder){ return value != null ? finder.apply(value) ? (E)value : null : null; diff --git a/src/dev/peerat/parser/java/operation/SwitchOperation.java b/src/dev/peerat/parser/java/operation/SwitchOperation.java index 2320a63..4833c1b 100644 --- a/src/dev/peerat/parser/java/operation/SwitchOperation.java +++ b/src/dev/peerat/parser/java/operation/SwitchOperation.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.function.Function; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; @@ -12,10 +11,6 @@ public class SwitchOperation extends Operation{ //+ AND OBJECT FOR CONTAINING EVERY CASE OP - @Override - public void build(Builder builder) throws Exception{ - } - @Override public E find(Function finder) { return null; diff --git a/src/dev/peerat/parser/java/operation/SynchronizedOperation.java b/src/dev/peerat/parser/java/operation/SynchronizedOperation.java index 04f8935..1ac5293 100644 --- a/src/dev/peerat/parser/java/operation/SynchronizedOperation.java +++ b/src/dev/peerat/parser/java/operation/SynchronizedOperation.java @@ -34,11 +34,6 @@ public class SynchronizedOperation extends OperationBag{ super.findAll(finder, list); } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/ThrowOperation.java b/src/dev/peerat/parser/java/operation/ThrowOperation.java index 25d16a9..3baf4b1 100644 --- a/src/dev/peerat/parser/java/operation/ThrowOperation.java +++ b/src/dev/peerat/parser/java/operation/ThrowOperation.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.function.Function; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.value.Value; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; @@ -20,12 +19,6 @@ public class ThrowOperation extends Operation{ public Value getValue(){ return this.value; } - - @Override - public void build(Builder builder) throws Exception { - builder.append(" throw "); - value.build(builder); - } @Override public E find(Function finder) { diff --git a/src/dev/peerat/parser/java/operation/TryOperation.java b/src/dev/peerat/parser/java/operation/TryOperation.java index 6edcc73..d06c9bb 100644 --- a/src/dev/peerat/parser/java/operation/TryOperation.java +++ b/src/dev/peerat/parser/java/operation/TryOperation.java @@ -39,11 +39,6 @@ public class TryOperation extends OperationBag{ super.findAll(finder, list); } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/operation/WhileOperation.java b/src/dev/peerat/parser/java/operation/WhileOperation.java index e60a985..2389cd5 100644 --- a/src/dev/peerat/parser/java/operation/WhileOperation.java +++ b/src/dev/peerat/parser/java/operation/WhileOperation.java @@ -33,11 +33,6 @@ public class WhileOperation extends OperationBag{ super.findAll(finder, list); } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); diff --git a/src/dev/peerat/parser/java/tree/ClassTree.java b/src/dev/peerat/parser/java/tree/ClassTree.java index 2ea8060..f4bfb15 100644 --- a/src/dev/peerat/parser/java/tree/ClassTree.java +++ b/src/dev/peerat/parser/java/tree/ClassTree.java @@ -1,5 +1,6 @@ package dev.peerat.parser.java.tree; +import dev.peerat.parser.Bag; import dev.peerat.parser.Token; import dev.peerat.parser.java.Annotation.AnnotableBuffer; import dev.peerat.parser.java.Class; @@ -67,7 +68,7 @@ public class ClassTree extends SyntaxTree { clazz_extend.then((validator) -> validator.validate((token) -> token.getValue().equals("{"))) .end((parent, bag) -> { Class current = new Class((((AnnotableBuffer) parent).getAnnotationBuffer()), - bag.get("modifier") == null ? 0 : bag.get("modifier"), + bag.get("modifier") == null ? 0 : bag.get("modifier").get(), bag.get("name"), bag.get("extend"), bag.get("implement")); if (parent instanceof ClassContainer) diff --git a/src/dev/peerat/parser/java/tree/OperationTree.java b/src/dev/peerat/parser/java/tree/OperationTree.java index 3a7ab87..fc00a91 100644 --- a/src/dev/peerat/parser/java/tree/OperationTree.java +++ b/src/dev/peerat/parser/java/tree/OperationTree.java @@ -2,7 +2,6 @@ package dev.peerat.parser.java.tree; import dev.peerat.parser.TokenType; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation.OperationContainer; import dev.peerat.parser.java.operation.AssignOperation; import dev.peerat.parser.java.operation.BreakOperation; import dev.peerat.parser.java.operation.ContinueOperation; @@ -12,6 +11,7 @@ import dev.peerat.parser.java.operation.ReturnOperation; import dev.peerat.parser.java.operation.SynchronizedOperation; import dev.peerat.parser.java.operation.ThrowOperation; import dev.peerat.parser.java.operation.WhileOperation; +import dev.peerat.parser.java.operation.Operation.OperationContainer; import dev.peerat.parser.java.value.BiValue; import dev.peerat.parser.java.value.MethodCallValue; import dev.peerat.parser.java.value.Value; diff --git a/src/dev/peerat/parser/java/value/ArrayAccessValue.java b/src/dev/peerat/parser/java/value/ArrayAccessValue.java index 14b19e0..96bf3b5 100644 --- a/src/dev/peerat/parser/java/value/ArrayAccessValue.java +++ b/src/dev/peerat/parser/java/value/ArrayAccessValue.java @@ -25,11 +25,6 @@ public class ArrayAccessValue extends Value{ return this.access; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -42,7 +37,9 @@ public class ArrayAccessValue extends Value{ @Override public VisitorBag visit(JavaVisitor visitor) { - return null; + if(visitor.canVisit(getClass())) return visitor.visit(this); + VisitorBag bag = new VisitorBag(); + return bag; } } diff --git a/src/dev/peerat/parser/java/value/ArrayValue.java b/src/dev/peerat/parser/java/value/ArrayValue.java index 38119b0..284e8aa 100644 --- a/src/dev/peerat/parser/java/value/ArrayValue.java +++ b/src/dev/peerat/parser/java/value/ArrayValue.java @@ -19,11 +19,6 @@ public class ArrayValue extends Value{ return this.values; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -38,9 +33,6 @@ public class ArrayValue extends Value{ public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); VisitorBag bag = new VisitorBag(); - for(Value value : this.values){ - bag.merge(value.visit(visitor)); - } return bag; } diff --git a/src/dev/peerat/parser/java/value/BiValue.java b/src/dev/peerat/parser/java/value/BiValue.java index 8e9eaab..92e91a9 100644 --- a/src/dev/peerat/parser/java/value/BiValue.java +++ b/src/dev/peerat/parser/java/value/BiValue.java @@ -31,11 +31,6 @@ public class BiValue extends Value{ return right; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -55,8 +50,6 @@ public class BiValue extends Value{ public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); VisitorBag bag = new VisitorBag(); - bag.merge(left.visit(visitor)); - bag.merge(right.visit(visitor)); return bag; } } diff --git a/src/dev/peerat/parser/java/value/CastValue.java b/src/dev/peerat/parser/java/value/CastValue.java index a80e7c6..bb0343b 100644 --- a/src/dev/peerat/parser/java/value/CastValue.java +++ b/src/dev/peerat/parser/java/value/CastValue.java @@ -26,11 +26,6 @@ public class CastValue extends Value{ return this.value; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -43,7 +38,9 @@ public class CastValue extends Value{ @Override public VisitorBag visit(JavaVisitor visitor) { - return null; + if(visitor.canVisit(getClass())) return visitor.visit(this); + VisitorBag bag = new VisitorBag(); + return bag; } diff --git a/src/dev/peerat/parser/java/value/InstanceValue.java b/src/dev/peerat/parser/java/value/InstanceValue.java index 4543fb3..5c7a522 100644 --- a/src/dev/peerat/parser/java/value/InstanceValue.java +++ b/src/dev/peerat/parser/java/value/InstanceValue.java @@ -62,11 +62,6 @@ public class InstanceValue extends Value implements VariableContainer, FunctionC return list; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -81,10 +76,6 @@ public class InstanceValue extends Value implements VariableContainer, FunctionC public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); VisitorBag bag = new VisitorBag(); - if(this.parameters != null) - for(Value value : this.parameters){ - bag.merge(value.visit(visitor)); - } return bag; } diff --git a/src/dev/peerat/parser/java/value/LambdaValue.java b/src/dev/peerat/parser/java/value/LambdaValue.java index 16dd8c0..1afdf7d 100644 --- a/src/dev/peerat/parser/java/value/LambdaValue.java +++ b/src/dev/peerat/parser/java/value/LambdaValue.java @@ -6,10 +6,10 @@ import java.util.function.Function; import dev.peerat.parser.Token; import dev.peerat.parser.java.JavaElement; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.Variable; -import dev.peerat.parser.java.Operation.OperationContainer; import dev.peerat.parser.java.Variable.VariableContainer; +import dev.peerat.parser.java.operation.Operation; +import dev.peerat.parser.java.operation.Operation.OperationContainer; import dev.peerat.parser.java.value.Value.ValueContainer; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; @@ -52,11 +52,6 @@ public class LambdaValue extends Value implements OperationContainer, VariableCo this.operations.add(value); } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; diff --git a/src/dev/peerat/parser/java/value/MethodCallValue.java b/src/dev/peerat/parser/java/value/MethodCallValue.java index 739357b..d4a55ec 100644 --- a/src/dev/peerat/parser/java/value/MethodCallValue.java +++ b/src/dev/peerat/parser/java/value/MethodCallValue.java @@ -38,11 +38,6 @@ public class MethodCallValue extends Value{ return this.parameters; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -57,11 +52,6 @@ public class MethodCallValue extends Value{ public VisitorBag visit(JavaVisitor visitor){ if(visitor.canVisit(getClass())) return visitor.visit(this); VisitorBag bag = new VisitorBag(); - bag.merge(this.base.visit(visitor)); - if(this.parameters != null) - for(Value value : this.parameters){ - bag.merge(value.visit(visitor)); - } return bag; } diff --git a/src/dev/peerat/parser/java/value/ModifierValue.java b/src/dev/peerat/parser/java/value/ModifierValue.java index dd96fe7..2ba3c53 100644 --- a/src/dev/peerat/parser/java/value/ModifierValue.java +++ b/src/dev/peerat/parser/java/value/ModifierValue.java @@ -26,11 +26,6 @@ public class ModifierValue extends Value{ return this.value; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -50,7 +45,6 @@ public class ModifierValue extends Value{ public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); VisitorBag bag = new VisitorBag(); - bag.merge(value.visit(visitor)); return bag; } } diff --git a/src/dev/peerat/parser/java/value/StaticValue.java b/src/dev/peerat/parser/java/value/StaticValue.java index 03b17b8..71a3d6b 100644 --- a/src/dev/peerat/parser/java/value/StaticValue.java +++ b/src/dev/peerat/parser/java/value/StaticValue.java @@ -20,11 +20,6 @@ public class StaticValue extends Value{ return this.token; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -44,6 +39,7 @@ public class StaticValue extends Value{ @Override public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); - return null; + VisitorBag bag = new VisitorBag(); + return bag; } } diff --git a/src/dev/peerat/parser/java/value/TriValue.java b/src/dev/peerat/parser/java/value/TriValue.java index 19d26d1..a72239f 100644 --- a/src/dev/peerat/parser/java/value/TriValue.java +++ b/src/dev/peerat/parser/java/value/TriValue.java @@ -31,11 +31,6 @@ public class TriValue extends Value{ return fail; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -55,11 +50,6 @@ public class TriValue extends Value{ public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); VisitorBag bag = new VisitorBag(); - - bag.merge(this.check.visit(visitor)); - bag.merge(this.success.visit(visitor)); - bag.merge(this.fail.visit(visitor)); - return bag; } diff --git a/src/dev/peerat/parser/java/value/VariableAccessValue.java b/src/dev/peerat/parser/java/value/VariableAccessValue.java index 904f5f6..ec45394 100644 --- a/src/dev/peerat/parser/java/value/VariableAccessValue.java +++ b/src/dev/peerat/parser/java/value/VariableAccessValue.java @@ -26,11 +26,6 @@ public class VariableAccessValue extends Value{ return this.variable; } - @Override - public void build(Builder builder) throws Exception { - - } - @Override public E find(Function finder) { return null; @@ -45,7 +40,6 @@ public class VariableAccessValue extends Value{ public VisitorBag visit(JavaVisitor visitor) { if(visitor.canVisit(getClass())) return visitor.visit(this); VisitorBag bag = new VisitorBag(); - bag.merge(this.base.visit(visitor)); return bag; } diff --git a/src/dev/peerat/parser/java/visitor/operation/JavaOperationVisitor.java b/src/dev/peerat/parser/java/visitor/operation/JavaOperationVisitor.java index d34c36e..9588d69 100644 --- a/src/dev/peerat/parser/java/visitor/operation/JavaOperationVisitor.java +++ b/src/dev/peerat/parser/java/visitor/operation/JavaOperationVisitor.java @@ -1,6 +1,6 @@ package dev.peerat.parser.java.visitor.operation; -import dev.peerat.parser.java.Operation; +import dev.peerat.parser.java.operation.Operation; import dev.peerat.parser.java.visitor.JavaVisitor; import dev.peerat.parser.visitor.VisitorBag; diff --git a/src/dev/peerat/parser/java/visitor/value/JavaArrayAccessValueVisitor.java b/src/dev/peerat/parser/java/visitor/value/JavaArrayAccessValueVisitor.java new file mode 100644 index 0000000..0794171 --- /dev/null +++ b/src/dev/peerat/parser/java/visitor/value/JavaArrayAccessValueVisitor.java @@ -0,0 +1,50 @@ +package dev.peerat.parser.java.visitor.value; + +import dev.peerat.parser.java.value.ArrayAccessValue; +import dev.peerat.parser.java.value.Value; +import dev.peerat.parser.java.visitor.JavaVisitor; +import dev.peerat.parser.visitor.Visitor; +import dev.peerat.parser.visitor.VisitorBag; + +public class JavaArrayAccessValueVisitor extends JavaVisitor{ + + private Visitor basePredicate; + private Visitor accessPredicate; + + public JavaArrayAccessValueVisitor(){ + super(ArrayAccessValue.class); + } + + public JavaArrayAccessValueVisitor checkBase(Visitor visitor){ + this.basePredicate = visitor; + return this; + } + + public JavaArrayAccessValueVisitor accessor(Visitor visitor){ + this.accessPredicate = visitor; + return this; + } + + @Override + public VisitorBag visitElement(ArrayAccessValue element){ + VisitorBag bag = new VisitorBag(); + + if(this.basePredicate != null){ + VisitorBag visited = this.basePredicate.visit(element.base()); + bag.merge(visited); + if(!visited.isValidated()) return bag; + } + + if(this.accessPredicate != null){ + VisitorBag visited = this.accessPredicate.visit(element.getAccessor()); + bag.merge(visited); + if(!visited.isValidated()) return bag; + } + + bag.compute(element); + return bag; + } + + + +} diff --git a/test/dev/peerat/parser/java/OperationTests.java b/test/dev/peerat/parser/java/OperationTests.java index c5fb78c..c571b11 100644 --- a/test/dev/peerat/parser/java/OperationTests.java +++ b/test/dev/peerat/parser/java/OperationTests.java @@ -15,7 +15,6 @@ import dev.peerat.parser.Parser; import dev.peerat.parser.Token; import dev.peerat.parser.TokenType; import dev.peerat.parser.TokenValidator; -import dev.peerat.parser.java.Operation.OperationContainer; import dev.peerat.parser.java.operation.AssignOperation; import dev.peerat.parser.java.operation.BreakOperation; import dev.peerat.parser.java.operation.CatchOperation; @@ -30,6 +29,7 @@ import dev.peerat.parser.java.operation.SynchronizedOperation; import dev.peerat.parser.java.operation.ThrowOperation; import dev.peerat.parser.java.operation.TryOperation; import dev.peerat.parser.java.operation.WhileOperation; +import dev.peerat.parser.java.operation.Operation.OperationContainer; import dev.peerat.parser.java.value.Value; import dev.peerat.parser.state.RedirectStateTree; import dev.peerat.parser.state.StateTree; diff --git a/test/dev/peerat/parser/java/ValueTypesTests.java b/test/dev/peerat/parser/java/ValueTypesTests.java index 3ef819f..56d2b20 100644 --- a/test/dev/peerat/parser/java/ValueTypesTests.java +++ b/test/dev/peerat/parser/java/ValueTypesTests.java @@ -58,9 +58,6 @@ public class ValueTypesTests { return this.value; } - @Override - public void build(Builder builder) throws Exception {} - @Override public E find(Function finder){return null;} diff --git a/test/dev/peerat/parser/java/element/BaseElementTests.java b/test/dev/peerat/parser/java/element/BaseElementTests.java index e4672ba..74cd88b 100644 --- a/test/dev/peerat/parser/java/element/BaseElementTests.java +++ b/test/dev/peerat/parser/java/element/BaseElementTests.java @@ -21,8 +21,8 @@ import dev.peerat.parser.java.Interface; import dev.peerat.parser.java.JavaElement; import dev.peerat.parser.java.JavaFile; import dev.peerat.parser.java.JavaParser; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.Variable; +import dev.peerat.parser.java.operation.Operation; public class BaseElementTests{ diff --git a/test/dev/peerat/parser/java/element/operation/AssignOperationTest.java b/test/dev/peerat/parser/java/element/operation/AssignOperationTest.java index 0a66459..aec914c 100644 --- a/test/dev/peerat/parser/java/element/operation/AssignOperationTest.java +++ b/test/dev/peerat/parser/java/element/operation/AssignOperationTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import dev.peerat.parser.java.Function; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.element.BaseElementTests; import dev.peerat.parser.java.operation.AssignOperation; +import dev.peerat.parser.java.operation.Operation; import dev.peerat.parser.java.value.StaticValue; public class AssignOperationTest extends BaseElementTests{ diff --git a/test/dev/peerat/parser/java/element/operation/LoopOperationTests.java b/test/dev/peerat/parser/java/element/operation/LoopOperationTests.java index d5fe3ca..1e330cc 100644 --- a/test/dev/peerat/parser/java/element/operation/LoopOperationTests.java +++ b/test/dev/peerat/parser/java/element/operation/LoopOperationTests.java @@ -4,11 +4,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import dev.peerat.parser.java.Function; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.element.BaseElementTests; import dev.peerat.parser.java.operation.BreakOperation; import dev.peerat.parser.java.operation.ContinueOperation; import dev.peerat.parser.java.operation.ForOperation; +import dev.peerat.parser.java.operation.Operation; import dev.peerat.parser.java.operation.ReturnOperation; import dev.peerat.parser.java.operation.WhileOperation; diff --git a/test/dev/peerat/parser/java/element/operation/TryCatchFinallyOperationTest.java b/test/dev/peerat/parser/java/element/operation/TryCatchFinallyOperationTest.java index 1bec1dc..4d8c4e8 100644 --- a/test/dev/peerat/parser/java/element/operation/TryCatchFinallyOperationTest.java +++ b/test/dev/peerat/parser/java/element/operation/TryCatchFinallyOperationTest.java @@ -4,10 +4,10 @@ import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import dev.peerat.parser.java.Function; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.element.BaseElementTests; import dev.peerat.parser.java.operation.BreakOperation; import dev.peerat.parser.java.operation.ForOperation; +import dev.peerat.parser.java.operation.Operation; public class TryCatchFinallyOperationTest extends BaseElementTests{ diff --git a/test/dev/peerat/parser/java/element/value/TypeOfValuesTests.java b/test/dev/peerat/parser/java/element/value/TypeOfValuesTests.java index 5901c8d..9991a12 100644 --- a/test/dev/peerat/parser/java/element/value/TypeOfValuesTests.java +++ b/test/dev/peerat/parser/java/element/value/TypeOfValuesTests.java @@ -6,9 +6,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import dev.peerat.parser.java.Function; import dev.peerat.parser.java.JavaFile; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.element.BaseElementTests; import dev.peerat.parser.java.operation.IfOperation; +import dev.peerat.parser.java.operation.Operation; import dev.peerat.parser.java.value.BiValue; import dev.peerat.parser.java.value.StaticValue; import dev.peerat.parser.java.value.Value; diff --git a/test/dev/peerat/parser/java/element/value/ValueInCondition.java b/test/dev/peerat/parser/java/element/value/ValueInCondition.java index b4d6934..293060a 100644 --- a/test/dev/peerat/parser/java/element/value/ValueInCondition.java +++ b/test/dev/peerat/parser/java/element/value/ValueInCondition.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import dev.peerat.parser.java.Function; -import dev.peerat.parser.java.Operation; import dev.peerat.parser.java.element.BaseElementTests; import dev.peerat.parser.java.operation.IfOperation; +import dev.peerat.parser.java.operation.Operation; import dev.peerat.parser.java.value.BiValue; import dev.peerat.parser.java.value.StaticValue;