Skip to content

[stdlib] Add Unicode script data to scalar properties #42227

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
merged 2 commits into from
Apr 8, 2022
Merged

[stdlib] Add Unicode script data to scalar properties #42227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79bf635
Add Unicode script data to scalar properties
Azoy Apr 6, 2022
1a3f791
Underscore the script APIs
Azoy Apr 6, 2022
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: 1 addition & 3 deletions stdlib/public/StringProcessing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ set(swift_string_processing_link_libraries
swift_RegexParser)

file(GLOB_RECURSE _STRING_PROCESSING_SOURCES
"${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_StringProcessing/*.swift"
"${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_CUnicode/*.h"
"${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_CUnicode/*.c")
"${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}/Sources/_StringProcessing/*.swift")
set(STRING_PROCESSING_SOURCES)
foreach(source ${_STRING_PROCESSING_SOURCES})
file(TO_CMAKE_PATH "${source}" source)
Expand Down
9 changes: 8 additions & 1 deletion stdlib/public/SwiftShims/UnicodeData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ __swift_uint32_t _swift_stdlib_getComposition(__swift_uint32_t x,
// Grapheme Breaking
//===----------------------------------------------------------------------===//


SWIFT_RUNTIME_STDLIB_INTERNAL
__swift_uint8_t _swift_stdlib_getGraphemeBreakProperty(__swift_uint32_t scalar);

Expand Down Expand Up @@ -101,6 +100,14 @@ __swift_uint16_t _swift_stdlib_getAge(__swift_uint32_t scalar);
SWIFT_RUNTIME_STDLIB_INTERNAL
__swift_uint8_t _swift_stdlib_getGeneralCategory(__swift_uint32_t scalar);

SWIFT_RUNTIME_STDLIB_INTERNAL
__swift_uint8_t _swift_stdlib_getScript(__swift_uint32_t scalar);

SWIFT_RUNTIME_STDLIB_INTERNAL
const __swift_uint8_t *_swift_stdlib_getScriptExtensions(
__swift_uint32_t scalar,
__swift_uint8_t *count);

#ifdef __cplusplus
} // extern "C"
#endif
Expand Down
42 changes: 42 additions & 0 deletions stdlib/public/core/UnicodeSPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
//
//===----------------------------------------------------------------------===//

import SwiftShims

//===----------------------------------------------------------------------===//
// Unicode.NFD
//===----------------------------------------------------------------------===//
Expand Down Expand Up @@ -123,3 +125,43 @@ extension Substring {
Unicode._NFC(base: unicodeScalars)
}
}

//===----------------------------------------------------------------------===//
// Unicode.Script
//===----------------------------------------------------------------------===//

extension Unicode.Scalar.Properties {
@_spi(_Unicode)
@available(SwiftStdlib 5.7, *)
public var script: UInt8 {
let rawValue = _swift_stdlib_getScript(_scalar.value)

_internalInvariant(rawValue != .max, "Unknown script rawValue")

return rawValue
}

@_spi(_Unicode)
@available(SwiftStdlib 5.7, *)
public var scriptExtensions: [UInt8] {
var count: UInt8 = 0
let pointer = _swift_stdlib_getScriptExtensions(_scalar.value, &count)

guard let pointer = pointer else {
return [script]
}

var result: [UInt8] = []
result.reserveCapacity(Int(count))

for i in 0 ..< count {
let script = pointer[Int(i)]

_internalInvariant(script != .max, "Unknown script rawValue")

result.append(script)
}

return result
}
}
Loading