From: adam <adam@megacz.com>
Date: Wed, 4 Jan 2006 10:49:14 +0000 (-0500)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~443
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=145a9cab78330e3daad06a72e914895d32a1d621;ds=sidebyside

checkpoint

darcs-hash:20060104104914-5007d-913ac463629afb684e9ce5b99e7681453c298558.gz
---

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index a4f3d6a..0bc14ae 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -202,7 +202,7 @@ class GSS {
                 int where = parents().size();
                 for(Parser.Table.Reduction r : state.getReductions(token))
                     if (r.numPop >= 1)
-                        r.reduce(this, null, null);
+                        r.reduce(this);
             }
 
             public void queueReductions(Node n2) {
@@ -217,7 +217,7 @@ class GSS {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
                         if (r.numPop==0)
-                            r.reduce(this, null, r.zero());
+                            r.reduce(this);
             }
 
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index f087a05..817aea6 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -311,8 +311,9 @@ 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());
+            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;
             }