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 619bf65..316caaf 100644 (file)
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -12,14 +12,14 @@ public class ParseFailed extends Exception {
 
     private final Input.Location location;
     private final String message;
-    public ParseFailed() { this("", null); }
-    public ParseFailed(String message, Input.Location loc) { this.location = loc; this.message = message; }
+    ParseFailed() { this("", null); }
+    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))*/; }
 
     // FIXME
     private static HashSet<GSS.Phase.Node> touched = new HashSet<GSS.Phase.Node>();
-    public static <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force) {
+    static <Tok> void complain(GSS.Phase<Tok>.Node n, HashMap<String,HashSet<String>> errors, boolean force) {
         if (touched.contains(n)) return;
         touched.add(n);
         for(Position p : n.state) {
@@ -35,9 +35,9 @@ public class ParseFailed extends Exception {
         }
     }
 
-    public static String el(Object e) {
+    static String el(Object e) {
         String s = e.toString();
-        if (s.length()==0 || s.charAt(0)!='\"' || s.charAt(s.length()-1)!='\"') return ANSI.yellow(s);
+        if (s.length()==0 || s.charAt(0)!='\"' || s.charAt(s.length()-1)!='\"') return /*ANSI.yellow(s)*/s;
         s = s.substring(1);
         s = s.substring(0, s.length()-1);
         StringBuffer ret = new StringBuffer();
@@ -45,13 +45,14 @@ public class ParseFailed extends Exception {
             if (s.charAt(i)=='\\' && i<s.length()-1) ret.append(s.charAt(++i));
             else ret.append(s);
         }
-        return ANSI.purple(ret.toString());
+        return /*ANSI.purple(ret.toString())*/ret.toString();
     }
-    public static String error(String message, Object token, Iterable<Node> nodes) {
+    static String error(String message, Object token, Iterable<Node> nodes) {
         String lookAhead = token==null ? "<EOF>" : token.toString();
         StringBuffer ret = new StringBuffer();
         ret.append("\n  ");
         ret.append(message);
+        /*
         HashMap<String,HashSet<String>> errors = new HashMap<String,HashSet<String>>();
         for(Node n : nodes) {
             //System.out.println(n.state);
@@ -72,6 +73,7 @@ public class ParseFailed extends Exception {
                 ret.append("\n");
             }
         }
+        */
         return ret.toString();
     }