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

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index ceb67eb..b9c4fcc 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -1,13 +1,17 @@
 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 {
@@ -38,21 +42,44 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         public void addTree(Tree<T> t) { super.add(t); }
     }
 
-    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);
+    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> {
+    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);
         }
@@ -62,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];
@@ -71,6 +99,7 @@ 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 void expand(final int i, final TreeMaker<T> h) {
@@ -101,7 +130,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             }
         }
 
-        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 "}"; }
@@ -119,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)