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

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index d7716dd..b9c4fcc 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -1,49 +1,85 @@
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.Sequence.Position;
 import edu.berkeley.sbp.util.*;
 import java.io.*;
 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>> {
+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++;
+    public int toInt() { return idx; }
 
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
     public final Tree<T> expand1() throws Ambiguous, ParseFailed {
-        Iterator<Tree<T>> it = expand(true).iterator();
-        if (!it.hasNext()) throw new ParseFailed();
-        return it.next();
+        try {
+            Iterator<Tree<T>> it = expand(true).iterator();
+            if (!it.hasNext()) throw new ParseFailed();
+            return it.next();
+        } catch (InnerAmbiguous ia) { throw new Ambiguous(ia.f); }
     }
 
     /** expand this forest into a set of trees */
     public HashSet<Tree<T>> expand(boolean toss) {
-        final HashSet<Tree<T>> hs = new HashSet<Tree<T>>();
-        TreeMaker<T> ret = new TreeMaker<T>(toss) {
-            public void start(T head, Input.Location loc) { }
-            public void finish(T head, Input.Location loc) { hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint))); }
-            public void child(Tree<T> t) { toks.add(t); }
-        };
-        visit(ret, null, null);
-        if (toss && hs.size() > 1) throw new Ambiguous(this);
-        return hs;
+        final HashSetTreeConsumer<T> ret = new HashSetTreeConsumer<T>();
+        visit(new TreeMaker2<T>(toss, ret), null, null);
+        if (toss && ret.size() > 1) throw new InnerAmbiguous(this);
+        return ret;
     }
 
-    static        <T> Forest<T> singleton(Input.Location loc)                       { return create(loc, null, new Forest[] { }, false, true); }
-    static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body)       { return create(loc, null, new Forest[] { body },  false, true); }
-    static        <T> Forest<T> leaf(Input.Location loc, T tag) { return create(loc, tag, null, false, false); }
-    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton) {
-        return new MyBody<T>(loc, tag, tokens, unwrap, singleton);
+    private static class InnerAmbiguous extends RuntimeException {
+        public final Forest<?> f;
+        public InnerAmbiguous(Forest<?> f) { this.f = f; }
     }
 
-    // Body //////////////////////////////////////////////////////////////////////////////
+    public 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); }
+    }
 
-    protected static interface Body<T> {
-        TreeMaker<T> expand(int i, TreeMaker<T> h);
+    static        <T> Forest<T> singleton(Input.Location loc, Position p) {
+        return create(loc, null, new Forest[] { }, 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);
+    }
+    // Body //////////////////////////////////////////////////////////////////////////////
 
+    protected static interface Body<T> extends GraphViz.ToGraphViz {
+        void expand(int i, TreeMaker<T> h);
+    }
+    public abstract void edges(GraphViz.Node n);
     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; }
+        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.directed = true;
+            edges(n);
+            return n;
+        }
+        public void edges(GraphViz.Node n) {
+            for(int i=0; i<tokens.length; i++) {
+                if (i==tokens.length-1 && unwrap) {
+                    tokens[i].edges(n);
+                } else {
+                    n.edge(tokens[i]);
+                }
+            }
+        }
+
         public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             ivbc.invoke(this, b, c);
         }
@@ -53,8 +89,9 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         private final Forest<T>[]       tokens;
         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) {
+        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];
@@ -62,12 +99,13 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             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 TreeMaker<T> expand(final int i, final TreeMaker<T> h) {
+        public void expand(final int i, final TreeMaker<T> h) {
             if (singleton) {
                 tokens[0].visit(h, null, i);
-                return h;
+                return;
             }
             if (i==0) h.start(tag, location);
 
@@ -81,19 +119,18 @@ 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 child(Tree<T> t) { toks.add(t); }
+                    public void addTree(Tree<T> t) { toks.add(t); }
                     public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
-                        h.child(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+                        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);
                     }
                 }, null, null);
             }
-            return h;
         }
 
-        protected String  headToString()         { return null; }
+        protected String  headToString()         { return tag==null?null:tag.toString(); }
         protected String  headToJava()           { return null; }
         protected String  left()                 { return "{"; }
         protected String  right()                { return "}"; }
@@ -111,7 +148,26 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     static class Ref<T> extends Forest<T> {
         private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
         public Ref() { }
+        public int toInt() {
+            if (hp.size()==1) return hp.iterator().next().toInt();
+            return super.toInt();
+        }
         public void merge(Forest p) { if (p!=this) hp.add(p, true); }
+
+        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 GraphViz.Node toGraphViz(GraphViz gv) {
+            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);
+            return n;
+        }
+
         public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             if (hp==null) return;
             for(Forest<T> f : hp)
@@ -121,14 +177,21 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     }
 
     public abstract <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);
-    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer> {
+    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 start(T head, Input.Location loc) { }
+        public void addTree(Tree<T> t) { toks.add(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>>();
         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 child(Tree<T> t);
+        public abstract void addTree(Tree<T> t);
         public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;