X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=5c091706b196b5ff0405778f62caffbfe9a233bc;hp=ed1c9aca4cec39a673b85e48edc65f715b41d478;hb=f33c05adc5aa3dd324c5352cdbd6f4b55359acad;hpb=7fbee73b4dd985cb5b217ed297710c00fd9d7004 diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java index ed1c9ac..5c09170 100644 --- a/src/edu/berkeley/sbp/Forest.java +++ b/src/edu/berkeley/sbp/Forest.java @@ -32,7 +32,7 @@ public abstract class Forest { protected static class Body { - private final Token.Location location; + private final Token.Location location; private final T tag; private final Forest[] tokens; private final Sequence creator; @@ -44,6 +44,7 @@ public abstract class Forest { this.tag = tag; this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length]; if (tokens != null) System.arraycopy(tokens, 0, this.tokens, 0, tokens.length); + if (tokens != null) for(int i=0; i { return needs <= -1 * creator.needs.size(); } - + private boolean rep = false; public String toString() { - StringBuffer ret = new StringBuffer(); - for(int i=0; i 0) { - ret.append(q); - ret.append(" "); + if (rep) return "***"; + try { + rep = true; + StringBuffer ret = new StringBuffer(); + for(int i=0; i 0) { + ret.append(q); + ret.append(" "); + } } + String tail = ret.toString().trim(); + String head = (tag!=null && !tag.toString().equals("")) ? (tail.length() > 0 ? tag+":" : tag+"") : ""; + if (tail.length() > 0) tail = "{" + tail + "}"; + return head + tail; + } finally { + rep = false; } - String tail = ret.toString().trim(); - String head = (tag!=null && !tag.toString().equals("")) ? (tail.length() > 0 ? tag+":" : tag+"") : ""; - if (tail.length() > 0) tail = "{" + tail + "}"; - return head + tail; } } @@ -138,13 +145,14 @@ public abstract class Forest { public boolean valid = false; public Ref() { } public void merge(Forest p) { + //if (p==null) throw new Error("bad evil bad!"); if (res != null) throw new Error("already resolved!"); if (p==null) throw new Error(); - if (p!=this) hp.add(p); + if (p!=this) hp.add(p, true); } public Iterator> iterator() { return ((IterableForest)resolve()).iterator(); } public HashSet> expand(boolean toss) { return resolve().expand(toss); } - public boolean valid() { resolve(); return valid; } + public boolean valid() { if (valid) return true; resolve(); return valid; } public String toString() { return resolve().toString(); } public Forest resolve() { if (hp==null) return res; @@ -152,21 +160,28 @@ public abstract class Forest { FastSet nh = new FastSet(); for(Forest p : hp) for(Body b : (IterableForest)p) { - if (b.keep() && (b.creator==null || !b.creator.lame)) { valid = true; b.addTo(nh); } - else results = new HashSet(); + if (b.keep() && (b.creator==null || !b.creator.lame)) { + valid = true; + b.addTo(nh); + } else { + results = new HashSet(); + } } if (results != null) { - for(Forest p : hp) for(Body b : (IterableForest)p) results.add(b); + for(Forest p : hp) + for(Body b : (IterableForest)p) + results.add(b); for(Body b : results) { if (b.keep() && (b.creator==null || !b.creator.lame)) continue; - if (!b.keep(results)) continue; if (b.creator!=null && b.creator.lame) continue; + if (!b.keep(results)) continue; valid = true; b.addTo(nh); } } hp = null; - return res = new MultiForest(nh, valid); + res = new MultiForest(nh, valid); + return res; } }