Skip to content

Extract the generic integer formatting helper APIs to live on a generic type instead #121077

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

Closed
wants to merge 1 commit into from
Closed

Extract the generic integer formatting helper APIs to live on a generic type instead #121077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/libraries/Common/src/System/Number.Formatting.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace System
{
internal static partial class Number
{
private const int CharStackBufferSize = 32;
internal const int CharStackBufferSize = 32;

private const int DefaultPrecisionExponentialFormat = 6;

Expand Down Expand Up @@ -950,7 +950,11 @@ private static unsafe void FormatExponent<TChar>(ref ValueListBuilder<TChar> vlb
}

TChar* digits = stackalloc TChar[MaxUInt32DecDigits];
#if !SYSTEM_PRIVATE_CORELIB
TChar* p = UInt32ToDecChars(digits + MaxUInt32DecDigits, (uint)value, minDigits);
#else
TChar* p = NumberFormat<TChar>.UInt32ToDecChars(digits + MaxUInt32DecDigits, (uint)value, minDigits);
#endif
vlb.Append(new ReadOnlySpan<TChar>(p, (int)(digits + MaxUInt32DecDigits - p)));
}

Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Number.Grisu3.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Number.NumberToFloatingPointBits.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Number.Parsing.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\NumberFormat_1.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\BFloat16.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\BitOperations.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\Matrix3x2.cs" />
Expand Down
32 changes: 16 additions & 16 deletions ...ies/System.Private.CoreLib/src/System/Buffers/Text/Utf8Formatter/Utf8Formatter.Integer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,16 @@ public static bool TryFormat(uint value, Span<byte> destination, out int bytesWr
{
if (format.IsDefault)
{
return Number.TryUInt32ToDecStr(value, destination, out bytesWritten);
return NumberFormat<byte>.TryUInt32ToDecStr(value, destination, out bytesWritten);
}

switch (format.Symbol | 0x20)
{
case 'd':
return Number.TryUInt32ToDecStr(value, format.PrecisionOrZero, destination, out bytesWritten);
return NumberFormat<byte>.TryUInt32ToDecStr(value, format.PrecisionOrZero, destination, out bytesWritten);

case 'x':
return Number.TryInt32ToHexStr((int)value, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);
return NumberFormat<byte>.TryInt32ToHexStr((int)value, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);

case 'n':
return FormattingHelpers.TryFormat(value, destination, out bytesWritten, format);
Expand Down Expand Up @@ -192,19 +192,19 @@ private static bool TryFormat(int value, int hexMask, Span<byte> destination, ou
if (format.IsDefault)
{
return value >= 0 ?
Number.TryUInt32ToDecStr((uint)value, destination, out bytesWritten) :
Number.TryNegativeInt32ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);
NumberFormat<byte>.TryUInt32ToDecStr((uint)value, destination, out bytesWritten) :
NumberFormat<byte>.TryNegativeInt32ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);
}

switch (format.Symbol | 0x20)
{
case 'd':
return value >= 0 ?
Number.TryUInt32ToDecStr((uint)value, format.PrecisionOrZero, destination, out bytesWritten) :
Number.TryNegativeInt32ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);
NumberFormat<byte>.TryUInt32ToDecStr((uint)value, format.PrecisionOrZero, destination, out bytesWritten) :
NumberFormat<byte>.TryNegativeInt32ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);

case 'x':
return Number.TryInt32ToHexStr(value & hexMask, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);
return NumberFormat<byte>.TryInt32ToHexStr(value & hexMask, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);

case 'n':
return FormattingHelpers.TryFormat(value, destination, out bytesWritten, format);
Expand Down Expand Up @@ -249,16 +249,16 @@ public static bool TryFormat(ulong value, Span<byte> destination, out int bytesW
{
if (format.IsDefault)
{
return Number.TryUInt64ToDecStr(value, destination, out bytesWritten);
return NumberFormat<byte>.TryUInt64ToDecStr(value, destination, out bytesWritten);
}

switch (format.Symbol | 0x20)
{
case 'd':
return Number.TryUInt64ToDecStr(value, format.PrecisionOrZero, destination, out bytesWritten);
return NumberFormat<byte>.TryUInt64ToDecStr(value, format.PrecisionOrZero, destination, out bytesWritten);

case 'x':
return Number.TryInt64ToHexStr((long)value, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);
return NumberFormat<byte>.TryInt64ToHexStr((long)value, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);

case 'n':
return FormattingHelpers.TryFormat(value, destination, out bytesWritten, format);
Expand Down Expand Up @@ -303,19 +303,19 @@ public static bool TryFormat(long value, Span<byte> destination, out int bytesWr
if (format.IsDefault)
{
return value >= 0 ?
Number.TryUInt64ToDecStr((ulong)value, destination, out bytesWritten) :
Number.TryNegativeInt64ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);
NumberFormat<byte>.TryUInt64ToDecStr((ulong)value, destination, out bytesWritten) :
NumberFormat<byte>.TryNegativeInt64ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);
}

switch (format.Symbol | 0x20)
{
case 'd':
return value >= 0 ?
Number.TryUInt64ToDecStr((ulong)value, format.PrecisionOrZero, destination, out bytesWritten) :
Number.TryNegativeInt64ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);
NumberFormat<byte>.TryUInt64ToDecStr((ulong)value, format.PrecisionOrZero, destination, out bytesWritten) :
NumberFormat<byte>.TryNegativeInt64ToDecStr(value, format.PrecisionOrZero, "-"u8, destination, out bytesWritten);

case 'x':
return Number.TryInt64ToHexStr(value, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);
return NumberFormat<byte>.TryInt64ToHexStr(value, Number.GetHexBase(format.Symbol), format.PrecisionOrZero, destination, out bytesWritten);

case 'n':
return FormattingHelpers.TryFormat(value, destination, out bytesWritten, format);
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Byte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ public string ToString([StringSyntax(StringSyntaxAttribute.NumericFormat)] strin

public bool TryFormat(Span<char> destination, out int charsWritten, [StringSyntax(StringSyntaxAttribute.NumericFormat)] ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
return Number.TryFormatUInt32(m_value, format, provider, destination, out charsWritten);
return NumberFormat<char>.TryFormatUInt32(m_value, format, provider, destination, out charsWritten);
}

/// <inheritdoc cref="IUtf8SpanFormattable.TryFormat" />
public bool TryFormat(Span<byte> utf8Destination, out int bytesWritten, [StringSyntax(StringSyntaxAttribute.NumericFormat)] ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
return Number.TryFormatUInt32(m_value, format, provider, utf8Destination, out bytesWritten);
return NumberFormat<byte>.TryFormatUInt32(m_value, format, provider, utf8Destination, out bytesWritten);
}

//
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Decimal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,13 @@ public string ToString([StringSyntax(StringSyntaxAttribute.NumericFormat)] strin

public bool TryFormat(Span<char> destination, out int charsWritten, [StringSyntax(StringSyntaxAttribute.NumericFormat)] ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
return Number.TryFormatDecimal(this, format, NumberFormatInfo.GetInstance(provider), destination, out charsWritten);
return NumberFormat<char>.TryFormatDecimal(this, format, NumberFormatInfo.GetInstance(provider), destination, out charsWritten);
}

/// <inheritdoc cref="IUtf8SpanFormattable.TryFormat" />
public bool TryFormat(Span<byte> utf8Destination, out int bytesWritten, [StringSyntax(StringSyntaxAttribute.NumericFormat)] ReadOnlySpan<char> format = default, IFormatProvider? provider = null)
{
return Number.TryFormatDecimal(this, format, NumberFormatInfo.GetInstance(provider), utf8Destination, out bytesWritten);
return NumberFormat<byte>.TryFormatDecimal(this, format, NumberFormatInfo.GetInstance(provider), utf8Destination, out bytesWritten);
}

// Converts a string to a Decimal. The string must consist of an optional
Expand Down
Loading
Loading