Jacek Caban : jscript: Added '&&' expression implementation.
Alexandre Julliard
julliard at winehq.org
Fri Sep 12 07:01:22 CDT 2008
Module: wine
Branch: master
Commit: bc9e6aa1e5a0124b14a832d75f0c7ead998d4f1d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9e6aa1e5a0124b14a832d75f0c7ead998d4f1d
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Sep 11 23:55:38 2008 +0200
jscript: Added '&&' expression implementation.
---
dlls/jscript/engine.c | 45 +++++++++++++++++++++++++++++++++++++++++--
dlls/jscript/tests/lang.js | 9 ++++++++
2 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index cf1045b..d5cc1c1 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1270,10 +1270,49 @@ HRESULT logical_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f
return S_OK;
}
-HRESULT logical_and_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition 11.11 */
+HRESULT logical_and_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;
+ exprval_t exprval;
+ VARIANT_BOOL b;
+ VARIANT val;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval);
+ if(FAILED(hres))
+ return hres;
+
+ hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val);
+ exprval_release(&exprval);
+ if(FAILED(hres))
+ return hres;
+
+ hres = to_boolean(&val, &b);
+ if(SUCCEEDED(hres) && !b) {
+ ret->type = EXPRVAL_VARIANT;
+ ret->u.var = val;
+ return S_OK;
+ }
+
+ VariantClear(&val);
+ if(FAILED(hres))
+ return hres;
+
+ hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval);
+ if(FAILED(hres))
+ return hres;
+
+ hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val);
+ exprval_release(&exprval);
+ if(FAILED(hres))
+ return hres;
+
+ ret->type = EXPRVAL_VARIANT;
+ ret->u.var = val;
+ return S_OK;
}
HRESULT binary_or_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 b334d96..92fb6cd 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -186,4 +186,13 @@ ok(tmp === 3, "3 || (...) is not 3");
tmp = false || 2;
ok(tmp === 2, "false || 2 is not 2");
+tmp = 0 && ok(false, "second and expression called");
+ok(tmp === 0, "0 && (...) is not 0");
+
+tmp = true && "test";
+ok(tmp === "test", "true && \"test\" is not \"test\"");
+
+tmp = true && 0;
+ok(tmp === 0, "true && 0 is not 0");
+
reportSuccess();
More information about the wine-cvs
mailing list