misc updates

[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 ed1c9ac..dbcd3c0 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -19,32 +19,29 @@ public abstract class Forest<T> {
     /** expand this forest into a set of trees */
     public abstract HashSet<Tree<T>>  expand(boolean toss);
 
     /** expand this forest into a set of trees */
     public abstract HashSet<Tree<T>>  expand(boolean toss);
 

-    abstract boolean valid();
-
-    static <T> Forest<T>   singleton(Token.Location loc, Sequence creator)                       { return create(loc, null, new Forest[] { }, creator, false, true); }
-    static <T> Forest<T>   singleton(Token.Location loc, Forest<T> body, Sequence creator)       { return create(loc, null, new Forest[] { body }, creator, false, true); }
-    static <T> Forest<T>   leaf(Token.Location loc, T tag,                     Sequence creator) { return create(loc, tag, null, creator, false, false); }
-    public static <T> Forest<T>   create(Token.Location loc, T tag, Forest<T>[] tokens, Sequence creator, boolean unwrap, boolean singleton) {
-        return new MultiForest<T>(loc, tag, tokens, creator, unwrap, singleton);
+    static        <T> Forest<T> singleton(Token.Location loc)                       { return create(loc, null, new Forest[] { }, false, true); }
+    static        <T> Forest<T> singleton(Token.Location loc, Forest<T> body)       { return create(loc, null, new Forest[] { body },  false, true); }
+    static        <T> Forest<T> leaf(Token.Location loc, T tag) { return create(loc, tag, null, false, false); }
+    public static <T> Forest<T> create(Token.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton) {
+        return new MultiForest<T>(loc, tag, tokens, unwrap, singleton);

     }
 
     // Body //////////////////////////////////////////////////////////////////////////////
 
     protected static class Body<T> {
 
     }
 
     // Body //////////////////////////////////////////////////////////////////////////////
 
     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 T                 tag;
         private final Forest<T>[]       tokens;

-        private final Sequence          creator;

         private final boolean           unwrap;
         private final boolean           singleton;
 
         private final boolean           unwrap;
         private final boolean           singleton;
 

-        private Body(Token.Location loc, T tag, Forest<T>[] tokens, Sequence creator, boolean unwrap, boolean singleton) {
+        private Body(Token.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton) {

             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
             if (tokens != null) System.arraycopy(tokens, 0, this.tokens, 0, tokens.length);
             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
             if (tokens != null) System.arraycopy(tokens, 0, this.tokens, 0, tokens.length);

-            this.creator = creator;
+            if (tokens != null) for(int i=0; i<tokens.length; i++) if (tokens[i]==null) throw new Error(i+"");

             this.unwrap = unwrap;
             this.singleton = singleton;
         }
             this.unwrap = unwrap;
             this.singleton = singleton;
         }

@@ -62,48 +59,24 @@ public abstract class Forest<T> {
                         b.expand(toss, toks, 0, h);
 
             } else {
                         b.expand(toss, toks, 0, h);
 
             } else {

-                if (tokens[i]!=null) {
-                    HashSet<Tree<T>> exp = tokens[i].expand(toss);
-                    if (exp != null)
-                        for(Tree<T> r : exp) {
-                            int old = toks.size();
-                            toks.add(r);
-                            expand(toss, toks, i+1, h);
-                            while(toks.size() > old) toks.remove(toks.size()-1);
-                        }
+                boolean hit = false;
+                for(Tree<T> r : tokens[i].expand(toss)) {
+                    hit = true;
+                    int old = toks.size();
+                    toks.add(r);
+                    expand(toss, toks, i+1, h);
+                    while(toks.size() > old) toks.remove(toks.size()-1);

                 }
                 }

+                //if (!hit) throw new Error();

             }
             return h;
         }
             }
             return h;
         }

-        void addTo(HashSet<Body> h) {
-            if (!singleton) h.add(this);
-            else for(Body b : (IterableForest<T>)tokens[0]) b.addTo(h);
-        }
+

         void addTo(FastSet<Body> h) {
             if (!singleton) h.add(this, true);
             else for(Body b : (IterableForest<T>)tokens[0]) b.addTo(h);
         }
 
         void addTo(FastSet<Body> h) {
             if (!singleton) h.add(this, true);
             else for(Body b : (IterableForest<T>)tokens[0]) b.addTo(h);
         }
 

