checkpoint

[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 31bd1b3..bbcb032 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -21,14 +21,14 @@ public abstract class Parser<Tok, Result> {
     public Forest<Result> parse(Input<Tok> input) throws IOException, ParseFailed {
         GSS gss = new GSS();
         Input.Location loc = input.getLocation();
-        GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(1, 0, 0), loc, null);
+        GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(), loc, null);
         current.newNode(null, Forest.leaf(null, null, null), pt.start, true);
         int count = 1;
         for(;;) {
             loc = input.getLocation();
             current.reduce();
             Forest forest = current.token==null ? null : shiftToken((Tok)current.token, loc);
-            GSS.Phase next = gss.new Phase<Tok>(current, this, current, input.next(count, gss.resets, gss.waits), loc, forest);
+            GSS.Phase next = gss.new Phase<Tok>(current, this, current, input.next(), loc, forest);
             count = next.size();
             if (current.isDone()) return (Forest<Result>)gss.finalResult;
             current = next;