Jacek Caban : jscript: Added array literal implementation.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Sep 17 23:34:23 2008 +0200

jscript: Added array literal implementation.

---

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

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 09b1efe..2a37d05 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1329,10 +1329,56 @@ HRESULT literal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flag
     return S_OK;
 }

-HRESULT array_literal_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition    11.1.4 */
+HRESULT array_literal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    array_literal_expression_t *expr = (array_literal_expression_t*)_expr;
+    DWORD length = 0, i = 0;
+    array_element_t *elem;
+    DispatchEx *array;
+    exprval_t exprval;
+    VARIANT val;
+    HRESULT hres;
+
+    TRACE("\n");
+
+    for(elem = expr->element_list; elem; elem = elem->next)
+        length += elem->elision+1;
+    length += expr->length;
+
+    hres = create_array(ctx->parser->script, length, &array);
+    if(FAILED(hres))
+        return hres;
+
+    for(elem = expr->element_list; elem; elem = elem->next) {
+        i += elem->elision;
+
+        hres = expr_eval(ctx, elem->expr, 0, ei, &exprval);
+        if(FAILED(hres))
+            break;
+
+        hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val);
+        exprval_release(&exprval);
+        if(FAILED(hres))
+            break;
+
+        hres = jsdisp_propput_idx(array, i, ctx->parser->script->lcid, &val, ei, NULL/*FIXME*/);
+        VariantClear(&val);
+        if(FAILED(hres))
+            break;
+
+        i++;
+    }
+
+    if(FAILED(hres)) {
+        jsdisp_release(array);
+        return hres;
+    }
+
+    ret->type = EXPRVAL_VARIANT;
+    V_VT(&ret->u.var) = VT_DISPATCH;
+    V_DISPATCH(&ret->u.var) = (IDispatch*)_IDispatchEx_(array);
+    return S_OK;
 }

/* ECMA-262 3rd Edition    11.1.5 */
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 8a47cf4..afb71bf 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -539,4 +539,10 @@ try {
 }
 ok(state === "finally", "state = " + state + " expected finally");

+tmp = [,,1,2,,,true];
+ok(tmp.length === 7, "tmp.length !== 7");
+ok(tmp["0"] === undefined, "tmp[0] is not undefined");
+ok(tmp["3"] === 2, "tmp[3] !== 2");
+ok(tmp["6"] === true, "tmp[6] !== true");
+
 reportSuccess();