checkpoint

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

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 8412471..f85ec0b 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -27,7 +27,7 @@ public class GSS {
     HashMapBag<Integer,Sequence>       expected        = new HashMapBag<Integer,Sequence>();
     
     /** FIXME */
-    public  Forest.Ref finalResult;
+    public  Forest.Many finalResult;
 
     /** corresponds to a positions <i>between tokens</i> the input stream; same as Tomita's U_i's */
     class Phase<Tok> implements Invokable<State, Forest, Phase<Tok>.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable<Phase.Node> {
@@ -230,7 +230,7 @@ public class GSS {
             boolean ok = false;
             for(Phase.Node n : hash.values()) {
                 if (token == null && n.state.isAccepting()) {
-                    if (finalResult==null) finalResult = new Forest.Ref();
+                    if (finalResult==null) finalResult = new Forest.Many();
                     for(Object f : n.results())
                         finalResult.merge((Forest)f);
                 }
@@ -285,18 +285,18 @@ public class GSS {
             /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
             public  Phase phase() { return Phase.this; }
 
-            private HashSet<Forest.Ref> resultMap = new HashSet<Forest.Ref>();
-            public Iterable<Forest.Ref> results() { return resultMap; }
+            private HashSet<Forest.Many> resultMap = new HashSet<Forest.Many>();
+            public Iterable<Forest.Many> results() { return resultMap; }
             public FastSet<Node> parents() { return set; }
             public boolean merge(Node parent, Forest result) {
                 // FIXME: inefficient!
-                for(Forest.Ref f : results()) {
+                for(Forest.Many f : results()) {
                     if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) {
                         f.merge(result);
                         return true;
                     }
                 }
-                Forest.Ref f = new Forest.Ref();
+                Forest.Many f = new Forest.Many();
                 f.parents.add(parent);
                 f.merge(result);
                 resultMap.add(f);
@@ -341,7 +341,7 @@ public class GSS {
                 HashSet<Forest> rr = new HashSet<Forest>();
                 for(Forest result : results()) rr.add(result);
                 for(Forest result : rr)
-                    for(Node child : ((Forest.Ref<?>)result).parents) {
+                    for(Node child : ((Forest.Many<?>)result).parents) {
                         if (only != null && child!=only) continue;
                         holder[pos] = result;
                         if (pos==0) child.finish(r, r.rewrite(new Input.Region(child.phase().getLocation(), phase().getLocation())), target);