diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java index 40cf478..6b3d6ef 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java +++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java @@ -155,10 +155,10 @@ public class JavaParser extends Parser { StateTree annotation_q0 = new StateTree<>(); StateTree annotation_q2 = annotation_q0.then(LAMBDA_30).then(LAMBDA_name); StateTree annotation_q4 = annotation_q2.then(LAMBDA_23); - annotation_q4.then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).end(END_ANNOTATION); + annotation_q4.then(new RedirectStateTree<>(value_q0,(bag) -> "annotation_value")).then(LAMBDA_24).end(END_ANNOTATION); annotation_q4.then(LAMBDA_24).end(END_ANNOTATION); StateTree annotation_q7 = annotation_q4.then(LAMBDA_name); - StateTree annotation_q9 = annotation_q7.then(LAMBDA_8).then(new RedirectStateTree<>(value_q0,(bag) -> "?")); + StateTree annotation_q9 = annotation_q7.then(LAMBDA_8).then(new RedirectStateTree<>(value_q0,(bag) -> "annotation_value")); annotation_q9.then(LAMBDA_24).end(END_ANNOTATION); StateTree annotation_q10 = annotation_q9.then(LAMBDA_7); annotation_q10.then(annotation_q7); @@ -166,9 +166,9 @@ public class JavaParser extends Parser { StateTree variable_q0 = new StateTree<>(); StateTree variable_q10 = variable_q0.then(new RedirectStateTree<>(modifier_q0,(bag) -> "modifier")); - StateTree variable_q11 = variable_q0.then(new RedirectStateTree<>(annotation_q0,(bag) -> "?")); + StateTree variable_q11 = variable_q0.then(new RedirectStateTree<>(annotation_q0,(bag) -> "var_annotation")); variable_q11.then(variable_q10); - StateTree variable_q1 = variable_q0.then(new RedirectStateTree<>(type_q0,(bag) -> "type=token")); + StateTree variable_q1 = variable_q0.then(new RedirectStateTree<>(type_q0,(bag) -> "type")); StateTree variable_q2 = variable_q1.then(LAMBDA_name); StateTree variable_q5 = variable_q2.then(LAMBDA_7); StateTree variable_q7 = variable_q2.then(LAMBDA_8).then(new RedirectStateTree<>(value_q0,(bag) -> "?")); @@ -181,17 +181,17 @@ public class JavaParser extends Parser { StateTree operation_q0 = new StateTree<>(); StateTree operation_q1 = operation_q0.then(LAMBDA_name); - operation_q1.then(LAMBDA_8).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_1).end(END_OP); + operation_q1.then(LAMBDA_8).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value")).then(LAMBDA_1).end(END_OP); StateTree operation_q5 = operation_q1.then(LAMBDA_25); operation_q5.then(operation_q1); - operation_q0.then(LAMBDA_32).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).end(END_OP); - operation_q0.then(LAMBDA_33).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).end(END_OP); - operation_q0.then(LAMBDA_34).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).end(END_OP); - operation_q0.then(LAMBDA_35).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_1).end(END_OP); - operation_q0.then(LAMBDA_36).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).end(END_OP); - operation_q0.then(LAMBDA_37).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_24).end(END_OP); + operation_q0.then(LAMBDA_32).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value")).then(LAMBDA_24).end(END_OP); + operation_q0.then(LAMBDA_33).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value")).then(LAMBDA_24).end(END_OP); + operation_q0.then(LAMBDA_34).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value")).then(LAMBDA_24).end(END_OP); + operation_q0.then(LAMBDA_35).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value(190)")).then(LAMBDA_1).end(END_OP); + operation_q0.then(LAMBDA_36).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value(191)")).end(END_OP); + operation_q0.then(LAMBDA_37).then(LAMBDA_23).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value(192)")).then(LAMBDA_24).end(END_OP); operation_q0.then(LAMBDA_38).then(LAMBDA_1).end(END_OP); - operation_q0.then(LAMBDA_39).then(new RedirectStateTree<>(value_q0,(bag) -> "?")).then(LAMBDA_1).end(END_OP); + operation_q0.then(LAMBDA_39).then(new RedirectStateTree<>(value_q0,(bag) -> "op_value(194)")).then(LAMBDA_1).end(END_OP); operation_q0.then(LAMBDA_40).then(LAMBDA_1).end(END_OP); operation_q0.then(LAMBDA_41).end(END_OP); @@ -199,8 +199,8 @@ public class JavaParser extends Parser { StateTree function_q18 = function_q17.then(LAMBDA_42); StateTree function_q19 = function_q18.then(LAMBDA_43); function_q19.end((a,b) -> { System.out.println("\t\tolala"); return a;}); - StateTree function_q21 = function_q18.then(new RedirectStateTree<>(variable_q0,(bag) -> "var")); - StateTree function_q22 = function_q18.then(new RedirectStateTree<>(operation_q0,(bag) -> "op")); + StateTree function_q21 = function_q18.then(new RedirectStateTree<>(variable_q0,(bag) -> "func_var")); + StateTree function_q22 = function_q18.then(new RedirectStateTree<>(operation_q0,(bag) -> "func_op")); function_q21.then(function_q19); function_q22.then(function_q19); function_q22.then(function_q21); @@ -212,26 +212,26 @@ public class JavaParser extends Parser { (t) -> t.getType().equals(TokenType.NAME), (bag, token) -> bag.set("name", token))).then(LAMBDA_23); StateTree function_q4 = function_q3.then(LAMBDA_24); - StateTree function_q10 = function_q4.then(LAMBDA_45).then(new RedirectStateTree<>(type_q0,(bag) -> "?")); + StateTree function_q10 = function_q4.then(LAMBDA_45).then(new RedirectStateTree<>(type_q0,(bag) -> "func_type(215)")); function_q10.end(END_FUNC).then(function_q17); StateTree function_q11 = function_q10.then(LAMBDA_7); function_q11.then(function_q10); function_q4.end(END_FUNC).then(function_q17); - StateTree function_q7 = function_q3.then(new RedirectStateTree<>(type_q0,(bag) -> "?")).then(LAMBDA_name); + StateTree function_q7 = function_q3.then(new RedirectStateTree<>(type_q0,(bag) -> "func_type(220)")).then(LAMBDA_name); function_q7.then(function_q4); - StateTree function_q6 = function_q3.then(new RedirectStateTree<>(type_q0,(bag) -> "?")); + StateTree function_q6 = function_q3.then(new RedirectStateTree<>(type_q0,(bag) -> "func_type(222)")); StateTree function_q8 = function_q7.then(LAMBDA_7); function_q8.then(function_q6); - StateTree function_q15 = function_q0.then(new RedirectStateTree<>(modifier_q0, (bag) -> "?")); - StateTree function_q20 = function_q0.then(new RedirectStateTree<>(annotation_q0,(bag) -> "?")).loop(); + StateTree function_q15 = function_q0.then(new RedirectStateTree<>(modifier_q0, (bag) -> "func_modifier")); + StateTree function_q20 = function_q0.then(new RedirectStateTree<>(annotation_q0,(bag) -> "func_annotation")).loop(); function_q20.then(function_q1); function_q20.then(function_q15); function_q15.then(function_q1); StateTree class_q16 = new StateTree<>(); - StateTree class_q18 = class_q16.then(new RedirectStateTree<>(variable_q0,(bag) -> "?")); + StateTree class_q18 = class_q16.then(new RedirectStateTree<>(variable_q0,(bag) -> "class_var")).loop(); class_q18.then(class_q16); - StateTree class_q19 = class_q16.then(new RedirectStateTree<>(function_q0,(bag) -> "?")); + StateTree class_q19 = class_q16.then(new RedirectStateTree<>(function_q0,(bag) -> "class_func")).loop(); class_q19.then(class_q16); StateTree class_q0 = new StateTree<>(); StateTree class_q1 = class_q0.then(LAMBDA_47); @@ -247,7 +247,7 @@ public class JavaParser extends Parser { class_q7.then(class_q9); StateTree class_q17 = class_q0.then(new RedirectStateTree<>(annotation_q0,(bag) -> "class_annotation")).loop(); class_q17.then(class_q1); - StateTree class_q3 = class_q0.then(new RedirectStateTree<>(modifier_q0,(bag) -> "modifier")); + StateTree class_q3 = class_q0.then(new RedirectStateTree<>(modifier_q0,(bag) -> "class_modifier")); class_q3.then(class_q1); class_q17.then(class_q3);