Peer-at-Code/peer-at-code-parser-java
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

JavaElement -> Abstract to Interface + 'Function<E, Boolean>' to 'Predicate<E>' + Visitor Concat in JavaArrayAccessValueVisitor Operator Count little refractor

Browse source
This commit is contained in:
jeffcheasey88 2025-05-10 12:46:55 +02:00
parent e04b0f0262
commit fb96c287cf
48 changed files with 511 additions and 336 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/dev/peerat/parser/java/Annotation.java
View file

@ -1,9 +1,11 @@
package dev.peerat.parser.java;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.value.Value;
@ -11,7 +13,7 @@ import dev.peerat.parser.java.visitor.JavaVisitor;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
public class Annotation extends JavaElement{
public class Annotation implements JavaElement{
public static interface AnnotableBuffer{
@ -21,7 +23,7 @@ public class Annotation extends JavaElement{
}
public static abstract class Annotable extends JavaElement{
public static abstract class Annotable implements JavaElement{
private List<Annotation> annotations;
@ -52,21 +54,21 @@ public class Annotation extends JavaElement{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(annotations != null){
for(Annotation annotation : this.annotations){
if(finder.apply(annotation)) return (E) annotation;
if(finder.test(annotation)) return (E) annotation;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(annotations != null){
for(Annotation annotation : this.annotations){
if(finder.apply(annotation)) list.add((E) annotation);
annotation.findAll(finder, list);
if(finder.test(annotation)) collector.add((E) annotation);
annotation.findAll(finder, collector);
}
}
}
@ -93,21 +95,21 @@ public class Annotation extends JavaElement{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(this.values != null){
for(Value value : this.values.values()){
if(finder.apply(value)) return (E)value;
if(finder.test(value)) return (E)value;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(this.values != null){
for(Value value : this.values.values()){
if(finder.apply(value)) list.add((E)value);
value.findAll(finder, list);
if(finder.test(value)) collector.add((E)value);
value.findAll(finder, collector);
}
}
}

14
src/dev/peerat/parser/java/AnnotationClass.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.visitor.JavaVisitor;
@ -43,25 +45,25 @@ public class AnnotationClass extends ClassBase{
}
@Override
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
E annotation = super.find(finder);
if(annotation != null) return annotation;
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) return (E) element;
if(finder.test(element)) return (E) element;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
super.findAll(finder, collector);
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) list.add((E) element);
element.findAll(finder, list);
if(finder.test(element)) collector.add((E) element);
element.findAll(finder, collector);
}
}
}

14
src/dev/peerat/parser/java/Class.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.visitor.Visitor;
@ -53,25 +55,25 @@ public class Class extends ClassBase{
}
@Override
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
E annotation = super.find(finder);
if(annotation != null) return annotation;
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) return (E) element;
if(finder.test(element)) return (E) element;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
super.findAll(finder, collector);
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) list.add((E) element);
element.findAll(finder, list);
if(finder.test(element)) collector.add((E) element);
element.findAll(finder, collector);
}
}
}

14
src/dev/peerat/parser/java/Enumeration.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.visitor.JavaVisitor;
@ -48,25 +50,25 @@ public class Enumeration extends ClassBase{
}
@Override
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
E annotation = super.find(finder);
if(annotation != null) return annotation;
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) return (E) element;
if(finder.test(element)) return (E) element;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
super.findAll(finder, collector);
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) list.add((E) element);
element.findAll(finder, list);
if(finder.test(element)) collector.add((E) element);
element.findAll(finder, collector);
}
}
}

20
src/dev/peerat/parser/java/Function.java
View file

