diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java index 9529660..968244b 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java +++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java @@ -130,9 +130,9 @@ public class JavaParser extends Parser { System.out.println("----"); //(ab = (cd & 34)) -// tokenizer.getTokens().addAll(build("(","ab","=","(","cd","&","34",")",")")); + tokenizer.getTokens().addAll(build("(","ab","=","(","cd","&","34",")",")")); // tokenizer.getTokens().addAll(build("(","ab","=","cd",")")); - tokenizer.getTokens().addAll(build("(","ab",")")); +// tokenizer.getTokens().addAll(build("(","ab",")")); value_q0.seed(tokenizer, null); System.out.println("----"); @@ -211,9 +211,11 @@ public class JavaParser extends Parser { Value result = validator.getBag().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 END_VALUE = (element, validator) -> { @@ -226,9 +228,11 @@ public class JavaParser extends Parser { BiFunction 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().get("?").get()); Value origin = (Value)element; origin.switchInto(v); + validator.getBag().set(v); return v; }; BiFunction END_TRIVALUE = (element, validator) -> {