checkpoint harmony

[sbp.git] / src / edu / berkeley / sbp / GSS.java

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 8053ae8..b98d077 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -296,11 +296,7 @@ class GSS {
         class Reset extends RuntimeException { }
 
         public void invoke(State st, Forest result, Node n) {
-            boolean ok = next.newNode(n, result, st, false);
-            if (ok && !good) {
-                good = !st.lame();
-                //if (good) System.out.println(st);
-            }
+            good |= next.newNode(n, result, st, false);
         }
 
         /** perform all shift operations, adding promoted nodes to <tt>next</tt> */
@@ -385,10 +381,10 @@ class GSS {
 
             public final void invoke(Reduction r, Node n, Node n2) {
                 if (n==null) {
-                    if (r.numPop==0) r.reduce(this);
+                    if (r.position.pos==0) r.reduce(this);
                     return;
                 }
-                if (r.numPop==0) return;
+                if (r.position.pos==0) return;
                 if (n2==null) r.reduce(n);
                 else          r.reduce(n, n2);
             }