checkpoint

[sbp.git] / src / edu / berkeley / sbp / Forest.java

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 4de9fa8..7b11532 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -20,7 +20,9 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     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 add(Tree<T> t) { hs.add(t); }
+            public void add(Input.Location loc) {
+                hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+            }
         };
         visit(ret, null, null);
         if (toss && hs.size() > 1) throw new Ambiguous(this);
@@ -40,7 +42,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         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>, TreeMaker<T>, Integer> {
+    protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
 
         public <B,C> void visit(Invokable<Forest.Body<T>,B,C> ivbc, B b, C c) {
             ivbc.invoke(this, b, c);
@@ -62,41 +64,31 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             this.singleton = singleton;
         }
 
-        public TreeMaker<T> expand(int i, TreeMaker<T> h) {
+        public TreeMaker<T> expand(final int i, final TreeMaker<T> h) {
             if (singleton) {
                 tokens[0].visit(h, null, i);
-
-            } else if (i==tokens.length) {
-                h.add(new Tree<T>(null, tag, h.toks.toArray(tree_hint)));
+                return h;
+            }
+            if (i==0) h.head(tag);
+            if (i==tokens.length) {
+                h.add(/*FIXME*/null);
 
             } else if (unwrap && i==tokens.length-1) {
                 if (tokens[i] != null)
                     tokens[i].visit(h, null, 0);
 
             } else {
-                //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);
-                    expand(i+1, h);
-                    while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
-                }
-
-                //if (!hit) throw new Error();
+                tokens[i].visit(new TreeMaker<T>(h.toss) {
+                    public void add(Input.Location loc) {
+                        int old = h.toks.size();
+                        h.toks.add(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;
         }
-        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; }
@@ -126,11 +118,13 @@ 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> /*extends HashSet<Tree<T>>*/ implements Invokable<Forest.Body<T>,Boolean,Integer> {
+    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer> {
         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 add(Tree<T> t);
+        public void head(T head) { this.head = head; }
+        public abstract void add(Input.Location loc);
         public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;