diff --git a/Sources/BitCollections/CMakeLists.txt b/Sources/BitCollections/CMakeLists.txt index 1d5733634..b8990fdf7 100644 --- a/Sources/BitCollections/CMakeLists.txt +++ b/Sources/BitCollections/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ This source file is part of the Swift Collections Open Source Project -Copyright (c) 2022 Apple Inc. and the Swift project authors +Copyright (c) 2022 - 2023 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -13,9 +13,8 @@ add_library(BitCollections "BitArray/BitArray+Codable.swift" "BitArray/BitArray+Collection.swift" "BitArray/BitArray+Copy.swift" - "BitArray/BitArray+CustomDebugStringConvertible.swift" "BitArray/BitArray+CustomReflectable.swift" - "BitArray/BitArray+CustomStringConvertible.swift" + "BitArray/BitArray+Descriptions.swift" "BitArray/BitArray+Equatable.swift" "BitArray/BitArray+ExpressibleByArrayLiteral.swift" "BitArray/BitArray+Extras.swift" @@ -23,7 +22,7 @@ add_library(BitCollections "BitArray/BitArray+Hashable.swift" "BitArray/BitArray+Initializers.swift" "BitArray/BitArray+Invariants.swift" - "BitArray/BitArray+Random.swift" + "BitArray/BitArray+RandomBits.swift" "BitArray/BitArray+RangeReplaceableCollection.swift" "BitArray/BitArray+Testing.swift" "BitArray/BitArray._UnsafeHandle.swift" diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index ad81e77d9..0d24cb071 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ This source file is part of the Swift Collections Open Source Project -Copyright (c) 2021-2022 Apple Inc. and the Swift project authors +Copyright (c) 2021 - 2023 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,7 +10,8 @@ See https://swift.org/LICENSE.txt for license information add_subdirectory(BitCollections) add_subdirectory(Collections) add_subdirectory(DequeModule) +add_subdirectory(HashTreeCollections) add_subdirectory(HeapModule) add_subdirectory(OrderedCollections) -add_subdirectory(HashTreeCollections) +add_subdirectory(RopeModule) add_subdirectory(_CollectionsUtilities) diff --git a/Sources/HashTreeCollections/CMakeLists.txt b/Sources/HashTreeCollections/CMakeLists.txt index 96bc2ac0a..f28687f46 100644 --- a/Sources/HashTreeCollections/CMakeLists.txt +++ b/Sources/HashTreeCollections/CMakeLists.txt @@ -1,7 +1,7 @@ #[[ This source file is part of the Swift Collections Open Source Project -Copyright (c) 2022 Apple Inc. and the Swift project authors +Copyright (c) 2022 - 2023 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -12,8 +12,6 @@ add_library(HashTreeCollections "HashNode/_Bitmap.swift" "HashNode/_Bucket.swift" "HashNode/_Hash.swift" - "HashNode/_HashTreeIterator.swift" - "HashNode/_HashTreeStatistics.swift" "HashNode/_HashLevel.swift" "HashNode/_HashNode+Builder.swift" "HashNode/_HashNode+Debugging.swift" @@ -40,10 +38,12 @@ add_library(HashTreeCollections "HashNode/_HashNode+Subtree Removals.swift" "HashNode/_HashNode+UnsafeHandle.swift" "HashNode/_HashNode.swift" - "HashNode/_RawHashNode+UnsafeHandle.swift" - "HashNode/_RawHashNode.swift" "HashNode/_HashSlot.swift" "HashNode/_HashStack.swift" + "HashNode/_HashTreeIterator.swift" + "HashNode/_HashTreeStatistics.swift" + "HashNode/_RawHashNode+UnsafeHandle.swift" + "HashNode/_RawHashNode.swift" "HashNode/_HashNodeHeader.swift" "HashNode/_UnmanagedHashNode.swift" "HashNode/_UnsafePath.swift" diff --git a/Sources/HashTreeCollections/HashNode/_StorageHeader.swift b/Sources/HashTreeCollections/HashNode/_HashNodeHeader.swift similarity index 100% rename from Sources/HashTreeCollections/HashNode/_StorageHeader.swift rename to Sources/HashTreeCollections/HashNode/_HashNodeHeader.swift diff --git a/Sources/RopeModule/CMakeLists.txt b/Sources/RopeModule/CMakeLists.txt new file mode 100644 index 000000000..936e16cc2 --- /dev/null +++ b/Sources/RopeModule/CMakeLists.txt @@ -0,0 +1,94 @@ +#[[ +This source file is part of the Swift Collections Open Source Project + +Copyright (c) 2023 Apple Inc. and the Swift project authors +Licensed under Apache License v2.0 with Runtime Library Exception + +See https://swift.org/LICENSE.txt for license information +#]] + +add_library(RopeModule + "BigString/Basics/BigString+Metrics.swift" + "BigString/Basics/BigString+Index.swift" + "BigString/Basics/BigString+Summary.swift" + "BigString/Basics/BigString.swift" + "BigString/Basics/BigString+Iterators.swift" + "BigString/Basics/BigString+Contents.swift" + "BigString/Basics/BigString+Invariants.swift" + "BigString/Basics/BigString+Ingester.swift" + "BigString/Basics/BigString+Debugging.swift" + "BigString/Basics/BigString+Builder.swift" + "BigString/Chunk/BigString+Chunk+Append and Insert.swift" + "BigString/Chunk/BigString+Chunk+Indexing by UTF16.swift" + "BigString/Chunk/BigString+Chunk+Counts.swift" + "BigString/Chunk/BigString+Chunk+Indexing by Characters.swift" + "BigString/Chunk/BigString+Chunk.swift" + "BigString/Chunk/BigString+Chunk+Description.swift" + "BigString/Chunk/BigString+Chunk+Splitting.swift" + "BigString/Chunk/BigString+Chunk+Breaks.swift" + "BigString/Chunk/BigString+Chunk+RopeElement.swift" + "BigString/Operations/BigString+Split.swift" + "BigString/Operations/BigString+Managing Breaks.swift" + "BigString/Operations/BigString+RemoveSubrange.swift" + "BigString/Operations/BigString+ReplaceSubrange.swift" + "BigString/Operations/BigString+Insert.swift" + "BigString/Operations/BigString+Initializers.swift" + "BigString/Operations/Range+BigString.swift" + "BigString/Operations/BigString+Append.swift" + "BigString/Views/BigString+UnicodeScalarView.swift" + "BigString/Views/BigString+UTF8View.swift" + "BigString/Views/BigSubstring+UnicodeScalarView.swift" + "BigString/Views/BigSubstring.swift" + "BigString/Views/BigSubstring+UTF16View.swift" + "BigString/Views/BigString+UTF16View.swift" + "BigString/Views/BigSubstring+UTF8View.swift" + "BigString/Conformances/BigString+Hashing.swift" + "BigString/Conformances/BigString+CustomStringConvertible.swift" + "BigString/Conformances/BigString+BidirectionalCollection.swift" + "BigString/Conformances/BigString+CustomDebugStringConvertible.swift" + "BigString/Conformances/BigString+Equatable.swift" + "BigString/Conformances/BigString+TextOutputStream.swift" + "BigString/Conformances/BigString+LosslessStringConvertible.swift" + "BigString/Conformances/BigString+Sequence.swift" + "BigString/Conformances/BigString+ExpressibleByStringLiteral.swift" + "BigString/Conformances/BigString+RangeReplaceableCollection.swift" + "BigString/Conformances/BigString+Comparable.swift" + "Rope/Basics/RopeMetric.swift" + "Rope/Basics/_RopeItem.swift" + "Rope/Basics/Rope+Debugging.swift" + "Rope/Basics/_RopeVersion.swift" + "Rope/Basics/RopeElement.swift" + "Rope/Basics/Rope.swift" + "Rope/Basics/Rope+_UnsafeHandle.swift" + "Rope/Basics/Rope+_Storage.swift" + "Rope/Basics/Rope+Invariants.swift" + "Rope/Basics/Rope+_UnmanagedLeaf.swift" + "Rope/Basics/RopeSummary.swift" + "Rope/Basics/Rope+Builder.swift" + "Rope/Basics/_RopePath.swift" + "Rope/Basics/Rope+_Node.swift" + "Rope/Operations/Rope+Extract.swift" + "Rope/Operations/Rope+Append.swift" + "Rope/Operations/Rope+Split.swift" + "Rope/Operations/Rope+Find.swift" + "Rope/Operations/Rope+Insert.swift" + "Rope/Operations/Rope+ForEachWhile.swift" + "Rope/Operations/Rope+MutatingForEach.swift" + "Rope/Operations/Rope+Join.swift" + "Rope/Operations/Rope+Remove.swift" + "Rope/Operations/Rope+RemoveSubrange.swift" + "Rope/Conformances/Rope+Index.swift" + "Rope/Conformances/Rope+Sequence.swift" + "Rope/Conformances/Rope+Collection.swift" + "Utilities/String Utilities.swift" + "Utilities/_CharacterRecognizer.swift" + "Utilities/String.Index+ABI.swift" + "Utilities/Optional Utilities.swift" + ) +target_link_libraries(RopeModule PRIVATE + _CollectionsUtilities) +set_target_properties(RopeModule PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) + +_install_target(RopeModule) +set_property(GLOBAL APPEND PROPERTY SWIFT_COLLECTIONS_EXPORTS RopeModule) diff --git a/Sources/_CollectionsUtilities/CMakeLists.txt b/Sources/_CollectionsUtilities/CMakeLists.txt index 0fdaec55e..3873f3839 100644 --- a/Sources/_CollectionsUtilities/CMakeLists.txt +++ b/Sources/_CollectionsUtilities/CMakeLists.txt @@ -1,29 +1,29 @@ #[[ This source file is part of the Swift Collections Open Source Project -Copyright (c) 2022 Apple Inc. and the Swift project authors +Copyright (c) 2022 - 2023 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information #]] add_library(_CollectionsUtilities - "Compatibility/Array+WithContiguousStorage Compatibility.swift" - "Compatibility/UnsafeMutableBufferPointer+SE-0370.swift" - "Compatibility/UnsafeMutablePointer+SE-0370.swift" - "Compatibility/UnsafeRawPointer extensions.swift" - "Debugging.swift" - "Descriptions.swift" - "IntegerTricks/FixedWidthInteger+roundUpToPowerOfTwo.swift" - "IntegerTricks/Integer rank.swift" - "IntegerTricks/UInt+first and last set bit.swift" - "IntegerTricks/UInt+reversed.swift" - "RandomAccessCollection+Offsets.swift" - "UnsafeBitSet/_UnsafeBitSet+Index.swift" - "UnsafeBitSet/_UnsafeBitSet+_Word.swift" - "UnsafeBitSet/_UnsafeBitSet.swift" - "UnsafeBufferPointer+Extras.swift" - "UnsafeMutableBufferPointer+Extras.swift" + "Compatibility/autogenerated/Array+WithContiguousStorage Compatibility.swift" + "Compatibility/autogenerated/UnsafeMutableBufferPointer+SE-0370.swift" + "Compatibility/autogenerated/UnsafeMutablePointer+SE-0370.swift" + "Compatibility/autogenerated/UnsafeRawPointer extensions.swift" + "autogenerated/Debugging.swift" + "autogenerated/Descriptions.swift" + "IntegerTricks/autogenerated/FixedWidthInteger+roundUpToPowerOfTwo.swift" + "IntegerTricks/autogenerated/Integer rank.swift" + "IntegerTricks/autogenerated/UInt+first and last set bit.swift" + "IntegerTricks/autogenerated/UInt+reversed.swift" + "autogenerated/RandomAccessCollection+Offsets.swift" + "UnsafeBitSet/autogenerated/_UnsafeBitSet+Index.swift" + "UnsafeBitSet/autogenerated/_UnsafeBitSet+_Word.swift" + "UnsafeBitSet/autogenerated/_UnsafeBitSet.swift" + "autogenerated/UnsafeBufferPointer+Extras.swift" + "autogenerated/UnsafeMutableBufferPointer+Extras.swift" "_SortedCollection.swift" "_UniqueCollection.swift" ) diff --git a/Xcode/Collections.xcodeproj/project.pbxproj b/Xcode/Collections.xcodeproj/project.pbxproj index adec5ddec..38b1e44e9 100644 --- a/Xcode/Collections.xcodeproj/project.pbxproj +++ b/Xcode/Collections.xcodeproj/project.pbxproj @@ -281,7 +281,7 @@ 7DE9215A29CA70F4004483EB /* _HashNode+Structural subtracting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE329CA70F3004483EB /* _HashNode+Structural subtracting.swift */; }; 7DE9215B29CA70F4004483EB /* _HashNode+Structural mapValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE429CA70F3004483EB /* _HashNode+Structural mapValues.swift */; }; 7DE9215C29CA70F4004483EB /* _Bitmap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE529CA70F3004483EB /* _Bitmap.swift */; }; - 7DE9215D29CA70F4004483EB /* _StorageHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE629CA70F3004483EB /* _StorageHeader.swift */; }; + 7DE9215D29CA70F4004483EB /* _HashNodeHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE629CA70F3004483EB /* _HashNodeHeader.swift */; }; 7DE9215E29CA70F4004483EB /* _HashNode+Lookups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE729CA70F3004483EB /* _HashNode+Lookups.swift */; }; 7DE9215F29CA70F4004483EB /* _UnsafePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE829CA70F3004483EB /* _UnsafePath.swift */; }; 7DE9216029CA70F4004483EB /* _HashNode+Structural isDisjoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DE91FE929CA70F3004483EB /* _HashNode+Structural isDisjoint.swift */; }; @@ -731,7 +731,7 @@ 7DE91FE329CA70F3004483EB /* _HashNode+Structural subtracting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "_HashNode+Structural subtracting.swift"; sourceTree = ""; }; 7DE91FE429CA70F3004483EB /* _HashNode+Structural mapValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "_HashNode+Structural mapValues.swift"; sourceTree = ""; }; 7DE91FE529CA70F3004483EB /* _Bitmap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _Bitmap.swift; sourceTree = ""; }; - 7DE91FE629CA70F3004483EB /* _StorageHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _StorageHeader.swift; sourceTree = ""; }; + 7DE91FE629CA70F3004483EB /* _HashNodeHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _HashNodeHeader.swift; sourceTree = ""; }; 7DE91FE729CA70F3004483EB /* _HashNode+Lookups.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "_HashNode+Lookups.swift"; sourceTree = ""; }; 7DE91FE829CA70F3004483EB /* _UnsafePath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _UnsafePath.swift; sourceTree = ""; }; 7DE91FE929CA70F3004483EB /* _HashNode+Structural isDisjoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "_HashNode+Structural isDisjoint.swift"; sourceTree = ""; }; @@ -1457,7 +1457,7 @@ 7DE91FDE29CA70F3004483EB /* _RawHashNode+UnsafeHandle.swift */, 7DE91FCF29CA70F3004483EB /* _HashSlot.swift */, 7DE91FCB29CA70F3004483EB /* _HashStack.swift */, - 7DE91FE629CA70F3004483EB /* _StorageHeader.swift */, + 7DE91FE629CA70F3004483EB /* _HashNodeHeader.swift */, 7DE91FD929CA70F3004483EB /* _UnmanagedHashNode.swift */, 7DE91FE829CA70F3004483EB /* _UnsafePath.swift */, ); @@ -2055,7 +2055,7 @@ 7DE920EC29CA70F4004483EB /* BitArray+Collection.swift in Sources */, 7DE9201729CA70F3004483EB /* OrderedDictionary+Codable.swift in Sources */, 7DE9208329CA70F4004483EB /* BigString+CustomDebugStringConvertible.swift in Sources */, - 7DE9215D29CA70F4004483EB /* _StorageHeader.swift in Sources */, + 7DE9215D29CA70F4004483EB /* _HashNodeHeader.swift in Sources */, 7DE9213329CA70F4004483EB /* TreeSet+Collection.swift in Sources */, 7DE9217929CA70F4004483EB /* Heap+UnsafeHandle.swift in Sources */, 7DE920BC29CA70F4004483EB /* _UniqueCollection.swift in Sources */,