Merge pull request #993 from pgovind/RegEx

Parse RegEx such as "[^]"
dotnet · Dec 19, 2019 · 8e51dc3 · 8e51dc3
2 parents 0a29c61 + fad9533
commit 8e51dc3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs b/...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs
@@ -562,6 +562,10 @@ private RegexNode ScanReplacement()
                 {
                     charClass!.Negate = true;
                 }
+                if ((_options & RegexOptions.ECMAScript) != 0 && CharAt(_currentPos) == ']')
+                {
+                    firstChar = false;
+                }
             }
 
             for (; CharsRight() > 0; firstChar = false)

diff --git a/src/libraries/System.Text.RegularExpressions/tests/Regex.MultipleMatches.Tests.cs b/src/libraries/System.Text.RegularExpressions/tests/Regex.MultipleMatches.Tests.cs
@@ -140,6 +140,19 @@ public static IEnumerable<object[]> Matches_TestData()
                     new CaptureData("C789", 10, 4),
                 }
             };
+
+            yield return new object[]
+            {
+                "[^]", "every", RegexOptions.ECMAScript,
+                new CaptureData[]
+                {
+                    new CaptureData("e", 0, 1),
+                    new CaptureData("v", 1, 1),
+                    new CaptureData("e", 2, 1),
+                    new CaptureData("r", 3, 1),
+                    new CaptureData("y", 4, 1),
+                }
+            };
         }
 
         [Theory]

diff --git a/src/libraries/System.Text.RegularExpressions/tests/RegexParserTests.cs b/src/libraries/System.Text.RegularExpressions/tests/RegexParserTests.cs
@@ -713,6 +713,7 @@ static RegexParserTests()
         [InlineData(@"\d{2147483648}", RegexOptions.None, RegexParseError.CaptureGroupOutOfRange)]
         [InlineData("[a-z-[b][", RegexOptions.None, RegexParseError.UnterminatedBracket)]
         [InlineData("(?()|||||)", RegexOptions.None, RegexParseError.TooManyAlternates)]
+        [InlineData("[^]", RegexOptions.None, RegexParseError.UnterminatedBracket)]
         public void Parse(string pattern, RegexOptions options, object errorObj)
         {
             RegexParseError? error = (RegexParseError?)errorObj;