ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of single-digit numbers

Browse Source
This commit is contained in:
Tetralux
2020-05-06 23:21:24 +00:00
parent 4fc60601d3
commit 7d4f9545a7
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/strconv/strconv.odin
+27 -21
View File
@@ -47,18 +47,19 @@ parse_i64_of_base :: proc(str: string, base: int) -> (value: i64, ok: bool) {
i := 0; i := 0;
for r in s { for r in s {
i += 1; if r == '_' {
if r == '_' do continue; i += 1;
v := i64(_digit_value(r)); continue;
if v >= i64(base) {
break;
} }
v := i64(_digit_value(r));
if v >= i64(base) do break;
value *= i64(base); value *= i64(base);
value += v; value += v;
i += 1;
} }
if neg do value = -value; if neg do value = -value;
ok = i > 1; ok = i > 0;
return; return;
} }
@@ -100,18 +101,19 @@ parse_i64_maybe_prefixed :: proc(str: string) -> (value: i64, ok: bool) {
i := 0; i := 0;
for r in s { for r in s {
i += 1; if r == '_' {
if r == '_' do continue; i += 1;
v := i64(_digit_value(r)); continue;
if v >= base {
break;
} }
v := i64(_digit_value(r));
if v >= base do break;
value *= base; value *= base;
value += v; value += v;
i += 1;
} }
if neg do value = -value; if neg do value = -value;
ok = i > 1; ok = i > 0;
return; return;
} }
@@ -138,17 +140,18 @@ parse_u64_of_base :: proc(str: string, base: int) -> (value: u64, ok: bool) {
i := 0; i := 0;
for r in s { for r in s {
i += 1; if r == '_' {
if r == '_' do continue; i += 1;
v := u64(_digit_value(r)); continue;
if v >= u64(base) {
break;
} }
v := u64(_digit_value(r));
if v >= u64(base) do break;
value *= u64(base); value *= u64(base);
value += v; value += v;
i += 1;
} }
ok = i > 1; ok = i > 0;
return; return;
} }
@@ -184,15 +187,18 @@ parse_u64_maybe_prefixed :: proc(str: string) -> (value: u64, ok: bool) {
i := 0; i := 0;
for r in s { for r in s {
i += 1; if r == '_' {
if r == '_' do continue; i += 1;
continue;
}
v := u64(_digit_value(r)); v := u64(_digit_value(r));
if v >= base do break; if v >= base do break;
value *= base; value *= base;
value += u64(v); value += u64(v);
i += 1;
} }
ok = i > 1; ok = i > 0;
return; return;
} }