X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=f37c5751b1a636c18dd2fd668c084d3f7d4c4c2a;hp=6f1098e779a418237495c20a215257123dcba860;hb=f71911854d01647a743d52bfccff8d78a4497550;hpb=72cc02d0f08922a98b9f2139e814b6c33b275a43

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 6f1098e..f37c575 100644
--- 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;
             }