refactored error reporting

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

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 8869281..41eae02 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -32,8 +32,8 @@ public abstract class Parser<T extends Token, R> {
             current.reduce();
             Forest forest = current.token==null ? null : shiftedToken((T)current.token, loc);
             GSS.Phase next = gss.new Phase(current, this, current, input.next(count, gss.resets, gss.waits), loc, forest);
-            count = next.hash.size();
-            if (current.isDone()) return (Forest<R>)current.finalResult;
+            count = next.size();
+            if (current.isDone()) return (Forest<R>)gss.finalResult;
             current = next;
         }
     }