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

Jump to bottom

add remaining math methods (#524) #525

Merged
merged 11 commits into from
Jul 2, 2020
Merged

add remaining math methods (#524) #525

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4bc31ef
add `Math.clz32` method (#524)
mr-rodgers Jun 24, 2020
034b613
fix doc urls for clz32
mr-rodgers Jun 24, 2020
37af5fc
[#524] optimize impl for `Math.clz32`
mr-rodgers Jun 25, 2020
419f409
[#524] add implementation for `Math.expm1()`
mr-rodgers Jun 25, 2020
509a587
[#524] add implementation for `Math.fround()`
mr-rodgers Jun 25, 2020
c061b69
[#524] implement `Math.hypot()`
mr-rodgers Jun 25, 2020
c6642c0
[#524] implement `Math.log1p()`
mr-rodgers Jun 25, 2020
041f330
[#524] implement `Math.imul()`
mr-rodgers Jun 25, 2020
2359149
improve `Math.clz32()` implementation
mr-rodgers Jun 25, 2020
4649739
Merge remote-tracking branch 'upstream/master' into 524-add-remaining…
mr-rodgers Jun 25, 2020
e51ee81
[#524] add tests for more states
mr-rodgers Jun 26, 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
21 changes: 21 additions & 0 deletions boa/src/builtins/math/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use crate::{
exec::Interpreter,
BoaProfiler,
};
use num_traits::cast::ToPrimitive;
use std::f64;

#[cfg(test)]
Expand Down Expand Up @@ -165,6 +166,25 @@ impl Math {
Ok(args.get(0).map_or(f64::NAN, |x| f64::from(x).ceil()).into())
}

/// Get the number of leading zeros in the 32 bit representation of a number
///
/// More information:
/// - [ECMAScript reference][spec]
/// - [MDN documentation][mdn]
///
/// [spec]: https://tc39.es/ecma262/#sec-math.clz32
/// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
pub(crate) fn clz32(_: &Value, args: &[Value], _: &mut Interpreter) -> ResultValue {
Ok(args
.get(0)
.and_then(|x| f64::from(x).to_u32())
.map_or(32usize, |u| {
let s = format!("{:032b}", u);
s.chars().take_while(|x| *x == '0').count()
})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.and_then(|x| f64::from(x).to_u32())
.map_or(32usize, |u| {
let s = format!("{:032b}", u);
s.chars().take_while(|x| *x == '0').count()
})
.and_then(|x| i32::from(x).leading_zeros())
.unwrap_or(32)

A better way of doing this would we to use .leading_zeros() which would eliminate the allocation from format!

.into())
}

/// Get the cosine of a number.
///
/// More information:
Expand Down Expand Up @@ -485,6 +505,7 @@ impl Math {
make_builtin_fn(Self::atan2, "atan2", &math, 2);
make_builtin_fn(Self::cbrt, "cbrt", &math, 1);
make_builtin_fn(Self::ceil, "ceil", &math, 1);
make_builtin_fn(Self::clz32, "clz32", &math, 1);
make_builtin_fn(Self::cos, "cos", &math, 1);
make_builtin_fn(Self::cosh, "cosh", &math, 1);
make_builtin_fn(Self::exp, "exp", &math, 1);
Expand Down
30 changes: 30 additions & 0 deletions boa/src/builtins/math/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,36 @@ fn ceil() {
assert_eq!(c.to_number(), -7_f64);
}

#[test]
fn clz32() {
let realm = Realm::create();
let mut engine = Interpreter::new(realm);
let init = r#"
var a = Math.clz32();
var b = Math.clz32({});
var c = Math.clz32(1);
var d = Math.clz32("1");
var e = Math.clz32(4);
var f = Math.clz32(Infinity);
"#;

eprintln!("{}", forward(&mut engine, init));

let a = forward_val(&mut engine, "a").unwrap();
let b = forward_val(&mut engine, "b").unwrap();
let c = forward_val(&mut engine, "c").unwrap();
let d = forward_val(&mut engine, "d").unwrap();
let e = forward_val(&mut engine, "e").unwrap();
let f = forward_val(&mut engine, "f").unwrap();

assert_eq!(a.to_number(), 32_f64);
assert_eq!(b.to_number(), 32_f64);
assert_eq!(c.to_number(), 31_f64);
assert_eq!(d.to_number(), 31_f64);
assert_eq!(e.to_number(), 29_f64);
assert_eq!(f.to_number(), 32_f64);
}

#[test]
fn cos() {
let realm = Realm::create();
Expand Down