add Static based Regex.EnumerateMatches

api_list.include.md

@@ -302,6 +302,9 @@
 
 #### RegexPolyfill
 
+ * `ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<Char>, String)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches?view=net-8.0#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string))
+ * `ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<Char>, String, RegexOptions, TimeSpan)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions-system-timespan))
+ * `ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<Char>, String, RegexOptions)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions))
  * `Boolean IsMatch(ReadOnlySpan<Char>, String, RegexOptions, TimeSpan)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions-system-timespan))
  * `Boolean IsMatch(ReadOnlySpan<Char>, String, RegexOptions)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions))
  * `Boolean IsMatch(ReadOnlySpan<Char>, String)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string))

readme.md

@@ -658,6 +658,9 @@ The class `Polyfill` includes the following extension methods:
 
 #### RegexPolyfill
 
+ * `ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<Char>, String)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches?view=net-8.0#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string))
+ * `ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<Char>, String, RegexOptions, TimeSpan)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions-system-timespan))
+ * `ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<Char>, String, RegexOptions)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions))
  * `Boolean IsMatch(ReadOnlySpan<Char>, String, RegexOptions, TimeSpan)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions-system-timespan))
  * `Boolean IsMatch(ReadOnlySpan<Char>, String, RegexOptions)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions))
  * `Boolean IsMatch(ReadOnlySpan<Char>, String)` [reference](https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string))

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>2.5.0</Version>
+    <Version>2.6.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Polyfill</PackageTags>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>

src/Polyfill/Regex/Polyfill_Regex.cs

@@ -45,29 +45,5 @@ public static ValueMatchEnumerator EnumerateMatches (this Regex target, ReadOnly
     [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-int32)")]
     public static ValueMatchEnumerator EnumerateMatches (this Regex target, ReadOnlySpan<char> input, int startat) =>
         new(target, input, startat);
-    //
-    // /// <summary>
-    // /// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
-    // /// </summary>
-    // /// <returns>A Regex.ValueMatchEnumerator to iterate over the matches.</returns>
-    // [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string)")]
-    // public static ValueMatchEnumerator EnumerateMatches (this Regex target, ReadOnlySpan<char> input, string pattern) =>
-    //     new(target, input, target.RightToLeft ? input.Length : 0);
-    //
-    // /// <summary>
-    // /// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
-    // /// </summary>
-    // /// <returns>A Regex.ValueMatchEnumerator to iterate over the matches.</returns>
-    // [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions)")]
-    // public static ValueMatchEnumerator EnumerateMatches (this Regex target, ReadOnlySpan<char> input, string pattern, System.Text.RegularExpressions.RegexOptions options) =>
-    //     new(target, input, target.RightToLeft ? input.Length : 0);
-    //
-    // /// <summary>
-    // /// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
-    // /// </summary>
-    // /// <returns>A Regex.ValueMatchEnumerator to iterate over the matches.</returns>
-    // [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions-system-timespan)")]
-    // public static ValueMatchEnumerator EnumerateMatches (this Regex target, ReadOnlySpan<char> input, string pattern, System.Text.RegularExpressions.RegexOptions options, TimeSpan matchTimeout) =>
-    //     new(target, input, target.RightToLeft ? input.Length : 0);
 }
 #endif

src/Polyfill/Regex/RegexPolyfill.cs

@@ -6,24 +6,32 @@
 using System.Text.RegularExpressions;
 using Link = System.ComponentModel.DescriptionAttribute;
 
+#if HAS_SPAN
+#if NET7_0_OR_GREATER
+using ValueMatchEnumerator = System.Text.RegularExpressions.Regex.ValueMatchEnumerator;
+#else
+using ValueMatchEnumerator = System.Text.RegularExpressions.ValueMatchEnumerator;
+#endif
+#endif
+
 [ExcludeFromCodeCoverage]
 #if PolyPublic
 public
 #endif
-static partial class RegexPolyfill
+    static partial class RegexPolyfill
 {
 #if HAS_SPAN
     /// <summary>
     /// Indicates whether the specified regular expression finds a match in the specified input span, using the specified matching options and time-out interval.
     /// </summary>
     /// <returns>true if the regular expression finds a match; otherwise, false.</returns>
     [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions-system-timespan)")]
-    public static bool IsMatch(ReadOnlySpan<char> input, string pattern, RegexOptions options, TimeSpan matchTimeout)
+    public static bool IsMatch(ReadOnlySpan<char> input, string pattern, RegexOptions options, TimeSpan timeout)
     {
 #if NET7_0_OR_GREATER
-       return Regex.IsMatch(input, pattern, options, matchTimeout);
+       return Regex.IsMatch(input, pattern, options, timeout);
 #else
-       return Regex.IsMatch(input.ToString(), pattern, options, matchTimeout);
+        return Regex.IsMatch(input.ToString(), pattern, options, timeout);
 #endif
     }
 
@@ -32,12 +40,12 @@ public static bool IsMatch(ReadOnlySpan<char> input, string pattern, RegexOption
     /// </summary>
     /// <returns>true if the regular expression finds a match; otherwise, false.</returns>
     [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.ismatch#system-text-regularexpressions-regex-ismatch(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions)")]
-    public static bool IsMatch(ReadOnlySpan<char> input, string pattern, System.Text.RegularExpressions.RegexOptions options)
+    public static bool IsMatch(ReadOnlySpan<char> input, string pattern, RegexOptions options)
     {
 #if NET7_0_OR_GREATER
        return Regex.IsMatch(input, pattern, options);
 #else
-       return Regex.IsMatch(input.ToString(), pattern, options);
+        return Regex.IsMatch(input.ToString(), pattern, options);
 #endif
     }
 
@@ -51,7 +59,49 @@ public static bool IsMatch(ReadOnlySpan<char> input, string pattern)
 #if NET7_0_OR_GREATER
        return Regex.IsMatch(input, pattern);
 #else
-       return Regex.IsMatch(input.ToString(), pattern);
+        return Regex.IsMatch(input.ToString(), pattern);
+#endif
+    }
+
+    /// <summary>
+    /// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
+    /// </summary>
+    /// <returns>A Regex.ValueMatchEnumerator to iterate over the matches.</returns>
+    [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches?view=net-8.0#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string)")]
+    public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern)
+    {
+#if NET7_0_OR_GREATER
+        return Regex.EnumerateMatches(input, pattern);
+#else
+        return new Regex(pattern).EnumerateMatches(input);
+#endif
+    }
+
+    /// <summary>
+    /// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
+    /// </summary>
+    /// <returns>A Regex.ValueMatchEnumerator to iterate over the matches.</returns>
+    [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions-system-timespan)")]
+    public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options, TimeSpan timeout)
+    {
+#if NET7_0_OR_GREATER
+        return Regex.EnumerateMatches(input, pattern, options, timeout);
+#else
+        return new Regex(pattern, options, timeout).EnumerateMatches(input);
+#endif
+    }
+
+    /// <summary>
+    /// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
+    /// </summary>
+    /// <returns>A Regex.ValueMatchEnumerator to iterate over the matches.</returns>
+    [Link("https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches#system-text-regularexpressions-regex-enumeratematches(system-readonlyspan((system-char))-system-string-system-text-regularexpressions-regexoptions)")]
+    public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options)
+    {
+#if NET7_0_OR_GREATER
+        return Regex.EnumerateMatches(input, pattern);
+#else
+        return new Regex(pattern, options).EnumerateMatches(input);
 #endif
     }
 #endif

src/Tests/PolyfillTests_Regex.cs

@@ -25,4 +25,19 @@ public void EnumerateMatches()
 
         Assert.IsTrue(found);
     }
+
+    [Test]
+    public void EnumerateMatchesStatic()
+    {
+        var span = "a55a".AsSpan();
+        var found = false;
+        foreach (var match in RegexPolyfill.EnumerateMatches(span, @"\d+"))
+        {
+            found = true;
+            Assert.AreEqual(1, match.Index);
+            Assert.AreEqual(2, match.Length);
+        }
+
+        Assert.IsTrue(found);
+    }
 }