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

IUtf8SpanFormattable IUtf8SpanParsable を実装 #827

Merged
merged 2 commits into from
Nov 15, 2023
Merged

IUtf8SpanFormattable IUtf8SpanParsable を実装 #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af8ae32
RefStringTokenizerのUTF-8バージョンを実装
yuto-trd Sep 20, 2023
a6c403e
以下の型にIUtf8SpanFormattableなどを実装
yuto-trd Sep 20, 2023
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
119 changes: 93 additions & 26 deletions src/Beutl.Engine/Graphics/Point.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Globalization;
using System.Numerics;
using System.Text.Json.Serialization;
using System.Text.Unicode;

using Beutl.Converters;
using Beutl.Utilities;
Expand All @@ -18,7 +19,11 @@ namespace Beutl.Graphics;
public readonly struct Point
: IEquatable<Point>,
IParsable<Point>,
IFormattable,
ISpanParsable<Point>,
ISpanFormattable,
IUtf8SpanParsable<Point>,
IUtf8SpanFormattable,
IEqualityOperators<Point, Point, bool>,
IUnaryNegationOperators<Point, Point>,
IAdditionOperators<Point, Point, Point>,
Expand Down Expand Up @@ -192,7 +197,7 @@ public static implicit operator Vector(Point p)
/// <returns>The status of the operation.</returns>
public static bool TryParse(string s, out Point point)
{
return TryParse(s.AsSpan(), out point);
return TryParse(s.AsSpan(), null, out point);
}

/// <summary>
Expand All @@ -203,16 +208,7 @@ public static bool TryParse(string s, out Point point)
/// <returns>The status of the operation.</returns>
public static bool TryParse(ReadOnlySpan<char> s, out Point point)
{
try
{
point = Parse(s);
return true;
}
catch
{
point = default;
return false;
}
return TryParse(s, null, out point);
}

/// <summary>
Expand All @@ -222,7 +218,7 @@ public static bool TryParse(ReadOnlySpan<char> s, out Point point)
/// <returns>The <see cref="Point"/>.</returns>
public static Point Parse(string s)
{
return Parse(s.AsSpan());
return Parse(s.AsSpan(), null);
}

/// <summary>
Expand All @@ -232,11 +228,7 @@ public static Point Parse(string s)
/// <returns>The <see cref="Point"/>.</returns>
public static Point Parse(ReadOnlySpan<char> s)
{
using var tokenizer = new RefStringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point.");
return new Point(
tokenizer.ReadSingle(),
tokenizer.ReadSingle()
);
return Parse(s, null);
}

/// <summary>
Expand Down Expand Up @@ -321,25 +313,37 @@ public void Deconstruct(out float x, out float y)
y = Y;
}

static Point IParsable<Point>.Parse(string s, IFormatProvider? provider)
public static Point Parse(string s, IFormatProvider? provider)
{
return Parse(s);
return Parse(s.AsSpan(), provider);
}

static bool IParsable<Point>.TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, [MaybeNullWhen(false)] out Point result)
public static bool TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, out Point result)
{
result = default;
return s != null && TryParse(s, out result);
return TryParse(s.AsSpan(), provider, out result);
}

static Point ISpanParsable<Point>.Parse(ReadOnlySpan<char> s, IFormatProvider? provider)
public static Point Parse(ReadOnlySpan<char> s, IFormatProvider? provider)
{
return Parse(s);
using var tokenizer = new RefStringTokenizer(s, provider ?? CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point.");
return new Point(
tokenizer.ReadSingle(),
tokenizer.ReadSingle()
);
}

static bool ISpanParsable<Point>.TryParse([NotNullWhen(true)] ReadOnlySpan<char> s, IFormatProvider? provider, [MaybeNullWhen(false)] out Point result)
public static bool TryParse(ReadOnlySpan<char> s, IFormatProvider? provider, out Point result)
{
return TryParse(s, out result);
try
{
result = Parse(s, provider);
return true;
}
catch
{
result = default;
return false;
}
}

static void ITupleConvertible<Point, float>.ConvertTo(Point self, Span<float> tuple)
Expand All @@ -352,4 +356,67 @@ static void ITupleConvertible<Point, float>.ConvertFrom(Span<float> tuple, out P
{
self = new Point(tuple[0], tuple[1]);
}

public string ToString(IFormatProvider? formatProvider)
{
if (formatProvider == null)
{
return ToString();
}
else
{
char separator = TokenizerHelper.GetSeparatorFromFormatProvider(formatProvider);
return string.Create(formatProvider, $"{X}{separator} {Y}");
}
}

public string ToString(string? format, IFormatProvider? formatProvider)
{
return ToString(formatProvider);
}

public bool TryFormat(Span<char> destination, out int charsWritten, ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
char separator = TokenizerHelper.GetSeparatorFromFormatProvider(provider);
return MemoryExtensions.TryWrite(destination, provider, $"{X}{separator} {Y}", out charsWritten);
}

public static Point Parse(ReadOnlySpan<byte> utf8Text)
{
return Parse(utf8Text, null);
}

public static Point Parse(ReadOnlySpan<byte> utf8Text, IFormatProvider? provider)
{
using var tokenizer = new RefUtf8StringTokenizer(utf8Text, provider ?? CultureInfo.InvariantCulture, exceptionMessage: "Invalid Point.");
return new Point(
tokenizer.ReadSingle(),
tokenizer.ReadSingle()
);
}

public static bool TryParse(ReadOnlySpan<byte> utf8Text, out Point result)
{
return TryParse(utf8Text, null, out result);
}

public static bool TryParse(ReadOnlySpan<byte> utf8Text, IFormatProvider? provider, out Point result)
{
try
{
result = Parse(utf8Text, provider);
return true;
}
catch
{
result = default;
return false;
}
}

public bool TryFormat(Span<byte> utf8Destination, out int bytesWritten, ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
char separator = TokenizerHelper.GetSeparatorFromFormatProvider(provider);
return Utf8.TryWrite(utf8Destination, provider, $"{X}{separator} {Y}", out bytesWritten);
}
}
108 changes: 88 additions & 20 deletions src/Beutl.Engine/Graphics/Rect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Globalization;
using System.Numerics;
using System.Text.Json.Serialization;
using System.Text.Unicode;

using Beutl.Converters;
using Beutl.Utilities;
Expand All @@ -19,6 +20,9 @@ public readonly struct Rect
: IEquatable<Rect>,
IParsable<Rect>,
ISpanParsable<Rect>,
ISpanFormattable,
IUtf8SpanParsable<Rect>,
IUtf8SpanFormattable,
IEqualityOperators<Rect, Rect, bool>,
IMultiplyOperators<Rect, Vector, Rect>,
IMultiplyOperators<Rect, float, Rect>,
Expand Down Expand Up @@ -576,16 +580,7 @@ public static bool TryParse(string s, out Rect rect)
/// <returns>The status of the operation.</returns>
public static bool TryParse(ReadOnlySpan<char> s, out Rect rect)
{
try
{
rect = Parse(s);
return true;
}
catch
{
rect = default;
return false;
}
return TryParse(s, out rect);
}

/// <summary>
Expand All @@ -605,7 +600,22 @@ public static Rect Parse(string s)
/// <returns>The parsed <see cref="Rect"/>.</returns>
public static Rect Parse(ReadOnlySpan<char> s)
{
using var tokenizer = new RefStringTokenizer(s, CultureInfo.InvariantCulture, exceptionMessage: "Invalid Rect.");
return Parse(s, null);
}

public static Rect Parse(string s, IFormatProvider? provider)
{
return Parse(s.AsSpan(), provider);
}

public static bool TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, out Rect result)
{
return TryParse(s.AsSpan(), provider, out result);
}

