ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-17 11:22:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #633 from Tetralux/fix-parseint-again

Browse Source 
Fix parsing of single-digit numbers
This commit is contained in:
gingerBill
2020-05-07 00:35:26 +01:00
committed by GitHub
parent 4fc60601d3 7d4f9545a7
commit 6adbdb1e0e
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;
for r in s {
i += 1;
if r == '_' do continue;
v := i64(_digit_value(r));
if v >= i64(base) {
break;
if r == '_' {
i += 1;
continue;
}
v := i64(_digit_value(r));
if v >= i64(base) do break;
value *= i64(base);
value += v;
i += 1;
}
if neg do value = -value;
ok = i > 1;
ok = i > 0;
return;
}
@@ -100,18 +101,19 @@ parse_i64_maybe_prefixed :: proc(str: string) -> (value: i64, ok: bool) {
i := 0;
for r in s {
i += 1;
if r == '_' do continue;
v := i64(_digit_value(r));
if v >= base {
break;
if r == '_' {
i += 1;
continue;
}
v := i64(_digit_value(r));
if v >= base do break;
value *= base;
value += v;
i += 1;
}
if neg do value = -value;
ok = i > 1;
ok = i > 0;
return;
}
@@ -138,17 +140,18 @@ parse_u64_of_base :: proc(str: string, base: int) -> (value: u64, ok: bool) {
i := 0;
for r in s {
i += 1;
if r == '_' do continue;
v := u64(_digit_value(r));
if v >= u64(base) {
break;
if r == '_' {
i += 1;
continue;
}
v := u64(_digit_value(r));
if v >= u64(base) do break;
value *= u64(base);
value += v;
i += 1;
}
ok = i > 1;
ok = i > 0;
return;
}
@@ -184,15 +187,18 @@ parse_u64_maybe_prefixed :: proc(str: string) -> (value: u64, ok: bool) {
i := 0;
for r in s {
i += 1;
if r == '_' do continue;
if r == '_' {
i += 1;
continue;
}
v := u64(_digit_value(r));
if v >= base do break;
value *= base;
value += u64(v);
i += 1;
}
ok = i > 1;
ok = i > 0;
return;
}