syntax: fix a bug when pushing range in intervalset.

Licheam · web-flow · commit dd46d346fb40 · 2023-07-23T14:56:36.000+08:00
diff --git a/regex-syntax/src/hir/interval.rs b/regex-syntax/src/hir/interval.rs
@@ -97,6 +97,7 @@ impl<I: Interval> IntervalSet<I> {
         let mut drain_end = self.ranges.len();
         while drain_end > 0
             && self.ranges[drain_end - 1].lower() > interval.upper()
+            && !self.ranges[drain_end - 1].is_contiguous(&interval)
         {
             drain_end -= 1;
         }
@@ -106,7 +107,7 @@ impl<I: Interval> IntervalSet<I> {
         {
             self.ranges[drain_end - 1] =
                 self.ranges[drain_end - 1].union(&interval).unwrap();
-            for i in 0..drain_end - 1 {
+            for i in (0..drain_end - 1).rev() {
                 if let Some(union) =
                     self.ranges[drain_end - 1].union(&self.ranges[i])
                 {

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ impl<I: Interval> IntervalSet<I> {`
`97`	`97`	`let mut drain_end = self.ranges.len();`
`98`	`98`	`while drain_end > 0`
`99`	`99`	`&& self.ranges[drain_end - 1].lower() > interval.upper()`
	`100`	`+ && !self.ranges[drain_end - 1].is_contiguous(&interval)`
`100`	`101`	`{`
`101`	`102`	`drain_end -= 1;`
`102`	`103`	`}`
`@@ -106,7 +107,7 @@ impl<I: Interval> IntervalSet<I> {`
`106`	`107`	`{`
`107`	`108`	`self.ranges[drain_end - 1] =`
`108`	`109`	`self.ranges[drain_end - 1].union(&interval).unwrap();`
`109`		`- for i in 0..drain_end - 1 {`
	`110`	`+ for i in (0..drain_end - 1).rev() {`
`110`	`111`	`if let Some(union) =`
`111`	`112`	`self.ranges[drain_end - 1].union(&self.ranges[i])`
`112`	`113`	`{`