X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=2cc9f49d4ed5c8e4100a9339013d3f55fa32a36d;hp=1fa0b08b4676dabafb542f804c582116ef0f9643;hb=a82ff8c049dd265ecf1d115d60e1be8ecb81a4c1;hpb=df2dac17a58713dd1e3fba3101666bea7cb6f561

diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java
index 1fa0b08..2cc9f49 100644
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -4,7 +4,7 @@ package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.Sequence.Position;
 import edu.berkeley.sbp.GSS.Phase;
-import edu.berkeley.sbp.GSS.Phase.Node;
+import edu.berkeley.sbp.Node;
 import edu.berkeley.sbp.util.*;
 import java.io.*;
 import java.util.*;
@@ -39,32 +39,35 @@ public class ParseFailed extends Exception {
         if (p.element() == null) return false;
         if (!(p.element() instanceof Union)) return false;
         Union u = (Union)p.element();
-        if (u.synthetic) return false;
-        if (u.name==null) return false;
-        if (u.name.length() == 0) return false;
-        char c = u.name.charAt(0);
+        if (u.isSynthetic()) return false;
+        if (u.getName()==null) return false;
+        if (u.getName().length() == 0) return false;
+        char c = u.getName().charAt(0);
         return (c >= 'A' && c <= 'Z');
     }
 
-    static <Tok> void barf(HashMap<Element,Input.Location> sb, GSS.Phase<Tok>.Node n, int indent, boolean skip, int count, Input.Location loc) {
+    static <Tok> void barf(HashMap<Element,Input.Location> sb, Node n, int indent, boolean skip, int count, Input.Location loc) {
         if (count <= 0) {
             barf(sb, n, indent, skip, loc);
         } else {
-            for(GSS.Phase<Tok>.Node nn : n.parents())
+            /*
+              FIXME: removed
+            for(Node nn : (Iterable<Node>)n.parents())
                 barf(sb, nn, indent, skip, count-1, n.phase().getLocation());
+            */
         }
     }
-    static <Tok> void barf(HashMap<Element,Input.Location> sb, GSS.Phase<Tok>.Node n, int indent, boolean skip, Input.Location loc) {
+    static <Tok> void barf(HashMap<Element,Input.Location> sb, Node n, int indent, boolean skip, Input.Location loc) {
         if (touched.contains(n)) return;
         touched.add(n);
         String s = "";
         for(int i=0; i< indent; i++) s += " ";
-        GSS.Phase<Tok>.Node parent = n;
+        Node parent = n;
         boolean done = false;
         boolean alldone = false;
         boolean go = false;
         boolean force = false;
-        for(Position p : parent.state) {
+        for(Position p : (Iterable<Position>)parent.state()) {
             if (skip) p = p.next();
             int raise = 0;
             done = false;
@@ -81,7 +84,7 @@ public class ParseFailed extends Exception {
                else if (p.pos-raise > 0)
                     barf(sb, n, indent, false, 1);
                 */
-                if (!new Walk.Cache().possiblyEpsilon(p.element()))
+                if (!new Cache(null, null).possiblyEpsilon(p.element()))
                     break;
                 p = p.next();
                 raise++;
@@ -97,16 +100,21 @@ public class ParseFailed extends Exception {
 
 
     // FIXME
-    private static HashSet<GSS.Phase.Node> touched = new HashSet<GSS.Phase.Node>();
-    static <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force, int indent) {
+    private static HashSet<Node> touched = new HashSet<Node>();
+    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 : n.state) {
+        for(Position p : (Iterable<Position>)n.state()) {
             //if (!p.isLast() && !p.next().isLast()) continue;
             if (((p.isFirst() || p.isLast()) && !force)/* || p.owner().name==null*/ ||
                 !important(p)) {
+            /*
+              FIXME: removed
                 for(Node n2 : n.parents())
-                    complain(n2, errors, force /*| p.isFirst()*/, indent);
+                    complain(n2, errors, force
+                    //| p.isFirst()
+                , indent);
+            */
             } else {
                 String seqname = p.owner()/*.name*/+"";
                 HashSet<String> hs = errors.get(seqname);
@@ -130,6 +138,10 @@ public class ParseFailed extends Exception {
         return ANSI.purple(ret.toString());
     }
 
+    static void error(String message, GSS.Phase phase) throws ParseFailed {
+        error(message, phase.getLocation(), phase.getToken(),
+              phase, phase.getRegion(), phase.getGSS().getInput(), phase.getGSS());
+    }
     static void error(String message,
                       Input.Location loc,
                       Object token,