checkpoint

[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 6f1098e..f37c575 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -314,8 +314,8 @@ public abstract class Parser<T extends Token, R> {
                 holder[numPop-1] = f;
                 return reduce(parent, numPop-2, rex, onlychild, target);                
             }
-            public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, GSS.Phase target, Forest rex) {
-                return reduce(parent, numPop-1, rex, onlychild, target);
+            public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, Forest rex) {
+                return reduce(parent, numPop-1, rex, onlychild, parent.phase());
             }
 
             private Forest zero = null;
@@ -341,7 +341,7 @@ public abstract class Parser<T extends Token, R> {
                 } else {
                     State state = parent.state.gotoSetNonTerminals.get(position.owner());
                     if (state!=null)
-                        target.newNode(parent, rex, state, numPop<=0, parent.phase);
+                        target.newNode(parent, rex, state, numPop<=0, parent.phase());
                 }
                 return rex;
             }