Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[iOS][non-icu] HybridGlobalization implement GetSortKey on hybrid mode #95260

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 13 commits into from
Dec 6, 2023
Merged

[iOS][non-icu] HybridGlobalization implement GetSortKey on hybrid mode #95260

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4b04265
Implement GetSortKey on hybrid mode
mkhamoyan Nov 27, 2023
cdc0030
Update tests
mkhamoyan Nov 27, 2023
e03f411
Refactor the function and run more tests
mkhamoyan Nov 28, 2023
a97a48b
Minor update
mkhamoyan Nov 28, 2023
b37beba
update GetSortKeyNative function
mkhamoyan Nov 29, 2023
33049cf
Disable test only for hybrid mode on osx
mkhamoyan Nov 29, 2023
3b72c25
Enable SortKey tests
mkhamoyan Nov 30, 2023
09c5be3
Fix build failure
mkhamoyan Nov 30, 2023
3ed713f
Refactor GetSortKey function
mkhamoyan Dec 4, 2023
b87b919
Merge branch 'main' into get_sort_key_hybrid
mkhamoyan Dec 4, 2023
32cc7f1
Update src/libraries/System.Private.CoreLib/src/System/Globalization/…
mkhamoyan Dec 4, 2023
dd9bab2
Refactor GetSortKey function
mkhamoyan Dec 5, 2023
52243ba
update documentation
mkhamoyan Dec 6, 2023
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
Prev Previous commit
Next Next commit
update GetSortKeyNative function
  • Loading branch information
@mkhamoyan
mkhamoyan committed Nov 29, 2023
commit b37beba81f90f07672e37821c0efe034fbf87aa2
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ private unsafe SortKey IcuCreateSortKey(string source, CompareOptions options)
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
{
if (Interop.Globalization.GetSortKey(_sortHandle, pSource, source.Length, null, 0, options) != sortKeyLength)
if (Interop.Globalization.GetSortKeyNative(m_name, m_name.Length, pSource, source.Length, null, 0, options) != sortKeyLength)
{
throw new ArgumentException(SR.Arg_ExternalException);
}
Expand Down
10 changes: 4 additions & 6 deletions src/native/libs/System.Globalization.Native/pal_collation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,8 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t
@autoreleasepool {
if (cwStrLength == 0)
{
if (sortKey == NULL)
sortKey = malloc(1);
sortKey[0] = '\0';
if (sortKey != NULL)
sortKey[0] = '\0';
return 1;
}
NSString *sourceString = [NSString stringWithCharacters: lpStr length: cwStrLength];
Expand All @@ -330,9 +329,8 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t

if (dataToUse != nil) {
const uint8_t *bytesToCopy = (const uint8_t *)[dataToUse bytes];
if (sortKey == NULL)
sortKey = (uint8_t *)malloc(utf8Length);
memcpy(sortKey, bytesToCopy, utf8Length);
if (sortKey != NULL)
memcpy(sortKey, bytesToCopy, utf8Length);
return utf8Length;
}

Expand Down