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

Fix IntervalSet.add when multiple merges are required

This commit is contained in:
Sam Harwell 2013-02-05 13:11:49 -06:00
parent aae042c6db
commit adf80e166a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,14 +141,17 @@ public class IntervalSet implements IntSet {
iter.set(bigger); iter.set(bigger);
// make sure we didn't just create an interval that // make sure we didn't just create an interval that
// should be merged with next interval in list // should be merged with next interval in list
if ( iter.hasNext() ) { while ( iter.hasNext() ) {
Interval next = iter.next(); Interval next = iter.next();
if ( bigger.adjacent(next)||!bigger.disjoint(next) ) { if ( !bigger.adjacent(next) && bigger.disjoint(next) ) {
break;
}
// if we bump up against or overlap next, merge // if we bump up against or overlap next, merge
iter.remove(); // remove this one iter.remove(); // remove this one
iter.previous(); // move backwards to what we just set iter.previous(); // move backwards to what we just set
iter.set(bigger.union(next)); // set to 3 merged ones iter.set(bigger.union(next)); // set to 3 merged ones
} iter.next(); // first call to next after previous duplicates the result
} }
return; return;
} }