From 5ad4f66c8aa09d71da6192950efdf9dbfa6720ed Mon Sep 17 00:00:00 2001
From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com>
Date: Sun, 9 Jul 2023 18:25:53 +0200
Subject: [PATCH] Clean Code

---
 src/be/jeffcheasey88/peeratcode/parser/Bag.java        |  2 --
 .../peeratcode/parser/java/JavaParser.java             | 10 +---------
 .../peeratcode/parser/state/RedirectStateTree.java     |  4 ++--
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/be/jeffcheasey88/peeratcode/parser/Bag.java b/src/be/jeffcheasey88/peeratcode/parser/Bag.java
index 4dcd039..b0dddff 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/Bag.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/Bag.java
@@ -29,7 +29,6 @@ public class Bag{
 	}
 	
 	public void set(Object value){
-		System.out.println("bag set "+value);
 		this.value = value;
 	}
 	
@@ -38,7 +37,6 @@ public class Bag{
 	}
 	
 	public void set(String key, Object value){
-		System.out.println("bag set "+key+" -> "+value);
 		this.map.put(key, value);
 	}
 	
diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index d6ac6c9..9c14d1c 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -152,7 +152,7 @@ public class JavaParser  extends Parser<JavaFile> {
 //		tokenizer.getTokens().addAll(build("(","ab","=","cd",")"));
 //		tokenizer.getTokens().addAll(build("(","ab",")"));
 //		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);
 		System.out.println("----");
 		
@@ -226,29 +226,22 @@ public class JavaParser  extends Parser<JavaFile> {
 			Function<TokenValidator, Boolean> LAMBDA_29
 			){
 		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();
 			if(result.get() != null){
-				System.out.println("got "+result.get());
 				validator.getBag().set(result.get());
 				return result.get();
 			}
-			System.out.println("got "+result);
 			validator.getBag().set(result);
 			return result;
 		};
 		BiFunction<JavaElement, TokenValidator, JavaElement> END_VALUE = (element, validator) -> {
 			//single value
-			System.out.println("\tvalue\t"+element);
 			Value v = new Value(validator.getBag().get());
 			validator.getBag().set(v);
 			return v;
 		};
 		BiFunction<JavaElement, TokenValidator, JavaElement> END_BIVALUE = (element, validator) -> {
 			//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 origin = (Value)element;
 			origin.switchInto(v);
@@ -257,7 +250,6 @@ public class JavaParser  extends Parser<JavaFile> {
 		};
 		BiFunction<JavaElement, TokenValidator, JavaElement> END_TRIVALUE = (element, validator) -> {
 			//same but for val ? val : val 
-			System.out.println("\ttrivalue\t"+element);
 			return new TriValue();
 		};
 		StateTree<JavaElement> value_q0 = new StateTree<>();
diff --git a/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java b/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java
index 01db486..ede78d1 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java
@@ -23,7 +23,7 @@ public class RedirectStateTree<E, T extends E> extends StateTree<T>{
 		
 		String g = group.apply(currentBag);
 		localBag.addPath(currentBag.path()+"/"+g);
-		System.out.println("redirect "+localBag.path());
+//		System.out.println("redirect "+localBag.path());
 		currentBag.set(g, localBag);
 		validator.setBag(localBag);
 		
@@ -33,7 +33,7 @@ public class RedirectStateTree<E, T extends E> extends StateTree<T>{
 			return false;
 		});
 		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;
 		
 		validator.merge(branch);