Jacek Caban : jscript: Added Math.floor implementation.
Alexandre Julliard
julliard at winehq.org
Wed Oct 22 08:00:17 CDT 2008
Module: wine
Branch: master
Commit: 9709eadca1be7d618243499386de3b957b83f111
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9709eadca1be7d618243499386de3b957b83f111
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Oct 21 16:56:15 2008 -0700
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 1d37de5..d3d59ae 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 602b7df..d613eb1 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);
More information about the wine-cvs
mailing list