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: 20bc98d5d86e6c0847a9be75b3272f4ba25d3712
URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bc98d5d86e6c0847a9be75b3272f4ba25d3712
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 17 23:32:59 2008 +0200
jscript: Added '~' expression implementation.
---
dlls/jscript/engine.c | 30 +++++++++++++++++++++++++++---
dlls/jscript/tests/lang.js | 4 ++++
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index d579485..ff20151 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2328,10 +2328,34 @@ HRESULT greatereq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl
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)
+/* ECMA-262 3rd Edition 11.4.8 */
+HRESULT binary_negation_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
{
- FIXME("\n");
- return E_NOTIMPL;
+ unary_expression_t *expr = (unary_expression_t*)_expr;
+ exprval_t exprval;
+ VARIANT val;
+ INT i;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, 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_int32(ctx->parser->script, &val, ei, &i);
+ if(FAILED(hres))
+ return hres;
+
+ ret->type = EXPRVAL_VARIANT;
+ V_VT(&ret->u.var) = VT_I4;
+ V_I4(&ret->u.var) = ~i;
+ return S_OK;
}
/* ECMA-262 3rd Edition 11.4.9 */
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 18c0933..03c208a 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -301,6 +301,10 @@ tmp = 5;
ok((tmp ^= 3) === 6, "tmp(5) ^= 3 !== 6");
ok(getVT(tmp) === "VT_I4", "getVT(tmp ^= 3) = " + getVT(tmp));
+tmp = ~1;
+ok(tmp === -2, "~1 !== -2");
+ok(getVT(tmp) === "VT_I4", "getVT(~1) = " + getVT(tmp));
+
ok((3,4) === 4, "(3,4) !== 4");
ok(1 < 3.4, "1 < 3.4 failed");
More information about the wine-cvs
mailing list