projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e80bc9
)
more accurate positions in CharInput
author
adam
<adam@megacz.com>
Fri, 20 Apr 2007 03:24:07 +0000
(23:24 -0400)
committer
adam
<adam@megacz.com>
Fri, 20 Apr 2007 03:24:07 +0000
(23:24 -0400)
darcs-hash:
20070420032407
-5007d-
3cd0f9eb4995bf6a0f119bcee258086ca5647701
.gz
src/edu/berkeley/sbp/chr/CharInput.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/sbp/chr/CharInput.java
b/src/edu/berkeley/sbp/chr/CharInput.java
index
3ebbb88
..
8814f79
100644
(file)
--- 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> {
Character ret = __next();
if (ret==null) return null;
char c = ret.charValue();
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 {
return ret;
}
public Character __next() throws IOException {
@@
-160,8
+155,8
@@
public class CharInput extends Cartesian.Input<Character> {
public String showRegion(Region<Character> rc, int maxLength) {
if (cache == null) return null;
Cartesian.Region r = (Cartesian.Region)rc;
public String showRegion(Region<Character> 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();
if (start < 0) start = 0;
if (end < start) end = start;
if (end > cache.length()) end = cache.length();
@@
-181,4
+176,5
@@
public class CharInput extends Cartesian.Input<Character> {
return cache.substring(start, end);
}
return cache.substring(start, end);
}
+ public void close() { }
}
}