X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=a156252902572b81284f3adb2f53de326ba75ea3;hb=1b46ed935f0fb6fb18afd40f5d1771be030a5a0d;hp=8869281b97e9ef9caaa7417db16ce1a3b106b2ca;hpb=5e831dcf55eafdc17e2255e7d63b319672a4be6a;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 8869281..a156252 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -32,8 +32,8 @@ public abstract class Parser<T extends Token, R> {
             current.reduce();
             Forest forest = current.token==null ? null : shiftedToken((T)current.token, loc);
             GSS.Phase next = gss.new Phase(current, this, current, input.next(count, gss.resets, gss.waits), loc, forest);
-            count = next.hash.size();
-            if (current.isDone()) return (Forest<R>)current.finalResult;
+            count = next.size();
+            if (current.isDone()) return (Forest<R>)gss.finalResult;
             current = next;
         }
     }
@@ -126,7 +126,7 @@ public abstract class Parser<T extends Token, R> {
             public  final     int               idx    = master_state_idx++;
             private final     HashSet<Position> hs;
 
-            private transient HashMap<Element,State>          gotoSetNonTerminals = new HashMap<Element,State>();
+            public transient HashMap<Element,State>          gotoSetNonTerminals = new HashMap<Element,State>();
             private transient TopologicalBag<Token,State>     gotoSetTerminals    = new TopologicalBag<Token,State>();
 
             private           TopologicalBag<Token,Reduction> reductions          = new TopologicalBag<Token,Reduction>();
@@ -272,47 +272,20 @@ public abstract class Parser<T extends Token, R> {
                 return zero = position.rewrite(null);
             }
 
-            public void reduce(GSS.Phase.Node parent) {
-                Forest[] holder = new Forest[position.pos];
-                if (position.pos==0) finish(parent, zero(), parent.phase(), holder);
-                else           reduce(parent, position.pos-1, parent.phase(), holder);
-            }
-
-            public void reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild) {
-                Forest[] holder = new Forest[position.pos];
-                if (position.pos<=0) throw new Error("called wrong form of reduce()");
-                int pos = position.pos-1;
-                Forest old = holder[pos];
-                holder[pos] = parent.pending();
-                if (pos==0) {
-                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
-                    finish(onlychild, position.rewrite(parent.phase().getLocation()), parent.phase(), holder);
-                } else {
-                    reduce(onlychild, pos-1, parent.phase(), holder);
-                }
-                holder[pos] = old;
-            }
-
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else
-            private void reduce(GSS.Phase.Node parent, int pos, GSS.Phase target, Forest[] holder) {
+            public void reduce(GSS.Phase.Node parent, int pos, GSS.Phase target, Forest[] holder) {
                 Forest old = holder[pos];
                 holder[pos] = parent.pending();
                 if (pos==0) {
                     System.arraycopy(holder, 0, position.holder, 0, holder.length);
                     for(int i=0; i<position.pos; i++) if (position.holder[i]==null) throw new Error("realbad");
                     Forest rex = position.rewrite(target.getLocation());
-                    for(GSS.Phase.Node child : parent.parents()) finish(child, rex, target, holder);
+                    for(GSS.Phase.Node child : parent.parents()) child.finish(this, rex, target, holder);
                 } else {
                     for(GSS.Phase.Node child : parent.parents()) reduce(child, pos-1, target, holder);
                 }
                 holder[pos] = old;
             }
-            private void finish(GSS.Phase.Node parent, Forest result, GSS.Phase target, Forest[] holder) {
-                State state = parent.state.gotoSetNonTerminals.get(position.owner());
-                if (result==null) throw new Error();
-                if (state!=null)
-                    target.newNode(parent, result, state, position.pos<=0, this);
-            }
         }
     }