it all works

[sbp.git] / src / edu / berkeley / sbp / Forest.java
diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java

index 6ac1e4b..5c09170 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -32,7 +32,7 @@ public abstract class Forest<T> {
  
      protected static class Body<T> {
  
-        private final Token.Location          location;
+        private final Token.Location    location;
          private final T                 tag;
          private final Forest<T>[]       tokens;
          private final Sequence          creator;
@@ -44,6 +44,7 @@ public abstract class Forest<T> {
              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<tokens.length; i++) if (tokens[i]==null) throw new Error(i+"");
              this.creator = creator;
              this.unwrap = unwrap;
              this.singleton = singleton;
@@ -103,20 +104,26 @@ public abstract class Forest<T> {
              return needs <= -1 * creator.needs.size();
          }
  
-
+        private boolean rep = false;
          public String toString() {
-            StringBuffer ret = new StringBuffer();
-            for(int i=0; i<tokens.length; i++) {
-                String q = tokens[i]==null ? "null" : tokens[i].toString();
-                if (q.length() > 0) {
-                    ret.append(q);
-                    ret.append(" ");
+            if (rep) return "***";
+            try {
+                rep = true;
+                StringBuffer ret = new StringBuffer();
+                for(int i=0; i<tokens.length; i++) {
+                    String q = tokens[i]==null ? "null" : tokens[i].toString();
+                    if (q.length() > 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,9 +145,10 @@ public abstract class Forest<T> {
          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<Body<T>> iterator() { return ((IterableForest<T>)resolve()).iterator(); }
          public HashSet<Tree<T>> expand(boolean toss) { return resolve().expand(toss); }
@@ -152,8 +160,12 @@ public abstract class Forest<T> {
              FastSet<Body> nh      = new FastSet<Body>();
              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<Body>();
+                    if (b.keep() && (b.creator==null || !b.creator.lame)) {
+                        valid = true;
+                        b.addTo(nh);
+                    } else {
+                        results = new HashSet<Body>();
+                    }
                  }
              if (results != null) {
                  for(Forest<?> p : hp)
@@ -168,7 +180,8 @@ public abstract class Forest<T> {
                  }
              }
              hp = null;
-            return res = new MultiForest(nh, valid);
+            res = new MultiForest(nh, valid);
+            return res;
          }
      }