checkpoint

darcs-hash:20060122094514-5007d-875b311678a9b359dd8984e4dd598dbd18ed014a.gz

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 786ffad..378c069 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -18,8 +18,8 @@ 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) {
 
     /** expand this forest into a set of trees */
     public HashSet<Tree<T>> expand(boolean toss) {

-        TreeMaker<T> ret = new TreeMaker<T>();
-        visit(ret, new Boolean(toss), null);
+        TreeMaker<T> ret = new TreeMaker<T>(toss);
+        visit(ret, null, null);

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

@@ -34,17 +34,14 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     // Body //////////////////////////////////////////////////////////////////////////////
 
     protected static interface Body<T> {
     // Body //////////////////////////////////////////////////////////////////////////////
 
     protected static interface Body<T> {

-        TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h);
+        TreeMaker<T> expand(int i, TreeMaker<T> h);

     }
 
     }
 

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

 
         public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             ivbc.invoke(this, b, c);
         }
 
         public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C 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;

@@ -62,31 +59,41 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             this.singleton = singleton;
         }
 
             this.singleton = singleton;
         }
 

-        public TreeMaker<T> expand(boolean toss, int i, TreeMaker<T> h) {
+        public TreeMaker<T> expand(int i, TreeMaker<T> h) {

             if (singleton) {
             if (singleton) {

-                tokens[0].visit(h, toss, i);
+                tokens[0].visit(h, null, 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].visit(h, toss, 0);
+                    tokens[i].visit(h, null, 0);

 
             } else {
 
             } else {

-                boolean hit = false;
-                //tokens[i].visit(this, 
-                for(Tree<T> r : tokens[i].expand(toss)) {
-                    hit = true;
+                //boolean hit = false;
+                //tokens[i].visit(this, h, i);
+
+                for(Tree<T> r : tokens[i].expand(h.toss)) {
+                    //hit = true;

                     int old = h.toks.size();
                     h.toks.add(r);
                     int old = h.toks.size();
                     h.toks.add(r);

-                    expand(toss, i+1, h);
+                    expand(i+1, h);

                     while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
                 }
                     while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
                 }

+

                 //if (!hit) throw new Error();
             }
             return h;
         }
                 //if (!hit) throw new Error();
             }
             return h;
         }

+        public void invoke(Tree<T> r, TreeMaker<T> h, Integer i) {
+            //hit = true;
+            int old = h.toks.size();
+            h.toks.add(r);
+            expand(i+1, h);
+            while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
+            //ivbc.invoke(this, b, c);
+        }

 
         protected String  headToString()         { return null; }
         protected String  headToJava()           { return null; }
 
         protected String  headToString()         { return null; }
         protected String  headToJava()           { return null; }

@@ -109,7 +116,8 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         public void merge(Forest p) { if (p!=this) hp.add(p, true); }
         public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             if (hp==null) return;
         public void merge(Forest p) { if (p!=this) hp.add(p, true); }
         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);
+            for(Forest<T> f : hp)
+                f.visit(ivbc, b, c);

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

@@ -117,14 +125,16 @@ 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 class TreeMaker<T> extends HashSet<Tree<T>> implements Invokable<Forest.Body<T>,Boolean,Integer> {
         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
     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 boolean toss;
+        public TreeMaker(boolean toss) { this.toss = toss; }
+        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>>();
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;
                 this.toks = new ArrayList<Tree<T>>();

-                bod.expand(toss, 0, this);
+                bod.expand(0, this);

                 this.toks = toks;
             } else {
                 this.toks = toks;
             } else {

-                bod.expand(toss, i, this);
+                bod.expand(i, this);

             }
         }
     }
             }
         }
     }