use Sequence.Pos rather than Sequence.Position wherever possible

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

diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java
index 8936184..7a3416e 100644 (file)
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -2,7 +2,7 @@
 
 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;
@@ -35,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;
@@ -69,7 +69,7 @@ public class ParseFailed extends Exception {
         boolean go = false;
         boolean force = false;
         for(Pos pp : (Iterable<Pos>)parent.state().positions()) {
-            Position p = (Position)pp;
+            Pos p = (Pos)pp;
             if (skip) p = p.next();
             int raise = 0;
             done = false;
@@ -106,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)) {