Jacek Caban : jscript: Added '*=' expression implementation.
Alexandre Julliard
julliard at winehq.org
Wed Sep 17 07:14:48 CDT 2008
Module: wine
Branch: master
Commit: 01a4acbd8c377bebd03c9767a4bc3aa5d3c081b0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a4acbd8c377bebd03c9767a4bc3aa5d3c081b0
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Sep 16 20:46:49 2008 +0200
jscript: Added '*=' expression implementation.
---
dlls/jscript/engine.c | 10 +++++++---
dlls/jscript/tests/lang.js | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index fbb86c5..82474ba 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2112,10 +2112,14 @@ HRESULT assign_sub_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f
return assign_oper_eval(ctx, expr->expression1, expr->expression2, sub_eval, ei, ret);
}
-HRESULT assign_mul_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_mul_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, mul_eval, ei, ret);
}
HRESULT assign_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 c216932..14bf7a9 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -204,6 +204,10 @@ tmp = 2;
ok((tmp -= 1) === 1, "tmp -= 1 !== 1");
ok(tmp === 1, "tmp !=== 1");
+tmp = 2;
+ok((tmp *= 1.5) === 3, "tmp *= 1.5 !== 3");
+ok(tmp === 3, "tmp !=== 3");
+
tmp = 3 || ok(false, "second or expression called");
ok(tmp === 3, "3 || (...) is not 3");
More information about the wine-cvs
mailing list