X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=619bf65f88ae2465a6b3e9ce49c71a73c04d2324;hb=e12a3098c6ed3cbfa6493870af3688f833c4f8ac;hp=9a7012ffddf4d2f899b03129de2da561b9a0eacf;hpb=ddf7ffb485e6b3dd0fe6b1b39b47a21a1e4b8973;p=sbp.git

diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java
index 9a7012f..619bf65 100644
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -8,23 +8,26 @@ import java.io.*;
 import java.util.*;
 
 /** thrown when the parser arrives at a state from which it is clear that no valid parse can result */
-public class ParseFailed extends RuntimeException {
-    private final Token.Location location;
+public class ParseFailed extends Exception {
+
+    private final Input.Location location;
     private final String message;
     public ParseFailed() { this("", null); }
-    public ParseFailed(String message, Token.Location loc) { this.location = loc; this.message = message; }
-    public Token.Location getLocation() { return location; }
+    public ParseFailed(String message, Input.Location loc) { this.location = loc; this.message = message; }
+    public Input.Location getLocation() { return location; }
     public String toString() { return message/* + (location==null ? "" : (" at " + location))*/; }
 
-    public static void complain(Node n, HashMap<String,HashSet<String>> errors, boolean force) {
-        if (n.touched) return;
-        n.touched = true;
+    // FIXME
+    private static HashSet<GSS.Phase.Node> touched = new HashSet<GSS.Phase.Node>();
+    public static <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force) {
+        if (touched.contains(n)) return;
+        touched.add(n);
         for(Position p : n.state) {
-            if (((p.isFirst() || p.isLast()) && !force) || p.owner().name==null) {
+            if (((p.isFirst() || p.isLast()) && !force)/* || p.owner().name==null*/) {
                 for(Node n2 : n.parents())
                     complain(n2, errors, force | p.isFirst());
             } else {
-                String seqname = p.owner().name;
+                String seqname = p.owner()/*.name*/+"";
                 HashSet<String> hs = errors.get(seqname);
                 if (hs==null) errors.put(seqname, hs = new HashSet<String>());
                 hs.add(p.element()+"");
@@ -44,7 +47,7 @@ public class ParseFailed extends RuntimeException {
         }
         return ANSI.purple(ret.toString());
     }
-    public static String error(String message, Token token, Iterable<Node> nodes) {
+    public static String error(String message, Object token, Iterable<Node> nodes) {
         String lookAhead = token==null ? "<EOF>" : token.toString();
         StringBuffer ret = new StringBuffer();
         ret.append("\n  ");