Clean Code
This commit is contained in:
parent
2afbc70c60
commit
5ad4f66c8a
3 changed files with 3 additions and 13 deletions
|
@ -29,7 +29,6 @@ public class Bag{
|
||||||
}
|
}
|
||||||
|
|
||||||
public void set(Object value){
|
public void set(Object value){
|
||||||
System.out.println("bag set "+value);
|
|
||||||
this.value = value;
|
this.value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,7 +37,6 @@ public class Bag{
|
||||||
}
|
}
|
||||||
|
|
||||||
public void set(String key, Object value){
|
public void set(String key, Object value){
|
||||||
System.out.println("bag set "+key+" -> "+value);
|
|
||||||
this.map.put(key, value);
|
this.map.put(key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ public class JavaParser extends Parser<JavaFile> {
|
||||||
// tokenizer.getTokens().addAll(build("(","ab","=","cd",")"));
|
// tokenizer.getTokens().addAll(build("(","ab","=","cd",")"));
|
||||||
// tokenizer.getTokens().addAll(build("(","ab",")"));
|
// tokenizer.getTokens().addAll(build("(","ab",")"));
|
||||||
// tokenizer.getTokens().addAll(build("ab","=","cd","/","ef"));
|
// tokenizer.getTokens().addAll(build("ab","=","cd","/","ef"));
|
||||||
tokenizer.getTokens().addAll(build("'","ad","'","+","78","+","\"","ms","\""));
|
tokenizer.getTokens().addAll(build("main","=","=","null","?","\"","seks","\"",":","\"","noSeks","\""));
|
||||||
value_q0.seed(tokenizer, null);
|
value_q0.seed(tokenizer, null);
|
||||||
System.out.println("----");
|
System.out.println("----");
|
||||||
|
|
||||||
|
@ -226,29 +226,22 @@ public class JavaParser extends Parser<JavaFile> {
|
||||||
Function<TokenValidator, Boolean> LAMBDA_29
|
Function<TokenValidator, Boolean> LAMBDA_29
|
||||||
){
|
){
|
||||||
BiFunction<JavaElement, TokenValidator, JavaElement> END_NATIVE_VALUE = (element, validator) -> {
|
BiFunction<JavaElement, TokenValidator, JavaElement> END_NATIVE_VALUE = (element, validator) -> {
|
||||||
System.out.println("\tnative\t"+element);
|
|
||||||
System.out.println("\t"+validator.getBag());
|
|
||||||
Value result = validator.getBag().<Bag>get("?").get();
|
Value result = validator.getBag().<Bag>get("?").get();
|
||||||
if(result.get() != null){
|
if(result.get() != null){
|
||||||
System.out.println("got "+result.get());
|
|
||||||
validator.getBag().set(result.get());
|
validator.getBag().set(result.get());
|
||||||
return result.get();
|
return result.get();
|
||||||
}
|
}
|
||||||
System.out.println("got "+result);
|
|
||||||
validator.getBag().set(result);
|
validator.getBag().set(result);
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
BiFunction<JavaElement, TokenValidator, JavaElement> END_VALUE = (element, validator) -> {
|
BiFunction<JavaElement, TokenValidator, JavaElement> END_VALUE = (element, validator) -> {
|
||||||
//single value
|
//single value
|
||||||
System.out.println("\tvalue\t"+element);
|
|
||||||
Value v = new Value(validator.getBag().get());
|
Value v = new Value(validator.getBag().get());
|
||||||
validator.getBag().set(v);
|
validator.getBag().set(v);
|
||||||
return v;
|
return v;
|
||||||
};
|
};
|
||||||
BiFunction<JavaElement, TokenValidator, JavaElement> END_BIVALUE = (element, validator) -> {
|
BiFunction<JavaElement, TokenValidator, JavaElement> END_BIVALUE = (element, validator) -> {
|
||||||
//create new value from parent & created single value
|
//create new value from parent & created single value
|
||||||
System.out.println("\tbivalue\t"+element);
|
|
||||||
System.out.println("\t"+validator.getBag());
|
|
||||||
Value v = new BiValue((Value)element, validator.getBag().<Bag>get("?").get(), validator.getBag().get("type"));
|
Value v = new BiValue((Value)element, validator.getBag().<Bag>get("?").get(), validator.getBag().get("type"));
|
||||||
Value origin = (Value)element;
|
Value origin = (Value)element;
|
||||||
origin.switchInto(v);
|
origin.switchInto(v);
|
||||||
|
@ -257,7 +250,6 @@ public class JavaParser extends Parser<JavaFile> {
|
||||||
};
|
};
|
||||||
BiFunction<JavaElement, TokenValidator, JavaElement> END_TRIVALUE = (element, validator) -> {
|
BiFunction<JavaElement, TokenValidator, JavaElement> END_TRIVALUE = (element, validator) -> {
|
||||||
//same but for val ? val : val
|
//same but for val ? val : val
|
||||||
System.out.println("\ttrivalue\t"+element);
|
|
||||||
return new TriValue();
|
return new TriValue();
|
||||||
};
|
};
|
||||||
StateTree<JavaElement> value_q0 = new StateTree<>();
|
StateTree<JavaElement> value_q0 = new StateTree<>();
|
||||||
|
|
|
@ -23,7 +23,7 @@ public class RedirectStateTree<E, T extends E> extends StateTree<T>{
|
||||||
|
|
||||||
String g = group.apply(currentBag);
|
String g = group.apply(currentBag);
|
||||||
localBag.addPath(currentBag.path()+"/"+g);
|
localBag.addPath(currentBag.path()+"/"+g);
|
||||||
System.out.println("redirect "+localBag.path());
|
// System.out.println("redirect "+localBag.path());
|
||||||
currentBag.set(g, localBag);
|
currentBag.set(g, localBag);
|
||||||
validator.setBag(localBag);
|
validator.setBag(localBag);
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ public class RedirectStateTree<E, T extends E> extends StateTree<T>{
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
Object builded = redirect.internalSeed(branch, (E) element);
|
Object builded = redirect.internalSeed(branch, (E) element);
|
||||||
System.out.println("redirect "+localBag.path()+" builded "+builded);
|
// System.out.println("redirect "+localBag.path()+" builded "+builded);
|
||||||
if(builded == null) return null;
|
if(builded == null) return null;
|
||||||
|
|
||||||
validator.merge(branch);
|
validator.merge(branch);
|
||||||
|
|
Loading…
Add table
Reference in a new issue