Skip to content

Adding Regex.IsMatch(Span) and RegexRunner.Scan() methods #65473

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 18 commits into from
Feb 26, 2022
Merged

Adding Regex.IsMatch(Span) and RegexRunner.Scan() methods #65473

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
27b0c72
Adding Regex.IsMatch(Span) and RegexRunner.Scan() methods
joperezr Feb 17, 2022
6f933a3
Addressing some PR Feedback
joperezr Feb 17, 2022
7bfb28c
Fixing case where span-based APIs are called from a precompiled regex…
joperezr Feb 17, 2022
95c9f3d
Adding Tests for IsMatch span overload
joperezr Feb 18, 2022
6a2043e
Refactor Run<TState> and Run to share centralized logic
joperezr Feb 18, 2022
c410b50
Emit IsBoundary and IsECMABoundary instead of exposing them.
joperezr Feb 18, 2022
6d1710b
Address Emitter changes feedback.
joperezr Feb 18, 2022
4ca5883
Addressing PR Feedback.
joperezr Feb 22, 2022
4f0bd06
Addressing most of the PR comments
joperezr Feb 23, 2022
94d24e3
Fix issue where runtextbeg and length do not match the size of the input
joperezr Feb 23, 2022
62b5b2b
Add Precompiled tests for all overloads of methods.
joperezr Feb 23, 2022
f23c3f2
Fix precompiled test failing in non-Windows due to new lines.
joperezr Feb 24, 2022
7f93517
Apply suggestions from code review
joperezr Feb 24, 2022
08e2a11
Addressing more PR Feedback
joperezr Feb 25, 2022
9b5d704
Fix protected Scan method
joperezr Feb 25, 2022
47d312f
Addressing feedback and adding more tests
joperezr Feb 25, 2022
8295331
Merge remote-tracking branch 'mainrepo/main' into AddingSpanRegexOver…
joperezr Feb 25, 2022
7dc8ca7
Fix few failing tests in Mono runtime
joperezr Feb 26, 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
52 changes: 13 additions & 39 deletions src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Emitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,42 +281,16 @@ private static ImmutableArray<Diagnostic> EmitRegexMethod(IndentedTextWriter wri
writer.WriteLine();
writer.WriteLine($" /// <summary>Determines whether the character at the specified index is a boundary.</summary>");
writer.WriteLine($" [global::System.Runtime.CompilerServices.MethodImpl(global::System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]");
writer.WriteLine($" private static bool IsBoundary(global::System.ReadOnlySpan<char>inputSpan, int index, int startpos, int endpos)");
writer.WriteLine($" private bool IsBoundary(global::System.ReadOnlySpan<char>inputSpan, int index)");
writer.WriteLine($" {{");
writer.WriteLine($" return (index > startpos && IsBoundaryWordChar(inputSpan![index - 1])) !=");
writer.WriteLine($" (index < endpos && IsBoundaryWordChar(inputSpan![index]));");
writer.WriteLine($" const char ZeroWidthNonJoiner = '\\u200C', ZeroWidthJoiner = '\\u200D';");
writer.WriteLine();
writer.WriteLine($" bool IsBoundaryWordChar(char ch)");
writer.WriteLine($" {{");
writer.WriteLine($" global::System.ReadOnlySpan<byte> asciiLookup = new byte[]");
writer.WriteLine($" {{");
writer.WriteLine($" 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x03,");
writer.WriteLine($" 0xFE, 0xFF, 0xFF, 0x87, 0xFE, 0xFF, 0xFF, 0x07");
writer.WriteLine($" }};");
writer.WriteLine();
writer.WriteLine($" int chDiv8 = ch >> 3;");
writer.WriteLine($" if ((uint)chDiv8 < (uint)asciiLookup.Length)");
writer.WriteLine($" {{");
writer.WriteLine($" return (asciiLookup[chDiv8] & (1 << (ch & 0x7))) != 0;");
writer.WriteLine($" }}");
writer.WriteLine();
writer.WriteLine($" switch (global::System.Globalization.CharUnicodeInfo.GetUnicodeCategory(ch))");
writer.WriteLine($" {{");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.UppercaseLetter:");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.LowercaseLetter:");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.TitlecaseLetter:");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.ModifierLetter:");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.OtherLetter:");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.NonSpacingMark:");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.DecimalDigitNumber:");
writer.WriteLine($" case global::System.Globalization.UnicodeCategory.ConnectorPunctuation:");
writer.WriteLine($" return true;");
writer.WriteLine($" return (index > base.runtextbeg && IsBoundaryWordChar(inputSpan![index - 1])) !=");
writer.WriteLine($" (index < inputSpan.Length && IsBoundaryWordChar(inputSpan![index]));");
writer.WriteLine();
writer.WriteLine($" default:");
writer.WriteLine($" const char ZeroWidthNonJoiner = '\u200C', ZeroWidthJoiner = '\u200D';");
writer.WriteLine($" return ch == ZeroWidthJoiner | ch == ZeroWidthNonJoiner;");
writer.WriteLine($" }}");
writer.WriteLine($" }}");
writer.WriteLine($" bool IsBoundaryWordChar(char ch) =>");
writer.WriteLine($" IsWordChar(ch) ||");
writer.WriteLine($" (ch == ZeroWidthJoiner | ch == ZeroWidthNonJoiner);");
writer.WriteLine($" }}");
}

