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

checkpoint

darcs-hash:20060104102904-5007d-cb491981c635fe69b6fa33a894a87a5f3c9d8493.gz
---

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 77464c2..3c1174e 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -211,7 +211,7 @@ class GSS {
                 allqueued = true;
                 int where = parents().size();
                 for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
-                    if (r.numPop > 1)
+                    if (r.numPop >= 1)
                         r.reduce(this, null, null);
                 for(int i=0; i<where; i++)
                     queueReductions(get(i), false);
@@ -235,12 +235,14 @@ class GSS {
                     // cache instances here as a way of avoiding
                     // recreating them.
                     if (r.numPop <= 0) continue;
-                    if (r.numPop == 1) {
-                        Forest ret = n.cache().get(r);
-                        if (ret != null) r.reduce(this, n2, ret);
-                        else n.cache().put(r, r.reduce(this, n2, null));
-                    } else {
-                        if (includeLongs) r.reduce(this, n2, null);
+                    if (includeLongs) {
+                        if (r.numPop == 1) {
+                            Forest ret = n.cache().get(r);
+                            if (ret != null) r.reduce(this, n2, ret);
+                            else n.cache().put(r, r.reduce(this, n2, null));
+                        } else {
+                            r.reduce(this, n2, null);
+                        }
                     }
                 }
             }