forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

fix toString for EPS 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9465]
This commit is contained in:
parrt 2011-11-26 11:00:38 -08:00
parent a81ab4cc64
commit 9b924d0348
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/Java/src/org/antlr/v4/runtime/misc/IntervalSet.java
View File

@ -481,14 +481,12 @@ public class IntervalSet implements IntSet {
int a = I.a;
int b = I.b;
if ( a==b ) {
if ( a==Token.EOF ) buf.append("<EOF>");
else if ( a==Token.EPSILON ) buf.append("<EPSILON>");
else buf.append(tokenNames[a]);
buf.append(elementName(tokenNames, a));
}
else {
for (int i=a; i<=b; i++) {
if ( i>a ) buf.append(", ");
buf.append(tokenNames[i]);
buf.append(elementName(tokenNames, i));
}
}
if ( iter.hasNext() ) {
@ -498,8 +496,15 @@ public class IntervalSet implements IntSet {
if ( this.size()>1 ) {
buf.append("}");
}
return buf.toString();
}
return buf.toString();
}
protected String elementName(String[] tokenNames, int a) {
if ( a==Token.EOF ) return "<EOF>";
else if ( a==Token.EPSILON ) return "<EPSILON>";
else return tokenNames[a];
}
@Override
public int size() {
@ -582,17 +587,17 @@ public class IntervalSet implements IntSet {
// if whole interval x..x, rm
if ( el==a && el==b ) {
intervals.remove(i);
return;
break;
}
// if on left edge x..b, adjust left
if ( el==a ) {
I.a++;
return;
break;
}
// if on right edge a..x, adjust right
if ( el==b ) {
I.b--;
return;
break;
}
// if in middle a..x..b, split interval
if ( el>a && el<b ) { // found in this interval