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

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Fri Sep 19 00:44:49 2008 +0200

jscript: Added '>>>' expression implementation.

---

dlls/jscript/engine.c      |   27 +++++++++++++++++++++++++--
 dlls/jscript/tests/lang.js |    6 ++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 25120af..5f93ace 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2807,10 +2807,33 @@ HRESULT right_shift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD
     return binary_expr_eval(ctx, expr, rshift_eval, ei, ret);
 }

+/* ECMA-262 3rd Edition    11.7.3 */
+static HRESULT rshift2_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
+{
+    DWORD li, ri;
+    HRESULT hres;
+
+    hres = to_uint32(ctx->parser->script, lval, ei, &li);
+    if(FAILED(hres))
+        return hres;
+
+    hres = to_uint32(ctx->parser->script, rval, ei, &ri);
+    if(FAILED(hres))
+        return hres;
+
+    V_VT(retv) = VT_I4;
+    V_I4(retv) = li >> (ri&0x1f);
+    return S_OK;
+}
+
+/* ECMA-262 3rd Edition    11.7.3 */
 HRESULT right2_shift_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 binary_expr_eval(ctx, expr, rshift2_eval, ei, ret);
 }

/* ECMA-262 3rd Edition    11.13.1 */
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 7599340..45bdd4e 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -301,6 +301,12 @@ ok(tmp === 2, "8 >> 2 = " + tmp);
 tmp = -64 >> 4;
 ok(tmp === -4, "-64 >> 4 = " + tmp);

+tmp = 8 >>> 2;
+ok(tmp === 2, "8 >> 2 = " + tmp);
+
+tmp = -64 >>> 4;
+ok(tmp === 0x0ffffffc, "-64 >>> 4 = " + tmp);
+
 tmp = 10;
 ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8");
 ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp));