Jacek Caban : jscript: Added prefix increment expression.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Thu Sep 11 23:57:40 2008 +0200

jscript: Added prefix increment expression.

---

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

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 666f3ea..f6d5d86 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1548,10 +1548,38 @@ HRESULT post_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWOR
     return E_NOTIMPL;
 }

-HRESULT pre_increment_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition    11.4.4 */
+HRESULT pre_increment_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 pre_decrement_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 9211483..269c9da 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -223,4 +223,8 @@ ok("abce" >= "abcd", "abce >= abce failed");
 ok("x" >= "", ""x" >= "" failed");
 ok(0 >= 0, "0 >= 0");

+tmp = 1;
+ok(++tmp === 2, "++tmp (1) is not 2");
+ok(tmp === 2, "incremented tmp is not 2");
+
 reportSuccess();