X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=f087a05e0ea93e48d909ed04fc2e562bb7f725fd;hb=e4f373b56b1cdc2c086c0b86e5ec45bad784df0e;hp=dc6c1f6d38f4e727be22d572e78703093dc69a0c;hpb=c263c1e02119917a9d63ab14db9711c7d1cb4d9d;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index dc6c1f6..f087a05 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -184,7 +184,7 @@ public abstract class Parser<T extends Token, R> {
             public boolean             canShift(Token t)           { return shifts.contains(t); }
             public Iterable<State>     getShifts(Token t)          { return shifts.get(t); }
             public boolean             isAccepting()               { return accept; }
-            public Iterable<Reduction> getReductions(Token t)      { return reductions.get(t); }
+            public Iterable<Reduction> getReductions(Token t)      { return t==null ? eofReductions : reductions.get(t); }
             public Iterable<Reduction> getEofReductions()          { return eofReductions; }
             public Iterator<Position>  iterator()                  { return hs.iterator(); }
 
@@ -316,6 +316,19 @@ public abstract class Parser<T extends Token, R> {
                 return ret;
             }
 
+            public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild) {
+                int pos = numPop-1;
+                if (pos>=0) holder[pos] = parent.pending();
+                Forest rex = null;
+                if (pos==0) {
+                    if (rex==null) {
+                        System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                        rex = position.rewrite(parent.phase().getLocation());
+                    }
+                }
+                return reduce(onlychild, pos-1, rex, null, parent.phase());
+            }
+
             private Forest zero = null;
             public Forest zero() {
                 if (zero != null) return zero;