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

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index dc6c1f6..08c49a9 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(); }
 
@@ -311,11 +311,6 @@ public abstract class Parser<T extends Token, R> {
             }
             public String toString() { return "[reduce " + position + "]"; }
 
-            public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild, Forest rex) {
-                Forest ret = reduce(parent, numPop-1, rex, onlychild, parent.phase());
-                return ret;
-            }
-
             private Forest zero = null;
             public Forest zero() {
                 if (zero != null) return zero;
@@ -323,32 +318,41 @@ public abstract class Parser<T extends Token, R> {
                 return zero = position.rewrite(null);
             }
 
-            // 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();
+            public Forest reduce(GSS.Phase.Node parent) {
+                if (numPop==0) return finish(parent, zero(), parent.phase());
+                return reduce(parent, numPop-1, null, parent.phase());
+            }
+
+            public Forest reduce(GSS.Phase.Node parent, GSS.Phase.Node onlychild) {
+                if (numPop<=0) throw new Error("called wrong form of reduce()");
+                int pos = numPop-1;
+                holder[pos] = parent.pending();
                 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());
+                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                    return finish(onlychild, position.rewrite(parent.phase().getLocation()), parent.phase());
                 }
+                return reduce(onlychild, pos-1, null, parent.phase());
+            }
+
+            // 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 target) {
+                if (pos<0) return finish(parent, rex, target);
+                holder[pos] = parent.pending();
+                if (pos==0 && rex==null) {
+                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                    rex = position.rewrite(target.getLocation());
+                }
+                for(GSS.Phase.Node child : parent.parents())
+                    if (pos==0) finish(child, rex, target);
+                    else reduce(child, pos-1, 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;
+            }
         }
     }