Merge pull request #287 from lorentey/fix-BitSet-isEqualSet

[BitSet] Fix a thinko in BitSet.isEqualSet
apple · May 19, 2023 · 523a409 · 523a409
2 parents 7de462e + de0f594
commit 523a409
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Sources/BitCollections/BitSet/BitSet._UnsafeHandle.swift b/Sources/BitCollections/BitSet/BitSet._UnsafeHandle.swift
@@ -223,8 +223,8 @@ extension _UnsafeBitSet {
     let r = range.clamped(to: 0 ..< UInt(capacity))
     guard r == range else { return false }
 
-    let lower = Index(range.lowerBound)
-    let upper = Index(range.upperBound)
+    let lower = Index(range.lowerBound).split
+    let upper = Index(range.upperBound).endSplit
 
     guard upper.word == wordCount &- 1 else { return false }
 

diff --git a/Tests/BitCollectionsTests/BitSetTests.swift b/Tests/BitCollectionsTests/BitSetTests.swift
@@ -1109,6 +1109,14 @@ final class BitSetTest: CollectionTestCase {
 
     let c = BitSet(130 ..< 160)
     expectTrue(c.isEqualSet(to: 130 ..< 160))
+
+    withEvery("i", in: stride(from: 0, to: 200, by: 4)) { i in
+      withEvery("j", in: stride(from: i, to: 200, by: 4)) { j in
+        let c = BitSet(i ..< j)
+        expectTrue(c.isEqualSet(to: i ..< j))
+        expectFalse(c.isEqualSet(to: i ..< (j + 1)))
+      }
+    }
   }
 
   func test_isEqual_to_counted_BitSet() {