1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-28 04:28:01 +02:00

Improvements to Number parsing

This commit is contained in:
disarray2077 2023-05-14 16:54:26 -03:00
parent 4c65652955
commit 5d28f8e1f0
10 changed files with 418 additions and 90 deletions

View file

@ -1,9 +1,19 @@
using System.Globalization;
namespace System
{
#unwarn
struct UInt16 : uint16, IInteger, IUnsigned, IHashable, IFormattable, IIsNaN
{
public const uint16 MaxValue = (uint16)0xFFFF;
public enum ParseError
{
case Ok;
case NoValue;
case Overflow;
case InvalidChar(uint16 partialResult);
}
public const uint16 MaxValue = 0xFFFF;
public const uint16 MinValue = 0;
public static int operator<=>(Self a, Self b)
@ -66,5 +76,63 @@ namespace System
NumberFormatter.NumberToString(format, (uint32)this, formatProvider, outString);
}
}
public static Result<uint16, ParseError> Parse(StringView val, NumberStyles style = .Number, CultureInfo cultureInfo = null)
{
if (val.IsEmpty)
return .Err(.NoValue);
uint16 result = 0;
uint16 prevResult = 0;
uint16 radix = style.HasFlag(.AllowHexSpecifier) ? 0x10 : 10;
for (int32 i = 0; i < val.Length; i++)
{
char8 c = val[i];
if ((c >= '0') && (c <= '9'))
{
result &*= radix;
result &+= (uint16)(c - '0');
}
else if ((c >= 'a') && (c <= 'f'))
{
if (radix != 0x10)
return .Err(.InvalidChar(result));
result &*= radix;
result &+= (uint16)(c - 'a' + 10);
}
else if ((c >= 'A') && (c <= 'F'))
{
if (radix != 0x10)
return .Err(.InvalidChar(result));
result &*= radix;
result &+= (uint16)(c - 'A' + 10);
}
else if ((c == 'X') || (c == 'x'))
{
if ((!style.HasFlag(.AllowHexSpecifier)) || (i == 0) || (result != 0))
return .Err(.InvalidChar(result));
radix = 0x10;
}
else if (c == '\'')
{
// Ignore
}
else if ((c == '+') && (i == 0))
{
// Ignore
}
else
return .Err(.InvalidChar(result));
if (result < prevResult)
return .Err(.Overflow);
prevResult = result;
}
return result;
}
}
}