Jacek Caban : jscript: Added '<' expression implementation.
Alexandre Julliard
julliard at winehq.org
Fri Sep 12 07:01:24 CDT 2008
Module: wine
Branch: master
Commit: 8e2a9ae06a92b7602f184160103bdeaff8104993
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2a9ae06a92b7602f184160103bdeaff8104993
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Sep 11 23:56:03 2008 +0200
jscript: Added '<' expression implementation.
---
dlls/jscript/engine.c | 62 +++++++++++++++++++++++++++++++++++++++++--
dlls/jscript/tests/lang.js | 7 +++++
2 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index d5cc1c1..6d336fe 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1621,10 +1621,66 @@ HRESULT not_equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f
return return_bool(ret, !b);
}
-HRESULT less_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition 11.8.5 */
+static HRESULT less_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, BOOL *ret)
{
- FIXME("\n");
- return E_NOTIMPL;
+ VARIANT l, r, ln, rn;
+ HRESULT hres;
+
+ hres = to_primitive(ctx->parser->script, lval, ei, &l);
+ if(FAILED(hres))
+ return hres;
+
+ hres = to_primitive(ctx->parser->script, rval, ei, &r);
+ if(FAILED(hres)) {
+ VariantClear(&l);
+ return hres;
+ }
+
+ if(V_VT(&l) == VT_BSTR && V_VT(&r) == VT_BSTR) {
+ *ret = strcmpW(V_BSTR(&l), V_BSTR(&r)) < 0;
+ SysFreeString(V_BSTR(&l));
+ SysFreeString(V_BSTR(&r));
+ return S_OK;
+ }
+
+ hres = to_number(ctx->parser->script, &l, ei, &ln);
+ VariantClear(&l);
+ if(SUCCEEDED(hres))
+ hres = to_number(ctx->parser->script, &r, ei, &rn);
+ VariantClear(&r);
+ if(FAILED(hres))
+ return hres;
+
+ if(V_VT(&ln) == VT_I4 && V_VT(&rn) == VT_I4)
+ *ret = V_I4(&ln) < V_I4(&rn);
+ else
+ *ret = num_val(&ln) < num_val(&rn);
+
+ return S_OK;
+}
+
+/* ECMA-262 3rd Edition 11.8.1 */
+HRESULT less_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;
+ 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 lesseq_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 92fb6cd..f94284f 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -195,4 +195,11 @@ ok(tmp === "test", "true && \"test\" is not \"test\"");
tmp = true && 0;
ok(tmp === 0, "true && 0 is not 0");
+ok(1 < 3.4, "1 < 3.4 failed");
+ok(!(3.4 < 1), "3.4 < 1");
+ok("abc" < "abcd", "abc < abcd failed");
+ok("abcd" < "abce", "abce < abce failed");
+ok("" < "x", "\"\" < \"x\" failed");
+ok(!(0 < 0), "0 < 0");
+
reportSuccess();
More information about the wine-cvs
mailing list