X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=e74d81eda484d97caaec05bacf7c52f5b94dad39;hb=743754674298bb8a3303bdffd3b5c5cc0de1b158;hp=83990536fd9d2f62c9de832d15e99f05e37e9140;hpb=9a8ebbb93e14d7ac7ad30268b58c6a75f437e5c9;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 8399053..e74d81e 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -1,6 +1,6 @@
 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.*;
@@ -11,35 +11,48 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
     public final Tree<T> expand1() throws Ambiguous, ParseFailed {
-        Iterator<Tree<T>> it = expand(true).iterator();
-        if (!it.hasNext()) throw new ParseFailed();
-        return it.next();
+        try {
+            Iterator<Tree<T>> it = expand(true).iterator();
+            if (!it.hasNext()) throw new ParseFailed();
+            return it.next();
+        } catch (InnerAmbiguous ia) { throw new Ambiguous(ia.f); }
     }
 
     /** expand this forest into a set of trees */
     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(Input.Location loc, T head) {
-                hs.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
-            }
-        };
-        visit(ret, null, null);
-        if (toss && hs.size() > 1) throw new Ambiguous(this);
-        return hs;
+        //if (toss) scan();
+        final HashSetTreeConsumer<T> ret = new HashSetTreeConsumer<T>();
+        visit(new TreeMaker2<T>(toss, ret), null, null);
+        if (toss && ret.size() > 1) throw new InnerAmbiguous(this);
+        return ret;
+    }
+
+    private static class InnerAmbiguous extends RuntimeException {
+        public final Forest<?> f;
+        public InnerAmbiguous(Forest<?> f) { this.f = f; }
+    }
+
+    public static interface TreeConsumer<T> {
+        public void addTree(Tree<T> t);
+    }
+    public static class HashSetTreeConsumer<T> extends HashSet<Tree<T>> implements TreeConsumer<T> {
+        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); }
+    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> {
-        TreeMaker<T> expand(int i, TreeMaker<T> h);
+        void expand(int i, TreeMaker<T> h);
     }
 
     protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
@@ -53,8 +66,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];
@@ -62,14 +76,18 @@ 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 TreeMaker<T> expand(final int i, final TreeMaker<T> h) {
+        public void expand(final int i, final TreeMaker<T> h) {
             if (singleton) {
                 tokens[0].visit(h, null, i);
+                return;
+            }
+            if (i==0) h.start(tag, location);
 
-            } else if (i==tokens.length) {
-                h.add(/*FIXME*/null, tag);
+            if (i==tokens.length) {
+                h.finish(tag, location);
 
             } else if (unwrap && i==tokens.length-1) {
                 if (tokens[i] != null)
@@ -77,15 +95,16 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
             } else {
                 tokens[i].visit(new TreeMaker<T>(h.toss) {
-                    public void add(Input.Location loc, T head) {
+                    public void start(T head, Input.Location loc) { }
+                    public void addTree(Tree<T> t) { toks.add(t); }
+                    public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
-                        h.toks.add(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+                        h.addTree(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;
         }
 
         protected String  headToString()         { return null; }
@@ -116,11 +135,21 @@ 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> implements Invokable<Forest.Body<T>,Boolean,Integer> {
+    private static class TreeMaker2<T> extends TreeMaker<T> {
+        private TreeConsumer<T> tc;
+        public TreeMaker2(boolean toss, TreeConsumer<T> tc) { super(toss); this.tc = tc; }
+        public void finish(T head, Input.Location loc) { tc.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));; }
+        public void start(T head, Input.Location loc) { }
+        public void addTree(Tree<T> t) { toks.add(t); }
+    }
+    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer>, TreeConsumer<T> {
         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(Input.Location loc, T head);
+        public abstract void start(T head, Input.Location loc);
+        public abstract void finish(T head, Input.Location loc);
+        public abstract void addTree(Tree<T> t);
         public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;