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

Compare commits

base: Peer-at-Code:4a8588968c00290a6cdf5931d5ae1749adfe1702
Branches Tags
Peer-at-Code:main
Peer-at-Code:java
..
compare: Peer-at-Code:90007dc0d2055c541bc9d2e7dd8294b0d7f8ba4f
Branches Tags
Peer-at-Code:java
Peer-at-Code:main

No commits in common. "4a8588968c00290a6cdf5931d5ae1749adfe1702" and "90007dc0d2055c541bc9d2e7dd8294b0d7f8ba4f" have entirely different histories.
4a8588968c ... 90007dc0d2

61 changed files with 360 additions and 831 deletions
Show stats Expand all files Collapse all files

2
src/dev/peerat/parser/Bag.java → src/be/jeffcheasey88/peeratcode/parser/Bag.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;

4
src/dev/peerat/parser/Parser.java → src/be/jeffcheasey88/peeratcode/parser/Parser.java
View file

@ -1,9 +1,9 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import dev.peerat.parser.state.StateTree; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
public class Parser<E>{ public class Parser<E>{

2
src/dev/peerat/parser/StreamTokenValidator.java → src/be/jeffcheasey88/peeratcode/parser/StreamTokenValidator.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;

2
src/dev/peerat/parser/StreamTokenizer.java → src/be/jeffcheasey88/peeratcode/parser/StreamTokenizer.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
public class StreamTokenizer extends Tokenizer{ public class StreamTokenizer extends Tokenizer{

2
src/dev/peerat/parser/Token.java → src/be/jeffcheasey88/peeratcode/parser/Token.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
public class Token{ public class Token{

2
src/dev/peerat/parser/TokenType.java → src/be/jeffcheasey88/peeratcode/parser/TokenType.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
public enum TokenType{ public enum TokenType{

2
src/dev/peerat/parser/TokenValidator.java → src/be/jeffcheasey88/peeratcode/parser/TokenValidator.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Function; import java.util.function.Function;

2
src/dev/peerat/parser/Tokenizer.java → src/be/jeffcheasey88/peeratcode/parser/Tokenizer.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser; package be.jeffcheasey88.peeratcode.parser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.util.ArrayList; import java.util.ArrayList;

26
src/dev/peerat/parser/java/Annotation.java → src/be/jeffcheasey88/peeratcode/parser/java/Annotation.java
View file

@ -1,11 +1,10 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
public class Annotation extends JavaElement{ public class Annotation extends JavaElement{
@ -32,27 +31,6 @@ public class Annotation extends JavaElement{
public Token getName(){ public Token getName(){
return name; return name;
} }
public Map<Token, Value> getParameters(){
return this.values;
}
@Override
public void build(Builder builder) throws Exception{
builder.append(name);
if(values != null && values.size() > 0){
builder.append("(");
for(Entry<Token,Value> 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 @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){

79
src/dev/peerat/parser/java/Class.java → src/be/jeffcheasey88/peeratcode/parser/java/Class.java
View file

@ -1,15 +1,25 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import be.jeffcheasey88.peeratcode.parser.java.Annotation.AnnotableBuffer;
import be.jeffcheasey88.peeratcode.parser.java.Function.FunctionContainer;
import be.jeffcheasey88.peeratcode.parser.java.Variable.VariableContainer;
public class Class extends ClassBase{ interface ClassContainer{
void addClass(Class clazz);
}
public class Class extends JavaElement implements AnnotableBuffer, ClassContainer, FunctionContainer, VariableContainer{
private List<Annotation> annotationBuffer;
private List<Annotation> annotations; private List<Annotation> annotations;
//where mod ????
private Token name; private Token name;
private Token extend; private Token extend;
private Token implement; private Token implement;
@ -39,56 +49,9 @@ public class Class extends ClassBase{
} }
@Override @Override
public void addClass(ClassBase clazz){ public void addClass(Class clazz){
this.elements.add(clazz); this.elements.add(clazz);
} }
public List<Annotation> getAnnotations(){
return this.annotations;
}
public Token getName(){
return this.name;
}
public Token getExtension(){
return this.extend;
}
public Token getImplementations(){
return this.implement;
}
public List<JavaElement> getElements(){
return this.elements;
}
@Override
public void build(Builder builder) throws Exception{
if(annotations != null){
for(Annotation annotation : this.annotations){
annotation.build(builder);
}
}
builder.append("class");
builder.append(name);
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 @Override
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
@ -104,6 +67,18 @@ public class Class extends ClassBase{
} }
return null; return null;
} }
@Override
public void addAnnotationBuffer(Annotation annotation){
if(annotationBuffer == null) annotationBuffer = new ArrayList<>();
annotationBuffer.add(annotation);
}
public List<Annotation> getAnnotationBuffer(){
List<Annotation> list = this.annotationBuffer;
this.annotationBuffer = null;
return list;
}
} }

76
src/dev/peerat/parser/java/Function.java → src/be/jeffcheasey88/peeratcode/parser/java/Function.java
View file

@ -1,13 +1,11 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.java.Operation.OperationContainer;
import dev.peerat.parser.java.Operation.OperationContainer; import be.jeffcheasey88.peeratcode.parser.java.Variable.VariableContainer;
import dev.peerat.parser.java.Variable.VariableContainer;
public class Function extends JavaElement implements VariableContainer, OperationContainer{ public class Function extends JavaElement implements VariableContainer, OperationContainer{
@ -60,72 +58,6 @@ public class Function extends JavaElement implements VariableContainer, Operatio
public void addOperation(Operation operation) { public void addOperation(Operation operation) {
this.elements.add(operation); this.elements.add(operation);
} }
public List<Annotation> getAnnotations(){
return this.annotations;
}
public int getModifier(){
return this.mod;
}
public Token getGeneric(){
return this.generic;
}
public Token getReturnType(){
return this.type;
}
public Token getName(){
return this.name;
}
public List<Variable> getParameters(){
return this.parameters;
}
public List<Token> getThrowables(){
return this.throwables;
}
public List<JavaElement> getElements(){
return this.elements;
}
@Override
public void build(Builder builder) throws Exception{
if(annotations != null){
for(Annotation annotation : this.annotations){
annotation.build(builder);
}
}
String mod = Modifier.toString(this.mod);
builder.append(new Token(type.getLineNumber(), type.getCharacterNumber()-(mod.length()+1), mod, TokenType.GROUP));
if(generic != null) builder.append(generic);
builder.append(type);
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 @Override
public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){

14
src/be/jeffcheasey88/peeratcode/parser/java/JavaElement.java Normal file
View file

@ -0,0 +1,14 @@
package be.jeffcheasey88.peeratcode.parser.java;
import be.jeffcheasey88.peeratcode.parser.Bag;
import java.util.function.Function;
public abstract class JavaElement{
Bag bag; //to remove
public abstract <E extends JavaElement> E find(Function<JavaElement, Boolean> finder);
}

69
src/be/jeffcheasey88/peeratcode/parser/java/JavaFile.java Normal file
View file

@ -0,0 +1,69 @@
package be.jeffcheasey88.peeratcode.parser.java;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
import be.jeffcheasey88.peeratcode.parser.Bag;
import be.jeffcheasey88.peeratcode.parser.Token;
import be.jeffcheasey88.peeratcode.parser.java.Annotation.AnnotableBuffer;
public class JavaFile extends JavaElement implements ClassContainer, AnnotableBuffer{
private List<Annotation> annotationBuffer;
private List<Token> pack;
private List<List<Token>> imports;
private Class mainClazz;
private List<Class> subClazz;
public JavaFile(){
this.imports = new ArrayList<>();
this.subClazz = new ArrayList<>();
}
JavaFile setPackage(Bag bag){
this.pack = bag.<List<Token>>get();
// System.out.println("setPackage "+pack);
return this;
}
JavaFile addImport(Bag bag){
this.imports.add(bag.<List<Token>>get());
// System.out.println("addImport "+imports.get(imports.size()-1));
return this;
}
// Class setClass(Class clazz){
// this.mainClazz = clazz;
//// System.out.println("setClass "+clazz);
// return clazz;
// }
@Override
public void addClass(Class clazz){
if(mainClazz == null) this.mainClazz = clazz;
else subClazz.add(clazz);
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(finder.apply(mainClazz)) return (E) mainClazz;
for(Class clazz : subClazz){
if(finder.apply(clazz)) return (E) clazz;
}
return null;
}
@Override
public void addAnnotationBuffer(Annotation annotation){
if(annotationBuffer == null) annotationBuffer = new ArrayList<>();
annotationBuffer.add(annotation);
}
public List<Annotation> getAnnotationBuffer(){
List<Annotation> list = this.annotationBuffer;
this.annotationBuffer = null;
return list;
}
}

48
src/dev/peerat/parser/java/JavaParser.java → src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.BufferedWriter; import java.io.BufferedWriter;
@ -15,19 +15,19 @@ import java.util.Map.Entry;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.Tokenizer; import be.jeffcheasey88.peeratcode.parser.Tokenizer;
import dev.peerat.parser.java.Annotation.AnnotableBuffer; import be.jeffcheasey88.peeratcode.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.java.Function.FunctionContainer; import be.jeffcheasey88.peeratcode.parser.java.Function.FunctionContainer;
import dev.peerat.parser.java.Variable.VariableContainer; import be.jeffcheasey88.peeratcode.parser.java.Variable.VariableContainer;
import dev.peerat.parser.state.BuilderStateTree; import be.jeffcheasey88.peeratcode.parser.state.BuilderStateTree;
import dev.peerat.parser.state.InitialStateTree; import be.jeffcheasey88.peeratcode.parser.state.InitialStateTree;
import dev.peerat.parser.state.RedirectStateTree; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
public class JavaParser extends Parser<JavaElement> { public class JavaParser extends Parser<JavaElement> {
@ -945,7 +945,8 @@ public class JavaParser extends Parser<JavaElement> {
StateTree<JavaElement> importState = new StateTree<>(); StateTree<JavaElement> importState = new StateTree<>();
importState.then((validator) -> { importState.then((validator) -> {
if(validator.validate( if(validator.validate(
(token) -> token.getValue().equals("import"))){ (token) -> token.getValue().equals("import"),
(bag, token) -> bag.set(new LinkedList<>()))){
validator.validate( validator.validate(
(token) -> token.getValue().equals("static"), (token) -> token.getValue().equals("static"),
@ -953,18 +954,14 @@ public class JavaParser extends Parser<JavaElement> {
while(validator.validate( while(validator.validate(
(token) -> !token.getValue().equals(";"), (token) -> !token.getValue().equals(";"),
(bag, token) -> { (bag, token) -> bag.<List<Token>>get().add(token))
Token current = bag.get();
if(current == null) bag.set(token);
else bag.set(current.concat(token));
})
); );
return validator.validate((token) -> token.getValue().equals(";")); return validator.validate((token) -> token.getValue().equals(";"));
} }
return false; return false;
}).<JavaElement>end((parent, bag) -> { }).<JavaElement>end((parent, bag) -> {
((JavaFile)parent).addImport(new Import(bag.has("static"), bag.get())); ((JavaFile)parent).addImport(bag);
return parent; return parent;
}); });
@ -974,15 +971,12 @@ public class JavaParser extends Parser<JavaElement> {
//PACKAGE //PACKAGE
StateTree<JavaElement> pack = main.then((validator) -> { StateTree<JavaElement> pack = main.then((validator) -> {
if(validator.validate( if(validator.validate(
(token) -> token.getValue().equals("package"))){ (token) -> token.getValue().equals("package"),
(bag, token) -> bag.set(new LinkedList<>()))){
while(validator.validate( while(validator.validate(
(token) -> !token.getValue().equals(";"), (token) -> !token.getValue().equals(";"),
(bag, token) -> { (bag, token) -> bag.<List<Token>>get().add(token))
Token current = bag.get();
if(current == null) bag.set(token);
else bag.set(current.concat(token));
})
); );
return validator.validate((token) -> token.getValue().equals(";")); return validator.validate((token) -> token.getValue().equals(";"));
} }

2
src/dev/peerat/parser/java/Operation.java → src/be/jeffcheasey88/peeratcode/parser/java/Operation.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
public abstract class Operation extends JavaElement{ public abstract class Operation extends JavaElement{

29
src/dev/peerat/parser/java/Value.java → src/be/jeffcheasey88/peeratcode/parser/java/Value.java
View file

@ -1,8 +1,8 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
public class Value extends JavaElement{ public class Value extends JavaElement{
@ -32,15 +32,6 @@ public class Value extends JavaElement{
return "Value[token="+token+", content="+content+"]"; return "Value[token="+token+", content="+content+"]";
} }
@Override
public void build(Builder builder) throws Exception{
if(token != null){
builder.append(token);
}else{
content.build(builder);
}
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return content != null ? finder.apply(content) ? (E) content : null : null; return content != null ? finder.apply(content) ? (E) content : null : null;
@ -75,13 +66,6 @@ public class Value extends JavaElement{
return left+" "+action+" "+right; return left+" "+action+" "+right;
} }
@Override
public void build(Builder builder) throws Exception{
left.build(builder);
builder.append(action);
right.build(builder);
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return finder.apply(left) ? (E) left : finder.apply(right) ? (E) right : null; return finder.apply(left) ? (E) left : finder.apply(right) ? (E) right : null;
@ -108,15 +92,6 @@ public class Value extends JavaElement{
return fail; return fail;
} }
@Override
public void build(Builder builder) throws Exception {
check.build(builder);
builder.append("?");
success.build(builder);
builder.append(":");
fail.build(builder);
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return finder.apply(check) ? (E) check : finder.apply(success) ? (E) success : finder.apply(fail) ? (E) fail : null; return finder.apply(check) ? (E) check : finder.apply(success) ? (E) success : finder.apply(fail) ? (E) fail : null;

51
src/dev/peerat/parser/java/Variable.java → src/be/jeffcheasey88/peeratcode/parser/java/Variable.java
View file

@ -1,12 +1,10 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType;
public class Variable extends JavaElement{ public class Variable extends JavaElement{
@ -45,49 +43,7 @@ public class Variable extends JavaElement{
public String toString(){ public String toString(){
return "Variable[mod="+mod+", type="+type+", name="+name+", elips="+elips+", value="+value+"]"; return "Variable[mod="+mod+", type="+type+", name="+name+", elips="+elips+", value="+value+"]";
} }
public List<Annotation> getAnnotations(){
return this.annotations;
}
public int getModifier(){
return this.mod;
}
public Token getType(){
return this.type;
}
public Token getName(){
return this.name;
}
public boolean isElipsis(){
return this.elips;
}
public Value getValue(){
return this.value;
}
@Override
public void build(Builder builder) throws Exception{
if(annotations != null){
for(Annotation annotation : this.annotations){
annotation.build(builder);
}
}
String mod = Modifier.toString(this.mod);
builder.append(new Token(type.getLineNumber(), type.getCharacterNumber()-(mod.length()+1), mod, TokenType.GROUP));
builder.append(type);
if(elips) builder.append("...");
builder.append(name);
if(value != null){
builder.append("=");
value.build(builder);
}
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(annotations != null){ if(annotations != null){
@ -97,5 +53,4 @@ public class Variable extends JavaElement{
} }
return value != null ? finder.apply(value) ? (E)value : null : null; return value != null ? finder.apply(value) ? (E)value : null : null;
} }
} }

15
src/dev/peerat/parser/java/operation/AssignOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/AssignOperation.java
View file

@ -1,10 +1,10 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Operation; import be.jeffcheasey88.peeratcode.parser.java.Operation;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class AssignOperation extends Operation{ public class AssignOperation extends Operation{
@ -23,13 +23,6 @@ public class AssignOperation extends Operation{
public Value right(){ public Value right(){
return right; return right;
} }
@Override
public void build(Builder builder) throws Exception{
left.build(builder);
builder.append("=");
right.build(builder);
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){

11
src/dev/peerat/parser/java/operation/BreakOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/BreakOperation.java
View file

@ -1,18 +1,13 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Operation; import be.jeffcheasey88.peeratcode.parser.java.Operation;
public class BreakOperation extends Operation{ public class BreakOperation extends Operation{
public BreakOperation(){} public BreakOperation(){}
@Override
public void build(Builder builder) throws Exception{
builder.append("break;");
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){ public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){

4
src/dev/peerat/parser/java/operation/CatchOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/CatchOperation.java
View file

@ -1,8 +1,8 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.List; import java.util.List;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
public class CatchOperation extends OperationBag{ public class CatchOperation extends OperationBag{

15
src/be/jeffcheasey88/peeratcode/parser/java/operation/ContinueOperation.java Normal file
View file

@ -0,0 +1,15 @@
package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function;
import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import be.jeffcheasey88.peeratcode.parser.java.Operation;
public class ContinueOperation extends Operation{
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return null;
}
}

5
src/be/jeffcheasey88/peeratcode/parser/java/operation/DoOperation.java Normal file
View file

@ -0,0 +1,5 @@
package be.jeffcheasey88.peeratcode.parser.java.operation;
public class DoOperation extends OperationBag{
}

5
src/be/jeffcheasey88/peeratcode/parser/java/operation/ElseOperation.java Normal file
View file

@ -0,0 +1,5 @@
package be.jeffcheasey88.peeratcode.parser.java.operation;
public class ElseOperation extends OperationBag{
}

5
src/be/jeffcheasey88/peeratcode/parser/java/operation/FinallyOperation.java Normal file
View file

@ -0,0 +1,5 @@
package be.jeffcheasey88.peeratcode.parser.java.operation;
public class FinallyOperation extends OperationBag{
}

8
src/dev/peerat/parser/java/operation/ForOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/ForOperation.java
View file

@ -1,11 +1,11 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
import dev.peerat.parser.java.Variable; import be.jeffcheasey88.peeratcode.parser.java.Variable;
public class ForOperation extends OperationBag{ public class ForOperation extends OperationBag{

8
src/dev/peerat/parser/java/operation/ForeachOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/ForeachOperation.java
View file

@ -1,10 +1,10 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class ForeachOperation extends OperationBag{ public class ForeachOperation extends OperationBag{

6
src/dev/peerat/parser/java/operation/IfOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/IfOperation.java
View file

@ -1,9 +1,9 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class IfOperation extends OperationBag{ public class IfOperation extends OperationBag{

18
src/dev/peerat/parser/java/operation/MethodCallOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/MethodCallOperation.java
View file

@ -1,12 +1,12 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Operation; import be.jeffcheasey88.peeratcode.parser.java.Operation;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class MethodCallOperation extends Operation{ public class MethodCallOperation extends Operation{
@ -37,17 +37,11 @@ public class MethodCallOperation extends Operation{
public List<Value> getParameters(){ public List<Value> getParameters(){
return this.parameters; return this.parameters;
} }
@Override
public void build(Builder builder) throws Exception{
if(previous != null) previous.build(builder);
//todo
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) { public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
if(finder.apply(start)) return (E)start; if(finder.apply(start)) return (E)start;
if(previous != null) if(finder.apply(previous)) return (E) previous; if(finder.apply(previous)) return (E) previous;
for(Value param : this.parameters){ for(Value param : this.parameters){
if(finder.apply(param)) return (E)param; if(finder.apply(param)) return (E)param;
} }

17
src/dev/peerat/parser/java/operation/OperationBag.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/OperationBag.java
View file

@ -1,14 +1,14 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Operation; import be.jeffcheasey88.peeratcode.parser.java.Operation;
import dev.peerat.parser.java.Variable; import be.jeffcheasey88.peeratcode.parser.java.Variable;
import dev.peerat.parser.java.Operation.OperationContainer; import be.jeffcheasey88.peeratcode.parser.java.Operation.OperationContainer;
import dev.peerat.parser.java.Variable.VariableContainer; import be.jeffcheasey88.peeratcode.parser.java.Variable.VariableContainer;
public class OperationBag extends Operation implements VariableContainer, OperationContainer{ public class OperationBag extends Operation implements VariableContainer, OperationContainer{
@ -38,9 +38,4 @@ public class OperationBag extends Operation implements VariableContainer, Operat
return null; return null;
} }
@Override
public void build(Builder builder) throws Exception {
//todo and super on child
}
} }

14
src/dev/peerat/parser/java/operation/ReturnOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/ReturnOperation.java
View file

@ -1,10 +1,10 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Operation; import be.jeffcheasey88.peeratcode.parser.java.Operation;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class ReturnOperation extends Operation{ public class ReturnOperation extends Operation{
@ -18,15 +18,9 @@ public class ReturnOperation extends Operation{
return this.value; return this.value;
} }
@Override
public void build(Builder builder) throws Exception {
value.build(builder);
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) { public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
return value != null ? finder.apply(value) ? (E)value : null : null; return value != null ? finder.apply(value) ? (E)value : null : null;
} }
} }

10
src/dev/peerat/parser/java/operation/SwitchOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/SwitchOperation.java
View file

@ -1,15 +1,11 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Operation; import be.jeffcheasey88.peeratcode.parser.java.Operation;
public class SwitchOperation extends Operation{ public class SwitchOperation extends Operation{
@Override
public void build(Builder builder) throws Exception{
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) { public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {

6
src/dev/peerat/parser/java/operation/SynchronizedOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/SynchronizedOperation.java
View file

@ -1,9 +1,9 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class SynchronizedOperation extends OperationBag{ public class SynchronizedOperation extends OperationBag{

14
src/dev/peerat/parser/java/operation/ThrowOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/ThrowOperation.java
View file

@ -1,10 +1,10 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Operation; import be.jeffcheasey88.peeratcode.parser.java.Operation;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class ThrowOperation extends Operation{ public class ThrowOperation extends Operation{
@ -17,12 +17,6 @@ public class ThrowOperation extends Operation{
public Value getValue(){ public Value getValue(){
return this.value; return this.value;
} }
@Override
public void build(Builder builder) throws Exception {
builder.append(" throw ");
value.build(builder);
}
@Override @Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) { public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {

6
src/dev/peerat/parser/java/operation/TryOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/TryOperation.java
View file

@ -1,9 +1,9 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Variable; import be.jeffcheasey88.peeratcode.parser.java.Variable;
public class TryOperation extends OperationBag{ public class TryOperation extends OperationBag{

6
src/dev/peerat/parser/java/operation/WhileOperation.java → src/be/jeffcheasey88/peeratcode/parser/java/operation/WhileOperation.java
View file

@ -1,9 +1,9 @@
package dev.peerat.parser.java.operation; package be.jeffcheasey88.peeratcode.parser.java.operation;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.Value;
public class WhileOperation extends OperationBag{ public class WhileOperation extends OperationBag{

4
src/dev/peerat/parser/state/BinaryStateTree.java → src/be/jeffcheasey88/peeratcode/parser/state/BinaryStateTree.java
View file

@ -1,8 +1,8 @@
package dev.peerat.parser.state; package be.jeffcheasey88.peeratcode.parser.state;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
public class BinaryStateTree<E> extends StateTree<E>{ public class BinaryStateTree<E> extends StateTree<E>{

6
src/dev/peerat/parser/state/BuilderStateTree.java → src/be/jeffcheasey88/peeratcode/parser/state/BuilderStateTree.java
View file

@ -1,12 +1,12 @@
package dev.peerat.parser.state; package be.jeffcheasey88.peeratcode.parser.state;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
public class BuilderStateTree<E, B> extends StateTree<B>{ public class BuilderStateTree<E, B> extends StateTree<B>{

4
src/dev/peerat/parser/state/InitialStateTree.java → src/be/jeffcheasey88/peeratcode/parser/state/InitialStateTree.java
View file

@ -1,9 +1,9 @@
package dev.peerat.parser.state; package be.jeffcheasey88.peeratcode.parser.state;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
public class InitialStateTree<E> extends StateTree<E>{ public class InitialStateTree<E> extends StateTree<E>{

6
src/dev/peerat/parser/state/RedirectStateTree.java → src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java
View file

@ -1,9 +1,9 @@
package dev.peerat.parser.state; package be.jeffcheasey88.peeratcode.parser.state;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
public class RedirectStateTree<E, T extends E> extends StateTree<T>{ public class RedirectStateTree<E, T extends E> extends StateTree<T>{

6
src/dev/peerat/parser/state/StateTree.java → src/be/jeffcheasey88/peeratcode/parser/state/StateTree.java
View file

@ -1,12 +1,12 @@
package dev.peerat.parser.state; package be.jeffcheasey88.peeratcode.parser.state;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
public class StateTree<E>{ public class StateTree<E>{

30
src/dev/peerat/parser/state/generator/ParserComposantGenerator.java → src/be/jeffcheasey88/peeratcode/parser/state/generator/ParserComposantGenerator.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.state.generator; package be.jeffcheasey88.peeratcode.parser.state.generator;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@ -12,20 +12,20 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.Tokenizer; import be.jeffcheasey88.peeratcode.parser.Tokenizer;
import dev.peerat.parser.state.RedirectStateTree; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant; import be.jeffcheasey88.peeratcode.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant;
import dev.peerat.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.ComposantCall; import be.jeffcheasey88.peeratcode.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.ComposantCall;
import dev.peerat.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.LinkedComposant; import be.jeffcheasey88.peeratcode.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.LinkedComposant;
import dev.peerat.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.MultipleWayComposant; import be.jeffcheasey88.peeratcode.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.MultipleWayComposant;
import dev.peerat.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.NamedElement; import be.jeffcheasey88.peeratcode.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.NamedElement;
import dev.peerat.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.Redirection; import be.jeffcheasey88.peeratcode.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.Redirection;
import dev.peerat.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.Validator; import be.jeffcheasey88.peeratcode.parser.state.generator.ParserComposantGenerator.SynthaxeComposant.Composant.Validator;
public class ParserComposantGenerator { public class ParserComposantGenerator {

34
src/dev/peerat/parser/ElementBuilder.java
View file

@ -1,34 +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<Token> 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{
}
}
}

32
src/dev/peerat/parser/java/ClassBase.java
View file

@ -1,32 +0,0 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.List;
import dev.peerat.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.java.Function.FunctionContainer;
import dev.peerat.parser.java.Variable.VariableContainer;
interface ClassContainer{
void addClass(ClassBase clazz);
}
public abstract class ClassBase extends JavaElement implements AnnotableBuffer, ClassContainer, FunctionContainer, VariableContainer{
private List<Annotation> annotationBuffer;
@Override
public void addAnnotationBuffer(Annotation annotation){
if(annotationBuffer == null) annotationBuffer = new ArrayList<>();
annotationBuffer.add(annotation);
}
public List<Annotation> getAnnotationBuffer(){
List<Annotation> list = this.annotationBuffer;
this.annotationBuffer = null;
return list;
}
}

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

@ -1,23 +0,0 @@
package dev.peerat.parser.java;
import dev.peerat.parser.Token;
public class Import{
private boolean isStatic;
private Token value;
public Import(boolean isStatic, Token value){
this.isStatic = isStatic;
this.value = value;
}
public boolean isStatic(){
return this.isStatic;
}
public Token getValue(){
return this.value;
}
}

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

@ -1,99 +0,0 @@
package dev.peerat.parser.java;
import java.util.ArrayList;
import java.util.List;
import dev.peerat.parser.Token;
public class Interface extends ClassBase{
private List<Annotation> annotations;
//where mod ????
private Token name;
private Token extend;
private List<JavaElement> elements;
public Interface(List<Annotation> annotations, Token name){
this.annotations = annotations;
this.name = name;
this.elements = new ArrayList<>();
}
public Interface(List<Annotation> annotations, Token name, Token extend){
this(annotations, name);
this.extend = extend;
}
@Override
public void addFunction(Function function) {
this.elements.add(function);
}
@Override
public void addVariable(Variable variable) {
this.elements.add(variable);
}
@Override
public void addClass(ClassBase clazz){
this.elements.add(clazz);
}
public List<Annotation> getAnnotations(){
return this.annotations;
}
public Token getName(){
return this.name;
}
public Token getExtension(){
return this.extend;
}
public List<JavaElement> getElements(){
return this.elements;
}
@Override
public void build(Builder builder) throws Exception{
if(annotations != null){
for(Annotation annotation : this.annotations){
annotation.build(builder);
}
}
builder.append("interface");
builder.append(name);
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 extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
if(annotations != null){
for(Annotation annotation : this.annotations){
if(finder.apply(annotation)) return (E) annotation;
}
}
if(elements != null){
for(JavaElement element : this.elements){
if(finder.apply(element)) return (E) element;
}
}
return null;
}
}

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

@ -1,16 +0,0 @@
package dev.peerat.parser.java;
import java.util.function.Function;
import dev.peerat.parser.Bag;
import dev.peerat.parser.ElementBuilder;
public abstract class JavaElement implements ElementBuilder{
Bag bag; //to remove
public abstract <E extends JavaElement> E find(Function<JavaElement, Boolean> finder);
}

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

@ -1,96 +0,0 @@
package dev.peerat.parser.java;
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;
public class JavaFile extends JavaElement implements ClassContainer, AnnotableBuffer{
private List<Annotation> annotationBuffer;
private Token pack;
private List<Import> imports;
private ClassBase mainClazz;
private List<ClassBase> subClazz;
public JavaFile(){
this.imports = new ArrayList<>();
this.subClazz = new ArrayList<>();
}
JavaFile setPackage(Bag bag){
this.pack = bag.<Token>get();
return this;
}
JavaFile addImport(Import value){
this.imports.add(value);
return this;
}
@Override
public void addClass(ClassBase clazz){
if(mainClazz == null) this.mainClazz = clazz;
else subClazz.add(clazz);
}
public Token getPackage(){
return this.pack;
}
public List<Import> getImports(){
return this.imports;
}
public ClassBase getMainClass(){
return this.mainClazz;
}
public List<ClassBase> getSubClasses(){
return this.subClazz;
}
@Override
public void addAnnotationBuffer(Annotation annotation){
if(annotationBuffer == null) annotationBuffer = new ArrayList<>();
annotationBuffer.add(annotation);
}
public List<Annotation> getAnnotationBuffer(){
List<Annotation> list = this.annotationBuffer;
this.annotationBuffer = null;
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 extends JavaElement> E find(Function<JavaElement, Boolean> finder){
if(finder.apply(mainClazz)) return (E) mainClazz;
for(ClassBase clazz : subClazz){
if(finder.apply(clazz)) return (E) clazz;
}
return null;
}
}

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

@ -1,20 +0,0 @@
package dev.peerat.parser.java.operation;
import java.util.function.Function;
import dev.peerat.parser.java.JavaElement;
import dev.peerat.parser.java.Operation;
public class ContinueOperation extends Operation{
@Override
public void build(Builder builder) throws Exception{
builder.append("continue;");
}
@Override
public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
return null;
}
}

5
src/dev/peerat/parser/java/operation/DoOperation.java
View file

@ -1,5 +0,0 @@
package dev.peerat.parser.java.operation;
public class DoOperation extends OperationBag{
}

5
src/dev/peerat/parser/java/operation/ElseOperation.java
View file

@ -1,5 +0,0 @@
package dev.peerat.parser.java.operation;
public class ElseOperation extends OperationBag{
}

5
src/dev/peerat/parser/java/operation/FinallyOperation.java
View file

@ -1,5 +0,0 @@
package dev.peerat.parser.java.operation;
public class FinallyOperation extends OperationBag{
}

14
test/ForCase.java
View file

@ -2,13 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.Tokenizer; import be.jeffcheasey88.peeratcode.parser.Tokenizer;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.state.InitialStateTree; import be.jeffcheasey88.peeratcode.parser.state.InitialStateTree;
import dev.peerat.parser.state.StateTree; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
public class ForCase { public class ForCase {

10
test/GlobalCover.java
View file

@ -6,11 +6,11 @@ import java.io.FileWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.java.JavaFile; import be.jeffcheasey88.peeratcode.parser.java.JavaFile;
import dev.peerat.parser.java.JavaParser; import be.jeffcheasey88.peeratcode.parser.java.JavaParser;
class GlobalCover { class GlobalCover {

19
test/dev/peerat/parser/java/AnnotationTests.java → test/be/jeffcheasey88/peeratcode/parser/java/AnnotationTests.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -7,16 +7,13 @@ import java.util.Map;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.Annotation; import be.jeffcheasey88.peeratcode.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree;
public class AnnotationTests { public class AnnotationTests {

17
test/dev/peerat/parser/java/ClassTests.java → test/be/jeffcheasey88/peeratcode/parser/java/ClassTests.java
View file

@ -1,18 +1,15 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.Class; import be.jeffcheasey88.peeratcode.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.java.ClassContainer; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree;
public class ClassTests{ public class ClassTests{

27
test/dev/peerat/parser/java/FunctionTests.java → test/be/jeffcheasey88/peeratcode/parser/java/FunctionTests.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -8,20 +8,17 @@ import java.util.function.BiFunction;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.Function; import be.jeffcheasey88.peeratcode.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.Function.FunctionContainer;
import dev.peerat.parser.java.Variable; import be.jeffcheasey88.peeratcode.parser.state.BuilderStateTree;
import dev.peerat.parser.java.Annotation.AnnotableBuffer; import be.jeffcheasey88.peeratcode.parser.state.InitialStateTree;
import dev.peerat.parser.java.Function.FunctionContainer; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.state.BuilderStateTree; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.state.InitialStateTree;
import dev.peerat.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree;
public class FunctionTests { public class FunctionTests {

16
test/dev/peerat/parser/java/ModifierTests.java → test/be/jeffcheasey88/peeratcode/parser/java/ModifierTests.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -7,13 +7,13 @@ import java.lang.reflect.Modifier;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.Tokenizer; import be.jeffcheasey88.peeratcode.parser.Tokenizer;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.JavaElement;
import dev.peerat.parser.state.StateTree; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
public class ModifierTests{ public class ModifierTests{

49
test/dev/peerat/parser/java/OperationTests.java → test/be/jeffcheasey88/peeratcode/parser/java/OperationTests.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -11,31 +11,28 @@ import java.util.function.BiFunction;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.Operation.OperationContainer;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.java.operation.AssignOperation;
import dev.peerat.parser.java.Variable; import be.jeffcheasey88.peeratcode.parser.java.operation.BreakOperation;
import dev.peerat.parser.java.Operation.OperationContainer; import be.jeffcheasey88.peeratcode.parser.java.operation.CatchOperation;
import dev.peerat.parser.java.operation.AssignOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.ContinueOperation;
import dev.peerat.parser.java.operation.BreakOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.DoOperation;
import dev.peerat.parser.java.operation.CatchOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.ElseOperation;
import dev.peerat.parser.java.operation.ContinueOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.FinallyOperation;
import dev.peerat.parser.java.operation.DoOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.ForOperation;
import dev.peerat.parser.java.operation.ElseOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.IfOperation;
import dev.peerat.parser.java.operation.FinallyOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.ReturnOperation;
import dev.peerat.parser.java.operation.ForOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.SynchronizedOperation;
import dev.peerat.parser.java.operation.IfOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.ThrowOperation;
import dev.peerat.parser.java.operation.ReturnOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.TryOperation;
import dev.peerat.parser.java.operation.SynchronizedOperation; import be.jeffcheasey88.peeratcode.parser.java.operation.WhileOperation;
import dev.peerat.parser.java.operation.ThrowOperation; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.java.operation.TryOperation; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.java.operation.WhileOperation;
import dev.peerat.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree;
public class OperationTests { public class OperationTests {

17
test/dev/peerat/parser/java/TypeTests.java → test/be/jeffcheasey88/peeratcode/parser/java/TypeTests.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -6,14 +6,13 @@ import java.util.function.BiConsumer;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.state.RedirectStateTree; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.state.StateTree;
public class TypeTests{ public class TypeTests{

20
test/dev/peerat/parser/java/ValueTests.java → test/be/jeffcheasey88/peeratcode/parser/java/ValueTests.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -9,16 +9,14 @@ import java.util.function.BiFunction;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.Value.BiValue;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.java.Value.BiValue; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree;
public class ValueTests { public class ValueTests {

26
test/dev/peerat/parser/java/VariableTests.java → test/be/jeffcheasey88/peeratcode/parser/java/VariableTests.java
View file

@ -1,4 +1,4 @@
package dev.peerat.parser.java; package be.jeffcheasey88.peeratcode.parser.java;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -9,20 +9,16 @@ import java.util.function.BiFunction;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import dev.peerat.parser.Bag; import be.jeffcheasey88.peeratcode.parser.Bag;
import dev.peerat.parser.Parser; import be.jeffcheasey88.peeratcode.parser.Parser;
import dev.peerat.parser.Token; import be.jeffcheasey88.peeratcode.parser.Token;
import dev.peerat.parser.TokenType; import be.jeffcheasey88.peeratcode.parser.TokenType;
import dev.peerat.parser.TokenValidator; import be.jeffcheasey88.peeratcode.parser.TokenValidator;
import dev.peerat.parser.java.Class; import be.jeffcheasey88.peeratcode.parser.java.Annotation.AnnotableBuffer;
import dev.peerat.parser.java.JavaElement; import be.jeffcheasey88.peeratcode.parser.java.Variable.VariableContainer;
import dev.peerat.parser.java.Value; import be.jeffcheasey88.peeratcode.parser.state.InitialStateTree;
import dev.peerat.parser.java.Variable; import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
import dev.peerat.parser.java.Annotation.AnnotableBuffer; import be.jeffcheasey88.peeratcode.parser.state.StateTree;
import dev.peerat.parser.java.Variable.VariableContainer;
import dev.peerat.parser.state.InitialStateTree;
import dev.peerat.parser.state.RedirectStateTree;
import dev.peerat.parser.state.StateTree;
public class VariableTests{ public class VariableTests{