X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=5c399cc95c63246761ec4581af29816c2a664167;hp=a24c52371feb63d6b17f8a87fed65d4bed369e4d;hb=c4431d19cc5ddaae29d22c8c56366b53b0bad352;hpb=7d87b6f9aa045ec7e4a802a88240a235c5fde5a3

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index a24c523..5c399cc 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -185,6 +185,7 @@ public abstract class Parser<T extends Token, R> {
             public Iterable<State>     getShifts(Token t)          { return shifts.get(t); }
             public boolean             isAccepting()               { return accept; }
             public Iterable<Reduction> getReductions(Token t)      { return t==null ? eofReductions : reductions.get(t); }
+            public boolean             hasReductions(Token t)      { return t==null ? eofReductions.size()>0 : reductions.has(t); }
             public Iterable<Reduction> getEofReductions()          { return eofReductions; }
             public Iterator<Position>  iterator()                  { return hs.iterator(); }
 
@@ -311,24 +312,6 @@ public abstract class Parser<T extends Token, R> {
             }
             public String toString() { return "[reduce " + position + "]"; }
 
-            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) {
-                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;
@@ -336,35 +319,38 @@ public abstract class Parser<T extends Token, R> {
                 return zero = position.rewrite(null);
             }
 
+            public void reduce(GSS.Phase.Node parent) {
+                if (numPop==0) finish(parent, zero(), parent.phase());
+                else           reduce(parent, numPop-1, parent.phase());
+            }
+
+            public void 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) {
+                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                    finish(onlychild, position.rewrite(parent.phase().getLocation()), parent.phase());
+                } else {
+                    reduce(onlychild, pos-1, 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.Node onlychild, GSS.Phase target) {
-                if (pos>=0) holder[pos] = parent.pending();
+            private void reduce(GSS.Phase.Node parent, int pos, GSS.Phase target) {
+                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);
+                    System.arraycopy(holder, 0, position.holder, 0, holder.length);
+                    Forest rex = position.rewrite(target.getLocation());
+                    for(GSS.Phase.Node child : parent.parents()) finish(child, rex, target);
                 } else {
-                    return finish(parent, rex, target);
+                    for(GSS.Phase.Node child : parent.parents()) reduce(child, pos-1, target);
                 }
-                return rex;
             }
-            private Forest finish(GSS.Phase.Node parent, Forest result, GSS.Phase target) {
+            private void 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;
             }
         }
     }