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

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Thu Sep 11 23:56:51 2008 +0200

jscript: Added '>' expression implementation.

---

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

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 3d21b21..20516e2 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1706,10 +1706,27 @@ HRESULT lesseq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags
     return return_bool(ret, !b);
 }

-HRESULT greater_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition    11.8.2 */
+HRESULT greater_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;
+    VARIANT rval, lval;
+    BOOL b;
+    HRESULT hres;
+
+    TRACE("\n");
+
+    hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval);
+    if(FAILED(hres))
+        return hres;
+
+    hres = less_eval(ctx, &rval, &lval, ei, &b);
+    VariantClear(&lval);
+    VariantClear(&rval);
+    if(FAILED(hres))
+        return hres;
+
+    return return_bool(ret, b);
 }

HRESULT greatereq_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 2799b15..41b6cb5 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -209,4 +209,11 @@ ok("abcd" <= "abce", "abce <= abce failed");
 ok("" <= "x", """ <= "x" failed");
 ok(0 <= 0, "0 <= 0 failed");

+ok(3.4 > 1, "3.4 > 1 failed");
+ok(!(1 > 3.4), "1 > 3.4");
+ok("abcd" > "abc", "abc > abcd failed");
+ok("abce" > "abcd", "abce > abce failed");
+ok("x" > "", ""x" > "" failed");
+ok(!(0 > 0), "0 > 0");
+
 reportSuccess();