Skip to content
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

Fix Number.prototype.toExponential() #4177

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix Number.prototype.toExponential() #4177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ members = [

exclude = [
"tests/fuzz", # Does weird things on Windows tests
"tests/src", # Just a hack to have fuzz inside tests
"tests/src", # Just a hack to have fuzz inside tests
]

[workspace.package]
Expand Down Expand Up @@ -70,7 +70,14 @@ serde = "1.0.217"
static_assertions = "1.1.0"
textwrap = "0.16.0"
thin-vec = "0.2.13"
time = { version = "0.3.37", default-features = false, features = ["local-offset", "large-dates", "wasm-bindgen", "parsing", "formatting", "macros"] }
time = { version = "0.3.37", default-features = false, features = [
"local-offset",
"large-dates",
"wasm-bindgen",
"parsing",
"formatting",
"macros",
] }
tinystr = "0.7.5"
log = "0.4.25"
simple_logger = "5.0.0"
Expand Down Expand Up @@ -98,7 +105,7 @@ measureme = "12.0.1"
paste = "1.0"
rand = "0.9.0"
num-integer = "0.1.46"
ryu-js = "1.0.2"
ryu-js = { git = "https://github.com/boa-dev/ryu-js.git", rev = "14cfde2f061ddd6e0eeb76d9324812de1b8c7789" }
tap = "1.0.1"
thiserror = { version = "2.0.11", default-features = false }
dashmap = "6.1.0"
Expand All @@ -111,7 +118,9 @@ intrusive-collections = "0.9.7"
cfg-if = "1.0.0"
either = "1.13.0"
sys-locale = "0.3.2"
temporal_rs = { git = "https://github.com/boa-dev/temporal.git", rev = "7484b2584efc7430f5ca34cf3a91e858286a3a29", default-features = false, features = ["tzdb"] }
temporal_rs = { git = "https://github.com/boa-dev/temporal.git", rev = "7484b2584efc7430f5ca34cf3a91e858286a3a29", default-features = false, features = [
"tzdb",
] }
web-time = "1.1.0"
criterion = "0.5.1"
float-cmp = "0.10.0"
Expand Down
17 changes: 3 additions & 14 deletions core/engine/src/builtins/number/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ impl Number {
Some(IntegerOrInfinity::Integer(precision)) if (0..=100).contains(&precision) =>
// 5. If f < 0 or f > 100, throw a RangeError exception.
{
f64_to_exponential_with_precision(this_num, precision as usize)
ryu_js::Buffer::new()
.format_to_exponential(this_num, precision as u8)
.into()
}
_ => {
return Err(JsNativeError::range()
Expand Down Expand Up @@ -922,16 +924,3 @@ fn f64_to_exponential(n: f64) -> JsString {
_ => js_string!(s),
}
}

/// Helper function that formats a float as a ES6-style exponential number string with a given precision.
// We can't use the same approach as in `f64_to_exponential`
// because in cases like (0.999).toExponential(0) the result will be 1e0.
// Instead we get the index of 'e', and if the next character is not '-' we insert the plus sign
fn f64_to_exponential_with_precision(n: f64, prec: usize) -> JsString {
let mut res = format!("{n:.prec$e}");
let idx = res.find('e').expect("'e' not found in exponential string");
if res.as_bytes()[idx + 1] != b'-' {
res.insert(idx + 1, '+');
}
js_string!(res)
}
91 changes: 91 additions & 0 deletions core/engine/src/builtins/number/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,97 @@ fn num_to_string_exponential() {
]);
}

