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

[Alexandre Julliard]

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

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

jscript: Added '>>' expression implementation.

---

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

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index ae41df4..25120af 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2777,10 +2777,34 @@ HRESULT left_shift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f
     return binary_expr_eval(ctx, expr, lshift_eval, ei, ret);
 }

+/* ECMA-262 3rd Edition    11.7.2 */
+static HRESULT rshift_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
+{
+    DWORD ri;
+    INT li;
+    HRESULT hres;
+
+    hres = to_int32(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.2 */
 HRESULT right_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, rshift_eval, ei, ret);
 }

HRESULT right2_shift_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 c7a79d8..7599340 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -295,6 +295,12 @@ ok(tmp === 16, "2 << 3 = " + tmp);
 tmp = 2 << 35;
 ok(tmp === 16, "2 << 35 = " + tmp);

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