Skip to content

Commit 8e5a46c

Browse files
committed
Remove script data
1 parent 15a20b2 commit 8e5a46c

File tree

7 files changed

+14
-667
lines changed

7 files changed

+14
-667
lines changed

Package.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ let package = Package(
4545
dependencies: [
4646
"_RegexParser", "_StringProcessing"
4747
]),
48-
.target(
49-
name: "_CUnicode",
50-
dependencies: []),
5148
.target(
5249
name: "_StringProcessing",
53-
dependencies: ["_RegexParser", "_CUnicode"],
50+
dependencies: ["_RegexParser"],
5451
swiftSettings: [
5552
.unsafeFlags(["-enable-library-evolution"]),
5653
availabilityDefinition

Sources/_CUnicode/Common/ScriptData.h

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

Sources/_CUnicode/UnicodeData.c

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

Sources/_CUnicode/UnicodeScalarProps.c

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

Sources/_CUnicode/include/UnicodeData.h

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

Sources/_StringProcessing/ConsumerInterface.swift

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12+
@_spi(_Unicode) import Swift
1213
@_implementationOnly import _RegexParser
1314

1415
extension DSLTree.Node {
@@ -325,15 +326,23 @@ private func consumeScalarScript(
325326
_ s: Unicode.Script
326327
) -> MEProgram<String>.ConsumeFunction {
327328
consumeScalar {
328-
Unicode.Script($0) == s
329+
if #available(SwiftStdlib 5.7, *) {
330+
return unsafeBitCast($0.properties._script, to: Unicode.Script.self) == s
331+
} else {
332+
return false
333+
}
329334
}
330335
}
331336
private func consumeScalarScriptExtension(
332337
_ s: Unicode.Script
333338
) -> MEProgram<String>.ConsumeFunction {
334339
consumeScalar {
335-
let extensions = Unicode.Script.extensions(for: $0)
336-
return extensions.contains(s)
340+
if #available(SwiftStdlib 5.7, *) {
341+
let extensions = $0.properties._scriptExtensions
342+
return extensions.contains(unsafeBitCast(s, to: UInt8.self))
343+
} else {
344+
return false
345+
}
337346
}
338347
}
339348
private func consumeScalarGC(

Sources/_StringProcessing/Unicode/ScalarProps.swift

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,4 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
@_silgen_name("_swift_stdlib_getScript")
13-
func _swift_stdlib_getScript(_: UInt32) -> UInt8
14-
15-
@_silgen_name("_swift_stdlib_getScriptExtensions")
16-
func _swift_stdlib_getScriptExtensions(
17-
_: UInt32,
18-
_: UnsafeMutablePointer<UInt8>
19-
) -> UnsafePointer<UInt8>?
20-
21-
extension Unicode.Script {
22-
init(_ scalar: Unicode.Scalar) {
23-
let rawValue = _swift_stdlib_getScript(scalar.value)
24-
25-
_internalInvariant(rawValue != .max, "Unknown script rawValue: \(rawValue)")
26-
27-
self = unsafeBitCast(rawValue, to: Self.self)
28-
}
29-
30-
static func extensions(for scalar: Unicode.Scalar) -> [Unicode.Script] {
31-
var count: UInt8 = 0
32-
let pointer = _swift_stdlib_getScriptExtensions(scalar.value, &count)
33-
34-
guard let pointer = pointer else {
35-
return [Unicode.Script(scalar)]
36-
}
37-
38-
var result: [Unicode.Script] = []
39-
40-
for i in 0 ..< count {
41-
let script = pointer[Int(i)]
42-
43-
result.append(unsafeBitCast(script, to: Unicode.Script.self))
44-
}
45-
46-
return result
47-
}
48-
}
12+
// TODO

0 commit comments

Comments
 (0)