-        private boolean kcache = false;
-        private boolean keep = false;
-        public boolean keep() {
-            if (kcache) return keep;
-            kcache = true;
-            for(Forest<T> token : tokens) if (!token.valid()) return keep = false;
-            return keep = creator==null || (creator.needs.size()==0 && creator.hates.size()==0);
-        }
-        public boolean keep(Iterable<Body<T>> h) {
-            if (keep()) return true;
-            for(Forest<T> token : tokens) if (!token.valid()) return false;
-            int needs = 0;
-            for(Body<T> b : h) {
-                if (creator.hates.contains(b.creator) && b.keep(h)) return false;
-                if (creator.needs.contains(b.creator) && b.keep(h)) needs--;
-            }
-            return needs <= -1 * creator.needs.size();
-        }
-
-

         public String toString() {
             StringBuffer ret = new StringBuffer();
             for(int i=0; i<tokens.length; i++) {
         public String toString() {
             StringBuffer ret = new StringBuffer();
             for(int i=0; i<tokens.length; i++) {

@@ -123,7 +96,7 @@ public abstract class Forest<T> {
 
     // Ref //////////////////////////////////////////////////////////////////////////////
 
 
     // Ref //////////////////////////////////////////////////////////////////////////////
 

-    static abstract class IterableForest<T> extends Forest<T> implements Iterable<Forest.Body<T>> {
+    private static abstract class IterableForest<T> extends Forest<T> implements Iterable<Forest.Body<T>> {

         public abstract Iterator<Forest.Body<T>> iterator();
     }
 
         public abstract Iterator<Forest.Body<T>> iterator();
     }
 

@@ -135,38 +108,24 @@ public abstract class Forest<T> {
     static class Ref<T> extends IterableForest<T> {
         private FastSet<Forest> hp = new FastSet<Forest>();
         private Forest res = null;
     static class Ref<T> extends IterableForest<T> {
         private FastSet<Forest> hp = new FastSet<Forest>();
         private Forest res = null;

-        public boolean valid = false;

         public Ref() { }
         public void merge(Forest p) {
             if (res != null) throw new Error("already resolved!");
             if (p==null) throw new Error();
         public Ref() { }
         public void merge(Forest p) {
             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); }
         }
         public Iterator<Body<T>> iterator() { return ((IterableForest<T>)resolve()).iterator(); }
         public HashSet<Tree<T>> expand(boolean toss) { return resolve().expand(toss); }

-        public boolean valid() { resolve(); return valid; }

         public String toString() { return resolve().toString(); }
         public Forest resolve() {
             if (hp==null) return res;
         public String toString() { return resolve().toString(); }
         public Forest resolve() {
             if (hp==null) return res;

-            HashSet<Body> results = null;

             FastSet<Body> nh      = new FastSet<Body>();
             for(Forest<?> p : hp)
             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 (results != null) {
-                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;
-                    valid = true;
+                for(Body<?> b : (IterableForest<?>)p)

                     b.addTo(nh);
                     b.addTo(nh);

-                }
-            }
+            res = new MultiForest(nh);

             hp = null;
             hp = null;

-            return res = new MultiForest(nh, valid);
+            return res;

         }
     }
 
         }
     }
 

@@ -174,12 +133,9 @@ public abstract class Forest<T> {
 
     private static class MultiForest<T> extends IterableForest<T> {
         private final FastSet<Body<T>> results;
 
     private static class MultiForest<T> extends IterableForest<T> {
         private final FastSet<Body<T>> results;

-        private boolean valid;
-        public boolean valid() { return valid; }
-        private MultiForest(FastSet<Body<T>> results, boolean valid) { this.results = results; this.valid = valid; }
-        public MultiForest(Token.Location loc, T tag, Forest<T>[] tokens, Sequence creator, boolean unwrap, boolean singleton) {
-            this.results = new FastSet<Body<T>>(new Body(loc, tag, tokens, creator, unwrap, singleton));
-            this.valid = true;
+        private MultiForest(FastSet<Body<T>> results) { this.results = results; }
+        public MultiForest(Token.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton) {
+            this.results = new FastSet<Body<T>>(new Body(loc, tag, tokens, unwrap, singleton));

         }
         public Iterator<Body<T>> iterator() { return results.iterator(); }
 
         }
         public Iterator<Body<T>> iterator() { return results.iterator(); }
 

@@ -217,6 +173,5 @@ public abstract class Forest<T> {
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];

-    private static Body[] body_hint = new Body[0];

     private static final Forest[] emptyForestArray = new Forest[0];
 }
     private static final Forest[] emptyForestArray = new Forest[0];
 }