X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=75baf3af91a02d5fb442ff4791b8f9f9ee7664e7;hp=e5041d6466c071a2878a4d9766db5d939584b26d;hb=6a2ea790f843e058c7e67d3c7d1deebadcfe1fd5;hpb=4519f5ec820b1e704dba2df8727bd41b3384c49d

diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java
index e5041d6..75baf3a 100644
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -9,14 +9,14 @@ 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;
+    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) {
+    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) {
@@ -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  ");