Commit 065581b2 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

jscript: Added '%' expression implementation.

parent fe7c5d86
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <math.h>
#include "jscript.h"
#include "engine.h"
......@@ -2046,10 +2048,31 @@ HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j
}
/* ECMA-262 3rd Edition 11.5.3 */
HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
static HRESULT mod_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, fmod(num_val(&lnum), num_val(&rnum)));
return S_OK;
}
/* ECMA-262 3rd Edition 11.5.3 */
HRESULT mod_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, mod_eval, ei, ret);
}
/* ECMA-262 3rd Edition 11.4.2 */
......
......@@ -248,6 +248,18 @@ tmp = 3/2;
ok(tmp === 1.5, "3/2 !== 1.5");
ok(getVT(tmp) === "VT_R8", "getVT(3/2) !== VT_R8");
tmp = 3%2;
ok(tmp === 1, "3%2 = " + tmp);
tmp = 4%2;
ok(tmp ===0, "4%2 = " + tmp);
tmp = 3.5%1.5;
ok(tmp === 0.5, "3.5%1.5 = " + tmp);
tmp = 3%true;
ok(tmp === 0, "3%true = " + tmp);
tmp = "ab" + "cd";
ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment