X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=e7c0be4394c23d4951fc03f03be26cb2b44a80b3;hp=937a229420e2f26ea5d6489258aa41f9a773b365;hb=5ea3b9182192a0fbb7a0bd86b919384ddaeff29a;hpb=acfe58223b9a0f78e64a14a1ca5d5998626ee3fe

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 937a229..e7c0be4 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,18 @@ 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);
+    static        <T> Forest<T> leaf(Input.Region loc, T tag) { return create(loc, tag, null, false); }
+    public static <T> Forest<T> create(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
+        return new MyBody<T>(loc, tag, tokens, unwrap);
     }
     // 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; }
@@ -116,7 +97,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             GraphViz.Node n = gv.createNode(this);
             n.label = headToString()==null?"":headToString();
             n.directed = true;
-            n.comment = reduction==null?null:reduction+"";
+            //n.comment = reduction==null?null:reduction+"";
             edges(n);
             return n;
         }
@@ -128,7 +109,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);
                 }
             }
         }
@@ -137,31 +118,25 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             ivbc.invoke(this, b, c);
         }
 
-        private final Input.Location    location;
+        private final Input.Region      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.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
             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);
             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.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);
         }
         private void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target, Tree[] trees, int i) {
             if (i==ht.length) {
-                target.add(new Tree<T>(null, tag, trees));
+                target.add(new Tree<T>(location, tag, trees));
                 return;
             }
             for(Tree<T> tree : ht[i]) {
@@ -171,7 +146,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
                     System.arraycopy(trees, 0, trees2, 0, trees.length-1);
                     for(int j=0; j<tree.numChildren(); j++)
                         trees2[trees.length-1+j] = tree.child(j);
-                    target.add(new Tree<T>(null, tag, trees2));
+                    target.add(new Tree<T>(location, tag, trees2));
                 } else {
                     trees[i] = tree;
                     gather(tl, ht, target, trees, i+1);
@@ -180,10 +155,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             }
         }
         public void expand(TaskList tl, HashSet<Tree<T>> ht) {
-            if (singleton) {
-                tokens[0].expand(tl, ht);
-                return;
-            }
             HashSet<Tree<T>>[] children = new HashSet[tokens.length];
             tl.gather(this, children, ht);
             for(int i=0; i<children.length; i++) {
@@ -192,11 +163,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             }
         }
 
-        public void expand(final int i, final TreeMaker<T> h) {
-            if (singleton) {
-                tokens[0].visit(h, null, i);
-                return;
-            }
+        public void expand(final int i, final TreeBuilder<T> h) {
             if (i==0) h.start(tag, location);
 
             if (i==tokens.length) {
@@ -207,22 +174,21 @@ 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) {
-                    public void start(T head, Input.Location loc) { }
-                    public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }
-                    public void finish(T head, Input.Location loc) {
+                tokens[i].visit(new TreeBuilder<T>(h.toss) {
+                    public void start(T head, Input.Region loc) { }
+                    public void addTree(Tree<T> t) { toks.add(t); }
+                    public void finish(T head, Input.Region 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);
             }
         }
 
         protected String  headToString()         { return tag==null?null:tag.toString(); }
-        protected String  headToJava()           { return null; }
+        protected String  headToJava()           { return "null"; }
         protected String  left()                 { return "{"; }
         protected String  right()                { return "}"; }
         protected boolean ignoreSingleton()      { return false; }
@@ -286,36 +252,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 //////////////////////////////////////////////////////////////////////////////
 
@@ -324,7 +260,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
     private static final Forest[] emptyForestArray = new Forest[0];
 
     protected String  headToString()    { return null; }
-    protected String  headToJava()      { return null; }
+    protected String  headToJava()      { return "null"; }
     protected String  left()            { return "<?"; }
     protected String  right()           { return "?>"; }
     protected boolean ignoreSingleton() { return true; }