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

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index f37c575..817aea6 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(); }
 
@@ -310,12 +310,24 @@ public abstract class Parser<T extends Token, R> {
                 this.holder = new Forest[numPop];
             }
             public String toString() { return "[reduce " + position + "]"; }
-            public Forest reduce(Forest f, GSS.Phase.Node parent, GSS.Phase.Node onlychild, GSS.Phase target, Forest rex) {
-                holder[numPop-1] = f;
-                return reduce(parent, numPop-2, rex, onlychild, target);                
+
+            public Forest reduce(GSS.Phase.Node parent) {
+                Forest rex = numPop==0 ? zero() : null;
+                Forest ret = reduce(parent, numPop-1, rex, null, parent.phase());
+                return ret;
             }
-            public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, Forest rex) {
-                return reduce(parent, numPop-1, rex, onlychild, parent.phase());
+
+            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;
@@ -328,11 +340,17 @@ public abstract class Parser<T extends Token, R> {
             // FIXME: this could be more elegant and/or cleaner and/or somewhere else
             private Forest reduce(GSS.Phase.Node parent, int pos, Forest rex, GSS.Phase.Node onlychild, GSS.Phase target) {
                 if (pos>=0) holder[pos] = parent.pending();
-                if (pos<=0 && rex==null) {
-                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
-                    rex = position.rewrite(target.getLocation());
-                }
-                if (pos >=0) {
+                if (pos==0) {
+                    if (rex==null) {
+                        System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                        rex = position.rewrite(target.getLocation());
+                    }
+                    if (onlychild != null)
+                        reduce(onlychild, pos-1, rex, null, target);
+                    else 
+                        for(GSS.Phase.Node child : parent.parents())
+                            reduce(child, pos-1, rex, null, target);
+                } else if (pos>0) {
                     if (onlychild != null)
                         reduce(onlychild, pos-1, rex, null, target);
                     else