Skip to content
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

Add {Last}IndexOfAny{Except}InRange #76803

Merged
merged 3 commits into from
Oct 26, 2022
Merged

Add {Last}IndexOfAny{Except}InRange #76803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c64ef75
Add {Last}IndexOfAny{Exception}InRange
stephentoub Oct 10, 2022
baa4027
Address PR feedback
stephentoub Oct 10, 2022
98acf6c
Address PR feedback
stephentoub Oct 25, 2022
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
13 changes: 2 additions & 11 deletions src/libraries/Common/src/System/Net/HttpValidationHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,8 @@ internal static string CheckBadHeaderNameChars(string name)
return name;
}

internal static bool ContainsNonAsciiChars(string token)
{
for (int i = 0; i < token.Length; ++i)
{
if ((token[i] < 0x20) || (token[i] > 0x7e))
{
return true;
}
}
return false;
}
internal static bool ContainsNonAsciiChars(string token) =>
token.AsSpan().IndexOfAnyExceptInRange((char)0x20, (char)0x7e) >= 0;

internal static bool IsValidToken(string token)
{
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Memory/ref/System.Memory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,14 @@ public static void CopyTo<T>(this T[]? source, System.Span<T> destination) { }
public static int IndexOfAnyExcept<T>(this System.ReadOnlySpan<T> span, T value0, T value1) where T : System.IEquatable<T>? { throw null; }
public static int IndexOfAnyExcept<T>(this System.ReadOnlySpan<T> span, T value0, T value1, T value2) where T : System.IEquatable<T>? { throw null; }
public static int IndexOfAnyExcept<T>(this System.ReadOnlySpan<T> span, System.ReadOnlySpan<T> values) where T : System.IEquatable<T>? { throw null; }
public static int IndexOfAnyExceptInRange<T>(this System.ReadOnlySpan<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static int IndexOfAnyExceptInRange<T>(this System.Span<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static int IndexOf<T>(this System.ReadOnlySpan<T> span, System.ReadOnlySpan<T> value) where T : System.IEquatable<T>? { throw null; }
public static int IndexOf<T>(this System.ReadOnlySpan<T> span, T value) where T : System.IEquatable<T>? { throw null; }
public static int IndexOf<T>(this System.Span<T> span, System.ReadOnlySpan<T> value) where T : System.IEquatable<T>? { throw null; }
public static int IndexOf<T>(this System.Span<T> span, T value) where T : System.IEquatable<T>? { throw null; }
public static int IndexOfAnyInRange<T>(this System.ReadOnlySpan<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static int IndexOfAnyInRange<T>(this System.Span<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static bool IsWhiteSpace(this System.ReadOnlySpan<char> span) { throw null; }
public static int LastIndexOf(this System.ReadOnlySpan<char> span, System.ReadOnlySpan<char> value, System.StringComparison comparisonType) { throw null; }
public static int LastIndexOfAny<T>(this System.ReadOnlySpan<T> span, System.ReadOnlySpan<T> values) where T : System.IEquatable<T>? { throw null; }
Expand All @@ -277,10 +281,14 @@ public static void CopyTo<T>(this T[]? source, System.Span<T> destination) { }
public static int LastIndexOfAnyExcept<T>(this System.ReadOnlySpan<T> span, T value0, T value1) where T : System.IEquatable<T>? { throw null; }
public static int LastIndexOfAnyExcept<T>(this System.ReadOnlySpan<T> span, T value0, T value1, T value2) where T : System.IEquatable<T>? { throw null; }
public static int LastIndexOfAnyExcept<T>(this System.ReadOnlySpan<T> span, System.ReadOnlySpan<T> values) where T : System.IEquatable<T>? { throw null; }
public static int LastIndexOfAnyExceptInRange<T>(this System.ReadOnlySpan<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static int LastIndexOfAnyExceptInRange<T>(this System.Span<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static int LastIndexOf<T>(this System.ReadOnlySpan<T> span, System.ReadOnlySpan<T> value) where T : System.IEquatable<T>? { throw null; }
public static int LastIndexOf<T>(this System.ReadOnlySpan<T> span, T value) where T : System.IEquatable<T>? { throw null; }
public static int LastIndexOf<T>(this System.Span<T> span, System.ReadOnlySpan<T> value) where T : System.IEquatable<T?> { throw null; }
public static int LastIndexOf<T>(this System.Span<T> span, T value) where T : System.IEquatable<T>? { throw null; }
public static int LastIndexOfAnyInRange<T>(this System.ReadOnlySpan<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static int LastIndexOfAnyInRange<T>(this System.Span<T> span, T lowInclusive, T highInclusive) where T : System.IComparable<T> { throw null; }
public static bool Overlaps<T>(this System.ReadOnlySpan<T> span, System.ReadOnlySpan<T> other) { throw null; }
public static bool Overlaps<T>(this System.ReadOnlySpan<T> span, System.ReadOnlySpan<T> other, out int elementOffset) { throw null; }
public static bool Overlaps<T>(this System.Span<T> span, System.ReadOnlySpan<T> other) { throw null; }
Expand Down
202 changes: 202 additions & 0 deletions src/libraries/System.Memory/tests/Span/IndexOfAnyInRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Linq;
using Xunit;

namespace System.SpanTests
{
public class IndexOfAnyInRangeTests_Byte : IndexOfAnyInRangeTests<byte> { protected override byte Create(int value) => (byte)value; }
public class IndexOfAnyInRangeTests_SByte : IndexOfAnyInRangeTests<sbyte> { protected override sbyte Create(int value) => (sbyte)value; }
public class IndexOfAnyInRangeTests_Char : IndexOfAnyInRangeTests<char> { protected override char Create(int value) => (char)value; }
public class IndexOfAnyInRangeTests_Int16 : IndexOfAnyInRangeTests<short> { protected override short Create(int value) => (short)value; }
public class IndexOfAnyInRangeTests_UInt16 : IndexOfAnyInRangeTests<ushort> { protected override ushort Create(int value) => (ushort)value; }
public class IndexOfAnyInRangeTests_Int32 : IndexOfAnyInRangeTests<int> { protected override int Create(int value) => value; }
public class IndexOfAnyInRangeTests_UInt32 : IndexOfAnyInRangeTests<uint> { protected override uint Create(int value) => (uint)value; }
public class IndexOfAnyInRangeTests_Int64 : IndexOfAnyInRangeTests<long> { protected override long Create(int value) => value; }
public class IndexOfAnyInRangeTests_UInt64 : IndexOfAnyInRangeTests<ulong> { protected override ulong Create(int value) => (ulong)value; }
public class IndexOfAnyInRangeTests_IntPtr : IndexOfAnyInRangeTests<nint> { protected override nint Create(int value) => (nint)value; }
public class IndexOfAnyInRangeTests_UIntPtr : IndexOfAnyInRangeTests<nuint> { protected override nuint Create(int value) => (nuint)value; }
public class IndexOfAnyInRangeTests_TimeSpan : IndexOfAnyInRangeTests<TimeSpan> { protected override TimeSpan Create(int value) => TimeSpan.FromTicks(value); }

public class IndexOfAnyInRangeTests_RefType : IndexOfAnyInRangeTests<RefType>
{
protected override RefType Create(int value) => new RefType { Value = value };

[Fact]
public void NullBound_Throws()
{
foreach ((RefType low, RefType high) in new (RefType,RefType)[] { (null, new RefType { Value = 42 }), (null, null), (new RefType { Value = 42 }, null) })
{
string argName = low is null ? "lowInclusive" : "highInclusive";

AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.IndexOfAnyInRange(Span<RefType>.Empty, low, high));
AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.IndexOfAnyInRange(ReadOnlySpan<RefType>.Empty, low, high));

AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.LastIndexOfAnyInRange(Span<RefType>.Empty, low, high));
AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.LastIndexOfAnyInRange(ReadOnlySpan<RefType>.Empty, low, high));

AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.IndexOfAnyExceptInRange(Span<RefType>.Empty, low, high));
AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.IndexOfAnyExceptInRange(ReadOnlySpan<RefType>.Empty, low, high));

AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.LastIndexOfAnyExceptInRange(Span<RefType>.Empty, low, high));
AssertExtensions.Throws<ArgumentNullException>(argName, () => MemoryExtensions.LastIndexOfAnyExceptInRange(ReadOnlySpan<RefType>.Empty, low, high));
}
}

[Fact]
public void NullPermittedInInput()
{
RefType[] array = new[] { null, new RefType { Value = 1 }, null, null, new RefType { Value = 42 }, null };
RefType low = new RefType { Value = 41 }, high = new RefType { Value = 43 };

Assert.Equal(4, IndexOfAnyInRange(array, low, high));
Assert.Equal(4, LastIndexOfAnyInRange(array, low, high));

Assert.Equal(0, IndexOfAnyExceptInRange(array, low, high));
Assert.Equal(5, LastIndexOfAnyExceptInRange(array, low, high));
}
}

public class RefType : IComparable<RefType>
{
public int Value { get; set; }
public int CompareTo(RefType? other) => other is null ? 1 : Value.CompareTo(other.Value);
}

public abstract class IndexOfAnyInRangeTests<T>
where T : IComparable<T>
{
protected abstract T Create(int value);

[Fact]
public void EmptyInput_ReturnsMinus1()
{
T[] array = Array.Empty<T>();
T low = Create(0);
T high = Create(255);

Assert.Equal(-1, IndexOfAnyInRange(array, low, high));
Assert.Equal(-1, LastIndexOfAnyInRange(array, low, high));
Assert.Equal(-1, IndexOfAnyExceptInRange(array, low, high));
Assert.Equal(-1, LastIndexOfAnyExceptInRange(array, low, high));
}

[Fact]
public void NotFound_ReturnsMinus1()
{
T fillValue = Create(42);
for (int length = 0; length < 128; length++)
{
T[] array = Enumerable.Repeat(fillValue, length).ToArray();

Assert.Equal(-1, IndexOfAnyInRange(array, Create(43), Create(44)));
Assert.Equal(-1, LastIndexOfAnyInRange(array, Create(43), Create(44)));
Assert.Equal(-1, IndexOfAnyExceptInRange(array, Create(42), Create(44)));
Assert.Equal(-1, LastIndexOfAnyExceptInRange(array, Create(42), Create(44)));
}
}

[Fact]
public void FindValueInSequence_ReturnsFoundIndexOrMinus1()
{
for (int length = 1; length <= 64; length++)
{
T[] array = Enumerable.Range(0, length).Select(Create).ToArray();

Assert.Equal(0, IndexOfAnyInRange(array, Create(0), Create(length - 1)));
Assert.Equal(length - 1, LastIndexOfAnyInRange(array, Create(0), Create(length - 1)));
Assert.Equal(-1, IndexOfAnyExceptInRange(array, Create(0), Create(length - 1)));
Assert.Equal(-1, LastIndexOfAnyExceptInRange(array, Create(0), Create(length - 1)));

if (length > 4)
{
Assert.Equal(length / 4, IndexOfAnyInRange(array, Create(length / 4), Create(length * 3 / 4)));
Assert.Equal(length * 3 / 4, LastIndexOfAnyInRange(array, Create(length / 4), Create(length * 3 / 4)));
Assert.Equal(0, IndexOfAnyExceptInRange(array, Create(length / 4), Create(length * 3 / 4)));
Assert.Equal(length - 1, LastIndexOfAnyExceptInRange(array, Create(length / 4), Create(length * 3 / 4)));
}
}
}

[Fact]
public void MatrixOfLengthsAndOffsets_Any_FindsValueAtExpectedIndex()
{
foreach (int length in Enumerable.Range(1, 40))
{
for (int offset = 0; offset < length; offset++)
{
int target = -42;
T[] array = Enumerable.Repeat(Create(target - 2), length).ToArray();
array[offset] = Create(target);

Assert.Equal(offset, IndexOfAnyInRange(array, Create(target), Create(target)));
Assert.Equal(offset, IndexOfAnyInRange(array, Create(target - 1), Create(target)));
Assert.Equal(offset, IndexOfAnyInRange(array, Create(target), Create(target + 1)));
Assert.Equal(offset, IndexOfAnyInRange(array, Create(target - 1), Create(target + 1)));

Assert.Equal(offset, LastIndexOfAnyInRange(array, Create(target), Create(target)));
Assert.Equal(offset, LastIndexOfAnyInRange(array, Create(target - 1), Create(target)));
Assert.Equal(offset, LastIndexOfAnyInRange(array, Create(target), Create(target + 1)));
Assert.Equal(offset, LastIndexOfAnyInRange(array, Create(target - 1), Create(target + 1)));
}
}
}

[Fact]
public void MatrixOfLengthsAndOffsets_AnyExcept_FindsValueAtExpectedIndex()
{
foreach (int length in Enumerable.Range(1, 40))
{
for (int offset = 0; offset < length; offset++)
{
int target = -42;
T[] array = Enumerable.Repeat(Create(target), length).ToArray();
array[offset] = Create(target - 2);

Assert.Equal(offset, IndexOfAnyExceptInRange(array, Create(target), Create(target)));
Assert.Equal(offset, IndexOfAnyExceptInRange(array, Create(target - 1), Create(target)));
Assert.Equal(offset, IndexOfAnyExceptInRange(array, Create(target), Create(target + 1)));
Assert.Equal(offset, IndexOfAnyExceptInRange(array, Create(target - 1), Create(target + 1)));

Assert.Equal(offset, LastIndexOfAnyExceptInRange(array, Create(target), Create(target)));
Assert.Equal(offset, LastIndexOfAnyExceptInRange(array, Create(target - 1), Create(target)));
Assert.Equal(offset, LastIndexOfAnyExceptInRange(array, Create(target), Create(target + 1)));
Assert.Equal(offset, LastIndexOfAnyExceptInRange(array, Create(target - 1), Create(target + 1)));
}
}
}

// Wrappers for {Last}IndexOfAny{Except}InRange that invoke both the Span and ReadOnlySpan overloads,
// ensuring they both produce the same result, and returning that result.
// This avoids needing to code the same call sites twice in all the above tests.
stephentoub marked this conversation as resolved.
Show resolved Hide resolved

protected static int IndexOfAnyInRange(Span<T> span, T lowInclusive, T highInclusive)
{
int result = MemoryExtensions.IndexOfAnyInRange(span, lowInclusive, highInclusive);
Assert.Equal(result, MemoryExtensions.IndexOfAnyInRange((ReadOnlySpan<T>)span, lowInclusive, highInclusive));
return result;
}

protected static int LastIndexOfAnyInRange(Span<T> span, T lowInclusive, T highInclusive)
{
int result = MemoryExtensions.LastIndexOfAnyInRange(span, lowInclusive, highInclusive);
Assert.Equal(result, MemoryExtensions.LastIndexOfAnyInRange((ReadOnlySpan<T>)span, lowInclusive, highInclusive));
return result;
}

protected static int IndexOfAnyExceptInRange(Span<T> span, T lowInclusive, T highInclusive)
{
int result = MemoryExtensions.IndexOfAnyExceptInRange(span, lowInclusive, highInclusive);
Assert.Equal(result, MemoryExtensions.IndexOfAnyExceptInRange((ReadOnlySpan<T>)span, lowInclusive, highInclusive));
return result;
}

protected static int LastIndexOfAnyExceptInRange(Span<T> span, T lowInclusive, T highInclusive)
{
int result = MemoryExtensions.LastIndexOfAnyExceptInRange(span, lowInclusive, highInclusive);
Assert.Equal(result, MemoryExtensions.LastIndexOfAnyExceptInRange((ReadOnlySpan<T>)span, lowInclusive, highInclusive));
return result;
}
}
}
1 change: 1 addition & 0 deletions src/libraries/System.Memory/tests/System.Memory.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<Compile Include="Span\IndexOfAny.char.cs" />
<Compile Include="Span\IndexOfAny.T.cs" />
<Compile Include="Span\IndexOfAnyExcept.T.cs" />
<Compile Include="Span\IndexOfAnyInRange.cs" />
<Compile Include="Span\IndexOfSequence.byte.cs" />
<Compile Include="Span\IndexOfSequence.char.cs" />
<Compile Include="Span\IndexOfSequence.T.cs" />
Expand Down
49 changes: 17 additions & 32 deletions src/libraries/System.Net.Http/src/System/Net/Http/Headers/UriHeaderParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Text;

namespace System.Net.Http.Headers
{
Expand Down Expand Up @@ -59,44 +60,28 @@ public override bool TryParseValue([NotNullWhen(true)] string? value, object? st
// If not, just return the input value.
internal static string DecodeUtf8FromString(string input)
{
if (string.IsNullOrWhiteSpace(input))
if (!string.IsNullOrWhiteSpace(input))
{
return input;
}

bool possibleUtf8 = false;
for (int i = 0; i < input.Length; i++)
{
if (input[i] > (char)255)
{
return input; // This couldn't have come from the wire, someone assigned it directly.
}
else if (input[i] > (char)127)
int possibleUtf8Pos = input.AsSpan().IndexOfAnyExceptInRange((char)0, (char)127);
if (possibleUtf8Pos >= 0 &&
input.AsSpan(possibleUtf8Pos).IndexOfAnyExceptInRange((char)0, (char)255) < 0)
{
possibleUtf8 = true;
break;
}
}
if (possibleUtf8)
{
byte[] rawBytes = new byte[input.Length];
for (int i = 0; i < input.Length; i++)
{
if (input[i] > (char)255)
Span<byte> rawBytes = input.Length <= 256 ? stackalloc byte[input.Length] : new byte[input.Length];
stephentoub marked this conversation as resolved.
Show resolved Hide resolved
for (int i = 0; i < input.Length; i++)
{
return input; // This couldn't have come from the wire, someone assigned it directly.
rawBytes[i] = (byte)input[i];
}
rawBytes[i] = (byte)input[i];
}
try
{
// We don't want '?' replacement characters, just fail.
System.Text.Encoding decoder = System.Text.Encoding.GetEncoding("utf-8", System.Text.EncoderFallback.ExceptionFallback,
System.Text.DecoderFallback.ExceptionFallback);
return decoder.GetString(rawBytes, 0, rawBytes.Length);

try
{
// We don't want '?' replacement characters, just fail.
Encoding decoder = Encoding.GetEncoding("utf-8", EncoderFallback.ExceptionFallback, DecoderFallback.ExceptionFallback);
return decoder.GetString(rawBytes);
}
catch (ArgumentException) { } // Not actually Utf-8
}
catch (ArgumentException) { } // Not actually Utf-8
}

return input;
}

Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<Reference Include="System.Collections" />
<Reference Include="System.Collections.Specialized" />
<Reference Include="System.Diagnostics.Tracing" />
<Reference Include="System.Memory" />
<Reference Include="System.Runtime" />
</ItemGroup>
</Project>
Loading