StateTree -> multiple case & import (all)

src/be/jeffcheasey88/peeratcode/parser/TokenValidator.java

@@ -55,6 +55,7 @@ public class TokenValidator{
 	public void merge(TokenValidator branch){
 		this.index = branch.index;
 		this.validated = branch.validated;
+		this.bag = branch.bag;
 	}
 	
 	public void setBag(Bag bag){

src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java

@@ -74,7 +74,7 @@ public class JavaParser  extends Parser<JavaFile> {
 			}
 			return false;
 		}).<JavaElement>end((javafile, bag) -> javafile.setPackage(bag))
-			.thenNoChild(importState);
+			.multiple(importState);
 		
 		
 		System.out.println((System.currentTimeMillis()-time)+"ms");

src/be/jeffcheasey88/peeratcode/parser/state/BuilderStateTree.java

@@ -13,6 +13,7 @@ public class BuilderStateTree<E, B> extends StateTree<B>{
 	private BiFunction<E, Bag, B> builder;
 	
 	private List<StateTree<E>> childs;
+	private StateTree<E> multiple;
 
 	public BuilderStateTree(BiFunction<E, Bag, B> builder){
 		super();
@@ -28,20 +29,20 @@ public class BuilderStateTree<E, B> extends StateTree<B>{
 		BuilderStateTree<B, ?> builded = super.internalSeed(validator, build);
 		if(builded != null) builded.build(validator, build);
 		
-		BuilderStateTree<E, ?> buildedNoChilds = internalSeedNoChilds(validator, element);
+		internalSeedNoChilds(validator, element);
-		if(buildedNoChilds != null) buildedNoChilds.build(validator, element);
 		
 		return build;
 	}
 	
-	BuilderStateTree<E, ?> internalSeedNoChilds(TokenValidator validator, E element){
+	void internalSeedNoChilds(TokenValidator validator, E element){
 		for(StateTree<E> child : this.childs){
 			TokenValidator branch = validator.branch();
 			if(child.checker == null){
 				BuilderStateTree<E, ?> builded = child.internalSeed(branch, element);
 				if(builded != null){
 					validator.merge(branch);
-					return builded;
+					builded.build(validator, element);
+					return;
 				}
 				continue;
 			}
@@ -49,11 +50,30 @@ public class BuilderStateTree<E, B> extends StateTree<B>{
 				BuilderStateTree<E, ?> builded = child.internalSeed(branch, element);
 				if(builded != null){
 					validator.merge(branch);
-					return builded;
+					builded.build(validator, element);
+					return;
+				}
+			}
+		}
+		
+		if(multiple != null){
+			TokenValidator branch = validator.branch();
+			if(multiple.checker == null){
+				BuilderStateTree<E, ?> builded;
+				while((builded = multiple.internalSeed(branch, element)) != null){
+					validator.merge(branch);
+					builded.build(validator, element);
+				}
+				return;
+			}
+			while(multiple.checker.apply(branch)){
+				BuilderStateTree<E, ?> builded = multiple.internalSeed(branch, element);
+				if(builded != null){
+					validator.merge(branch);
+					builded.build(validator, element);
 				}
 			}
 		}
-		return null;
 	}
 	
 	public <T extends StateTree<E>> StateTree<E> thenNoChild(StateTree<E> child){
@@ -67,4 +87,9 @@ public class BuilderStateTree<E, B> extends StateTree<B>{
 		this.childs.add(state);
 		return state;
 	}
+	
+	public <T extends StateTree<E>> StateTree<E> multiple(StateTree<E> child){
+		this.multiple = child;
+		return child;
+	}
 }

src/be/jeffcheasey88/peeratcode/parser/state/StateTree.java

@@ -24,7 +24,6 @@ public class StateTree<E>{
 	public void seed(Tokenizer tokenizer, E container){
 		TokenValidator validator = new TokenValidator(tokenizer.getTokens().toArray(new Token[0]));
 		while(validator.hasNext()){
-			System.out.println("seed");
 			BuilderStateTree<E, ?> build = internalSeed(validator, container);
 			System.out.println("Validate "+validator.MAX_VALIDATE+"/"+tokenizer.getTokens().size()+" tokens !");
 			if(build == null) break;