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

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index b00f069..e7c0be4 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -77,12 +77,9 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
         public InnerAmbiguous(Forest<?> f) { this.f = f; }
     }
 
-    static        <T> Forest<T> singleton(Input.Region loc, Position p) {
-        return create(loc, null, new Forest[] { }, false, true, p); }
-    static        <T> Forest<T> singleton(Input.Region loc, Forest<T> body, Position p) { return body; }
-    static        <T> Forest<T> leaf(Input.Region loc, T tag, Position p) { return create(loc, tag, null, false, false, p); }
-    public static <T> Forest<T> create(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position p) {
-        return new MyBody<T>(loc, tag, tokens, 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 //////////////////////////////////////////////////////////////////////////////
 
@@ -100,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;
         }
@@ -121,22 +118,18 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             ivbc.invoke(this, b, c);
         }
 
-        private final Input.Region    location;
+        private final Input.Region      location;
         private final T                 tag;
         private final Forest<T>[]       tokens;
         private final boolean           unwrap;
-        private final boolean           singleton;
-        private final Sequence.Position reduction;
 
-        private MyBody(Input.Region loc, T tag, Forest<T>[] tokens, 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;
         }
         public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
             gather(tl, ht, target, new Tree[ht.length], 0);
@@ -162,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++) {
@@ -175,10 +164,6 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
         }
 
         public void expand(final int i, final TreeBuilder<T> h) {
-            if (singleton) {
-                tokens[0].visit(h, null, i);
-                return;
-            }
             if (i==0) h.start(tag, location);
 
             if (i==tokens.length) {