From 9709eadca1be7d618243499386de3b957b83f111 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 21 Oct 2008 16:56:15 -0700 Subject: [PATCH] jscript: Added Math.floor implementation. --- dlls/jscript/math.c | 20 ++++++++++++++++++-- dlls/jscript/tests/api.js | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 1d37de5a531..d3d59ae22c6 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -204,8 +204,24 @@ static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) + num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, floor(num_val(&v))); + return S_OK; } static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 602b7dfd6a7..d613eb1a263 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -431,6 +431,24 @@ ok(tmp === 1, "Math.ceil(true) = " + tmp); tmp = Math.ceil(1.1, 3, 4); ok(tmp === 2, "Math.ceil(1.1, 3, 4) = " + tmp); +tmp = Math.floor(0.5); +ok(tmp === 0, "Math.floor(0.5) = " + tmp); + +tmp = Math.floor(-0.5); +ok(tmp === -1, "Math.floor(-0.5) = " + tmp); + +tmp = Math.floor(1.1); +ok(tmp === 1, "Math.floor(1.1) = " + tmp); + +tmp = Math.floor(true); +ok(tmp === 1, "Math.floor(true) = " + tmp); + +tmp = Math.floor(1.1, 3, 4); +ok(tmp === 1, "Math.floor(1.1, 3, 4) = " + tmp); + +tmp = Math.floor(); +ok(isNaN(tmp), "floor is not NaN"); + tmp = Math.abs(3); ok(tmp === 3, "Math.abs(3) = " + tmp);