X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=9bc2ae88d1abf0294cd0c0052085097ad009b753;hb=b7cd03704a32c751575472eadfd433ce15694fce;hp=31a3a56e8e19da65c899f2d59ea308ed9716a550;hpb=a8478f5ddfbfbc8d910d09f27163cbd55752d3b6;p=sbp.git diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java index 31a3a56..9bc2ae8 100644 --- a/src/edu/berkeley/sbp/ParseFailed.java +++ b/src/edu/berkeley/sbp/ParseFailed.java @@ -50,8 +50,11 @@ public class ParseFailed extends Exception { if (count <= 0) { barf(sb, n, indent, skip, loc); } else { + /* + FIXME: removed for(Node nn : (Iterable)n.parents()) barf(sb, nn, indent, skip, count-1, n.phase().getLocation()); + */ } } static void barf(HashMap sb, Node n, int indent, boolean skip, Input.Location loc) { @@ -105,8 +108,13 @@ public class ParseFailed extends Exception { //if (!p.isLast() && !p.next().isLast()) continue; if (((p.isFirst() || p.isLast()) && !force)/* || p.owner().name==null*/ || !important(p)) { + /* + FIXME: removed for(Node n2 : n.parents()) - complain(n2, errors, force /*| p.isFirst()*/, indent); + complain(n2, errors, force + //| p.isFirst() + , indent); + */ } else { String seqname = p.owner()/*.name*/+""; HashSet hs = errors.get(seqname); @@ -130,6 +138,10 @@ public class ParseFailed extends Exception { return ANSI.purple(ret.toString()); } + static void error(String message, GSS.Phase phase) throws ParseFailed { + error(message, phase.getLocation(), phase.getToken(), + phase, phase.getRegion(), phase.getGSS().getInput(), phase.getGSS()); + } static void error(String message, Input.Location loc, Object token,