X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=2d2e550cce16e613bec3951d8d8a348a0ba949d9;hp=db833b9d824af74ca76f5f4a2647de739b930b9a;hb=76ce41540f06ac1fbcb44332dd62f53e88c27cf1;hpb=24219bdf084b45273e869cd19382d1640b396566

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index db833b9..2d2e550 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -134,7 +134,7 @@ class GSS {
             for(StateNode n : hash.values()) {
                 if (token == null && n.state().isAccepting()) {
                     if (finalResult==null) finalResult = new Forest.Many();
-                    for(Result r : n)
+                    for(ResultNode r : n)
                         finalResult.merge(r.getForest());
                 }
                 if (token == null) continue;
@@ -192,7 +192,7 @@ class GSS {
         private boolean newNode(Forest f, Pos reduction, StateNode pred, State state, boolean fromEmptyReduction) {
             StateNode p = pred==null ? null : hash.get(state, pred.phase());
             if (p != null) {
-                p.addResult(f, reduction, pred);
+                p.addPred(f, reduction, pred);
                 return !state.doomed();
             }
             do {