projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e5041d6
..
9c0a3ad
100644
(file)
--- 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 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) {
//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());
}
}
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 ");
String lookAhead = token==null ? "<EOF>" : token.toString();
StringBuffer ret = new StringBuffer();
ret.append("\n ");