Skip to content

fix: spec compliant parseInt #1378

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

Merged
merged 17 commits into from
Jul 9, 2020
Merged

fix: spec compliant parseInt #1378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e730028
fix rejection cases for parseInt and F32/F64.parseInt
MaxGraey Jul 6, 2020
ce5085a
add extra "abc" test
MaxGraey Jul 6, 2020
98f1948
refactor
MaxGraey Jul 6, 2020
ea62594
use mul instead copysign for special case of strtod
MaxGraey Jul 6, 2020
15d7a5f
add more tests cases & revert some changes
MaxGraey Jul 7, 2020
65446f9
more tests
MaxGraey Jul 7, 2020
36c7d45
remove some redundancy in tests
MaxGraey Jul 7, 2020
a4a86ab
add more tests from tc39/test262. Refactor radix detection
MaxGraey Jul 7, 2020
2f341b2
improve comment
MaxGraey Jul 7, 2020
021d910
wip
MaxGraey Jul 7, 2020
138b8ed
add stripPrefix according to spec and fix all tests
MaxGraey Jul 7, 2020
721b707
uncomment test
MaxGraey Jul 7, 2020
5b9a040
remove stripPrefix as unnecessary for now
MaxGraey Jul 7, 2020
ae64741
simplify
MaxGraey Jul 7, 2020
da1489a
refactor
MaxGraey Jul 7, 2020
d272c60
unify plus / minus handling
MaxGraey Jul 7, 2020
bb22a10
use const offsets
MaxGraey Jul 8, 2020
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 std/assembly/number.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ export abstract class F32 {
}

static parseInt(value: string, radix: i32 = 0): f32 {
return <f32>strtol<i64>(value, radix);
return <f32>strtol<f64>(value, radix);
}

static parseFloat(value: string): f32 {
Expand Down Expand Up @@ -359,7 +359,7 @@ export abstract class F64 {
}

static parseInt(value: string, radix: i32 = 0): f64 {
return <f64>strtol<i64>(value, radix);
return strtol<f64>(value, radix);
}

static parseFloat(value: string): f64 {
Expand Down
97 changes: 62 additions & 35 deletions std/assembly/util/string.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,47 +652,68 @@ export function toUpper8(c: u32): u32 {
export function strtol<T>(str: string, radix: i32 = 0): T {
var len = str.length;
if (!len) {
// @ts-ignore: cast
if (isFloat<T>()) return <T>NaN;
// @ts-ignore: cast
return <T>0;
if (isFloat<T>()) {
// @ts-ignore: cast
return <T>NaN;
} else {
// @ts-ignore: cast
return <T>0;
}
}

var ptr = changetype<usize>(str) /* + HEAD -> offset */;
var code = <u32>load<u16>(ptr);

// determine sign
// @ts-ignore: cast
var sign: T = 1;
// trim white spaces
while (isSpace(code)) {
code = <u32>load<u16>(ptr += 2);
--len;
}
if (code == CharCode.MINUS) {
// determine sign
// @ts-ignore
var sign: T = 1;
if (code == CharCode.MINUS || code == CharCode.PLUS) {
if (!--len) {
// @ts-ignore: cast
if (isFloat<T>()) return <T>NaN;
// @ts-ignore: cast
return <T>0;
if (isFloat<T>()) {
// @ts-ignore: cast
return <T>NaN;
} else {
// @ts-ignore: cast
return <T>0;
}
}
code = <u32>load<u16>(ptr += 2);
// @ts-ignore: type
sign = -1;
} else if (code == CharCode.PLUS) {
if (!--len) {
// @ts-ignore: cast
if (isFloat<T>()) return <T>NaN;
// @ts-ignore: cast
return <T>0;
if (code == CharCode.MINUS) {
// @ts-ignore: type
sign = -1;
}
code = <u32>load<u16>(ptr += 2);
}

// determine radix
if (!radix) {
// See https://tc39.es/ecma262/#sec-parseint-string-radix
if (radix) {
if (radix < 2 || radix > 36) {
if (isFloat<T>()) {
// @ts-ignore: cast
return <T>NaN;
} else {
// @ts-ignore: cast
return <T>0;
}
}
// handle case as parseInt("0xFF", 16) by spec
if (radix == 16) {
if (
len > 2 &&
code == CharCode._0 &&
(<u32>load<u16>(ptr, 2) | 32) == CharCode.x
) {
ptr += 4; len -= 2;
}
}
} else {
// determine radix by literal prefix
if (code == CharCode._0 && len > 2) {
switch (<u32>load<u16>(ptr + 2) | 32) {
switch (<u32>load<u16>(ptr, 2) | 32) {
case CharCode.b: {
ptr += 4; len -= 2;
radix = 2;
Expand All @@ -708,14 +729,9 @@ export function strtol<T>(str: string, radix: i32 = 0): T {
radix = 16;
break;
}
default: radix = 10;
}
} else radix = 10;
} else if (radix < 2 || radix > 36) {
// @ts-ignore: cast
if (isFloat<T>()) return <T>NaN;
// @ts-ignore: cast
return <T>0;
}
if (!radix) radix = 10;
}

// calculate value
Expand All @@ -729,8 +745,19 @@ export function strtol<T>(str: string, radix: i32 = 0): T {
code -= CharCode.A - 10;
} else if (code - CharCode.a <= <u32>(CharCode.z - CharCode.a)) {
code -= CharCode.a - 10;
} else break;
if (code >= <u32>radix) break;
}
if (code >= <u32>radix) {
if (!num) {
if (isFloat<T>()) {
// @ts-ignore: cast
return <T>NaN;
} else {
// @ts-ignore: cast
return <T>0;
}
}
break;
}
// @ts-ignore: type
num = num * radix + code;
ptr += 2;
Expand All @@ -746,7 +773,7 @@ export function strtod(str: string): f64 {
var ptr = changetype<usize>(str);
var code = <u32>load<u16>(ptr);

var sign = 1.;
var sign = 1.0;
// skip white spaces
while (len && isSpace(code)) {
code = <u32>load<u16>(ptr += 2);
Expand All @@ -770,7 +797,7 @@ export function strtod(str: string): f64 {
load<u64>(ptr, 0) == 0x690066006E0049 && // ifnI
load<u64>(ptr, 8) == 0x7900740069006E // ytin
) {
return copysign<f64>(Infinity, sign);
return Infinity * sign;
}
return NaN;
}
Expand Down
Loading