X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParseFailed.java;h=872ffacb1e421559a85974b9cef44d5303c82925;hp=2cc9f49d4ed5c8e4100a9339013d3f55fa32a36d;hb=24219bdf084b45273e869cd19382d1640b396566;hpb=a82ff8c049dd265ecf1d115d60e1be8ecb81a4c1 diff --git a/src/edu/berkeley/sbp/ParseFailed.java b/src/edu/berkeley/sbp/ParseFailed.java index 2cc9f49..872ffac 100644 --- a/src/edu/berkeley/sbp/ParseFailed.java +++ b/src/edu/berkeley/sbp/ParseFailed.java @@ -1,10 +1,11 @@ -// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license +// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license package edu.berkeley.sbp; import edu.berkeley.sbp.*; -import edu.berkeley.sbp.Sequence.Position; +import edu.berkeley.sbp.Sequence.Pos; +import edu.berkeley.sbp.Sequence.Pos; import edu.berkeley.sbp.GSS.Phase; -import edu.berkeley.sbp.Node; +import edu.berkeley.sbp.StateNode; import edu.berkeley.sbp.util.*; import java.io.*; import java.util.*; @@ -34,7 +35,7 @@ public class ParseFailed extends Exception { return ret.toString(); } - private static boolean important(Position p) { + private static boolean important(Pos p) { if (p.isLast()) return false; if (p.element() == null) return false; if (!(p.element() instanceof Union)) return false; @@ -46,28 +47,29 @@ public class ParseFailed extends Exception { return (c >= 'A' && c <= 'Z'); } - static void barf(HashMap sb, Node n, int indent, boolean skip, int count, Input.Location loc) { + static void barf(HashMap sb, StateNode n, int indent, boolean skip, int count, Input.Location loc) { if (count <= 0) { barf(sb, n, indent, skip, loc); } else { /* FIXME: removed - for(Node nn : (Iterable)n.parents()) + for(StateNode 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) { + static void barf(HashMap sb, StateNode n, int indent, boolean skip, Input.Location loc) { if (touched.contains(n)) return; touched.add(n); String s = ""; for(int i=0; i< indent; i++) s += " "; - Node parent = n; + StateNode parent = n; boolean done = false; boolean alldone = false; boolean go = false; boolean force = false; - for(Position p : (Iterable)parent.state()) { + for(Pos pp : (Iterable)parent.state().positions()) { + Pos p = (Pos)pp; if (skip) p = p.next(); int raise = 0; done = false; @@ -83,9 +85,9 @@ public class ParseFailed extends Exception { /* else if (p.pos-raise > 0) barf(sb, n, indent, false, 1); - */ - if (!new Cache(null, null).possiblyEpsilon(p.element())) + if (!new Grammar(null, null).possiblyEpsilon(p.element())) break; + */ p = p.next(); raise++; if (p.isLast()) { @@ -100,17 +102,17 @@ public class ParseFailed extends Exception { // FIXME - private static HashSet touched = new HashSet(); - static void complain(Node n, HashMap> errors, boolean force, int indent) { + private static HashSet touched = new HashSet(); + static void complain(StateNode n, HashMap> errors, boolean force, int indent) { if (touched.contains(n)) return; touched.add(n); - for(Position p : (Iterable)n.state()) { + for(Pos p : (Iterable)n.state()) { //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()) + for(StateNode n2 : n.parents()) complain(n2, errors, force //| p.isFirst() , indent); @@ -138,40 +140,39 @@ 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, GSS.Phase phase, Object token, Input.Region region) throws ParseFailed { + error(message, + token, + phase, + region, + phase.getGSS().getInput(), + phase.getGSS()); } - static void error(String message, - Input.Location loc, - Object token, - Iterable nodes, - Input.Region region, - Input input, - GSS gss) throws ParseFailed{ + private static void error(String message, + Object token, + Iterable nodes, + Input.Region region, + Input input, + GSS gss) throws ParseFailed{ String lookAhead = token==null ? "" : token.toString(); StringBuffer ret = new StringBuffer(); ret.append(ANSI.bold(ANSI.red(message))); - if (token != null) { - ret.append(" \'"); - ret.append(ANSI.cyan(StringUtil.escapify(token+"", "\\\'\r\n"))); - ret.append("\'"); - } + String toks = token+""; ret.append(" at "); ret.append(ANSI.yellow(region+"")); if (input != null) { 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 hm = new HashMap(); - for(Node no : nodes) + for(StateNode no : nodes) barf(hm, no, 0, false, region.getStart()); ret.append("\n expected: "); Set hs = hm.keySet(); @@ -199,14 +200,14 @@ 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++; } } /* ret.append("\n The author of SBP apologizes for the these nearly-useless error messages:\n\n"); HashMap> errors = new HashMap>(); - for(Node n : nodes) { + for(StateNode n : nodes) { //System.out.println(n.state); complain(n, errors, false, 0); }