Expand All @@ -325,16 +299,16 @@ private static ImmutableArray<Diagnostic> EmitRegexMethod(IndentedTextWriter wri
writer.WriteLine();
writer.WriteLine($" /// <summary>Determines whether the character at the specified index is a boundary.</summary>");
writer.WriteLine($" [global::System.Runtime.CompilerServices.MethodImpl(global::System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]");
writer.WriteLine($" private static bool IsECMABoundary(global::System.ReadOnlySpan<char>inputSpan, int index, int startpos, int endpos)");
writer.WriteLine($" private bool IsECMABoundary(global::System.ReadOnlySpan<char>inputSpan, int index)");
writer.WriteLine($" {{");
writer.WriteLine($" return (index > startpos && IsECMAWordChar(inputSpan![index - 1])) !=");
writer.WriteLine($" (index < endpos && IsECMAWordChar(inputSpan![index]));");
writer.WriteLine($" return (index > base.runtextbeg && IsECMAWordChar(inputSpan![index - 1])) !=");
writer.WriteLine($" (index < inputSpan.Length && IsECMAWordChar(inputSpan![index]));");
writer.WriteLine();
writer.WriteLine($" bool IsECMAWordChar(char ch) =>");
writer.WriteLine($" ((((uint)ch - 'A') & ~0x20) < 26) || // ASCII letter");
writer.WriteLine($" (((uint)ch - '0') < 10) || // digit");
writer.WriteLine($" ch == '_' || // underscore");
writer.WriteLine($" ch == '\u0130'; // latin capital letter I with dot above");
writer.WriteLine($" ch == '\\u0130'; // latin capital letter I with dot above");
writer.WriteLine($" }}");
}

Expand Down Expand Up @@ -2247,13 +2221,13 @@ void EmitBoundary(RegexNode node)
var boundaryFunctionRequired = node.Kind switch
{
RegexNodeKind.Boundary or
RegexNodeKind.NonBoundary => RequiredHelperFunctions.IsBoundary,
RegexNodeKind.NonBoundary => RequiredHelperFunctions.IsBoundary | RequiredHelperFunctions.IsWordChar, // IsBoundary internally uses IsWordChar
_ => RequiredHelperFunctions.IsECMABoundary
};

requiredHelpers |= boundaryFunctionRequired;

using (EmitBlock(writer, $"if ({call}(inputSpan, pos{(sliceStaticPos > 0 ? $" + {sliceStaticPos}" : "")}, base.runtextbeg, end))"))
using (EmitBlock(writer, $"if ({call}(inputSpan, pos{(sliceStaticPos > 0 ? $" + {sliceStaticPos}" : "")}))"))
{
writer.WriteLine($"goto {doneLabel};");
}
Expand Down