X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=9c0a3ad1d6bdd0025c2bd21750682e81f33421b8;hb=cf349fcf2f460e53ad5f9dd0397eb382c4aa92b2;hp=e5041d6466c071a2878a4d9766db5d939584b26d;hpb=2fa0e673bf1813cce48ae7004e533a317d5f58e0;p=sbp.git

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