checkpoint

[sbp.git] / src / edu / berkeley / sbp / ParseFailed.java

diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java
index 9c0a3ad..75baf3a 100644 (file)
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -9,11 +9,11 @@ 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 {
 
 /** 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); }
     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 <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force) {
     public String toString() { return message/* + (location==null ? "" : (" at " + location))*/; }
 
     public static <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force) {