ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Added '/' expression implementation.

This commit is contained in:
Jacek Caban 2008-09-16 20:47:06 +02:00 committed by Alexandre Julliard
parent 01a4acbd8c
commit 323e11b4ab
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/jscript/engine.c
View File

@ -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); 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"); VARIANT lnum, rnum;
return E_NOTIMPL; 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) HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)

12
dlls/jscript/tests/lang.js
View File

@ -193,6 +193,18 @@ tmp = 2.5*3.5;
ok(tmp === 8.75, "2.5*3.5 !== 8.75"); ok(tmp === 8.75, "2.5*3.5 !== 8.75");
ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); 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"; tmp = "ab" + "cd";
ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\""); ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");