Module: wine Branch: master Commit: 8b13719cd23f3e7bc29d4d3b6e0ffba2638ed835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b13719cd23f3e7bc29d4d3b6e...
Author: Jacek Caban jacek@codeweavers.com Date: Sun Sep 21 15:36:46 2008 +0200
jscript: Added Array.toString implementation.
---
dlls/jscript/array.c | 11 +++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 944c0e8..9d7c8d8 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -279,11 +279,18 @@ static HRESULT Array_splice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return E_NOTIMPL; }
+/* ECMA-262 3rd Edition 15.4.4.2 */ static HRESULT Array_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_ARRAY)) { + WARN("not Array object\n"); + return E_FAIL; + } + + return array_join(dispex, lcid, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); }
static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f331670..78c0425 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -79,4 +79,9 @@ ok(tmp === "1;2;;false;;;a", "arr.join(';') = " + tmp); tmp = arr.join(""); ok(tmp === "12falsea", "arr.join('') = " + tmp);
+tmp = arr.toString(); +ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +tmp = arr.toString("test"); +ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); + reportSuccess();