From 43f760ba1751430aa4543c94d1b259d9bdfd577a Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 16 Sep 2008 20:47:27 +0200 Subject: [PATCH] jscript: Added '/=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/lex.c | 2 +- dlls/jscript/tests/lang.js | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d9abababad8..93cfc6c1cde 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2144,10 +2144,14 @@ HRESULT assign_mul_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return assign_oper_eval(ctx, expr->expression1, expr->expression2, mul_eval, ei, ret); } -HRESULT assign_div_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, div_eval, ei, ret); } HRESULT assign_mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 0aea118224a..ed73202a5ab 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -666,7 +666,7 @@ int parser_lex(void *lval, parser_ctx_t *ctx) if(++ctx->ptr < ctx->end) { if(*ctx->ptr == '=') { /* /= */ ctx->ptr++; - *(int*)lval = EXPR_ASSIGNMUL; + *(int*)lval = EXPR_ASSIGNDIV; return tAssignOper; } } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5b55cd3a9bc..911aa405c2f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -220,6 +220,10 @@ tmp = 2; ok((tmp *= 1.5) === 3, "tmp *= 1.5 !== 3"); ok(tmp === 3, "tmp !=== 3"); +tmp = 5; +ok((tmp /= 2) === 2.5, "tmp /= 2 !== 2.5"); +ok(tmp === 2.5, "tmp !=== 2.5"); + tmp = 3 || ok(false, "second or expression called"); ok(tmp === 3, "3 || (...) is not 3");