Jacek Caban : jscript: Added '>=' expression implementation.
Alexandre Julliard
julliard at winehq.org
Fri Sep 12 07:01:27 CDT 2008
Module: wine
Branch: master
Commit: aa4f801ed0abdca2c8256645bb8c92dbd0a8d70f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4f801ed0abdca2c8256645bb8c92dbd0a8d70f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Sep 11 23:57:13 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 20516e2..666f3ea 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1729,10 +1729,27 @@ HRESULT greater_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flag
return return_bool(ret, b);
}
-HRESULT greatereq_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition 11.8.4 */
+HRESULT greatereq_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, &lval, &rval, ei, &b);
+ VariantClear(&lval);
+ VariantClear(&rval);
+ if(FAILED(hres))
+ return hres;
+
+ return return_bool(ret, !b);
}
HRESULT binary_negation_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 41b6cb5..9211483 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -216,4 +216,11 @@ ok("abce" > "abcd", "abce > abce failed");
ok("x" > "", "\"x\" > \"\" failed");
ok(!(0 > 0), "0 > 0");
+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();
More information about the wine-cvs
mailing list