From 323e11b4abb0bfa8f347da1789f233e52ca6ed13 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 16 Sep 2008 20:47:06 +0200 Subject: [PATCH] jscript: Added '/' expression implementation. --- dlls/jscript/engine.c | 28 +++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 82474ba2cdf..d9abababad8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1558,10 +1558,32 @@ HRESULT mul_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return binary_expr_eval(ctx, expr, mul_eval, ei, ret); } -HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.5.2 */ +static HRESULT div_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT lnum, rnum; + HRESULT hres; + + hres = to_number(ctx->parser->script, lval, ei, &lnum); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx->parser->script, rval, ei, &rnum); + if(FAILED(hres)) + return hres; + + num_set_val(retv, num_val(&lnum) / num_val(&rnum)); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.5.2 */ +HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, div_eval, ei, ret); } HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 14bf7a9b56d..5b55cd3a9bc 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -193,6 +193,18 @@ tmp = 2.5*3.5; ok(tmp === 8.75, "2.5*3.5 !== 8.75"); ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); +tmp = 4/2; +ok(tmp === 2, "4/2 !== 2"); +ok(getVT(tmp) === "VT_I4", "getVT(4/2) !== VT_I4"); + +tmp = 4.5/1.5; +ok(tmp === 3, "4.5/1.5 !== 3"); +ok(getVT(tmp) === "VT_I4", "getVT(4.5/1.5) !== VT_I4"); + +tmp = 3/2; +ok(tmp === 1.5, "3/2 !== 1.5"); +ok(getVT(tmp) === "VT_R8", "getVT(3/2) !== VT_R8"); + tmp = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");