Skip to content

[release/6.0-preview7] Eliminate backtracking in the interpreter for patterns with .* #55960

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
safern merged 17 commits into from
Jul 20, 2021
Merged

[release/6.0-preview7] Eliminate backtracking in the interpreter for patterns with .* #55960

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
daa2813
First cut of look up table for speeding up Go()
Apr 13, 2021
4a917c2
More efficient .* in RegexInterpreter
Apr 13, 2021
4cf9ce9
sq
Apr 19, 2021
11d00c1
Get more debug info
Apr 20, 2021
a015470
Remove assert and add unit test
Apr 26, 2021
d01e32c
Potential unit test
May 26, 2021
7b15bac
temp
Jun 21, 2021
c086dc8
Fix a bug
Jun 22, 2021
c9621dd
sq
Jun 22, 2021
485aac5
Add extra protection to the backtracking optimization
Jun 22, 2021
dba0279
Add unit test
Jun 22, 2021
2059451
Revert
Jun 30, 2021
2766f30
RegexCompiler changes
Apr 23, 2021
f136bde
sq
Jul 14, 2021
1db6349
Remove debug unit tests
Jul 14, 2021
848aff0
Add a length to the AsSpan call
Jul 14, 2021
69a9c1d
Address RegexCompiler comments and add unit tests
Jul 16, 2021
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
Remove assert and add unit test
  • Loading branch information
Prashanth Govindarajan authored and github-actions committed Jul 19, 2021
commit a0154702166484e06564885c1115165e3998b919
1 change: 0 additions & 1 deletion ...ies/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexInterpreter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,6 @@ protected override void Go()
if (len > i && _operator == RegexCode.Notoneloop)
{
TrackPush(len - i - 1, runtextpos - Bump());
Debug.Assert(_maxBacktrackPosition == -1, $"maxBacktrackPosition = {_maxBacktrackPosition}, runtext = {runtext}, runtextpos = {runtextpos}, ch = {ch}, code = {_code}, runregex = {runregex}");
_maxBacktrackPosition = tempMaxBacktrackPosition;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Text.RegularExpressions/tests/Regex.Match.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ public static IEnumerable<object[]> Match_Basic_TestData()

// Using *, +, ?, {}: Actual - "a+\\.?b*\\.?c{2}"
yield return new object[] { @"a+\.?b*\.+c{2}", "ab.cc", RegexOptions.None, 0, 5, true, "ab.cc" };
yield return new object[] { @"[^a]+\.[^z]+", "zzzzz", RegexOptions.None, 0, 5, false, string.Empty };

// RightToLeft
yield return new object[] { @"\s+\d+", "sdf 12sad", RegexOptions.RightToLeft, 0, 9, true, " 12" };
Expand Down