Jacek Caban : jscript: Added ',' expression implementation.
Alexandre Julliard
julliard at winehq.org
Thu Sep 18 07:55:50 CDT 2008
Module: wine
Branch: master
Commit: c0bfbba859c99d4680d51bac73d7dd1661ac4758
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0bfbba859c99d4680d51bac73d7dd1661ac4758
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 17 23:32:43 2008 +0200
jscript: Added ',' expression implementation.
---
dlls/jscript/engine.c | 20 +++++++++++++++++---
dlls/jscript/tests/lang.js | 2 ++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index cb2618b..d579485 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1388,10 +1388,24 @@ HRESULT property_value_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWO
return S_OK;
}
-HRESULT comma_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition 11.14 */
+HRESULT comma_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 lval, rval;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval);
+ if(FAILED(hres))
+ return hres;
+
+ VariantClear(&lval);
+
+ ret->type = EXPRVAL_VARIANT;
+ ret->u.var = rval;
+ return S_OK;
}
/* ECMA-262 3rd Edition 11.11 */
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index d57598d..18c0933 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -301,6 +301,8 @@ tmp = 5;
ok((tmp ^= 3) === 6, "tmp(5) ^= 3 !== 6");
ok(getVT(tmp) === "VT_I4", "getVT(tmp ^= 3) = " + getVT(tmp));
+ok((3,4) === 4, "(3,4) !== 4");
+
ok(1 < 3.4, "1 < 3.4 failed");
ok(!(3.4 < 1), "3.4 < 1");
ok("abc" < "abcd", "abc < abcd failed");
More information about the wine-cvs
mailing list