@ -2,7 +2,9 @@ package dev.peerat.parser.java;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.TokenType;
@ -100,36 +102,36 @@ public class Function extends Annotable implements VariableContainer, OperationC
}
@Override
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
E annotation = super.find(finder);
if(annotation != null) return annotation;
if(parameters != null){
for(Variable param : this.parameters){
if(finder.apply(param)) return (E) param;
if(finder.test(param)) return (E) param;
}
}
if(elements != null){
for(JavaElement content : this.elements){
if(finder.apply(content)) return (E) content;
if(finder.test(content)) return (E) content;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
super.findAll(finder, collector);
if(parameters != null){
for(Variable param : this.parameters){
if(finder.apply(param)) list.add((E) param);
param.findAll(finder, list);
if(finder.test(param)) collector.add((E) param);
param.findAll(finder, collector);
}
}
if(elements != null){
for(JavaElement content : this.elements){
if(finder.apply(content)) list.add((E) content);
content.findAll(finder, list);
if(finder.test(content)) collector.add((E) content);
content.findAll(finder, collector);
}
}
}

8
src/dev/peerat/parser/java/Import.java
View file

@ -1,14 +1,16 @@
package dev.peerat.parser.java;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.visitor.JavaVisitor;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
public class Import extends JavaElement{
public class Import implements JavaElement{
private boolean isStatic;
private Token value;
@ -27,12 +29,12 @@ public class Import extends JavaElement{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
}

14
src/dev/peerat/parser/java/Interface.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.visitor.JavaVisitor;
@ -48,25 +50,25 @@ public class Interface extends ClassBase{
}
@Override
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
E annotation = super.find(finder);
if(annotation != null) return annotation;
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) return (E) element;
if(finder.test(element)) return (E) element;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
super.findAll(finder, collector);
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) list.add((E) element);
element.findAll(finder, list);
if(finder.test(element)) collector.add((E) element);
element.findAll(finder, collector);
}
}
}

12
src/dev/peerat/parser/java/JavaElement.java
View file

@ -1,16 +1,16 @@
package dev.peerat.parser.java;
import java.util.List;
import java.util.function.Function;
import java.util.Collection;
import java.util.function.Predicate;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
public abstract class JavaElement{
public interface JavaElement{
public abstract <E extends JavaElement> E find(Function<JavaElement, Boolean> finder);
<E extends JavaElement> E find(Predicate<JavaElement> finder);
public abstract <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list);
<E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector);
public abstract VisitorBag visit(Visitor<JavaElement> visitor);
VisitorBag visit(Visitor<JavaElement> visitor);
}

20
src/dev/peerat/parser/java/JavaFile.java
View file

