Jacek Caban : jscript: Added array expression implementation.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Sep 10 21:07:06 2008 +0200

jscript: Added array expression implementation.

---

 dlls/jscript/engine.c      |   57 +++++++++++++++++++++++++++++++++++++++++--
 dlls/jscript/jscript.h     |    1 +
 dlls/jscript/jsutils.c     |   15 +++++++++++
 dlls/jscript/tests/lang.js |    2 +
 4 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 275943a..831dcba 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -715,10 +715,61 @@ HRESULT conditional_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD f
     return E_NOTIMPL;
 }
 
-HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+/* ECMA-262 3rd Edition    11.2.1 */
+HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    array_expression_t *expr = (array_expression_t*)_expr;
+    exprval_t exprval;
+    VARIANT member, val;
+    DISPID id;
+    BSTR str;
+    IDispatch *obj = NULL;
+    HRESULT hres;
+
+    TRACE("\n");
+
+    hres = expr_eval(ctx, expr->member_expr, EXPR_NEWREF, ei, &exprval);
+    if(FAILED(hres))
+        return hres;
+
+    hres = exprval_to_value(ctx->parser->script, &exprval, ei, &member);
+    exprval_release(&exprval);
+    if(FAILED(hres))
+        return hres;
+
+    hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval);
+    if(SUCCEEDED(hres)) {
+        hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val);
+        exprval_release(&exprval);
+    }
+
+    if(SUCCEEDED(hres))
+        hres = to_object(ctx, &member, &obj);
+    VariantClear(&member);
+    if(SUCCEEDED(hres)) {
+        hres = to_string(ctx->parser->script, &val, ei, &str);
+        if(SUCCEEDED(hres)) {
+            if(flags & EXPR_STRREF) {
+                ret->type = EXPRVAL_NAMEREF;
+                ret->u.nameref.disp = obj;
+                ret->u.nameref.name = str;
+                return S_OK;
+            }
+
+            hres = disp_get_id(obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id);
+        }
+
+        if(SUCCEEDED(hres)) {
+            exprval_set_idref(ret, obj, id);
+        }else if(!(flags & EXPR_NEWREF) && hres == DISP_E_UNKNOWNNAME) {
+            exprval_init(ret);
+            hres = S_OK;
+        }
+
+        IDispatch_Release(obj);
+    }
+
+    return hres;
 }
 
 /* ECMA-262 3rd Edition    11.2.1 */
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index f09cea7..f2490cb 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -116,6 +116,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*
 HRESULT create_math(script_ctx_t*,DispatchEx**);
 
 HRESULT to_boolean(VARIANT*,VARIANT_BOOL*);
+HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*);
 HRESULT to_object(exec_ctx_t*,VARIANT*,IDispatch**);
 
 typedef struct named_item_t {
diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index de04dfb..919bcca 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -164,6 +164,21 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b)
     return S_OK;
 }
 
+/* ECMA-262 3rd Edition    9.8 */
+HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str)
+{
+    switch(V_VT(v)) {
+    case VT_BSTR:
+        *str = SysAllocString(V_BSTR(v));
+        return S_OK;
+
+    default:
+        FIXME("unsupported vt %d\n", V_VT(v));
+    }
+
+    return E_NOTIMPL;
+}
+
 /* ECMA-262 3rd Edition    9.9 */
 HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp)
 {
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 4be651b..dca0771 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -45,6 +45,8 @@ function testFunc1(x, y) {
     ok(x === true, "x is not 1");
     ok(y === "test", "y is not \"test\"");
     ok(arguments.length === 2, "arguments.length is not 2");
+    ok(arguments["0"] === true, "arguments[0] is not true");
+    ok(arguments["1"] === "test", "arguments[1] is not \"test\"");
 
     return true;
 }