Skip to content

Commit b1432b7

Browse files
authored
Update PropertyList (#267)
* Add PropertyKeyLookup protocol * Update PropertyList.Tracker * Update invalidate test case for Tracker * Update override and description for PropertyList * Update subscript implementation for PropertyList * Update PropertyKeyLookup for PropertyList * Update forEach for PropertyList * Update compareLists implementation * Update merge test case for PropertyList * Fix existing test case * Complete PropertyList implementation * Fix 6.0 compiler compacitbity issue * Update documentation for PropertyList
1 parent ae06786 commit b1432b7

File tree

20 files changed

+1674
-619
lines changed

20 files changed

+1674
-619
lines changed

Package.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "5e3702487c06d4bad355311803d0cebe543527e4de91cb6857a25375e22f85a9",
2+
"originHash" : "b9fba48e8675bc3d76b8bb419a70ff1739d473df3240c29e20a4d2bfc78dd1c0",
33
"pins" : [
44
{
55
"identity" : "darwinprivateframeworks",

Package.swift

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ let openSwiftUICoreTestTarget = Target.testTarget(
163163
dependencies: [
164164
"OpenSwiftUI", // NOTE: For the Glue link logic only, do not call `import OpenSwiftUI` in this target
165165
"OpenSwiftUICore",
166+
"OpenSwiftUITestsSupport",
166167
.product(name: "Numerics", package: "swift-numerics"),
167168
],
168169
exclude: ["README.md"],
@@ -193,6 +194,14 @@ let openSwiftUITarget = Target.target(
193194
swiftSettings: sharedSwiftSettings
194195
)
195196

197+
let openSwiftUITestsSupportTarget = Target.target(
198+
name: "OpenSwiftUITestsSupport",
199+
dependencies: [
200+
"OpenSwiftUI",
201+
],
202+
swiftSettings: sharedSwiftSettings
203+
)
204+
196205
let openSwiftUIExtensionTarget = Target.target(
197206
name: "OpenSwiftUIExtension",
198207
dependencies: [
@@ -205,6 +214,7 @@ let openSwiftUITestTarget = Target.testTarget(
205214
name: "OpenSwiftUITests",
206215
dependencies: [
207216
"OpenSwiftUI",
217+
"OpenSwiftUITestsSupport",
208218
],
209219
exclude: ["README.md"],
210220
swiftSettings: sharedSwiftSettings
@@ -213,6 +223,7 @@ let openSwiftUITestTarget = Target.testTarget(
213223
let openSwiftUICompatibilityTestTarget = Target.testTarget(
214224
name: "OpenSwiftUICompatibilityTests",
215225
dependencies: [
226+
"OpenSwiftUITestsSupport",
216227
.product(name: "Numerics", package: "swift-numerics"),
217228
],
218229
exclude: ["README.md"],
@@ -238,6 +249,7 @@ let openSwiftUIBridgeTestTarget = Target.testTarget(
238249
name: "OpenSwiftUIBridgeTests",
239250
dependencies: [
240251
"OpenSwiftUIBridge",
252+
"OpenSwiftUITestsSupport",
241253
],
242254
exclude: ["README.md"],
243255
sources: ["BridgeableTests.swift", bridgeFramework],
@@ -246,8 +258,8 @@ let openSwiftUIBridgeTestTarget = Target.testTarget(
246258

247259
// MARK: - OpenSwiftUISymbolDualTests Target
248260

249-
let openSwiftUISymbolDualTestsHelperTarget = Target.target(
250-
name: "OpenSwiftUISymbolDualTestsHelper",
261+
let openSwiftUISymbolDualTestsSupportTarget = Target.target(
262+
name: "OpenSwiftUISymbolDualTestsSupport",
251263
dependencies: [
252264
.product(name: "SymbolLocator", package: "SymbolLocator"),
253265
],
@@ -262,7 +274,8 @@ let openSwiftUISymbolDualTestsTarget = Target.testTarget(
262274
name: "OpenSwiftUISymbolDualTests",
263275
dependencies: [
264276
"OpenSwiftUI",
265-
.target(name: "OpenSwiftUISymbolDualTestsHelper"),
277+
"OpenSwiftUITestsSupport",
278+
"OpenSwiftUISymbolDualTestsSupport",
266279
],
267280
exclude: ["README.md"],
268281
swiftSettings: sharedSwiftSettings
@@ -323,14 +336,15 @@ let package = Package(
323336

324337
cOpenSwiftUITarget,
325338
openSwiftUITarget,
339+
openSwiftUITestsSupportTarget,
326340
openSwiftUIExtensionTarget,
327341
openSwiftUITestTarget,
328342
openSwiftUICompatibilityTestTarget,
329343

330344
openSwiftUIBridgeTarget,
331345
openSwiftUIBridgeTestTarget,
332346

333-
openSwiftUISymbolDualTestsHelperTarget,
347+
openSwiftUISymbolDualTestsSupportTarget,
334348
openSwiftUISymbolDualTestsTarget
335349
]
336350
)

Sources/OpenSwiftUICore/Data/Other/BloomFilter.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,4 @@ package struct BloomFilter: Equatable {
9494
let bit2 = 1 &<< (value &>> 0x4)
9595
self.value = bit0 | bit1 | bit2
9696
}
97-
98-
// FIXME:
99-
@inline(__always)
100-
package func match(_ filter: BloomFilter) -> Bool {
101-
(value & filter.value) == value
102-
}
10397
}

Sources/OpenSwiftUICore/Data/Property/DerivedPropertyKey.swift

Lines changed: 0 additions & 11 deletions
This file was deleted.

Sources/OpenSwiftUICore/Data/Property/PropertyKey.swift

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)