X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=cadf343e309761b7d56182b6ffbc0a22df8a03ac;hp=170604a2e8e0f221c1751b6efd84e00d7a0f2505;hb=a7ba8d8a5f0cb7fbb5bf67f1a95f1cad5226c507;hpb=41b74cd8469abb0bdff811f26594a7ef87cb26a6

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 170604a..cadf343 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -63,10 +63,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
 
     /** expand this forest into a set of trees */
     public HashSet<Tree<T>> expand(boolean toss) {
-        /*
-        final HashSetTreeConsumer<T> ret = new HashSetTreeConsumer<T>();
-        visit(new TreeMaker2<T>(toss, ret), null, null);
-        */
         TaskList tl = new TaskList();
         HashSet<Tree<T>> ret = new HashSet<Tree<T>>();
         tl.expand(this, ret);
@@ -81,33 +77,21 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
         public InnerAmbiguous(Forest<?> f) { this.f = f; }
     }
 
-    static interface TreeConsumer<T> {
-        public void addTree(Tree<T> t);
-    }
-    static class HashSetTreeConsumer<T> extends HashSet<Tree<T>> implements TreeConsumer<T> {
-        public void addTree(Tree<T> t) {
-            super.add(t);
-        }
-    }
-
     static        <T> Forest<T> singleton(Input.Location loc, Position p) {
-        return create(loc, null, new Forest[] { }, new Object[0], false, true, p); }
-    static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body, Position p) {
-        //return create(loc, null, new Forest[] { body },  false, true, p);
-        return body;
-    }
-    static        <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, null, false, false, p); }
-    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, Object[] labels, boolean unwrap, boolean singleton, Position p) {
-        return new MyBody<T>(loc, tag, tokens, labels, unwrap, singleton, p);
+        return create(loc, null, new Forest[] { }, false, true, p); }
+    static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body, Position p) { return body; }
+    static        <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, false, false, p); }
+    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position p) {
+        return new MyBody<T>(loc, tag, tokens, unwrap, singleton, p);
     }
     // Body //////////////////////////////////////////////////////////////////////////////
 
-    protected static interface Body<T> extends GraphViz.ToGraphViz {
-        void expand(int i, TreeMaker<T> h);
+    public /*protected*/ static interface Body<T> extends GraphViz.ToGraphViz {
+        void expand(int i, TreeBuilder<T> h);
     }
     public abstract void edges(GraphViz.Node n);
     public boolean ambiguous() { return false; }
-    protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
+    public /*protected*/ static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
 
         public boolean isTransparent() { return false; }
         public boolean isHidden() { return false; }
@@ -128,7 +112,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
                 if (i==tokens.length-1 && unwrap && !tokens[i].ambiguous()) {
                     tokens[i].edges(n);
                 } else {
-                    n.edge(tokens[i], labels==null?null:labels[i]);
+                    n.edge(tokens[i], null);
                 }
             }
         }
@@ -140,12 +124,11 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
         private final Input.Location    location;
         private final T                 tag;
         private final Forest<T>[]       tokens;
-        private final Object[]          labels;
         private final boolean           unwrap;
         private final boolean           singleton;
         private final Sequence.Position reduction;
 
-        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, Object[] labels, boolean unwrap, boolean singleton, Position reduction) {
+        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position reduction) {
             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
@@ -154,7 +137,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             this.unwrap = unwrap;
             this.singleton = singleton;
             this.reduction = reduction;
-            this.labels = labels;
         }
         public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
             gather(tl, ht, target, new Tree[ht.length], 0);
@@ -192,7 +174,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             }
         }
 
-        public void expand(final int i, final TreeMaker<T> h) {
+        public void expand(final int i, final TreeBuilder<T> h) {
             if (singleton) {
                 tokens[0].visit(h, null, i);
                 return;
@@ -207,15 +189,14 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
                     tokens[i].visit(h, null, 0);
 
             } else {
-                tokens[i].visit(new TreeMaker<T>(h.toss) {
+                tokens[i].visit(new TreeBuilder<T>(h.toss) {
                     public void start(T head, Input.Location loc) { }
-                    public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }
+                    public void addTree(Tree<T> t) { toks.add(t); }
                     public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
-                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), labs.toArray(string_hint)), labels==null?null:labels[i]);
+                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
                         expand(i+1, h);
                         while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
-                        while(h.labs.size() > old) h.labs.remove(h.labs.size()-1);
                     }
                 }, null, null);
             }
@@ -286,36 +267,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
     }
 
     public abstract <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);
-    private static class TreeMaker2<T> extends TreeMaker<T> {
-        private TreeConsumer<T> tc;
-        public TreeMaker2(boolean toss, TreeConsumer<T> tc) { super(toss); this.tc = tc; }
-        public void finish(T head, Input.Location loc) { tc.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), labs.toArray(string_hint)));; }
-        public void start(T head, Input.Location loc) { }
-        public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }
-    }
-    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer>/*, TreeConsumer<T>*/ {
-        public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
-        public ArrayList<Object>  labs = new ArrayList<Object>();
-        private boolean toss;
-        protected T head;
-        public TreeMaker(boolean toss) { this.toss = toss; }
-        public abstract void start(T head, Input.Location loc);
-        public abstract void finish(T head, Input.Location loc);
-        public abstract void addTree(Tree<T> t, Object label);
-        public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
-            if (i==null) {
-                ArrayList<Tree<T>> toks = this.toks;
-                this.toks = new ArrayList<Tree<T>>();
-                ArrayList<Object> labs = this.labs;
-                this.labs = new ArrayList<Object>();
-                bod.expand(0, this);
-                this.toks = toks;
-                this.labs = labs;
-            } else {
-                bod.expand(i, this);
-            }
-        }
-    }
 
     // Statics //////////////////////////////////////////////////////////////////////////////