Jacek Caban : jscript: Added '|=' expression implementation.

Alexandre Julliard julliard at winehq.org
Thu Sep 18 07:55:46 CDT 2008


Module: wine
Branch: master
Commit: a51ec811c727c62defde5942861d5ea58749cd6b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a51ec811c727c62defde5942861d5ea58749cd6b

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Sep 17 23:31:22 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 fc4c1df..ee394a3 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2418,10 +2418,14 @@ HRESULT assign_and_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD fl
     return E_NOTIMPL;
 }
 
-HRESULT assign_or_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_or_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, bitor_eval, ei, ret);
 }
 
 HRESULT assign_xor_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 c3362aa..9d64505 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -273,6 +273,10 @@ tmp = -3.5 | 0;
 ok(tmp === -3, "-3.5 | 0 !== -3");
 ok(getVT(tmp) === "VT_I4", "getVT(3.5|0) = " + getVT(tmp));
 
+tmp = 10;
+ok((tmp |= 0x10) === 26, "tmp(10) |= 0x10 !== 26");
+ok(getVT(tmp) === "VT_I4", "getVT(tmp |= 10) = " + getVT(tmp));
+
 ok(1 < 3.4, "1 < 3.4 failed");
 ok(!(3.4 < 1), "3.4 < 1");
 ok("abc" < "abcd", "abc < abcd failed");




More information about the wine-cvs mailing list