public static Rect Parse(ReadOnlySpan<char> s, IFormatProvider? provider)
{
using var tokenizer = new RefStringTokenizer(s, provider ?? CultureInfo.InvariantCulture, exceptionMessage: "Invalid Rect.");
return new Rect(
tokenizer.ReadSingle(),
tokenizer.ReadSingle(),
Expand All @@ -614,25 +624,42 @@ public static Rect Parse(ReadOnlySpan<char> s)
);
}

static Rect IParsable<Rect>.Parse(string s, IFormatProvider? provider)
public static bool TryParse(ReadOnlySpan<char> s, IFormatProvider? provider, out Rect result)
{
return Parse(s);
try
{
result = Parse(s, provider);
return true;
}
catch
{
result = default;
return false;
}
}

static bool IParsable<Rect>.TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, [MaybeNullWhen(false)] out Rect result)
public bool TryFormat(Span<char> destination, out int charsWritten, ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
result = default;
return s != null && TryParse(s, out result);
char separator = TokenizerHelper.GetSeparatorFromFormatProvider(provider);
return MemoryExtensions.TryWrite(destination, provider, $"{X}{separator} {Y}{separator} {Width}{separator} {Height}", out charsWritten);
}

static Rect ISpanParsable<Rect>.Parse(ReadOnlySpan<char> s, IFormatProvider? provider)
public string ToString(string? format, IFormatProvider? formatProvider)
{
return Parse(s);
return ToString(formatProvider);
}

static bool ISpanParsable<Rect>.TryParse([NotNullWhen(true)] ReadOnlySpan<char> s, IFormatProvider? provider, [MaybeNullWhen(false)] out Rect result)
public string ToString(IFormatProvider? formatProvider)
{
return TryParse(s, out result);
if (formatProvider == null)
{
return ToString();
}
else
{
char separator = TokenizerHelper.GetSeparatorFromFormatProvider(formatProvider);
return string.Create(formatProvider, $"{X}{separator} {Y}{separator} {Width}{separator} {Height}");
}
}

static void ITupleConvertible<Rect, float>.ConvertTo(Rect self, Span<float> tuple)
Expand All @@ -647,4 +674,45 @@ static void ITupleConvertible<Rect, float>.ConvertFrom(Span<float> tuple, out Re
{
self = new Rect(tuple[0], tuple[1], tuple[2], tuple[3]);
}

public static Rect Parse(ReadOnlySpan<byte> utf8Text)
{
return Parse(utf8Text, null);
}

public static Rect Parse(ReadOnlySpan<byte> utf8Text, IFormatProvider? provider)
{
using var tokenizer = new RefUtf8StringTokenizer(utf8Text, provider ?? CultureInfo.InvariantCulture, exceptionMessage: "Invalid Rect.");
return new Rect(
tokenizer.ReadSingle(),
tokenizer.ReadSingle(),
tokenizer.ReadSingle(),
tokenizer.ReadSingle()
);
}

public static bool TryParse(ReadOnlySpan<byte> utf8Text, out Rect result)
{
return TryParse(utf8Text, out result);
}

public static bool TryParse(ReadOnlySpan<byte> utf8Text, IFormatProvider? provider, out Rect result)
{
try
{
result = Parse(utf8Text, provider);
return true;
}
catch
{
result = default;
return false;
}
}

public bool TryFormat(Span<byte> utf8Destination, out int bytesWritten, ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
char separator = TokenizerHelper.GetSeparatorFromFormatProvider(provider);
return Utf8.TryWrite(utf8Destination, provider, $"{X}{separator} {Y}{separator} {Width}{separator} {Height}", out bytesWritten);
}
}
Loading