Module: wine Branch: master Commit: 47fcf8d0c7359865a99c10d5d1843580e8cc4d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fcf8d0c7359865a99c10d5d1...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Sep 17 23:29:34 2008 +0200
jscript: Added '!=' expression implementation.
---
dlls/jscript/engine.c | 18 ++++++++++++++++-- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 65eeaf7..6f5beb4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1993,11 +1993,25 @@ HRESULT equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return return_bool(ret, b); }
+/* ECMA-262 3rd Edition 11.9.2 */ HRESULT not_equal_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;
- FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + hres = equal_values(ctx, &lval, &rval, ei, &b); + if(FAILED(hres)) + return hres; + + return return_bool(ret, !b); }
/* ECMA-262 3rd Edition 11.9.5 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c231180..5f9848e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -49,6 +49,9 @@ ok(true == 1, "true == 1 is false"); ok(!(true == 2), "true == 2"); ok(0 == false, "0 == false is false");
+ok(1 != 2, "1 != 2 is false"); +ok(false != 1, "false != 1 is false"); + var trueVar = true; ok(trueVar, "trueVar is not true");