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

Jump to bottom

Add binary support to number formatting #84889

Merged
merged 3 commits into from
Apr 18, 2023
Merged

Add binary support to number formatting #84889

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
e2c4330
Add binary support to number formatting
stephentoub Apr 15, 2023
6a8912a
Merge branch 'main' into formatb
stephentoub Apr 18, 2023
8ae78d3
Fix inlining of Convert.ToString
stephentoub Apr 18, 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
4 changes: 2 additions & 2 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 @@ -329,7 +329,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Icu.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Invariant.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'"/>
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
Expand Down Expand Up @@ -2599,4 +2599,4 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
</ItemGroup>
</Project>
</Project>
122 changes: 95 additions & 27 deletions src/libraries/System.Private.CoreLib/src/System/Convert.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,7 +2099,7 @@ public static byte ToByte(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}

if (value == null)
Expand All @@ -2122,7 +2122,7 @@ public static sbyte ToSByte(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}

if (value == null)
Expand All @@ -2147,7 +2147,7 @@ public static short ToInt16(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}

if (value == null)
Expand All @@ -2173,7 +2173,7 @@ public static ushort ToUInt16(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}

if (value == null)
Expand All @@ -2195,7 +2195,7 @@ public static int ToInt32(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}
return value != null ?
ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.IsTight) :
Expand All @@ -2211,7 +2211,7 @@ public static uint ToUInt32(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}
return value != null ?
(uint)ParseNumbers.StringToInt(value.AsSpan(), fromBase, ParseNumbers.TreatAsUnsigned | ParseNumbers.IsTight) :
Expand All @@ -2226,7 +2226,7 @@ public static long ToInt64(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}
return value != null ?
ParseNumbers.StringToLong(value.AsSpan(), fromBase, ParseNumbers.IsTight) :
Expand All @@ -2242,51 +2242,119 @@ public static ulong ToUInt64(string? value, int fromBase)
{
if (fromBase != 2 && fromBase != 8 && fromBase != 10 && fromBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
ThrowInvalidBase();
}
return value != null ?
(ulong)ParseNumbers.StringToLong(value.AsSpan(), fromBase, ParseNumbers.TreatAsUnsigned | ParseNumbers.IsTight) :
0;
}

// Convert the byte value to a string in base fromBase
public static string ToString(byte value, int toBase)
{
if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16)
{
throw new ArgumentException(SR.Arg_InvalidBase);
}
return ParseNumbers.IntToString((int)value, toBase, -1, ' ', ParseNumbers.PrintAsI1);
}
public static string ToString(byte value, int toBase) =>
ToString((int)value, toBase);

// Convert the Int16 value to a string in base fromBase
public static string ToString(short value, int toBase)
{
if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16)
string format = "d";

switch (toBase)
{
throw new ArgumentException(SR.Arg_InvalidBase);
}
return ParseNumbers.IntToString((int)value, toBase, -1, ' ', ParseNumbers.PrintAsI2);
case 2:
format = "b";
break;

case 8:
return ToOctalString((ushort)value);

case 10:
break;

case 16:
format = "x";
break;

default:
ThrowInvalidBase();
break;
};

return value.ToString(format, CultureInfo.InvariantCulture);
}

// Convert the Int32 value to a string in base toBase
public static string ToString(int value, int toBase)
{
if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16)
string format = "d";

switch (toBase)
{
throw new ArgumentException(SR.Arg_InvalidBase);
}
return ParseNumbers.IntToString(value, toBase, -1, ' ', 0);
case 2:
format = "b";
break;

case 8:
return ToOctalString((uint)value);

case 10:
break;

case 16:
format = "x";
break;

default:
ThrowInvalidBase();
break;
};

return value.ToString(format, CultureInfo.InvariantCulture);
}

// Convert the Int64 value to a string in base toBase
public static string ToString(long value, int toBase)
{
if (toBase != 2 && toBase != 8 && toBase != 10 && toBase != 16)
string format = "d";

switch (toBase)
{
throw new ArgumentException(SR.Arg_InvalidBase);
case 2:
format = "b";
break;

case 8:
return ToOctalString((ulong)value);

case 10:
break;

case 16:
format = "x";
break;

default:
ThrowInvalidBase();
break;
};

return value.ToString(format, CultureInfo.InvariantCulture);
}

private static void ThrowInvalidBase() => throw new ArgumentException(SR.Arg_InvalidBase);

private static string ToOctalString(ulong value)
{
Span<char> chars = stackalloc char[22]; // max length of a ulong in octal

int i = chars.Length;
do
{
chars[--i] = (char)('0' + (value & 7));
value >>= 3;
}
return ParseNumbers.LongToString(value, toBase, -1, ' ', 0);
while (value != 0);

return chars.Slice(i).ToString();
}

public static string ToBase64String(byte[] inArray)
Expand Down
Loading