X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fchr%2FCharInput.java;h=8814f796c5b3047a2c3313ea85de6b5a03894588;hb=78a166e98747ddeb79310ccba340f292fa8a6dca;hp=a03f940820c20c43ce600432f3ffbe165d37a366;hpb=dcf8aafe73cbd899d8aebd2ef92df5a75a2c2b69;p=sbp.git diff --git a/src/edu/berkeley/sbp/chr/CharInput.java b/src/edu/berkeley/sbp/chr/CharInput.java index a03f940..8814f79 100644 --- a/src/edu/berkeley/sbp/chr/CharInput.java +++ b/src/edu/berkeley/sbp/chr/CharInput.java @@ -95,11 +95,6 @@ public class CharInput extends Cartesian.Input { Character ret = __next(); if (ret==null) return null; char c = ret.charValue(); - if (indent) { - if (ret==CharAtom.left) System.out.print("\033[31m{\033[0m"); - else if (ret==CharAtom.right) System.out.print("\033[31m}\033[0m"); - else System.out.print(c+""); - } return ret; } public Character __next() throws IOException { @@ -157,19 +152,19 @@ public class CharInput extends Cartesian.Input { if (i>0) { r.unread(CharAtom.left); redent(i-1); return; } } - public String showRegion(Region rc) { + public String showRegion(Region rc, int maxLength) { if (cache == null) return null; Cartesian.Region r = (Cartesian.Region)rc; - int start = r.getStart().getScalar()+1; - int end = r.getEnd().getScalar()+1; + int start = r.getStart().getScalar(); + int end = r.getEnd().getScalar(); if (start < 0) start = 0; if (end < start) end = start; if (end > cache.length()) end = cache.length(); String ret; - if (end-start < 60) ret = cachesubstring(start, end); - else ret = cachesubstring(start, start+25) + + if (end-start < maxLength) ret = cachesubstring(start, end); + else ret = cachesubstring(start, start+(maxLength/2-5)) + "..." + - cachesubstring(end-25, end); + cachesubstring(end-(maxLength/2-5), end); return StringUtil.escapify(ret, "\n\r"); } @@ -181,4 +176,5 @@ public class CharInput extends Cartesian.Input { return cache.substring(start, end); } + public void close() { } }