diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaFile.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaFile.java index cf0554d..3721b07 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaFile.java +++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaFile.java @@ -21,7 +21,6 @@ public class JavaFile extends JavaElement{ JavaFile setPackage(Bag bag){ this.pack = bag.>get(); System.out.println("setPackage "+pack); - System.out.println(Thread.currentThread().getStackTrace().length+" traces"); return this; } diff --git a/src/be/jeffcheasey88/peeratcode/parser/state/BinaryStateTree.java b/src/be/jeffcheasey88/peeratcode/parser/state/BinaryStateTree.java index ae66494..b87bda3 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/state/BinaryStateTree.java +++ b/src/be/jeffcheasey88/peeratcode/parser/state/BinaryStateTree.java @@ -18,7 +18,7 @@ public class BinaryStateTree extends StateTree{ } @Override - B internalSeed(TokenValidator validator, E element){ + BuilderStateTree internalSeed(TokenValidator validator, E element){ return ((this.condition.apply(validator)) ? success : fail).internalSeed(validator, element); } diff --git a/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java b/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java index 83e5c07..25649aa 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java +++ b/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java @@ -17,7 +17,7 @@ public class RedirectStateTree extends StateTree{ } @Override - B internalSeed(TokenValidator validator, T element){ + BuilderStateTree internalSeed(TokenValidator validator, T element){ Bag currentBag = validator.getBag(); Bag localBag = new Bag(); diff --git a/src/be/jeffcheasey88/peeratcode/parser/state/StateTree.java b/src/be/jeffcheasey88/peeratcode/parser/state/StateTree.java index 2dbfc27..8e57057 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/state/StateTree.java +++ b/src/be/jeffcheasey88/peeratcode/parser/state/StateTree.java @@ -25,32 +25,33 @@ public class StateTree{ TokenValidator validator = new TokenValidator(tokenizer.getTokens().toArray(new Token[0])); while(validator.hasNext()) { System.out.println("seed"); - E build = internalSeed(validator, container); + BuilderStateTree build = internalSeed(validator, container); System.out.println("Validate "+validator.MAX_VALIDATE+"/"+tokenizer.getTokens().size()+" tokens !"); if(build == null) break; + build.build(validator, container); } } - B internalSeed(TokenValidator validator, E element){ + BuilderStateTree internalSeed(TokenValidator validator, E element){ for(StateTree child : this.childs){ TokenValidator branch = validator.branch(); if(child.checker == null){ - E builded = child.internalSeed(branch, element); + BuilderStateTree builded = child.internalSeed(branch, element); if(builded != null){ validator.merge(branch); - return (B) builded; + return builded; } continue; } if(child.checker.apply(branch)){ - E builded = child.internalSeed(branch, element); + BuilderStateTree builded = child.internalSeed(branch, element); if(builded != null){ validator.merge(branch); - return (B) builded; + return builded; } } } - if(this.builder != null) return (B) this.builder.build(validator, element); + if(this.builder != null) return this.builder; return null; }