checkpoint

darcs-hash:20060715061349-5007d-b25ab8b30dc59657025911f0107769412b8e0da9.gz

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 634d6ad..00f826a 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -7,51 +7,14 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** an efficient representation of a collection of trees (Tomita's shared packed parse forest) */
 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,
+public abstract class Forest<T> /*extends PrintableTree<Forest.Body<T>>*/
+    implements IntegerMappable,

                GraphViz.ToGraphViz {
 
     private static int master_idx = 0;
     private final int idx = master_idx++;
     public int toInt() { return idx; }
 
                GraphViz.ToGraphViz {
 
     private static int master_idx = 0;
     private final int idx = master_idx++;
     public int toInt() { return idx; }
 

-    public abstract void expand(TaskList tl, HashSet<Tree<T>> ht);
-    public abstract void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target);
-
-    public static class TaskList extends ArrayList<TaskList.Task> {
-        public interface Task {
-            public void perform();
-        }
-        public class ExpandTask implements Task {
-            private Forest f;
-            private HashSet hs;
-            public ExpandTask(Forest f, HashSet hs) { this.f = f; this.hs = hs; }
-            public void perform() { f.expand(TaskList.this, hs); }
-        }
-        public class GatherTask implements Task {
-            private Forest f;
-            private HashSet[] ht;
-            private HashSet hs;
-            public GatherTask(Forest f, HashSet<Tree<?>>[] ht, HashSet<Tree<?>> hs) { this.f = f; this.hs = hs; this.ht = ht;}
-            public void perform() { f.gather(TaskList.this, ht, hs); }
-        }
-        public void expand(Forest f, HashSet hs) {
-            add(new ExpandTask(f, hs));
-        }
-        public void gather(Forest f, HashSet[] ht, HashSet hs) {
-            add(new GatherTask(f, ht, hs));
-        }
-        public void run() {
-            while(true) {
-                if (isEmpty()) return;
-                Task task = get(size()-1);
-                remove(size()-1);
-                task.perform();
-            }
-        }
-    }
-

     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
     public final Tree<T> expand1() throws Ambiguous, ParseFailed {
         try {
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
     public final Tree<T> expand1() throws Ambiguous, ParseFailed {
         try {

@@ -62,13 +25,10 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
     }
 
     /** expand this forest into a set of trees */
     }
 
     /** expand this forest into a set of trees */

+    public abstract void expand(HashSet<Tree<T>> ht);

     public HashSet<Tree<T>> expand(boolean toss) {
     public HashSet<Tree<T>> expand(boolean toss) {

-        TaskList tl = new TaskList();

         HashSet<Tree<T>> ret = new HashSet<Tree<T>>();
         HashSet<Tree<T>> ret = new HashSet<Tree<T>>();

-        tl.expand(this, ret);
-        tl.run();
-
-        if (toss && ret.size() > 1) throw new InnerAmbiguous(this);
+        expand(ret);

         return ret;
     }
 
         return ret;
     }
 

@@ -79,16 +39,13 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
 
     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) {
 
     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);
+        return new Body<T>(loc, tag, tokens, unwrap);

     }
     // Body //////////////////////////////////////////////////////////////////////////////
 
     }
     // Body //////////////////////////////////////////////////////////////////////////////
 

-    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; }
     public abstract void edges(GraphViz.Node n);
     public boolean ambiguous() { return false; }

-    public /*protected*/ static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
+    public /*protected*/ static class Body<T> extends Forest<T> /* extends PrintableTree<Forest<T>> implements */ {

 
         private final Input.Region      location;
         private final T                 tag;
 
         private final Input.Region      location;
         private final T                 tag;

@@ -119,11 +76,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             }
         }
 
             }
         }
 

-        public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
-            ivbc.invoke(this, b, c);
-        }
-
-        private MyBody(Input.Region loc, T tag, Forest<T>[] tokens, boolean unwrap) {
+        private Body(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];
             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];

@@ -131,63 +84,21 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             if (tokens != null) for(int i=0; i<tokens.length; i++) if (tokens[i]==null) throw new Error(i+"");
             this.unwrap = unwrap;
         }
             if (tokens != null) for(int i=0; i<tokens.length; i++) if (tokens[i]==null) throw new Error(i+"");
             this.unwrap = unwrap;
         }

