diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e554dd89851..9b6ace9dc2f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1502,10 +1502,32 @@ HRESULT add_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return binary_expr_eval(ctx, expr, add_eval, ei, ret); } -HRESULT sub_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.6.2 */ +static HRESULT sub_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.6.2 */ +HRESULT sub_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, sub_eval, ei, ret); } HRESULT mul_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 e099df99aa6..96df5171389 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -173,6 +173,14 @@ tmp = 1.5+2.5; ok(tmp === 4, "1.4+2.5 !== 4"); ok(getVT(tmp) === "VT_I4", "getVT(1.5+2.5) !== VT_I4"); +tmp = 4-2; +ok(tmp === 2, "4-2 !== 2"); +ok(getVT(tmp) === "VT_I4", "getVT(4-2) !== VT_I4"); + +tmp = 4.5-2; +ok(tmp === 2.5, "4.5-2 !== 2.5"); +ok(getVT(tmp) === "VT_R8", "getVT(4-2) !== VT_R8"); + tmp = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");