Jacek Caban : jscript: Added for statement implementation.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Sep 17 23:36:19 2008 +0200

jscript: Added for statement implementation.

---

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

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 8d92533..80bc9d9 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -695,10 +695,84 @@ HRESULT while_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t
     return S_OK;
 }
 
-HRESULT for_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
+/* ECMA-262 3rd Edition    12.6.3 */
+HRESULT for_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    for_statement_t *stat = (for_statement_t*)_stat;
+    VARIANT val, tmp, retv;
+    exprval_t exprval;
+    VARIANT_BOOL b;
+    HRESULT hres;
+
+    TRACE("\n");
+
+    if(stat->variable_list) {
+        hres = variable_list_eval(ctx, stat->variable_list, &rt->ei);
+        if(FAILED(hres))
+            return hres;
+    }else if(stat->begin_expr) {
+        hres = expr_eval(ctx, stat->begin_expr, EXPR_NEWREF, &rt->ei, &exprval);
+        if(FAILED(hres))
+            return hres;
+
+        hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &val);
+        exprval_release(&exprval);
+        if(FAILED(hres))
+            return hres;
+
+        VariantClear(&val);
+    }
+
+    V_VT(&retv) = VT_EMPTY;
+
+    while(1) {
+        if(stat->expr) {
+            hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval);
+            if(FAILED(hres))
+                break;
+
+            hres = exprval_to_boolean(ctx->parser->script, &exprval, &rt->ei, &b);
+            exprval_release(&exprval);
+            if(FAILED(hres) || !b)
+                break;
+        }
+
+        hres = stat_eval(ctx, stat->statement, rt, &tmp);
+        if(FAILED(hres))
+            break;
+
+        VariantClear(&retv);
+        retv = tmp;
+
+        if(rt->type == RT_CONTINUE)
+            rt->type = RT_NORMAL;
+        else if(rt->type != RT_NORMAL)
+            break;
+
+        if(stat->end_expr) {
+            hres = expr_eval(ctx, stat->end_expr, 0, &rt->ei, &exprval);
+            if(FAILED(hres))
+                break;
+
+            hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &val);
+            exprval_release(&exprval);
+            if(FAILED(hres))
+                break;
+
+            VariantClear(&val);
+        }
+    }
+
+    if(FAILED(hres)) {
+        VariantClear(&retv);
+        return hres;
+    }
+
+    if(rt->type == RT_BREAK)
+        rt->type = RT_NORMAL;
+
+    *ret = retv;
+    return S_OK;
 }
 
 HRESULT forin_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 74a84ef..3b0d130 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -593,4 +593,26 @@ while(tmp < 4) {
 }
 ok(tmp === 4, "tmp !== 4");
 
+for(tmp=0; tmp < 4; tmp++)
+    ok(tmp < 4, "tmp = " + tmp);
+ok(tmp === 4, "tmp !== 4");
+
+for(tmp=0; tmp < 4; tmp++) {
+    if(tmp === 2)
+        break;
+    ok(tmp < 2, "tmp = " + tmp);
+}
+ok(tmp === 2, "tmp !== 2");
+
+for(tmp=0; tmp < 4; tmp++) {
+    if(tmp === 2)
+        continue;
+    ok(tmp < 4 && tmp != 2, "tmp = " + tmp);
+}
+ok(tmp === 4, "tmp !== 4");
+
+for(var fi=0; fi < 4; fi++)
+    ok(fi < 4, "fi = " + fi);
+ok(fi === 4, "fi !== 4");
+
 reportSuccess();