averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for scalar names

Browse Source
This commit is contained in:
Alejandro Alonso
2021-12-20 13:51:45 -08:00
parent e5bfda7c6e
commit 76fbb3c139
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
stdlib/public/stubs/Unicode/UnicodeScalarProps.cpp
View File

@@ -233,18 +233,30 @@ __swift_intptr_t _swift_stdlib_getScalarName(__swift_uint32_t scalar,
auto scalarIndex = (setOffset << 7) + (scalar & ((1 << 7) - 1));
auto scalarOffset = _swift_stdlib_names_scalars[scalarIndex];
if (scalarOffset == 0) {
// U+20 is the first scalar that Unicode defines a name for, so their offset
// will the only valid 0.
if (scalarOffset == 0 && scalar != 0x20) {
return 0;
}
__swift_uint32_t nextScalarOffset = 0;
int i = 1;
// Look for the next scalar who has a name and their position in the names
// array. This tells us exactly how many bytes our name takes up.
while (nextScalarOffset == 0) {
nextScalarOffset = _swift_stdlib_names_scalars[scalarIndex + i];
i += 1;
if (scalarIndex != NAMES_SCALARS_MAX_INDEX) {
int i = 1;
// Look for the next scalar who has a name and their position in the names
// array. This tells us exactly how many bytes our name takes up.
while (nextScalarOffset == 0) {
nextScalarOffset = _swift_stdlib_names_scalars[scalarIndex + i];
i += 1;
}
} else {
// This is the last element in the array which represents the last scalar
// name that Unicode defines (excluding variation selectors). This is
// U+E007F at the moment whose name is 'CANCEL TAG'. We add 4 because
// 'CANCEL' is found outside the byte area for words, but tag does.
// The resulting word indices look like this: [..., 0xFF, _, _, 0xXX];
nextScalarOffset = scalarOffset + 4;
}
auto nameSize = nextScalarOffset - scalarOffset;