diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java index 81af0fd..40edc63 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java +++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java @@ -145,17 +145,6 @@ public class JavaParser extends Parser { StateTree main = new StateTree<>(); StateTree value_q0 = value(LAMBDA_5, LAMBDA_6, LAMBDA_7, LAMBDA_8, LAMBDA_10, LAMBDA_11, LAMBDA_12, LAMBDA_13, LAMBDA_14, LAMBDA_15, LAMBDA_16, LAMBDA_17, LAMBDA_18, LAMBDA_19, LAMBDA_20, LAMBDA_21, LAMBDA_23, LAMBDA_24, LAMBDA_25, LAMBDA_26, LAMBDA_27, LAMBDA_28, LAMBDA_29); - System.out.println("----"); - //(ab = (cd & 34)) -// tokenizer.getTokens().addAll(build("(","ab","=","(","cd","&","34",")",")")); -// tokenizer.getTokens().addAll(build("(","ab","=","(","cd","&","(","ay","/","34",")",")",")")); -// tokenizer.getTokens().addAll(build("(","ab","=","cd",")")); -// tokenizer.getTokens().addAll(build("(","ab",")")); -// tokenizer.getTokens().addAll(build("ab","=","cd","/","ef")); - tokenizer.getTokens().addAll(build("main","=","=","null","?","\"","seks","\"",":","\"","noSeks","\"")); - value_q0.seed(tokenizer, null); - System.out.println("----"); - System.out.println((System.currentTimeMillis()-time)+"ms"); // try { @@ -235,13 +224,11 @@ public class JavaParser extends Parser { return result; }; BiFunction END_VALUE = (element, validator) -> { - //single value Value v = new Value(validator.getBag().get()); validator.getBag().set(v); return v; }; BiFunction END_BIVALUE = (element, validator) -> { - //create new value from parent & created single value Value origin = (Value)element; Value right = validator.getBag().get("?").get(); if(right.get() != null) right = right.get(); @@ -260,9 +247,6 @@ public class JavaParser extends Parser { return v; }; BiFunction END_TRIVALUE = (element, validator) -> { - //same but for val ? val : val - System.out.println("\t"+element); - System.out.println("\t"+validator.getBag()); Bag bag = validator.getBag(); Value origin = (Value)element; Value v = new TriValue(origin, bag.get("true").get(), bag.get("false").get()); diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/Value.java b/src/be/jeffcheasey88/peeratcode/parser/java/Value.java index e563ea9..6c94443 100644 --- a/src/be/jeffcheasey88/peeratcode/parser/java/Value.java +++ b/src/be/jeffcheasey88/peeratcode/parser/java/Value.java @@ -12,11 +12,9 @@ public class Value extends JavaElement{ public Value(Token token){ this.token = token; - System.out.println(this); } public void switchInto(Value value){ - System.out.println("\tswitch "+this+" onto "+value); this.value = value; } @@ -41,7 +39,6 @@ public class Value extends JavaElement{ this.right = right.get() == null ? right : right.get(); this.type = operation; - System.out.println(this); } @Override @@ -61,8 +58,6 @@ public class Value extends JavaElement{ this.condition = condition; this.success = success; this.fail = fail; - - System.out.println(this); } public void setCondition(Value value){