checkpoint

darcs-hash:20060122093011-5007d-388cde3e541b353df39172e236b03a615e6d4084.gz

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 4f4baac..786ffad 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -19,7 +19,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     /** expand this forest into a set of trees */
     public HashSet<Tree<T>> expand(boolean toss) {
         TreeMaker<T> ret = new TreeMaker<T>();
     /** expand this forest into a set of trees */
     public HashSet<Tree<T>> expand(boolean toss) {
         TreeMaker<T> ret = new TreeMaker<T>();

-        invoke(ret, new Boolean(toss), null);
+        visit(ret, new Boolean(toss), null);

         if (toss && ret.size() > 1) throw new Ambiguous(this);
         return ret;
     }
         if (toss && ret.size() > 1) throw new Ambiguous(this);
         return ret;
     }

@@ -37,11 +37,14 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h);
     }
 
         TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h);
     }
 

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

 
 

-        public <B,C> void invoke(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
+        public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {

             ivbc.invoke(this, b, c);
         }
             ivbc.invoke(this, b, c);
         }

+        public <B,C> void invoke(Tree<T> ivbc, B b, C c) {
+            //ivbc.invoke(this, b, c);
+        }

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

@@ -61,17 +64,18 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
         public TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h) {
             if (singleton) {
 
         public TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h) {
             if (singleton) {

-                tokens[0].invoke(h, toss, i);
+                tokens[0].visit(h, toss, i);

 
             } else if (i==tokens.length) {
                 h.add(new Tree<T>(null, tag, h.toks.toArray(tree_hint)));
 
             } else if (unwrap && i==tokens.length-1) {
                 if (tokens[i] != null)
 
             } else if (i==tokens.length) {
                 h.add(new Tree<T>(null, tag, h.toks.toArray(tree_hint)));
 
             } else if (unwrap && i==tokens.length-1) {
                 if (tokens[i] != null)

-                    tokens[i].invoke(h, toss, 0);
+                    tokens[i].visit(h, toss, 0);

 
             } else {
                 boolean hit = false;
 
             } else {
                 boolean hit = false;

+                //tokens[i].visit(this, 

                 for(Tree<T> r : tokens[i].expand(toss)) {
                     hit = true;
                     int old = h.toks.size();
                 for(Tree<T> r : tokens[i].expand(toss)) {
                     hit = true;
                     int old = h.toks.size();

@@ -103,14 +107,14 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
         public Ref() { }
         public void merge(Forest p) { if (p!=this) hp.add(p, true); }
         private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
         public Ref() { }
         public void merge(Forest p) { if (p!=this) hp.add(p, true); }

-        public <B,C> void invoke(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
+        public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {

             if (hp==null) return;
             if (hp==null) return;

-            for(Forest<T> f : hp) f.invoke(ivbc, b, c);
+            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 invoke(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);
+    public abstract <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c);

     private static class TreeMaker<T> extends HashSet<Tree<T>> implements Invokable<Forest.Body<T>,Boolean,Integer> {
         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
         public void invoke(Forest.Body<T> bod, Boolean toss, Integer i) {
     private static class TreeMaker<T> extends HashSet<Tree<T>> implements Invokable<Forest.Body<T>,Boolean,Integer> {
         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
         public void invoke(Forest.Body<T> bod, Boolean toss, Integer i) {

diff --git a/src/edu/berkeley/sbp/util/FastSet.java b/src/edu/berkeley/sbp/util/FastSet.java
index 1e6c6d5..e7ae063 100644 (file)
--- a/src/edu/berkeley/sbp/util/FastSet.java
+++ b/src/edu/berkeley/sbp/util/FastSet.java
@@ -28,7 +28,7 @@ public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T>, Visitable
         for(T t : s) array[size++] = t;
     }
 
         for(T t : s) array[size++] = t;
     }
 

-    public <B,C> void invoke(Invokable<T,B,C> ivbc, B b, C c) {
+    public <B,C> void visit(Invokable<T,B,C> ivbc, B b, C c) {

         if (only!=null) ivbc.invoke(only, b, c);
         else for(int j=0; j<size; j++)
             ivbc.invoke((T)array[j], b, c);
         if (only!=null) ivbc.invoke(only, b, c);
         else for(int j=0; j<size; j++)
             ivbc.invoke((T)array[j], b, c);