X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=7a3416ed6780ea2c8c796537eb5f68f0b7ae7ba7;hp=80007124687172f0974c228b172e8309a0c31729;hb=93b9f1a57460257f71a4cef17419a723e294550d;hpb=2afdfe14e78fa0597186614937c679a09d74ecdf

diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java
index 8000712..7a3416e 100644
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -1,8 +1,9 @@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
 
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.Sequence.Position;
+import edu.berkeley.sbp.Sequence.Pos;
+import edu.berkeley.sbp.Sequence.Pos;
 import edu.berkeley.sbp.GSS.Phase;
 import edu.berkeley.sbp.Node;
 import edu.berkeley.sbp.util.*;
@@ -34,7 +35,7 @@ public class ParseFailed extends Exception {
         return ret.toString();
     }
 
-    private static boolean important(Position p) {
+    private static boolean important(Pos p) {
         if (p.isLast()) return false;
         if (p.element() == null) return false;
         if (!(p.element() instanceof Union)) return false;
@@ -67,7 +68,8 @@ public class ParseFailed extends Exception {
         boolean alldone = false;
         boolean go = false;
         boolean force = false;
-        for(Position p : (Iterable<Position>)parent.state()) {
+        for(Pos pp : (Iterable<Pos>)parent.state().positions()) {
+            Pos p = (Pos)pp;
             if (skip) p = p.next();
             int raise = 0;
             done = false;
@@ -104,7 +106,7 @@ public class ParseFailed extends Exception {
     static <Tok> void complain(Node n, HashMap<String,HashSet<String>> errors, boolean force, int indent) {
         if (touched.contains(n)) return;
         touched.add(n);
-        for(Position p : (Iterable<Position>)n.state()) {
+        for(Pos p : (Iterable<Pos>)n.state()) {
             //if (!p.isLast() && !p.next().isLast()) continue;
             if (((p.isFirst() || p.isLast()) && !force)/* || p.owner().name==null*/ ||
                 !important(p)) {