Jacek Caban : jscript: Added '^' expression implementation.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Sep 17 23:32:11 2008 +0200

jscript: Added '^' expression implementation.

---

dlls/jscript/engine.c      |   29 ++++++++++++++++++++++++++---
 dlls/jscript/tests/lang.js |    4 ++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 0da2d6e..76e8830 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1513,10 +1513,33 @@ HRESULT binary_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl
     return binary_expr_eval(ctx, expr, bitor_eval, ei, ret);
 }

-HRESULT binary_xor_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition    11.10 */
+static HRESULT xor_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    INT li, ri;
+    HRESULT hres;
+
+    hres = to_int32(ctx->parser->script, lval, ei, &li);
+    if(FAILED(hres))
+        return hres;
+
+    hres = to_int32(ctx->parser->script, rval, ei, &ri);
+    if(FAILED(hres))
+        return hres;
+
+    V_VT(retv) = VT_I4;
+    V_I4(retv) = li^ri;
+    return S_OK;
+}
+
+/* ECMA-262 3rd Edition    11.10 */
+HRESULT binary_xor_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, xor_eval, ei, ret);
 }

/* ECMA-262 3rd Edition    11.10 */
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 9d64559..dd7c9fd 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -293,6 +293,10 @@ tmp = 10;
 ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8");
 ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp));

+tmp = 0xf0f0^0xff00;
+ok(tmp === 0x0ff0, "0xf0f0^0xff00 !== 0x0ff0");
+ok(getVT(tmp) === "VT_I4", "getVT(0xf0f0^0xff00) = " + getVT(tmp));
+
 ok(1 < 3.4, "1 < 3.4 failed");
 ok(!(3.4 < 1), "3.4 < 1");
 ok("abc" < "abcd", "abc < abcd failed");