apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Make _strtoi call _strtou, to deduplicate code

Browse Source
This commit is contained in:
apio 2022-11-19 22:52:08 +01:00
parent 30a7d760ae
commit 44f44aedca
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
luna/NumberParsing.cpp
View File

@ -96,7 +96,6 @@ usize _strtou(const char* str, const char** endptr, int base)
isize _strtoi(const char* str, const char** endptr, int base) isize _strtoi(const char* str, const char** endptr, int base)
{ {
isize val = 0;
bool negative = false; bool negative = false;
while (_isspace(*str)) str++; while (_isspace(*str)) str++;
@ -107,27 +106,8 @@ isize _strtoi(const char* str, const char** endptr, int base)
str++; str++;
} }
if ((base == 0 || base == 16) && *str == '0') usize rc = _strtou(str, endptr,
{ base); // FIXME: Check for overflow (the unsigned usize value might not fit into a signed isize)
str++;
if (_tolower(*str) == 'x')
{
base = 16;
str++;
}
else if (base == 0)
base = 8;
}
else if (base == 0)
base = 10;
while (is_valid_digit_for_base(base, *str)) return negative ? -(isize)rc : (isize)rc;
{
val = (base * val) + parse_digit_unchecked(*str);
str++;
}
if (endptr) *endptr = str;
return negative ? -val : val;
} }