Jacek Caban : jscript: Added prefix decrement expression implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ce423c2e3bdf0ba1d8d5c8f6ad7191bfbf07c173
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ce423c2e3bdf0ba1d8d5c8f6ad...

Author: Jacek Caban 
Date:   Thu Sep 11 23:58:03 2008 +0200

jscript: Added prefix decrement expression implementation.

---

dlls/jscript/engine.c      |   34 +++++++++++++++++++++++++++++++---
 dlls/jscript/tests/lang.js |    2 ++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index f6d5d86..d9e6353 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1582,10 +1582,38 @@ HRESULT pre_increment_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWOR
     return S_OK;
 }

-HRESULT pre_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition    11.4.5 */
+HRESULT pre_decrement_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;
+    VARIANT val, num;
+    exprval_t exprval;
+    HRESULT hres;
+
+    TRACE("\n");
+
+    hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval);
+    if(FAILED(hres))
+        return hres;
+
+    hres = exprval_value(ctx->parser->script, &exprval, ei, &val);
+    if(SUCCEEDED(hres)) {
+        hres = to_number(ctx->parser->script, &val, ei, &num);
+        VariantClear(&val);
+    }
+
+    if(SUCCEEDED(hres)) {
+        num_set_val(&val, num_val(&num)-1.0);
+        hres = put_value(ctx->parser->script, &exprval, &val, ei);
+    }
+
+    exprval_release(&exprval);
+    if(FAILED(hres))
+        return hres;
+
+    ret->type = EXPRVAL_VARIANT;
+    ret->u.var = val;
+    return S_OK;
 }

HRESULT new_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 269c9da..ef3e454 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -226,5 +226,7 @@ ok(0 >= 0, "0 >= 0");
 tmp = 1;
 ok(++tmp === 2, "++tmp (1) is not 2");
 ok(tmp === 2, "incremented tmp is not 2");
+ok(--tmp === 1, "--tmp (2) is not 1");
+ok(tmp === 1, "decremented tmp is not 1");

reportSuccess();