@ -1,8 +1,10 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.Annotation.AnnotableBuffer;
@ -10,7 +12,7 @@ import dev.peerat.parser.java.visitor.JavaVisitor;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
public class JavaFile extends JavaElement implements ClassContainer, AnnotableBuffer{
public class JavaFile implements JavaElement, ClassContainer, AnnotableBuffer{
private List<Annotation> annotationBuffer;
@ -67,21 +69,21 @@ public class JavaFile extends JavaElement implements ClassContainer, AnnotableBu
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(finder.apply(mainClazz)) return (E) mainClazz;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(finder.test(mainClazz)) return (E) mainClazz;
for(ClassBase clazz : subClazz){
if(finder.apply(clazz)) return (E) clazz;
if(finder.test(clazz)) return (E) clazz;
}
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
if(finder.apply(mainClazz)) list.add((E) mainClazz);
mainClazz.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(finder.test(mainClazz)) collector.add((E) mainClazz);
mainClazz.findAll(finder, collector);
for(ClassBase clazz : subClazz){
if(finder.apply(clazz)) list.add((E) clazz);
clazz.findAll(finder, list);
if(finder.test(clazz)) collector.add((E) clazz);
clazz.findAll(finder, collector);
}
}

9
src/dev/peerat/parser/java/JavaProject.java
View file

@ -1,13 +1,14 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
public class JavaProject extends JavaElement{
public class JavaProject implements JavaElement{
private List<JavaFile> files;
@ -24,12 +25,12 @@ public class JavaProject extends JavaElement{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
}

14
src/dev/peerat/parser/java/Variable.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.Annotation.Annotable;
@ -66,19 +68,19 @@ public class Variable extends Annotable{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
E annotation = super.find(finder);
if(annotation != null) return annotation;
return value != null ? finder.apply(value) ? (E)value : null : null;
return value != null ? finder.test(value) ? (E)value : null : null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
super.findAll(finder, collector);
if(value != null){
if(finder.apply(value)) list.add((E)value);
value.findAll(finder, list);
if(finder.test(value)) collector.add((E)value);
value.findAll(finder, collector);
}
}

10
src/dev/peerat/parser/java/builder/JavaOperationBuilder.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.builder;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Parser;
import dev.peerat.parser.java.JavaElement;
@ -28,7 +30,7 @@ public class JavaOperationBuilder extends JavaBuilder<Operation>{
return this.operation;
}
class Container extends JavaElement implements OperationContainer{
class Container implements JavaElement, OperationContainer{
@Override
public void addOperation(Operation operation){
@ -36,12 +38,14 @@ public class JavaOperationBuilder extends JavaBuilder<Operation>{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

10
src/dev/peerat/parser/java/builder/JavaValueBuilder.java
View file

@ -1,8 +1,10 @@
package dev.peerat.parser.java.builder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Parser;
import dev.peerat.parser.Token;
@ -121,7 +123,7 @@ public class JavaValueBuilder extends JavaBuilder<Value>{
return this.value;
}
class Container extends JavaElement implements ValueContainer{
class Container implements JavaElement, ValueContainer{
@Override
public void addValue(Value value) {
@ -129,14 +131,12 @@ public class JavaValueBuilder extends JavaBuilder<Value>{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
}
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {}
@Override
public VisitorBag visit(Visitor<JavaElement> visitor) {

19
src/dev/peerat/parser/java/operation/AssignOperation.java
View file

@ -1,11 +1,10 @@
package dev.peerat.parser.java.operation;
import java.util.List;
import java.util.function.Function;
import java.util.Collection;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
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;
@ -28,16 +27,16 @@ public class AssignOperation extends Operation{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return finder.apply(left) ? (E)left : finder.apply(right) ? (E)right : null;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
return finder.test(left) ? (E)left : finder.test(right) ? (E)right : null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
if(finder.apply(left)) list.add((E) left);
left.findAll(finder, list);
if(finder.apply(right)) list.add((E) right);
right.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(finder.test(left)) collector.add((E) left);
left.findAll(finder, collector);
if(finder.test(right)) collector.add((E) right);
right.findAll(finder, collector);
}
@Override

10
src/dev/peerat/parser/java/operation/BreakOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.visitor.JavaVisitor;
@ -13,12 +15,16 @@ public class BreakOperation extends Operation{
public BreakOperation(){}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){}
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}
@Override
public VisitorBag visit(Visitor<JavaElement> visitor) {

10
src/dev/peerat/parser/java/operation/ContinueOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.visitor.JavaVisitor;
@ -11,12 +13,16 @@ import dev.peerat.parser.visitor.VisitorBag;
public class ContinueOperation extends Operation{
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){}
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}
@Override
public VisitorBag visit(Visitor<JavaElement> visitor) {

30
src/dev/peerat/parser/java/operation/ForOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.Variable;
@ -46,48 +48,48 @@ public class ForOperation extends OperationBag{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(init_vars != null){
for(Variable variable : this.init_vars){
if(finder.apply(variable)) return (E)variable;
if(finder.test(variable)) return (E)variable;
}
}
if(init_values != null){
for(Value value : this.init_values){
if(finder.apply(value)) return (E)value;
if(finder.test(value)) return (E)value;
}
}
if(finder.apply(condition)) return (E)condition;
if(finder.test(condition)) return (E)condition;
if(this.updates != null){
for(Value value : this.updates){
if(finder.apply(value)) return (E)value;
if(finder.test(value)) return (E)value;
}
}
return super.find(finder);
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(init_vars != null){
for(Variable variable : this.init_vars){
if(finder.apply(variable)) list.add((E)variable);
variable.findAll(finder, list);
if(finder.test(variable)) collector.add((E)variable);
variable.findAll(finder, collector);
}
}
if(init_values != null){
for(Value value : this.init_values){
if(finder.apply(value)) list.add((E)value);
value.findAll(finder, list);
if(finder.test(value)) collector.add((E)value);
value.findAll(finder, collector);
}
}
if(finder.apply(condition)) list.add((E)condition);
if(finder.test(condition)) collector.add((E)condition);
if(this.updates != null){
for(Value value : this.updates){
if(finder.apply(value)) list.add((E)value);
value.findAll(finder, list);
if(finder.test(value)) collector.add((E)value);
value.findAll(finder, collector);
}
}
super.findAll(finder, list);
super.findAll(finder, collector);
}
@Override

13
src/dev/peerat/parser/java/operation/ForeachOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.JavaElement;
@ -37,16 +39,15 @@ public class ForeachOperation extends OperationBag{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(finder.apply(iterator)) return (E)iterator;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return super.find(finder);
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
if(finder.apply(iterator)) list.add((E)iterator);
iterator.findAll(finder, list);
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
super.findAll(finder, collector);
}
@Override

14
src/dev/peerat/parser/java/operation/IfOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.value.Value;
@ -23,16 +25,16 @@ public class IfOperation extends OperationBag{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(finder.apply(condition)) return (E)condition;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(finder.test(condition)) return (E)condition;
return super.find(finder);
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
if(finder.apply(condition)) list.add((E)condition);
condition.findAll(finder, list);
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(finder.test(condition)) collector.add((E)condition);
condition.findAll(finder, collector);
super.findAll(finder, collector);
}
@Override

2
src/dev/peerat/parser/java/operation/Operation.java
View file

@ -2,7 +2,7 @@ package dev.peerat.parser.java.operation;
import dev.peerat.parser.java.JavaElement;
public abstract class Operation extends JavaElement{
public abstract class Operation implements JavaElement{
public static interface OperationContainer{

13
src/dev/peerat/parser/java/operation/OperationBag.java
View file

@ -1,8 +1,10 @@
package dev.peerat.parser.java.operation;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.Variable;
@ -42,25 +44,26 @@ public abstract class OperationBag extends Operation implements VariableContaine
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) return (E)element;
if(finder.test(element)) return (E)element;
}
}
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) list.add((E)element);
element.findAll(finder, list);
if(finder.test(element)) collector.add((E)element);
element.findAll(finder, collector);
}
}
}
@Override
public VisitorBag visit(Visitor<JavaElement> visitor){
VisitorBag bag = new VisitorBag();

12
src/dev/peerat/parser/java/operation/ReturnOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.value.Value;
@ -22,15 +24,15 @@ public class ReturnOperation extends Operation{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return value != null ? finder.apply(value) ? (E)value : null : null;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
return value != null ? finder.test(value) ? (E)value : null : null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(value != null){
if(finder.apply(value)) list.add((E) value);
value.findAll(finder, list);
if(finder.test(value)) collector.add((E) value);
value.findAll(finder, collector);
}
}

10
src/dev/peerat/parser/java/operation/SwitchOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.visitor.JavaVisitor;
@ -13,12 +15,16 @@ public class SwitchOperation extends Operation{
//+ AND OBJECT FOR CONTAINING EVERY CASE OP
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){}
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}
@Override
public VisitorBag visit(Visitor<JavaElement> visitor) {

14
src/dev/peerat/parser/java/operation/SynchronizedOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.value.Value;
@ -23,16 +25,16 @@ public class SynchronizedOperation extends OperationBag{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(finder.apply(value)) return (E)value;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(finder.test(value)) return (E)value;
return super.find(finder);
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
if(finder.apply(value)) list.add((E)value);
value.findAll(finder, list);
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(finder.test(value)) collector.add((E)value);
value.findAll(finder, collector);
super.findAll(finder, collector);
}
@Override

12
src/dev/peerat/parser/java/operation/ThrowOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.value.Value;
@ -22,14 +24,14 @@ public class ThrowOperation extends Operation{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
return finder.apply(value) ? (E)value : null;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
return finder.test(value) ? (E)value : null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
if(finder.apply(value)) list.add((E) value);
value.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(finder.test(value)) collector.add((E) value);
value.findAll(finder, collector);
}
@Override

14
src/dev/peerat/parser/java/operation/TryOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.Variable;
@ -27,17 +29,17 @@ public class TryOperation extends OperationBag{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return resource != null ? finder.apply(resource) ? (E)resource : super.find(finder) : super.find(finder);
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
return resource != null ? finder.test(resource) ? (E)resource : super.find(finder) : super.find(finder);
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(resource != null){
if(finder.apply(resource)) list.add((E) resource);
resource.findAll(finder, list);
if(finder.test(resource)) collector.add((E) resource);
resource.findAll(finder, collector);
}
super.findAll(finder, list);
super.findAll(finder, collector);
}
@Override

14
src/dev/peerat/parser/java/operation/WhileOperation.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.operation;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.value.Value;
@ -22,16 +24,16 @@ public class WhileOperation extends OperationBag{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(finder.apply(condition)) return (E)condition;
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
if(finder.test(condition)) return (E)condition;
return super.find(finder);
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
if(finder.apply(condition)) list.add((E) condition);
condition.findAll(finder, list);
super.findAll(finder, list);
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
if(finder.test(condition)) collector.add((E) condition);
condition.findAll(finder, collector);
super.findAll(finder, collector);
}
@Override

8
src/dev/peerat/parser/java/value/ArrayAccessValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.visitor.Visitor;
@ -26,12 +28,14 @@ public class ArrayAccessValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

8
src/dev/peerat/parser/java/value/ArrayValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.visitor.Visitor;
@ -20,12 +22,14 @@ public class ArrayValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

8
src/dev/peerat/parser/java/value/BiValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.visitor.JavaVisitor;
@ -33,12 +35,14 @@ public class BiValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

8
src/dev/peerat/parser/java/value/CastValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.JavaElement;
@ -27,12 +29,14 @@ public class CastValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

45
src/dev/peerat/parser/java/value/InstanceValue.java
View file

@ -1,20 +1,25 @@
package dev.peerat.parser.java.value;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.Annotation;
import dev.peerat.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.java.Function.FunctionContainer;
import dev.peerat.parser.java.Annotation;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.Variable;
import dev.peerat.parser.java.Variable.VariableContainer;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
public class InstanceValue extends Value implements VariableContainer, FunctionContainer, AnnotableBuffer{ //TODO LIKE A CLASS, CAN CONTAINS CLASS
public class InstanceValue extends Value implements VariableContainer, FunctionContainer, AnnotableBuffer { // TODO LIKE
// A CLASS,
// CAN
// CONTAINS
// CLASS
private Token token;
private List<Value> parameters;
@ -22,63 +27,69 @@ public class InstanceValue extends Value implements VariableContainer, FunctionC
private List<JavaElement> elements;
private List<Annotation> annotationBuffer;
public InstanceValue(Token token, List<Value> parameters){
public InstanceValue(Token token, List<Value> parameters) {
this.token = token;
this.parameters = parameters;
this.elements = new ArrayList<>();
}
public Token getToken(){
public Token getToken() {
return token;
}
public List<Value> getParameters(){
public List<Value> getParameters() {
return this.parameters;
}
public List<JavaElement> getElements(){
public List<JavaElement> getElements() {
return this.elements;
}
@Override
public void addFunction(dev.peerat.parser.java.Function function){
public void addFunction(dev.peerat.parser.java.Function function) {
this.elements.add(function);
}
@Override
public void addVariable(Variable variable){
public void addVariable(Variable variable) {
this.elements.add(variable);
}
@Override
public void addAnnotationBuffer(Annotation annotation){
if(annotationBuffer == null) annotationBuffer = new ArrayList<>();
public void addAnnotationBuffer(Annotation annotation) {
if (annotationBuffer == null)
annotationBuffer = new ArrayList<>();
annotationBuffer.add(annotation);
}
public List<Annotation> getAnnotationBuffer(){
public List<Annotation> getAnnotationBuffer() {
List<Annotation> list = this.annotationBuffer;
this.annotationBuffer = null;
return list;
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}
@Override
public VisitorBag visit(Visitor<JavaElement> visitor) {
if(visitor.canVisit(getClass())) return visitor.visit(this);
if (visitor.canVisit(getClass()))
return visitor.visit(this);
VisitorBag bag = new VisitorBag();
for(Value value : parameters) bag.merge(value.visit(visitor));
for(JavaElement content : elements) bag.merge(content.visit(visitor));
for (Value value : parameters)
bag.merge(value.visit(visitor));
for (JavaElement content : elements)
bag.merge(content.visit(visitor));
return bag;
}

8
src/dev/peerat/parser/java/value/LambdaValue.java
View file

@ -1,8 +1,10 @@
package dev.peerat.parser.java.value;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.JavaElement;
@ -53,12 +55,14 @@ public class LambdaValue extends Value implements OperationContainer, VariableCo
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

8
src/dev/peerat/parser/java/value/MethodCallValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.JavaElement;
@ -39,12 +41,14 @@ public class MethodCallValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

8
src/dev/peerat/parser/java/value/ModifierValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.JavaElement;
@ -27,12 +29,14 @@ public class ModifierValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

9
src/dev/peerat/parser/java/value/StaticValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.JavaElement;
@ -21,16 +23,17 @@ public class StaticValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}
@Override
public String toString(){
return "StaticValue["+token.getValue()+"]";

8
src/dev/peerat/parser/java/value/TriValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.visitor.Visitor;
@ -32,12 +34,14 @@ public class TriValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

2
src/dev/peerat/parser/java/value/Value.java
View file

@ -2,7 +2,7 @@ package dev.peerat.parser.java.value;
import dev.peerat.parser.java.JavaElement;
public abstract class Value extends JavaElement{
public abstract class Value implements JavaElement{
//Only for TESTS purpose!
public static interface ValueContainer{

8
src/dev/peerat/parser/java/value/VariableAccessValue.java
View file

@ -1,7 +1,9 @@
package dev.peerat.parser.java.value;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import dev.peerat.parser.Token;
import dev.peerat.parser.java.JavaElement;
@ -27,12 +29,14 @@ public class VariableAccessValue extends Value{
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
// TODO Auto-generated method stub
return null;
}
@Override
public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
// TODO Auto-generated method stub
}

71
src/dev/peerat/parser/java/visitor/JavaFileVisitor.java Normal file
View file

@ -0,0 +1,71 @@
package dev.peerat.parser.java.visitor;
import java.util.function.Predicate;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.JavaFile;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
public class JavaFileVisitor extends JavaVisitor<JavaFile>{
private boolean checkPackage;
private boolean checkNoPackage;
private Predicate<String> pack;
private Visitor<JavaElement> imports;
private Visitor<JavaElement> classes;
public JavaFileVisitor(boolean propagate){
super(JavaFile.class, propagate);
}
public JavaFileVisitor hasPackage(){
this.checkPackage = true;
this.checkNoPackage = false;
return this;
}
public JavaFileVisitor hasNoPackage(){
this.checkPackage = false;
this.checkNoPackage = true;
return this;
}
public JavaFileVisitor packaged(Predicate<String> predicate){
this.pack = predicate;
return this;
}
public JavaFileVisitor imp(Visitor<JavaElement> visitor){
this.imports = visitor;
return this;
}
public JavaFileVisitor clazz(Visitor<JavaElement> visitor){
this.classes = visitor;
return this;
}
@Override
public VisitorBag visitElement(JavaFile element){
VisitorBag bag = new VisitorBag();
if(this.checkPackage && element.getPackage() == null) return bag;
else if(this.checkNoPackage && element.getPackage() != null) return bag;
if(this.pack != null && element.getPackage() != null && !this.pack.test(element.getPackage().getValue())) return bag;
if(this.imports != null && validates(bag, element.getImports(), this.imports)) return bag;
if(this.classes != null){
VisitorBag resultMain = this.classes.visit(element.getMainClass());
if(resultMain.isValidated()) bag.merge(resultMain);
if(!(validates(bag, element.getSubClasses(), this.classes) || resultMain.isValidated())) return bag;
}
bag.compute(element);
return bag;
}
}

51
src/dev/peerat/parser/java/visitor/JavaVariableVisitor.java
View file

@ -5,11 +5,10 @@ import java.util.function.Predicate;
import dev.peerat.parser.java.Variable;
import dev.peerat.parser.visitor.VisitorBag;
public class JavaVariableVisitor extends JavaVisitor<Variable>{
public class JavaVariableVisitor extends JavaModifiableVisitor<Variable, JavaVariableVisitor>{
private Predicate<String> typeFilter;
private Predicate<String> nameFilter;
private Predicate<Integer> modifierFilter;
public JavaVariableVisitor(boolean propagate){
super(Variable.class, propagate);
@ -25,54 +24,6 @@ public class JavaVariableVisitor extends JavaVisitor<Variable>{
return this;
}
public JavaVariableVisitor isPublic(){
Predicate<Integer> validator = (mod) -> (mod & 0x1) != 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
public JavaVariableVisitor isPrivate(){
Predicate<Integer> validator = (mod) -> (mod & 0x2) != 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
public JavaVariableVisitor isProtected(){
Predicate<Integer> validator = (mod) -> (mod & 0x4) != 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
public JavaVariableVisitor isStatic(){
Predicate<Integer> validator = (mod) -> (mod & 0x8) != 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
public JavaVariableVisitor isFinal(){
Predicate<Integer> validator = (mod) -> (mod & 0x10) != 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
public JavaVariableVisitor isVolatile(){
Predicate<Integer> validator = (mod) -> (mod & 0x40) != 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
public JavaVariableVisitor isTransient(){
Predicate<Integer> validator = (mod) -> (mod & 0x80) != 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
public JavaVariableVisitor isPackageLevel(){
Predicate<Integer> validator = (mod) -> (mod & 0x1) == 0 && (mod & 0x2) == 0 && (mod & 0x4) == 0;
this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
return this;
}
@Override
public VisitorBag visitElement(Variable element){
VisitorBag bag = new VisitorBag();

8
src/dev/peerat/parser/java/visitor/JavaVisitor.java
View file

@ -54,6 +54,10 @@ public abstract class JavaVisitor<T extends JavaElement> extends Visitor<JavaEle
return javaElement(true);
}
public static JavaFileVisitor allFile(){
return new JavaFileVisitor(true);
}
public static JavaClassBaseVisitor allClassBase(){
return new JavaClassBaseVisitor(true);
}
@ -153,6 +157,10 @@ public abstract class JavaVisitor<T extends JavaElement> extends Visitor<JavaEle
return javaElement(false);
}
public static JavaFileVisitor file(){
return new JavaFileVisitor(false);
}
public static JavaClassBaseVisitor classBase(){
return new JavaClassBaseVisitor(false);
}

5
src/dev/peerat/parser/java/visitor/value/JavaArrayAccessValueVisitor.java
View file

@ -3,6 +3,7 @@ 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.Operator;
import dev.peerat.parser.visitor.Visitor;
import dev.peerat.parser.visitor.VisitorBag;
@ -16,12 +17,12 @@ public class JavaArrayAccessValueVisitor extends JavaVisitor<ArrayAccessValue>{
}
public JavaArrayAccessValueVisitor checkBase(Visitor<Value> visitor){
this.basePredicate = visitor;
this.basePredicate = this.basePredicate == null ? visitor : Operator.and(this.basePredicate, visitor);
return this;
}
public JavaArrayAccessValueVisitor accessor(Visitor<Value> visitor){
this.accessPredicate = visitor;
this.accessPredicate = this.accessPredicate == null ? visitor : Operator.and(this.accessPredicate, visitor);
return this;
}

10
src/dev/peerat/parser/state/StateTree.java
View file

@ -24,10 +24,14 @@ public class StateTree<E>{
}
public void seed(TokenValidator validator, E container) throws SyntaxMissMatchException{
int parsed = 0;
while(validator.hasNext()){
BuilderStateTree<E, ?> build = internalSeed(validator, container);
if(build == null) throw new SyntaxMissMatchException(validator);
build.build(validator, container);
if(validator.hasNext()) throw new SyntaxMissMatchException(validator);
if(build != null) build.build(validator, container);
int current = validator.getValidatedTokenCount();
if(parsed == current) throw new SyntaxMissMatchException(validator);
parsed = current;
}
}
BuilderStateTree<E, ?> internalSeed(TokenValidator validator, E element){

31
src/dev/peerat/parser/visitor/Example.java
View file

@ -3,8 +3,14 @@ package dev.peerat.parser.visitor;
import static dev.peerat.parser.java.visitor.JavaVisitor.*;
import static dev.peerat.parser.visitor.Operator.*;
import java.util.List;
import java.util.Map;
import dev.peerat.parser.java.Import;
import dev.peerat.parser.java.JavaFile;
import dev.peerat.parser.java.JavaParser;
import dev.peerat.parser.java.JavaProject;
import dev.peerat.parser.java.Class;
public class Example {
@ -12,18 +18,23 @@ public class Example {
JavaParser parser = new JavaParser();
JavaFile container = new JavaFile();
parser.parse("package dev.peerat.test; public class Example{ private int i = j, j; public void helloTest(){ System.out.println(\"hello\"); } }", container);
parser.parse("package dev.peerat.test; import a; import b; public class C{} public class D{}",
container);
VisitorBag result = container.visit(
key(allClass()
.isPublic()
.elements(
value(allVariable()
)
)
));
JavaProject project = new JavaProject();
project.addFile(container);
System.out.println("allJavaElement in class : "+result.toList());
System.out.println(project.visit(
allFile().clazz(key(allClass())).imp(value(allImport()))
).toList());
// Map<Class, List<Import>> map = project.visit(
// and(
// allFile().imp(value(allImport()))
// ,
// allFile().clazz(key(allClass()))
// )).toMapValues();
// System.out.println(map);
}
}

15
src/dev/peerat/parser/visitor/Operator.java
View file

@ -1,5 +1,6 @@
package dev.peerat.parser.visitor;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
@ -12,9 +13,11 @@ public class Operator{
return new Visitor<E>(){
@Override
public VisitorBag visit(E element){
System.out.println("and "+Arrays.toString(visitors)+" -> "+element);
VisitorBag bag = new VisitorBag();
Set<Object> set = new HashSet<>();
for(Visitor<E> visitor : visitors){
if(!visitor.canVisit(element.getClass())) continue;
VisitorBag vbag = visitor.visit(element);
if(!vbag.isValidated()) return new VisitorBag();
bag.merge(vbag);
@ -138,22 +141,22 @@ public class Operator{
};
}
public static <E, T extends Visitor<E>> T count(T visitor, Predicate<Integer> validator){
return (T) new Visitor<E>(){
public static <E> Visitor<E> count(Visitor<E> visitor, Predicate<Integer> validator){
return new Visitor<E>(){
@Override
public VisitorBag visit(E element){
VisitorBag visited = visitor.visit(element);
return validator.test(visited.toList().size()) ? visited : new VisitorBag();
return visited.isValidated() && validator.test(visited.toList().size()) ? visited : new VisitorBag();
}
@Override
public boolean canVisit(Class<?> type) {
return true;
public boolean canVisit(Class<?> type){
return visitor.canVisit(type);
}
@Override
public boolean canPropagate(){
return true;
return visitor.canPropagate();
}
};
}

13
src/dev/peerat/parser/visitor/Visitor.java
View file

@ -1,5 +1,7 @@
package dev.peerat.parser.visitor;
import java.util.Collection;
import dev.peerat.parser.Token;
public abstract class Visitor<T>{
@ -18,4 +20,15 @@ public abstract class Visitor<T>{
public abstract VisitorBag visit(T element);
protected <E> boolean validates(VisitorBag bag, Collection<? extends E> list, Visitor<E> visitor){
boolean validateOne = false;
for(E element : list){
VisitorBag result = visitor.visit(element);
if(result.isValidated()){
validateOne = true;
bag.merge(result);
}
}
return validateOne;
}
}

5
src/dev/peerat/parser/visitor/VisitorBag.java
View file

@ -96,5 +96,10 @@ public class VisitorBag{
public List<V> getValues(){
return (List<V>) this.values;
}
@Override
public String toString(){
return "[key="+key+", values="+values+"]";
}
}
}