diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a566f81d8a0..fbb86c572d1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1530,10 +1530,32 @@ HRESULT sub_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return binary_expr_eval(ctx, expr, sub_eval, ei, ret); } -HRESULT mul_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.5.1 */ +static HRESULT mul_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.1 */ +HRESULT mul_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, mul_eval, ei, ret); } HRESULT div_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 64d3bbdae51..c216932b937 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -181,6 +181,18 @@ tmp = 4.5-2; ok(tmp === 2.5, "4.5-2 !== 2.5"); ok(getVT(tmp) === "VT_R8", "getVT(4-2) !== VT_R8"); +tmp = 2*3; +ok(tmp === 6, "2*3 !== 6"); +ok(getVT(tmp) === "VT_I4", "getVT(2*3) !== VT_I4"); + +tmp = 2*3.5; +ok(tmp === 7, "2*3.5 !== 7"); +ok(getVT(tmp) === "VT_I4", "getVT(2*3.5) !== VT_I4"); + +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 = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");