X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=9dabf6064cfc4649667a5f700ce41d83e0b46292;hb=eda544585c2304faa82d249c4744fd5cecbf9211;hp=b9c4fcc9ef40d1726c75f761f27b58e1d99824d0;hpb=142b31e063c97d2d6dc141a9e687d49b7f2ab826;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index b9c4fcc..9dabf60 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -7,7 +7,10 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** an efficient representation of a collection of trees (Tomita's shared packed parse forest) */
-public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ implements Visitable<Forest.Body<T>>, IntegerMappable, GraphViz.ToGraphViz {
+public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
+    implements Visitable<Forest.Body<T>>,
+               IntegerMappable,
+               GraphViz.ToGraphViz {
 
     private static int master_idx = 0;
     private final int idx = master_idx++;
@@ -35,22 +38,24 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         public InnerAmbiguous(Forest<?> f) { this.f = f; }
     }
 
-    public static interface TreeConsumer<T> {
+    static interface TreeConsumer<T> {
         public void addTree(Tree<T> t);
     }
-    public static class HashSetTreeConsumer<T> extends HashSet<Tree<T>> implements TreeConsumer<T> {
-        public void addTree(Tree<T> t) { super.add(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[] { }, false, true, 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, 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);
+    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);
     }
     // Body //////////////////////////////////////////////////////////////////////////////
 
@@ -58,6 +63,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         void expand(int i, TreeMaker<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 boolean isTransparent() { return false; }
@@ -65,17 +71,21 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         public GraphViz.Node toGraphViz(GraphViz gv) {
             if (gv.hasNode(this)) return gv.createNode(this);
             GraphViz.Node n = gv.createNode(this);
-            n.label = headToString()==null?"":headToString();
+            n.label = StringUtil.escapify(headToString()==null?"":headToString(), "\r\n");
             n.directed = true;
+            n.comment = reduction==null?null:reduction+"";
             edges(n);
             return n;
         }
+        boolean edges = false;
         public void edges(GraphViz.Node n) {
+            if (edges) return;
+            edges = true;
             for(int i=0; i<tokens.length; i++) {
-                if (i==tokens.length-1 && unwrap) {
+                if (i==tokens.length-1 && unwrap && !tokens[i].ambiguous()) {
                     tokens[i].edges(n);
                 } else {
-                    n.edge(tokens[i]);
+                    n.edge(tokens[i], labels==null?null:labels[i]);
                 }
             }
         }
@@ -87,11 +97,12 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         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, boolean unwrap, boolean singleton, Position reduction) {
+        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, Object[] labels, boolean unwrap, boolean singleton, Position reduction) {
             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
@@ -100,6 +111,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             this.unwrap = unwrap;
             this.singleton = singleton;
             this.reduction = reduction;
+            this.labels = labels;
         }
 
         public void expand(final int i, final TreeMaker<T> h) {
@@ -119,12 +131,13 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             } else {
                 tokens[i].visit(new TreeMaker<T>(h.toss) {
                     public void start(T head, Input.Location loc) { }
-                    public void addTree(Tree<T> t) { toks.add(t); }
+                    public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }
                     public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
-                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), labs.toArray(string_hint)), labels==null?null:labels[i]);
                         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);
             }
@@ -146,6 +159,11 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
      *  viewed, it becomes immutable
      */
     static class Ref<T> extends Forest<T> {
+        public boolean ambiguous() {
+            if (hp.size()==0) return false;
+            if (hp.size()==1) return hp.iterator().next().ambiguous();
+            return true;
+        }
         private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
         public Ref() { }
         public int toInt() {
@@ -156,15 +174,18 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
         public boolean isTransparent() { return hp.size()==1; }
         public boolean isHidden() { return hp.size()==0; }
-        public void edges(GraphViz.Node n) { for(Forest f : hp) f.edges(n); }
+        public void edges(GraphViz.Node n) {
+            if (hp.size()==1) { hp.iterator().next().edges(n); return; }
+            for(Forest f : hp) f.edges(n);
+        }
         public GraphViz.Node toGraphViz(GraphViz gv) {
-            if (hp.size()==0) return null;
+            //if (hp.size()==0) return null;
             if (hp.size()==1) return hp.iterator().next().toGraphViz(gv);
             if (gv.hasNode(this)) return gv.createNode(this);
             GraphViz.Node n = gv.createNode(this);
             n.label = "?";
             n.color = "red";
-            for(Forest f : hp) n.edge(f);
+            for(Forest f : hp) n.edge(f, null);
             return n;
         }
 
@@ -180,24 +201,28 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     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)));; }
+        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) { toks.add(t); }
+        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> {
+    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);
+        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);
             }
@@ -207,6 +232,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];
+    private static String[] string_hint = new String[0];
     private static final Forest[] emptyForestArray = new Forest[0];
 
     protected String  headToString()    { return null; }