From 98dd1416a8f75dd4e789656ef946ad451ce4e3aa Mon Sep 17 00:00:00 2001
From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:50:08 +0200
Subject: [PATCH] [Parse Class] -> Function with one operation

---
 .../peeratcode/parser/java/JavaParser.java    | 20 +++++++++++--------
 .../parser/state/RedirectStateTree.java       |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index 58966ef..5972da3 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -44,6 +44,7 @@ public class JavaParser  extends Parser<JavaFile> {
 			Token base = bag.get();
 			if(base == null) bag.set(token);
 			else bag.set(base.concat(token));
+			System.out.println("name validate "+token);
 		}),
 		LAMBDA_mod = (v) -> v.validate((t) ->
 			JavaParser.getModifier(t.getValue()) > 0,
@@ -78,6 +79,7 @@ public class JavaParser  extends Parser<JavaFile> {
 		});
 		BiFunction<JavaElement, TokenValidator, JavaElement>
 		END_OP = ((javafile, validator) -> {
+			System.out.println("\top");
 			return javafile;
 		});
 
@@ -157,9 +159,8 @@ public class JavaParser  extends Parser<JavaFile> {
 
 		StateTree<JavaElement> operation_q0 = new StateTree<>();
 		StateTree<JavaElement> operation_q1 = operation_q0.then(LAMBDA_name);
-		operation_q1.then(new RedirectStateTree<>(value_q0,(bag) -> "?")).end(END_OP);
-		StateTree<JavaElement> operation_q5 = operation_q1.then(LAMBDA_25);
-		operation_q5.then(operation_q1);
+		operation_q1.then(LAMBDA_8).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_1).end(END_OP);
+		operation_q1.then(LAMBDA_25).then(operation_q1);
 		operation_q0.then(LAMBDA_30).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).<JavaElement>end(END_OP);
 		operation_q0.then(LAMBDA_31).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).<JavaElement>end(END_OP);
 		operation_q0.then(LAMBDA_32).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).<JavaElement>end(END_OP);
@@ -173,17 +174,20 @@ public class JavaParser  extends Parser<JavaFile> {
 
 		StateTree<JavaElement> function_q17 = new StateTree<>();
 		StateTree<JavaElement> function_q18 = function_q17.then(LAMBDA_40);
-		function_q18.then(LAMBDA_41).end(END_FUNC);
+		StateTree<JavaElement> function_q19 = function_q18.then(LAMBDA_41);
+		function_q19.end(END_FUNC);
 		StateTree<JavaElement> function_q22 = function_q18.then(new RedirectStateTree<>(operation_q0,(bag) -> "?"));
-		function_q22.then(function_q18);
-		StateTree<JavaElement> function_q21 = function_q18.then(new RedirectStateTree<>(variable_q0,(bag) -> "?"));
-		function_q21.then(function_q18);
+		function_q22.then(function_q19);
+		StateTree<JavaElement> function_q21 = function_q22;
+		function_q21.then(function_q19);
+		function_q22.then(function_q21);
+		function_q21.then(function_q22);
 		StateTree<JavaElement> function_q0 = new StateTree<>();
 		StateTree<JavaElement> function_q1 = function_q0.then(new RedirectStateTree<>(type_q0,(bag) -> "return"));
 		function_q1.then(LAMBDA_40).end(END_FUNC).then(function_q17);
 		StateTree<JavaElement> function_q3 = function_q1.then((v) -> v.validate(
 				(t) -> t.getType().equals(TokenType.NAME),
-				(bag, t) -> bag.set("name", t))).then(LAMBDA_23);
+				(bag, t) -> bag.set("name",t))).then(LAMBDA_23);
 		StateTree<JavaElement> function_q4 = function_q3.then(LAMBDA_24);
 		StateTree<JavaElement> function_q10 = function_q4.then(LAMBDA_44).then(new RedirectStateTree<>(type_q0,(bag) -> "?"));
 		function_q10.end(END_FUNC).then(function_q17);
diff --git a/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java b/src/be/jeffcheasey88/peeratcode/parser/state/RedirectStateTree.java
index ede78d1..01db486 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);