X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=8e759a88a8b65d8ae88d21fb59ddb527c37939fe;hb=5c4157c1118401c4223ff485e9531fc3ba851be2;hp=9bc2ae88d1abf0294cd0c0052085097ad009b753;hpb=e84029a8b861075d6d0ed5040f919b2e4da4c98f;p=sbp.git

diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java
index 9bc2ae8..8e759a8 100644
--- a/src/edu/berkeley/sbp/ParseFailed.java
+++ b/src/edu/berkeley/sbp/ParseFailed.java
@@ -39,10 +39,10 @@ public class ParseFailed extends Exception {
         if (p.element() == null) return false;
         if (!(p.element() instanceof Union)) return false;
         Union u = (Union)p.element();
-        if (u.synthetic) return false;
-        if (u.name==null) return false;
-        if (u.name.length() == 0) return false;
-        char c = u.name.charAt(0);
+        if (u.isSynthetic()) return false;
+        if (u.getName()==null) return false;
+        if (u.getName().length() == 0) return false;
+        char c = u.getName().charAt(0);
         return (c >= 'A' && c <= 'Z');
     }
 
@@ -83,9 +83,9 @@ public class ParseFailed extends Exception {
                 /*
                else if (p.pos-raise > 0)
                     barf(sb, n, indent, false, 1);
-                */
-                if (!new Walk.Cache().possiblyEpsilon(p.element()))
+                if (!new Grammar(null, null).possiblyEpsilon(p.element()))
                     break;
+                */
                 p = p.next();
                 raise++;
                 if (p.isLast()) {
@@ -163,15 +163,15 @@ public class ParseFailed extends Exception {
             ret.append('\n');
             ret.append("     text: ");
             int budget = 60;
-            String second = input.showRegion(region);
+            String second = input.showRegion(region, 60);
             budget -= second.length();
             Input.Location after = region.getEnd();
             for(int i=0; i<10; i++) after = after.next() == null ? after : after.next();
-            String third = input.showRegion(region.getEnd().createRegion(after));
+            String third = input.showRegion(region.getEnd().createRegion(after), 60);
             budget -= third.length();
             Input.Location before = region.getStart();
             for(int i=0; i<budget; i++) before = before.prev() == null ? before : before.prev();
-            String first = input.showRegion(before.createRegion(region.getStart()));
+            String first = input.showRegion(before.createRegion(region.getStart()), 60);
             ret.append(ANSI.cyan(first));
             ret.append(ANSI.invert(ANSI.red(second)));
             ret.append(ANSI.cyan(third));
@@ -199,7 +199,7 @@ public class ParseFailed extends Exception {
                     ret.append("\n        or " + ANSI.purple(s));
                 }
                 Input.Region reg = loc2.createRegion(region.getEnd());
-                ret.append(" to match \"" + ANSI.cyan(input.showRegion(reg)) + "\" at " + ANSI.yellow(reg));
+                ret.append(" to match \"" + ANSI.cyan(input.showRegion(reg, 60)) + "\" at " + ANSI.yellow(reg));
                 i++;
             }
         }