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

Util -> Find update deep with trace

Browse source
This commit is contained in:
jeffcheasey88 2023-06-01 18:50:06 +02:00
parent a3c96aecc0
commit 8c90fc60b9
10 changed files with 57 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/be/jeffcheasey88/peeratcode/parser/java/Class.java
View file

@ -3,6 +3,7 @@ package be.jeffcheasey88.peeratcode.parser.java;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -109,11 +110,12 @@ public class Class extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<JavaElement, Boolean> deep){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
if(!deep.apply(this)) return null; trace.add(this);
if(!deep.apply(trace)) return null;
for(JavaElement element : this.childs){ for(JavaElement element : this.childs){
JavaElement result = element.find(search, deep); JavaElement result = element.find(search, deep, trace);
if(result != null) return result; if(result != null) return result;
} }
return null; return null;

3
src/be/jeffcheasey88/peeratcode/parser/java/JavaElement.java
View file

@ -1,12 +1,13 @@
package be.jeffcheasey88.peeratcode.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
public abstract class JavaElement { public abstract class JavaElement {
public abstract int parse(String content, CleanerPool global, CleanerPool local) throws Exception; public abstract int parse(String content, CleanerPool global, CleanerPool local) throws Exception;
public abstract JavaElement find(Function<JavaElement, Boolean> search, Function<JavaElement, Boolean> deep); public abstract JavaElement find(Function<JavaElement, Boolean> search, Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace);
//Only for development //Only for development
public abstract void show(int tab); public abstract void show(int tab);

6
src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
View file

@ -7,7 +7,9 @@ import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
import be.jeffcheasey88.peeratcode.parser.java.CleanerPool.Cleaner; import be.jeffcheasey88.peeratcode.parser.java.CleanerPool.Cleaner;
@ -110,8 +112,8 @@ public class JavaParser{
content = content.substring(index); content = content.substring(index);
} }
public JavaElement find(Function<JavaElement, Boolean> search, Function<JavaElement, Boolean> deep){ public JavaElement find(Function<JavaElement, Boolean> search, Function<Set<JavaElement>, Boolean> deep){
return this.clazz.find(search, deep); return this.clazz.find(search, deep, new HashSet<>());
} }
public Package getPackage(){ public Package getPackage(){

6
src/be/jeffcheasey88/peeratcode/parser/java/Variable.java
View file

@ -4,6 +4,7 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -132,9 +133,10 @@ public class Variable extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<JavaElement, Boolean> deep){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
if(!deep.apply(this)) return null; trace.add(this);
if(!deep.apply(trace)) return null;
//Value of the variable //Value of the variable
return null; return null;
} }

6
src/be/jeffcheasey88/peeratcode/parser/java/operations/AssigmentOperation.java
View file

@ -1,5 +1,6 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -34,9 +35,10 @@ public class AssigmentOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<JavaElement, Boolean> deep){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
if(!deep.apply(this)) return null; trace.add(this);
if(!deep.apply(trace)) return null;
//value //value
return null; return null;
} }

3
src/be/jeffcheasey88/peeratcode/parser/java/operations/LoopAffectOperation.java
View file

@ -1,5 +1,6 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -30,7 +31,7 @@ public class LoopAffectOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<JavaElement, Boolean> deep){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){
return search.apply(this) ? this : null; return search.apply(this) ? this : null;
} }

7
src/be/jeffcheasey88/peeratcode/parser/java/operations/MethodCallOperation.java
View file

@ -1,5 +1,6 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -26,6 +27,10 @@ public class MethodCallOperation extends JavaElement{
return matcher.group(1).length(); return matcher.group(1).length();
} }
public String getValue(){
return this.value;
}
@Override @Override
public void show(int tab){ public void show(int tab){
String start = ""; String start = "";
@ -34,7 +39,7 @@ public class MethodCallOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<JavaElement, Boolean> deep){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){
return search.apply(this) ? this : null; return search.apply(this) ? this : null;
} }
} }

8
src/be/jeffcheasey88/peeratcode/parser/java/operations/OperationContainer.java
View file

@ -2,6 +2,7 @@ package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
import be.jeffcheasey88.peeratcode.parser.java.CleanerPool; import be.jeffcheasey88.peeratcode.parser.java.CleanerPool;
import be.jeffcheasey88.peeratcode.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
@ -67,11 +68,12 @@ public abstract class OperationContainer extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<JavaElement, Boolean> deep){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
if(!deep.apply(this)) return null; trace.add(this);
if(!deep.apply(trace)) return null;
for(JavaElement element : this.childs){ for(JavaElement element : this.childs){
JavaElement result = element.find(search, deep); JavaElement result = element.find(search, deep, trace);
if(result != null) return result; if(result != null) return result;
} }
return null; return null;

8
src/be/jeffcheasey88/peeratcode/parser/java/operations/ReturnOperation.java
View file

@ -1,5 +1,6 @@
package be.jeffcheasey88.peeratcode.parser.java.operations; package be.jeffcheasey88.peeratcode.parser.java.operations;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -48,10 +49,11 @@ public class ReturnOperation extends JavaElement{
} }
@Override @Override
public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<JavaElement, Boolean> deep){ public JavaElement find(java.util.function.Function<JavaElement, Boolean> search, java.util.function.Function<Set<JavaElement>, Boolean> deep, Set<JavaElement> trace){
if(search.apply(this)) return this; if(search.apply(this)) return this;
if(!deep.apply(this)) return null; trace.add(this);
JavaElement result = value.find(search, deep); if(!deep.apply(trace)) return null;
JavaElement result = value.find(search, deep, trace);
if(result != null) return result; if(result != null) return result;
return null; return null;
} }

21
test/be/jeffcheasey88/peeratcode/parser/java/SearchTest.java
View file

@ -13,12 +13,14 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle; import org.junit.jupiter.api.TestInstance.Lifecycle;
import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation.ForOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation.ForOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation.WhileOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.ConditionalOperation.WhileOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.DoOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.DoOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.LoopAffectOperation.BreakOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.LoopAffectOperation.BreakOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.LoopAffectOperation.ContinueOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.LoopAffectOperation.ContinueOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.MethodCallOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.MethodCallOperation;
import be.jeffcheasey88.peeratcode.parser.java.operations.OperationContainer;
import be.jeffcheasey88.peeratcode.parser.java.operations.SynchronizedOperation; import be.jeffcheasey88.peeratcode.parser.java.operations.SynchronizedOperation;
@TestInstance(Lifecycle.PER_CLASS) @TestInstance(Lifecycle.PER_CLASS)
@ -47,7 +49,7 @@ class SearchTest{
JavaElement element = parser.find( JavaElement element = parser.find(
(e) -> e instanceof MethodCallOperation, (e) -> e instanceof MethodCallOperation,
(e) -> true); (trace) -> true);
assertNotNull(element); assertNotNull(element);
} catch (Exception e) { } catch (Exception e) {
@ -56,4 +58,21 @@ class SearchTest{
} }
@Test
void methodCallOutOfIfSearch(){
try {
JavaParser parser = parse("package be.jeffcheasey88.peeratcode.parser.java; class Test{ void function(){ int i = 0; if(i == 0){ this.none(); } valid(); } }");
JavaElement element = parser.find(
(e) -> e instanceof MethodCallOperation,
(trace) -> !trace.stream().anyMatch((e) -> (e instanceof ConditionalOperation)));
assertNotNull(element);
assertEquals("valid()", ((MethodCallOperation)element).getValue());
} catch (Exception e) {
e.printStackTrace();
}
}
} }