X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=9c0a3ad1d6bdd0025c2bd21750682e81f33421b8;hb=cf349fcf2f460e53ad5f9dd0397eb382c4aa92b2;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..9c0a3ad 100644
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -16,9 +16,9 @@ public class ParseFailed extends RuntimeException {
     public Token.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;
+    public static <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force) {
+        //if (n.touched) return;
+        //n.touched = true;
         for(Position p : n.state) {
             if (((p.isFirst() || p.isLast()) && !force) || p.owner().name==null) {
                 for(Node n2 : n.parents())
@@ -44,7 +44,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  ");