Skip to content

Use IndexOfAnyValues in CompareInfo.Icu.cs #79787

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
MihaZupan merged 1 commit into from
Dec 30, 2022
Merged

Use IndexOfAnyValues in CompareInfo.Icu.cs #79787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 15 additions & 16 deletions 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 @@ -11,6 +11,11 @@ namespace System.Globalization
{
public partial class CompareInfo
{
// Characters which require special handling are those in [0x00, 0x1F] and [0x7F, 0xFFFF] except \t\v\f
// Matches HighCharTable below.
private static readonly IndexOfAnyValues<char> s_nonSpecialAsciiChars =
IndexOfAnyValues.Create("\t\v\f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~");

[NonSerialized]
private bool _isAsciiEqualityOrdinal;

Expand Down Expand Up @@ -99,21 +104,18 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
char* a = ap;
char* b = bp;

for (int j = 0; j < target.Length; j++)
if (target.IndexOfAnyExcept(s_nonSpecialAsciiChars) >= 0)
{
char targetChar = *(b + j);
if (targetChar >= 0x80 || HighCharTable[targetChar])
goto InteropCall;
goto InteropCall;
}

if (target.Length > source.Length)
{
for (int k = 0; k < source.Length; k++)
if (source.IndexOfAnyExcept(s_nonSpecialAsciiChars) >= 0)
{
char targetChar = *(a + k);
if (targetChar >= 0x80 || HighCharTable[targetChar])
goto InteropCall;
goto InteropCall;
}

return -1;
}

Expand Down Expand Up @@ -203,21 +205,18 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
char* a = ap;
char* b = bp;

for (int j = 0; j < target.Length; j++)
if (target.IndexOfAnyExcept(s_nonSpecialAsciiChars) >= 0)
{
char targetChar = *(b + j);
if (targetChar >= 0x80 || HighCharTable[targetChar])
goto InteropCall;
goto InteropCall;
}

if (target.Length > source.Length)
{
for (int k = 0; k < source.Length; k++)
if (source.IndexOfAnyExcept(s_nonSpecialAsciiChars) >= 0)
{
char targetChar = *(a + k);
if (targetChar >= 0x80 || HighCharTable[targetChar])
goto InteropCall;
goto InteropCall;
}

return -1;
}

Expand Down