mirror of
https://github.com/oliverbooth/X10D
synced 2024-11-09 22:55:42 +00:00
feat: add Span overloads to complement char.Repeat/string.Repeat
This commit is contained in:
parent
56c3f117c7
commit
ff6b8d5465
@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- X10D: Added `string.ConcatIf`.
|
- X10D: Added `string.ConcatIf`.
|
||||||
- X10D: Added `string.MDBold`, `string.MDCode`, `string.MDCodeBlock([string])`, `string.MDHeading(int)`,
|
- X10D: Added `string.MDBold`, `string.MDCode`, `string.MDCodeBlock([string])`, `string.MDHeading(int)`,
|
||||||
`string.MDItalic`, `string.MDLink`, `string.MDStrikeOut`, and `string.MDUnderline` for Markdown formatting.
|
`string.MDItalic`, `string.MDLink`, `string.MDStrikeOut`, and `string.MDUnderline` for Markdown formatting.
|
||||||
|
- X10D: Added Span overloads which complement `char.Repeat` and `string.Repeat`.
|
||||||
- X10D.Unity: Added `RaycastHit.GetComponent` and `RaycastHit.TryGetComponent`.
|
- X10D.Unity: Added `RaycastHit.GetComponent` and `RaycastHit.TryGetComponent`.
|
||||||
- X10D.Unity: Added `DebugUtility.DrawFunction`, and `DebugUtility.DrawUnjoinedPolyhedron` on which it relies.
|
- X10D.Unity: Added `DebugUtility.DrawFunction`, and `DebugUtility.DrawUnjoinedPolyhedron` on which it relies.
|
||||||
|
|
||||||
@ -41,6 +42,7 @@ BigEndian/LittleEndian methods.
|
|||||||
- X10D: `Stream.GetHash<>` and `Stream.TryWriteHash<>` now throw ArgumentException in lieu of
|
- X10D: `Stream.GetHash<>` and `Stream.TryWriteHash<>` now throw ArgumentException in lieu of
|
||||||
TypeInitializationException.
|
TypeInitializationException.
|
||||||
- X10D: `char.IsEmoji` no longer allocates for .NET 7.
|
- X10D: `char.IsEmoji` no longer allocates for .NET 7.
|
||||||
|
- X10D: `string.Repeat` is now more efficient.
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
|
@ -60,4 +60,60 @@ internal class CharSpanTests
|
|||||||
Assert.That(string.Empty.AsSpan().CountSubstring('\0'), Is.Zero);
|
Assert.That(string.Empty.AsSpan().CountSubstring('\0'), Is.Zero);
|
||||||
Assert.That(string.Empty.AsSpan().CountSubstring(string.Empty.AsSpan(), StringComparison.OrdinalIgnoreCase), Is.Zero);
|
Assert.That(string.Empty.AsSpan().CountSubstring(string.Empty.AsSpan(), StringComparison.OrdinalIgnoreCase), Is.Zero);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldNotManipulateSpan_GivenCount0()
|
||||||
|
{
|
||||||
|
Span<char> destination = new char[11];
|
||||||
|
"Hello world".AsSpan().CopyTo(destination);
|
||||||
|
|
||||||
|
"a".AsSpan().Repeat(0, destination);
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo("Hello world"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldReturnItself_GivenCount1()
|
||||||
|
{
|
||||||
|
string repeated = "a".AsSpan().Repeat(1);
|
||||||
|
Assert.That(repeated, Has.Length.EqualTo(1));
|
||||||
|
Assert.That(repeated, Is.EqualTo("a"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldPopulateSpan_GivenValidSpan()
|
||||||
|
{
|
||||||
|
const string expected = "aaaaaaaaaa";
|
||||||
|
Span<char> destination = new char[10];
|
||||||
|
"a".AsSpan().Repeat(10, destination);
|
||||||
|
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo(expected));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldReturnEmptyString_GivenCount0()
|
||||||
|
{
|
||||||
|
Assert.That("a".AsSpan().Repeat(0), Is.EqualTo(string.Empty));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldReturnRepeatedString_GivenSpan()
|
||||||
|
{
|
||||||
|
const string expected = "aaaaaaaaaa";
|
||||||
|
string actual = "a".AsSpan().Repeat(10);
|
||||||
|
|
||||||
|
Assert.That(actual, Is.EqualTo(expected));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldThrowArgumentException_GivenSmallSpan()
|
||||||
|
{
|
||||||
|
Assert.Throws<ArgumentException>(() => "a".AsSpan().Repeat(10, Span<char>.Empty));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldThrowArgumentOutOfRangeException_GivenNegativeCount()
|
||||||
|
{
|
||||||
|
Assert.Throws<ArgumentOutOfRangeException>(() => _ = "a".AsSpan().Repeat(-1));
|
||||||
|
Assert.Throws<ArgumentOutOfRangeException>(() => "a".AsSpan().Repeat(-1, Span<char>.Empty));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,25 @@ internal class CharTests
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldPopulateSpanWithRepeatedCharacter_GivenValidCount()
|
||||||
|
{
|
||||||
|
const string expected = "aaaaaaaaaa";
|
||||||
|
Span<char> destination = new char[10];
|
||||||
|
'a'.Repeat(10, destination);
|
||||||
|
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo(expected));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldOnlyWriteOneCharToSpan_GivenCount1()
|
||||||
|
{
|
||||||
|
Span<char> destination = new char[10];
|
||||||
|
'a'.Repeat(1, destination);
|
||||||
|
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo("a\0\0\0\0\0\0\0\0\0"));
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Repeat_ShouldReturnRepeatedCharacter_GivenValidCount()
|
public void Repeat_ShouldReturnRepeatedCharacter_GivenValidCount()
|
||||||
{
|
{
|
||||||
@ -51,9 +70,34 @@ internal class CharTests
|
|||||||
Assert.That('a'.Repeat(0), Is.EqualTo(string.Empty));
|
Assert.That('a'.Repeat(0), Is.EqualTo(string.Empty));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldNotManipulateSpan_GivenCount0()
|
||||||
|
{
|
||||||
|
Span<char> destination = new char[10];
|
||||||
|
destination.Fill(' ');
|
||||||
|
'a'.Repeat(0, destination);
|
||||||
|
|
||||||
|
const string expected = " ";
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo(expected));
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Repeat_ShouldThrowArgumentOutOfRangeException_GivenNegativeCount()
|
public void Repeat_ShouldThrowArgumentOutOfRangeException_GivenNegativeCount()
|
||||||
|
{
|
||||||
|
Assert.Multiple(() =>
|
||||||
{
|
{
|
||||||
Assert.Throws<ArgumentOutOfRangeException>(() => _ = 'a'.Repeat(-1));
|
Assert.Throws<ArgumentOutOfRangeException>(() => _ = 'a'.Repeat(-1));
|
||||||
|
Assert.Throws<ArgumentOutOfRangeException>(() => 'a'.Repeat(-1, Span<char>.Empty));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldThrowArgumentException_GivenSmallSpan()
|
||||||
|
{
|
||||||
|
Assert.Throws<ArgumentException>(() =>
|
||||||
|
{
|
||||||
|
var destination = Span<char>.Empty;
|
||||||
|
'a'.Repeat(1, destination);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -762,6 +762,16 @@ internal class StringTests
|
|||||||
Assert.That("a".Repeat(0), Is.EqualTo(string.Empty));
|
Assert.That("a".Repeat(0), Is.EqualTo(string.Empty));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldNotManipulateSpan_GivenCount0()
|
||||||
|
{
|
||||||
|
Span<char> destination = new char[11];
|
||||||
|
"Hello world".AsSpan().CopyTo(destination);
|
||||||
|
|
||||||
|
"a".Repeat(0, destination);
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo("Hello world"));
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Repeat_ShouldReturnItself_GivenCount1()
|
public void Repeat_ShouldReturnItself_GivenCount1()
|
||||||
{
|
{
|
||||||
@ -770,10 +780,17 @@ internal class StringTests
|
|||||||
Assert.That(repeated, Is.EqualTo("a"));
|
Assert.That(repeated, Is.EqualTo("a"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldThrowArgumentException_GivenSmallSpan()
|
||||||
|
{
|
||||||
|
Assert.Throws<ArgumentException>(() => "a".Repeat(10, Span<char>.Empty));
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Repeat_ShouldThrowArgumentOutOfRangeException_GivenNegativeCount()
|
public void Repeat_ShouldThrowArgumentOutOfRangeException_GivenNegativeCount()
|
||||||
{
|
{
|
||||||
Assert.Throws<ArgumentOutOfRangeException>(() => _ = "a".Repeat(-1));
|
Assert.Throws<ArgumentOutOfRangeException>(() => _ = "a".Repeat(-1));
|
||||||
|
Assert.Throws<ArgumentOutOfRangeException>(() => "a".Repeat(-1, Span<char>.Empty));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -781,6 +798,26 @@ internal class StringTests
|
|||||||
{
|
{
|
||||||
string value = null!;
|
string value = null!;
|
||||||
Assert.Throws<ArgumentNullException>(() => _ = value.Repeat(0));
|
Assert.Throws<ArgumentNullException>(() => _ = value.Repeat(0));
|
||||||
|
Assert.Throws<ArgumentNullException>(() => value.Repeat(0, Span<char>.Empty));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldPopulateSpanWithRepeatedCharacter_GivenValidCount()
|
||||||
|
{
|
||||||
|
const string expected = "aaaaaaaaaa";
|
||||||
|
Span<char> destination = new char[10];
|
||||||
|
"a".Repeat(10, destination);
|
||||||
|
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo(expected));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Repeat_ShouldOnlyWriteOneCharToSpan_GivenCount1()
|
||||||
|
{
|
||||||
|
Span<char> destination = new char[10];
|
||||||
|
"a".Repeat(1, destination);
|
||||||
|
|
||||||
|
Assert.That(destination.ToString(), Is.EqualTo("a\0\0\0\0\0\0\0\0\0"));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
@ -47,4 +47,34 @@ public static class CharExtensions
|
|||||||
_ => new string(value, count)
|
_ => new string(value, count)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Writes a character to a span of characters, repeated a specified number of times.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="value">The character to repeat.</param>
|
||||||
|
/// <param name="count">The number of times to repeat.</param>
|
||||||
|
/// <param name="destination">The span of characters into which the repeated characters will be written.</param>
|
||||||
|
[MethodImpl(CompilerResources.MethodImplOptions)]
|
||||||
|
public static void Repeat(this char value, int count, Span<char> destination)
|
||||||
|
{
|
||||||
|
if (count < 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(count), ExceptionMessages.CountMustBeGreaterThanOrEqualTo0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (destination.Length < count)
|
||||||
|
{
|
||||||
|
throw new ArgumentException(ExceptionMessages.DestinationSpanLengthTooShort, nameof(destination));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
destination[i] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
using System.Diagnostics.Contracts;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Text;
|
||||||
|
using X10D.CompilerServices;
|
||||||
|
|
||||||
namespace X10D.Text;
|
namespace X10D.Text;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -67,4 +72,73 @@ public static class CharSpanExtensions
|
|||||||
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Repeats a span of characters a specified number of times.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="value">The string to repeat.</param>
|
||||||
|
/// <param name="count">The repeat count.</param>
|
||||||
|
/// <returns>A string containing <paramref name="value" /> repeated <paramref name="count" /> times.</returns>
|
||||||
|
/// <exception cref="ArgumentNullException"><paramref name="value" /> is <see langword="null" />.</exception>
|
||||||
|
/// <exception cref="ArgumentOutOfRangeException"><paramref name="count" /> is less than 0.</exception>
|
||||||
|
[Pure]
|
||||||
|
[MethodImpl(CompilerResources.MethodImplOptions)]
|
||||||
|
public static string Repeat(this ReadOnlySpan<char> value, int count)
|
||||||
|
{
|
||||||
|
switch (count)
|
||||||
|
{
|
||||||
|
case < 0:
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(count), ExceptionMessages.CountMustBeGreaterThanOrEqualTo0);
|
||||||
|
|
||||||
|
case 0:
|
||||||
|
return string.Empty;
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
return value.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
var builder = new StringBuilder(value.Length * count);
|
||||||
|
|
||||||
|
for (var i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
builder.Append(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Repeats a span of character a specified number of times, writing the result to another span of characters.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="value">The span of characters to repeat.</param>
|
||||||
|
/// <param name="count">The repeat count.</param>
|
||||||
|
/// <param name="destination">The destination span to write to.</param>
|
||||||
|
/// <exception cref="ArgumentOutOfRangeException"><paramref name="count" /> is less than 0.</exception>
|
||||||
|
/// <exception cref="ArgumentException">
|
||||||
|
/// <paramref name="destination" /> is too short to contain the repeated string.
|
||||||
|
/// </exception>
|
||||||
|
[MethodImpl(CompilerResources.MethodImplOptions)]
|
||||||
|
public static void Repeat(this ReadOnlySpan<char> value, int count, Span<char> destination)
|
||||||
|
{
|
||||||
|
if (count < 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(count), ExceptionMessages.CountMustBeGreaterThanOrEqualTo0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (destination.Length < value.Length * count)
|
||||||
|
{
|
||||||
|
throw new ArgumentException(ExceptionMessages.DestinationSpanLengthTooShort, nameof(destination));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var iteration = 0; iteration < count; iteration++)
|
||||||
|
{
|
||||||
|
Span<char> slice = destination.Slice(iteration * value.Length, value.Length);
|
||||||
|
value.CopyTo(slice);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -932,14 +932,50 @@ public static class StringExtensions
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
var builder = new StringBuilder(value.Length * count);
|
Span<char> destination = stackalloc char[value.Length * count];
|
||||||
|
value.Repeat(count, destination);
|
||||||
for (var i = 0; i < count; i++)
|
return new string(destination);
|
||||||
{
|
|
||||||
builder.Append(value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return builder.ToString();
|
/// <summary>
|
||||||
|
/// Repeats a string a specified number of times, writing the result to a span of characters.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="value">The string to repeat.</param>
|
||||||
|
/// <param name="count">The repeat count.</param>
|
||||||
|
/// <param name="destination">The destination span to write to.</param>
|
||||||
|
/// <exception cref="ArgumentNullException"><paramref name="value" /> is <see langword="null" />.</exception>
|
||||||
|
/// <exception cref="ArgumentOutOfRangeException"><paramref name="count" /> is less than 0.</exception>
|
||||||
|
/// <exception cref="ArgumentException">
|
||||||
|
/// <paramref name="destination" /> is too short to contain the repeated string.
|
||||||
|
/// </exception>
|
||||||
|
[MethodImpl(CompilerResources.MethodImplOptions)]
|
||||||
|
public static void Repeat(this string value, int count, Span<char> destination)
|
||||||
|
{
|
||||||
|
if (value is null)
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException(nameof(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count < 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(count), ExceptionMessages.CountMustBeGreaterThanOrEqualTo0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (destination.Length < value.Length * count)
|
||||||
|
{
|
||||||
|
throw new ArgumentException(ExceptionMessages.DestinationSpanLengthTooShort, nameof(destination));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var iteration = 0; iteration < count; iteration++)
|
||||||
|
{
|
||||||
|
Span<char> slice = destination.Slice(iteration * value.Length, value.Length);
|
||||||
|
value.AsSpan().CopyTo(slice);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
Loading…
Reference in New Issue
Block a user