checkpoint harmony

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

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index ee7a6f5..a156252 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -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,9 +272,6 @@ public abstract class Parser<T extends Token, R> {
                 return zero = position.rewrite(null);
             }
 
-            public void reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild) {
-            }
-
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else
             public void reduce(GSS.Phase.Node parent, int pos, GSS.Phase target, Forest[] holder) {
                 Forest old = holder[pos];
@@ -283,18 +280,12 @@ public abstract class Parser<T extends Token, R> {
                     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;
             }
-            public 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);
-            }
         }
     }