Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Polyfill/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// </summary>
//Link: https://learn.microsoft.com/en-us/dotnet/api/system.text.regularexpressions.regex.enumeratematches?view=net-11.0#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) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/Split/net461/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net462/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net47/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net471/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net472/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net48/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net481/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net5.0/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/net6.0/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/netcoreapp2.0/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/netcoreapp2.1/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/netcoreapp2.2/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/netcoreapp3.0/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/netcoreapp3.1/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/netstandard2.0/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/netstandard2.1/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
2 changes: 1 addition & 1 deletion src/Split/uap10.0/Regex/RegexPolyfill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, st
/// Searches an input span for all occurrences of a regular expression and returns a Regex.ValueMatchEnumerator to iterate over the matches.
/// </summary>
public static ValueMatchEnumerator EnumerateMatches(ReadOnlySpan<char> input, string pattern, RegexOptions options) =>
RegexCache.GetOrAdd(pattern, options, TimeSpan.MaxValue).EnumerateMatches(input);
RegexCache.GetOrAdd(pattern, options, Regex.InfiniteMatchTimeout).EnumerateMatches(input);
#endif
#if FeatureMemory && FeatureValueTuple
public static ValueSplitEnumerator EnumerateSplits(ReadOnlySpan<char> input, string pattern)
Expand Down
24 changes: 24 additions & 0 deletions src/Tests/PolyfillTests_Regex.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,30 @@ public Task EnumerateMatches()
return Task.CompletedTask;
}

[Test]
public async Task EnumerateMatchesStatic_WithOptions()
{
var results = new List<string>();
foreach (var match in Regex.EnumerateMatches("a55B7b".AsSpan(), @"b\d*", RegexOptions.IgnoreCase))
{
results.Add($"{match.Index}:{match.Length}");
}

await Assert.That(string.Join(" ", results)).IsEqualTo("3:2 5:1");
}

[Test]
public async Task EnumerateMatchesStatic_WithOptionsAndTimeout()
{
var results = new List<string>();
foreach (var match in Regex.EnumerateMatches("a55B7b".AsSpan(), @"b\d*", RegexOptions.IgnoreCase, TimeSpan.FromSeconds(10)))
{
results.Add($"{match.Index}:{match.Length}");
}

await Assert.That(string.Join(" ", results)).IsEqualTo("3:2 5:1");
}

[Test]
public Task EnumerateMatchesStatic()
{
Expand Down
Loading