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

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 6f1098e..a24c523 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,23 @@ 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) {
+                if (numPop==0) return finish(parent, zero(), parent.phase());
+                return reduce(parent, numPop-1, null, null, parent.phase());
             }
-            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) {
+                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,23 +339,33 @@ 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 
                         for(GSS.Phase.Node child : parent.parents())
                             reduce(child, pos-1, rex, null, target);
                 } else {
-                    State state = parent.state.gotoSetNonTerminals.get(position.owner());
-                    if (state!=null)
-                        target.newNode(parent, rex, state, numPop<=0, parent.phase);
+                    return finish(parent, rex, target);
                 }
                 return rex;
             }
+            private Forest finish(GSS.Phase.Node parent, Forest result, GSS.Phase target) {
+                State state = parent.state.gotoSetNonTerminals.get(position.owner());
+                if (state!=null)
+                    target.newNode(parent, result, state, numPop<=0, parent.phase());
+                return result;
+            }
         }
     }