// https://github.com/tc39/test262/blob/main/test/built-ins/Number/prototype/toExponential/return-values.js
#[test]
fn test262_number_prototype_toexponential_return_values() {
run_test_actions([
TestAction::assert_eq("(123.456).toExponential(0)", js_str!("1e+2")),
TestAction::assert_eq("(123.456).toExponential(1)", js_str!("1.2e+2")),
TestAction::assert_eq("(123.456).toExponential(2)", js_str!("1.23e+2")),
TestAction::assert_eq("(123.456).toExponential(3)", js_str!("1.235e+2")),
TestAction::assert_eq("(123.456).toExponential(4)", js_str!("1.2346e+2")),
TestAction::assert_eq("(123.456).toExponential(5)", js_str!("1.23456e+2")),
TestAction::assert_eq("(123.456).toExponential(6)", js_str!("1.234560e+2")),
TestAction::assert_eq("(123.456).toExponential(7)", js_str!("1.2345600e+2")),
TestAction::assert_eq(
"(123.456).toExponential(17)",
js_str!("1.23456000000000003e+2"),
),
TestAction::assert_eq(
"(123.456).toExponential(20)",
js_str!("1.23456000000000003070e+2"),
),
TestAction::assert_eq("(-123.456).toExponential(0)", js_str!("-1e+2")),
TestAction::assert_eq("(-123.456).toExponential(1)", js_str!("-1.2e+2")),
TestAction::assert_eq("(-123.456).toExponential(2)", js_str!("-1.23e+2")),
TestAction::assert_eq("(-123.456).toExponential(3)", js_str!("-1.235e+2")),
TestAction::assert_eq("(-123.456).toExponential(4)", js_str!("-1.2346e+2")),
TestAction::assert_eq("(-123.456).toExponential(5)", js_str!("-1.23456e+2")),
TestAction::assert_eq("(-123.456).toExponential(6)", js_str!("-1.234560e+2")),
TestAction::assert_eq("(-123.456).toExponential(7)", js_str!("-1.2345600e+2")),
TestAction::assert_eq(
"(-123.456).toExponential(17)",
js_str!("-1.23456000000000003e+2"),
),
TestAction::assert_eq(
"(-123.456).toExponential(20)",
js_str!("-1.23456000000000003070e+2"),
),
TestAction::assert_eq("(0.0001).toExponential(0)", js_str!("1e-4")),
TestAction::assert_eq("(0.0001).toExponential(1)", js_str!("1.0e-4")),
TestAction::assert_eq("(0.0001).toExponential(2)", js_str!("1.00e-4")),
TestAction::assert_eq("(0.0001).toExponential(3)", js_str!("1.000e-4")),
TestAction::assert_eq("(0.0001).toExponential(4)", js_str!("1.0000e-4")),
TestAction::assert_eq(
"(0.0001).toExponential(16)",
js_str!("1.0000000000000000e-4"),
),
TestAction::assert_eq(
"(0.0001).toExponential(17)",
js_str!("1.00000000000000005e-4"),
),
TestAction::assert_eq(
"(0.0001).toExponential(18)",
js_str!("1.000000000000000048e-4"),
),
TestAction::assert_eq(
"(0.0001).toExponential(19)",
js_str!("1.0000000000000000479e-4"),
),
TestAction::assert_eq(
"(0.0001).toExponential(20)",
js_str!("1.00000000000000004792e-4"),
),
TestAction::assert_eq("(0.9999).toExponential(0)", js_str!("1e+0")),
TestAction::assert_eq("(0.9999).toExponential(1)", js_str!("1.0e+0")),
TestAction::assert_eq("(0.9999).toExponential(2)", js_str!("1.00e+0")),
TestAction::assert_eq("(0.9999).toExponential(3)", js_str!("9.999e-1")),
TestAction::assert_eq("(0.9999).toExponential(4)", js_str!("9.9990e-1")),
TestAction::assert_eq(
"(0.9999).toExponential(16)",
js_str!("9.9990000000000001e-1"),
),
TestAction::assert_eq(
"(0.9999).toExponential(17)",
js_str!("9.99900000000000011e-1"),
),
TestAction::assert_eq(
"(0.9999).toExponential(18)",
js_str!("9.999000000000000110e-1"),
),
TestAction::assert_eq(
"(0.9999).toExponential(19)",
js_str!("9.9990000000000001101e-1"),
),
TestAction::assert_eq(
"(0.9999).toExponential(20)",
js_str!("9.99900000000000011013e-1"),
),
TestAction::assert_eq("(25).toExponential(0)", js_str!("3e+1")),
TestAction::assert_eq("(12345).toExponential(3)", js_str!("1.235e+4")),
]);
}

#[test]
fn value_of() {
// TODO: In addition to parsing numbers from strings, parse them bare As of October 2019
Expand Down
Loading