Skip to content

Commit 173d2ac

Browse files
MahanazAtiqullahcompnerdlorentey3405691582vihanb
authored
BitArray and BitSet data structures (apple#83)
* Create Screen Shot 2021-05-17 at 7.15.09 PM.png * Delete Screen Shot 2021-05-17 at 7.15.09 PM.png * Create BitArray.swift * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * Added BitArray as a product to the package * Update Package.swift * Update Package.swift * Update Package.swift * Update BitArray.swift * Update Package.swift * Update Collections.swift * Update Collections.swift * Update Package.swift * Create BitArray.xcscheme * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * build: add a CMake based build system (apple#42) Add a CMake based build system to enable bootstrapping the toolchain with the ability to use Swift Collections in SPM. * Update BitArray.swift * Update BitArray.swift * git: ignore vim swap files (apple#41) * Initial conformation to Collection. Lots of faulty code right now * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * Update BitArray.swift * [Deque] Work around stdlib issue with Array.withContiguousStorageIfAvailable (apple#44) Resolves apple#27. * [manifest] Ignore CMake files (apple#47) The package manager doesn’t like it when it finds unexpected non-source files in source directories. * [meta] Update dependencies (apple#48) (This only affects local development.) * [Deque][NFC] Remove unused code (apple#49) * Changes to support OpenBSD. (apple#52) * [cmake] Support amd64 architecture name. On OpenBSD, "x86_64" is called "amd64", and therefore recognition of this name is required for the cmake build. * [cmake] Add missing file. This is required since, for example, `Deque+Extras` requires `_withContiguousStorageIfAvailable_SR14663`. * ManagedBuffer.capacity is unavailable on OpenBSD. ManagedBuffer requires nonstandard API to implement `capacity` and subsequently is unavailable on OpenBSD. For portability, just use `minimumCapacity` on this platform. * Fixed subscript to have bit manipulations * Update BitArray.swift * Update BitArray.swift * Moved Collection Conformance into appropriate file * Implements some bit manip * Fixed issue with endIndex resetting when storage element is full When an element of the storage array in the BitArray filled, the endIndex would reset to 0, but then would be the correct value at any other time. This was due to a calculation error in endIndex * Update invalid OrderedDictionary invariant check. (apple#53) * Added XCTests, MutableCollection Conformance, Fixed endIndex bug MutableCollection conformance still has bugs to be fixed Additionally, the code is still very rough endIndex had an issue where it was 0 when the array was empty. Fixed this by switching the code for count and endIndex, and making endIndex = 1 when count is 0 * Update BitArrayTests.swift * Fixed subscript bug Wouldn't work sometimes when current value was true because the return for `storage[index] & mask` could be anything >= 1, and not == 1, hence resulting in a unwanted toggle of the value. Fixed by comparing a boolean value of the current value to the boolean value of the newValue instead of the integers * Code clean up ish * Fixing a small typo on quick help documentation. (apple#55) * Modifying Existing Code From Feedback - `endIndex` corrected - changed `remaining` in `count` to use ternary operator instead of being a computed local variable - added `_split` as a helper function to `subscript` - modified `set{...}` portion of `subscript` and included comments of the different options - removed `clear()` as `removeAll()` seems to already exist somewhere - modified unit tests to have a new BitArray for every test instead of a shared one - Improved `testSubscriptSetOnly()` to hopefully be more thorough * Added Bitwise Operations (No Tests) Both mutable and immutable OR, AND, XOR operations * Mark OrderedSetDiffingTests with availability (apple#54) * Added Rough Bitwise Operation UnitTests * Added BitSet Files Did not add methods as I know a lot will go in BitStorage, which Im still figuring out * Beginning implementations for BitSet * Mutating Bitwise Operations Performance-UNfriendly starter implementations * Fixed subscript set mask for the &= operation and changed fatalErrors to preconditions changed mask on &= operation from 0 to ~mask * Also corrected subscript set test to fail if mask of 0 was used (instead of ~mask) * Implemented BitSet with BitArray storage type and some tests Tests are not yet passing. Pushing early so mentor can see progress So sorry for waiting to push so late! * Fixed error in first BitSet test ( which is testAppend() ) so it passes! * BitSet formUnion initial implementation * formUnion() test added and implementation modified to pass test formUnion() is still incomplete and needs more tests atm * Finished formUnion() for BitSet * Modified formUnion() to use bit shifts instead * Initial formIntersection function for BitSet Untested * Added an array view for BitSet, fixed BitSet.count bug, added and modified tests * Initial Cartesian Product implementation and unfinished test * Update BitArrayConformances.swift * [CMake] swift-collections → SwiftCollections (apple#60) * [CMake] swift-collections → SwiftCollections This is an integration FIXME for SwiftPM: swiftlang/swift-package-manager#3595 (comment) * [CMake] Generate exports under cmake/modules/SwiftCollectionsConfig.cmake * Work around another MergeModules crash (apple#62) * [utils] Add utility for shuffling sources to help reproduce MergeModules issues * [Deque] Collapse Sequence/Collection conformances into a single file The MergeModules phase in the compiler is broken: it isn’t always able to correctly handle circular dependencies across source files, like the ones that keep organically popping up with Sequence/Collection conformances that are defined in separate files. Such dependencies sometimes triggers a compiler crash, depending on some (unknown) environmental parameters. Trying to manually find and eliminate these circular dependencies has not proved productive. Instead, roll all Collection conformances into a single, huge source file. * [Deque] Update CMakeLists * [test] checkCollection: Don’t pass decreasing indices to distance(from:to:) (apple#63) Also, try running the conformance checkers on the minimal collection types to catch similar issues. * Attempting to make an Index * First steps in implementing Index struct for BitSet * Fixed up endIndex * Last tweaks of tonight Tomorrow: fix up Index implementations, SetAlgebra, Unit Testing * Adding index function preconditions * Altered index(_ index: Index, offsetBy distance: Int) -> Index * Update BitSetConformances.swift * Update BitSetBitwiseOperations.swift * Time for SetAlgebra! * Transitioning to using CollectionsTestSupport * Conformance to Set Algebra (without bringing in bitarray methods) * Overloaded Bitwise Operators on BitArray * Tilday (bitwiseNOT operations) * Fixed coding style - 2 space indents * Initial implementation od initializers Bug found * Fixed count bug * Completed and XCTested BitArray initializers By"XCTested" I mean using my own XCTests without the thorough CollectionsTestSupport * Update BitArray.swift * BitSet Initializers -- XCTested By "XCTested" I mean not thoroughly tested with the CollectionsTestSupport methods * BitSet's "custom" SetAlgebra * contains(Int) and dropExcessFalses() methods for BitSet * Consistently use UNIT.bitWidth instead of the number 8 This will be useful for benchmarking purposes * Modified BitArray.swift according to feedback Also added more typealias consistencies (using `UNIT.max` instead of hardcoded 255) * Modified BitArray bitwise operations according to feedback Added overloaded mutating operators * Modified BitArrayConformances.swift according to feedback * Modified BitArrayOperations.swift according to feedbacl * Adjust Bitwise Operations' naming to be consistent with that of the atomics package * . * Modified According to Feedback * testing * First working test using CollectionsTestSupport Testing sequence initializer * All initializer tests for BitArray (except using BitSet) * Update BitArrayTests.swift * BitArray Append test * Improved BitArray append() test to test multiple appends * Untested remove functions Also updated any UInt8 usages to use the UNIT typealias instead * BitArray removeLast() Test * Update BitArrayTests.swift * BitArray removeAll() test * BitArray removeLast(_ rangeSize: Int) function test and bug fix * BitArray removet(at: Int) tests Also added test for discardable results for current and existing remove tests * BitArray removeFirst(_ rangeSize: Int) test implemented and passing Current method has terrible run time for now as I can't get the optimized version to work yet * BitArray first and last true index functions TEST and BUG FIX firstTrueIndex() lastTrueIndex() * Failing OR and AND bitwise operations test on BitArray * Update BitArrayTests.swift * Update BitArrayTests.swift * Update BitArrayTests.swift * PUSHHHHH * removeFirst(_ rangeSize: Int) optimization/bugFix * BitArray bitwise operations tests and bug fixes * BitSet tests, bug fixes, and name changes sequence init test and bug fix change "UNIT" to "WORD" * Update BitArrayTests.swift * add BitSet layout to test support * BitSet testExpressibleByArrayLiteralAndArrayLiteralInit() * testExpressibleByArrayLiteralAndArrayLiteralInit() * BitSet insert and contains functions test + bug fixes * forceInsert test for BitSet * BitSet remove function test and improvements * Update BitSetSetAlgebra.swift * BitSet intersection tests and bug fixes * BitSet symmetricDifference test and bug fix * starting index test and found interesting bug... * BitArray init(BitSet) test * Update BitSetTests.swift * patch * bug fix in BitSet index after * BitSet index before test * Clean up unneeded code * Delete BitArrayBenchmarks.swift * My added, not-working benchmark * BitSet init from BitArray benchmark * BiSet insert benchmark * BitSet forceInsert benchmark * Passing BitSet index offset by test I plan to add more to the test to test offsets from indices in the middle and not just start and end * BitArray testing modification to accommodate varying WORD sizes * Minor comment clean-up * Correcting bitset tests for varying WORD sizes * Headers with License info * simple set operation comparison incomplete * . * adjustments * Update BitSetOperations.swift * Benchmarks and preconditions * Update BitArrayOperations.swift * Update BitSetTests.swift * quick edits * . * Documentation for bitwise operations and some initializers * Testing `==` operator to ensure bug fix * BitSet SetAlgebra and Operations Documentation * Update BitSetOperations.swift Co-authored-by: Saleem Abdulrasool <[email protected]> Co-authored-by: Karoy Lorentey <[email protected]> Co-authored-by: 3405691582 <[email protected]> Co-authored-by: Vihan <[email protected]> Co-authored-by: Rodrigo Kreutz <[email protected]> Co-authored-by: Andrew Monshizadeh <[email protected]>
1 parent fcb788c commit 173d2ac

File tree

66 files changed

+4101
-963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+4101
-963
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
/Packages
44
/*.xcodeproj
55
xcuserdata/
6+
.*.sw?

‎.swiftpm/xcode/xcshareddata/xcschemes/BitArray.xcscheme

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1250"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "BitArray"
18+
BuildableName = "BitArray"
19+
BlueprintName = "BitArray"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "BitArray"
54+
BuildableName = "BitArray"
55+
BlueprintName = "BitArray"
56+
ReferencedContainer = "container:">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎.swiftpm/xcode/xcshareddata/xcschemes/BitArrayTests.xcscheme

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1250"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "NO"
13+
buildForArchiving = "NO"
14+
buildForAnalyzing = "NO">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "BitArrayTests"
18+
BuildableName = "BitArrayTests"
19+
BlueprintName = "BitArrayTests"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<Testables>
32+
<TestableReference
33+
skipped = "NO">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "BitArrayTests"
37+
BuildableName = "BitArrayTests"
38+
BlueprintName = "BitArrayTests"
39+
ReferencedContainer = "container:">
40+
</BuildableReference>
41+
</TestableReference>
42+
</Testables>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
</LaunchAction>
55+
<ProfileAction
56+
buildConfiguration = "Release"
57+
shouldUseLaunchSchemeArgsEnv = "YES"
58+
savedToolIdentifier = ""
59+
useCustomWorkingDirectory = "NO"
60+
debugDocumentVersioning = "YES">
61+
<MacroExpansion>
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "BitArrayTests"
65+
BuildableName = "BitArrayTests"
66+
BlueprintName = "BitArrayTests"
67+
ReferencedContainer = "container:">
68+
</BuildableReference>
69+
</MacroExpansion>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎.swiftpm/xcode/xcshareddata/xcschemes/swift-collections-Package.xcscheme

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
<BuildActionEntry
3838
buildForTesting = "YES"
3939
buildForRunning = "YES"
40-
buildForProfiling = "NO"
41-
buildForArchiving = "NO"
40+
buildForProfiling = "YES"
41+
buildForArchiving = "YES"
4242
buildForAnalyzing = "YES">
4343
<BuildableReference
4444
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "DequeTests"
46-
BuildableName = "DequeTests"
47-
BlueprintName = "DequeTests"
45+
BlueprintIdentifier = "OrderedCollections"
46+
BuildableName = "OrderedCollections"
47+
BlueprintName = "OrderedCollections"
4848
ReferencedContainer = "container:">
4949
</BuildableReference>
5050
</BuildActionEntry>
@@ -56,9 +56,9 @@
5656
buildForAnalyzing = "YES">
5757
<BuildableReference
5858
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "CollectionsTestSupport"
60-
BuildableName = "CollectionsTestSupport"
61-
BlueprintName = "CollectionsTestSupport"
59+
BlueprintIdentifier = "swift-collections-benchmark"
60+
BuildableName = "swift-collections-benchmark"
61+
BlueprintName = "swift-collections-benchmark"
6262
ReferencedContainer = "container:">
6363
</BuildableReference>
6464
</BuildActionEntry>
@@ -70,9 +70,9 @@
7070
buildForAnalyzing = "YES">
7171
<BuildableReference
7272
BuildableIdentifier = "primary"
73-
BlueprintIdentifier = "swift-collections-benchmark"
74-
BuildableName = "swift-collections-benchmark"
75-
BlueprintName = "swift-collections-benchmark"
73+
BlueprintIdentifier = "CollectionsTestSupport"
74+
BuildableName = "CollectionsTestSupport"
75+
BlueprintName = "CollectionsTestSupport"
7676
ReferencedContainer = "container:">
7777
</BuildableReference>
7878
</BuildActionEntry>
@@ -104,6 +104,34 @@
104104
ReferencedContainer = "container:">
105105
</BuildableReference>
106106
</BuildActionEntry>
107+
<BuildActionEntry
108+
buildForTesting = "YES"
109+
buildForRunning = "NO"
110+
buildForProfiling = "NO"
111+
buildForArchiving = "NO"
112+
buildForAnalyzing = "NO">
113+
<BuildableReference
114+
BuildableIdentifier = "primary"
115+
BlueprintIdentifier = "DequeTests"
116+
BuildableName = "DequeTests"
117+
BlueprintName = "DequeTests"
118+
ReferencedContainer = "container:">
119+
</BuildableReference>
120+
</BuildActionEntry>
121+
<BuildActionEntry
122+
buildForTesting = "YES"
123+
buildForRunning = "NO"
124+
buildForProfiling = "NO"
125+
buildForArchiving = "NO"
126+
buildForAnalyzing = "NO">
127+
<BuildableReference
128+
BuildableIdentifier = "primary"
129+
BlueprintIdentifier = "CollectionsTestSupportTests"
130+
BuildableName = "CollectionsTestSupportTests"
131+
BlueprintName = "CollectionsTestSupportTests"
132+
ReferencedContainer = "container:">
133+
</BuildableReference>
134+
</BuildActionEntry>
107135
<BuildActionEntry
108136
buildForTesting = "YES"
109137
buildForRunning = "YES"
@@ -112,9 +140,23 @@
112140
buildForAnalyzing = "YES">
113141
<BuildableReference
114142
BuildableIdentifier = "primary"
115-
BlueprintIdentifier = "OrderedCollections"
116-
BuildableName = "OrderedCollections"
117-
BlueprintName = "OrderedCollections"
143+
BlueprintIdentifier = "BitArray"
144+
BuildableName = "BitArray"
145+
BlueprintName = "BitArray"
146+
ReferencedContainer = "container:">
147+
</BuildableReference>
148+
</BuildActionEntry>
149+
<BuildActionEntry
150+
buildForTesting = "YES"
151+
buildForRunning = "YES"
152+
buildForProfiling = "YES"
153+
buildForArchiving = "YES"
154+
buildForAnalyzing = "YES">
155+
<BuildableReference
156+
BuildableIdentifier = "primary"
157+
BlueprintIdentifier = "BitArrayModule"
158+
BuildableName = "BitArrayModule"
159+
BlueprintName = "BitArrayModule"
118160
ReferencedContainer = "container:">
119161
</BuildableReference>
120162
</BuildActionEntry>
@@ -146,6 +188,26 @@
146188
ReferencedContainer = "container:">
147189
</BuildableReference>
148190
</TestableReference>
191+
<TestableReference
192+
skipped = "NO">
193+
<BuildableReference
194+
BuildableIdentifier = "primary"
195+
BlueprintIdentifier = "CollectionsTestSupportTests"
196+
BuildableName = "CollectionsTestSupportTests"
197+
BlueprintName = "CollectionsTestSupportTests"
198+
ReferencedContainer = "container:">
199+
</BuildableReference>
200+
</TestableReference>
201+
<TestableReference
202+
skipped = "NO">
203+
<BuildableReference
204+
BuildableIdentifier = "primary"
205+
BlueprintIdentifier = "BitArrayTests"
206+
BuildableName = "BitArrayTests"
207+
BlueprintName = "BitArrayTests"
208+
ReferencedContainer = "container:">
209+
</BuildableReference>
210+
</TestableReference>
149211
</Testables>
150212
</TestAction>
151213
<LaunchAction

‎.swiftpm/xcode/xcshareddata/xcschemes/swift-collections-benchmark.xcscheme

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@
4848
ReferencedContainer = "container:">
4949
</BuildableReference>
5050
</TestableReference>
51+
<TestableReference
52+
skipped = "NO">
53+
<BuildableReference
54+
BuildableIdentifier = "primary"
55+
BlueprintIdentifier = "BitArrayTests"
56+
BuildableName = "BitArrayTests"
57+
BlueprintName = "BitArrayTests"
58+
ReferencedContainer = "container:">
59+
</BuildableReference>
60+
</TestableReference>
5161
</Testables>
5262
</TestAction>
5363
<LaunchAction

0 commit comments

Comments
 (0)