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

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Oct  8 18:09:17 2008 -0500

jscript: Added '%' expression implementation.

---

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

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index d84e65b..b09136c 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#include <math.h>
+
 #include "jscript.h"
 #include "engine.h"

@@ -2046,10 +2048,31 @@ HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j
 }

/* ECMA-262 3rd Edition    11.5.3 */
-HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+static HRESULT mod_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    VARIANT lnum, rnum;
+    HRESULT hres;
+
+    hres = to_number(ctx->parser->script, lval, ei, &lnum);
+    if(FAILED(hres))
+        return hres;
+
+    hres = to_number(ctx->parser->script, rval, ei, &rnum);
+    if(FAILED(hres))
+        return hres;
+
+    num_set_val(retv, fmod(num_val(&lnum), num_val(&rnum)));
+    return S_OK;
+}
+
+/* ECMA-262 3rd Edition    11.5.3 */
+HRESULT mod_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, mod_eval, ei, ret);
 }

/* ECMA-262 3rd Edition    11.4.2 */
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 82e865f..39f8a29 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -248,6 +248,18 @@ tmp = 3/2;
 ok(tmp === 1.5, "3/2 !== 1.5");
 ok(getVT(tmp) === "VT_R8", "getVT(3/2) !== VT_R8");

+tmp = 3%2;
+ok(tmp === 1, "3%2 = " + tmp);
+
+tmp = 4%2;
+ok(tmp ===0, "4%2 = " + tmp);
+
+tmp = 3.5%1.5;
+ok(tmp === 0.5, "3.5%1.5 = " + tmp);
+
+tmp = 3%true;
+ok(tmp === 0, "3%true = " + tmp);
+
 tmp = "ab" + "cd";
 ok(tmp === "abcd", ""ab" + "cd" !== "abcd"");