-        public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
-            gather(tl, ht, target, new Tree[ht.length], 0);
+
+        public void expand(HashSet<Tree<T>> ht) {
+            expand(0, new Tree[tokens.length], ht);

         }
         }

-        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>(location, tag, trees, unwrap));
+        public void expand(final int i, Tree<T>[] ta, HashSet<Tree<T>> ht) {
+            if (i==tokens.length) {
+                ht.add(new Tree<T>(location, tag, ta, unwrap));

                 return;
             }
                 return;
             }

-            for(Tree<T> tree : ht[i]) {
-                /*
-                if (unwrap && i==trees.length-1) {
-                    // I think this is wrong
-                    Tree[] trees2 = new Tree[trees.length - 1 + tree.numChildren()];
-                    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>(location, tag, trees2));
-                } else {
-                */
-                    trees[i] = tree;
-                    gather(tl, ht, target, trees, i+1);
-                    trees[i] = null;
-                    //}
-            }
-        }
-        public void expand(TaskList tl, HashSet<Tree<T>> ht) {
-            HashSet<Tree<T>>[] children = new HashSet[tokens.length];
-            tl.gather(this, children, ht);
-            for(int i=0; i<children.length; i++) {
-                children[i] = new HashSet<Tree<T>>();
-                tl.expand(tokens[i], children[i]);
-            }
-        }
-
-        public void expand(final int i, final TreeBuilder<T> h) {
-            if (i==0) h.start(tag, location);
-
-            if (i==tokens.length) {
-                h.finish(tag, location);
-
-                /*
-            } else if (unwrap && i==tokens.length-1) {
-                if (tokens[i] != null)
-                    tokens[i].visit(h, null, 0);
-                */
-
-            } else {
-                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), unwrap));
-                        expand(i+1, h);
-                        while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
-                    }
-                }, null, null);
+            HashSet<Tree<T>> ht2 = new HashSet<Tree<T>>();
+            tokens[i].expand(ht2);
+            for(Tree<T> tc : ht2) {
+                ta[i] = tc;
+                expand(i+1, ta, ht);
+                ta[i] = null;

             }
         }
 
             }
         }
 

@@ -207,11 +118,9 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
      *  viewed, it becomes immutable
      */
     static class Ref<T> extends Forest<T> {
      *  viewed, it becomes immutable
      */
     static class Ref<T> extends Forest<T> {

-        public void expand(TaskList tl, HashSet<Tree<T>> ht) {
-            for (Forest<T> f : hp) f.expand(tl, ht);
-        }
-        public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
-            throw new Error();
+        public void expand(HashSet<Tree<T>> ht) {
+            for (Forest<T> f : hp)
+                f.expand(ht);

         }
         public HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
         public boolean contains(Forest f) {
         }
         public HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
         public boolean contains(Forest f) {

@@ -247,16 +156,9 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
             return n;
         }
 
             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)
-                f.visit(ivbc, b, c);
-        }

         public Forest resolve() { return this; }
     }
 
         public Forest resolve() { return this; }
     }
 

-    public abstract <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);
-

     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];

diff --git a/src/edu/berkeley/sbp/util/TreeBuilder.java b/src/edu/berkeley/sbp/util/TreeBuilder.java
index 9fae34f..7284018 100644 (file)
--- a/src/edu/berkeley/sbp/util/TreeBuilder.java
+++ b/src/edu/berkeley/sbp/util/TreeBuilder.java
@@ -2,7 +2,8 @@ package edu.berkeley.sbp.util;
 import edu.berkeley.sbp.*;
 import java.util.*;
 
 import edu.berkeley.sbp.*;
 import java.util.*;
 

-public abstract class TreeBuilder<T> implements Invokable<Forest.Body<T>,Boolean,Integer> {
+public abstract class TreeBuilder<T> /*implements Invokable<Forest.Body<T>,Boolean,Integer>*/ {
+    /*

     public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
     public boolean toss;
     protected T head;
     public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
     public boolean toss;
     protected T head;

@@ -20,4 +21,5 @@ public abstract class TreeBuilder<T> implements Invokable<Forest.Body<T>,Boolean
             bod.expand(i, this);
         }
     }
             bod.expand(i, this);
         }
     }

+    */

 }
 }