-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
Use IndexOf for .* in RegexInterpreter/Compiler #31930
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lpereira
reviewed
Feb 7, 2020
...libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs
Show resolved
Hide resolved
lpereira
reviewed
Feb 7, 2020
...libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs
Show resolved
Hide resolved
eerhardt
reviewed
Feb 7, 2020
...raries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs
Outdated
Show resolved
Hide resolved
eerhardt
reviewed
Feb 7, 2020
...raries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs
Outdated
Show resolved
Hide resolved
lpereira
reviewed
Feb 7, 2020
...libraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexCompiler.cs
Show resolved
Hide resolved
eerhardt
reviewed
Feb 7, 2020
...raries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs
Show resolved
Hide resolved
eerhardt
approved these changes
Feb 7, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Almost entirely style. A few substantive but small changes: - Store the TextInfo rather than storing the CultureInfo and accessing the TextInfo virtual property on each call. - Removed unnecessary resx string that should have been an assert - Coalesced duplicate case blocks
This is primarily to improve the performance of .* loops. We'll now use Span.IndexOf to search for the target character (e.g. \n), rather than the open-coded loop we currently have.
02ebe32
to
cd228df
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The first commit primarily cleans up style in RegexInterpreter. As part of that there were a few small substantive changes:
The second commit uses IndexOf to implement Notoneloop{atomic} when we're left-to-right and case-sensitive (which is the typical case). This is most beneficial when someone uses a loop like
.*
, which will generally become[^\n]*
, and thus weIndexOf('\n')
to find the end of the greedy consumption. If the end is found within just a few characters, there's a tiny regression, due to the overhead of calling AsSpan(...).IndexOf, but when there's more than that, the gains can be substantial.Contributes to #1349
cc: @danmosemsft, @eerhardt, @ViktorHofer