Skip to content

Bugfix Incorrect Assert in BTree.removeFirst/removeLast #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lorentey merged 3 commits into from
Jan 30, 2024
Merged

Bugfix Incorrect Assert in BTree.removeFirst/removeLast #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f3cced
Add tests for clearing btree using removeFirst
LeoNavel Jan 4, 2024
c623860
Add tests for clearing btree using removeLast
LeoNavel Jan 4, 2024
258df07
Replace less then with less then or equal in removeLast(_:) and remov…
LeoNavel Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/SortedCollections/BTree/_BTree+Partial RangeReplaceableCollection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ extension _BTree {
@inlinable
@inline(__always)
public mutating func removeLast(_ k: Int) {
assert(0 <= k && k < self.count, "Can't remove more items from a collection than it contains")
assert(0 <= k && k <= self.count, "Can't remove more items from a collection than it contains")
for _ in 0..<k {
self.removeLast()
}
Expand Down Expand Up @@ -95,7 +95,7 @@ extension _BTree {
@inlinable
@inline(__always)
public mutating func removeFirst(_ k: Int) {
assert(0 <= k && k < self.count, "Can't remove more items from a collection than it contains")
assert(0 <= k && k <= self.count, "Can't remove more items from a collection than it contains")
for _ in 0..<k {
self.removeFirst()
}
Expand Down
24 changes: 24 additions & 0 deletions Tests/SortedCollectionsTests/BTree/BTree+Deletion Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,29 @@ final class NodeDeletionTests: CollectionTestCase {
}
}
}

func test_removeAllWithRemoveFirst() {
withEvery("size", in: [1, 2, 4, 8, 16, 32, 64, 128, 512]) { size in
btreeOfSize(size) { tree, _ in
expectEqual(tree.count, size)

tree.removeFirst(size)

expectEqual(tree.count, 0)
}
}
}

func test_removeAllWithRemoveLast() {
withEvery("size", in: [1, 2, 4, 8, 16, 32, 64, 128, 512]) { size in
btreeOfSize(size) { tree, _ in
expectEqual(tree.count, size)

tree.removeLast(size)

expectEqual(tree.count, 0)
}
}
}
}
#endif