Jacek Caban : jscript: Use binary_expression_t instead of array_expression_t.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Dec  7 11:01:40 2011 +0100

jscript: Use binary_expression_t instead of array_expression_t.

---

 dlls/jscript/compile.c |   12 ++++++------
 dlls/jscript/engine.c  |    6 +++---
 dlls/jscript/engine.h  |    6 ------
 dlls/jscript/parser.y  |   15 ++-------------
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index a476155..c1073d8 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -257,13 +257,13 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex
         break;
     }
     case EXPR_ARRAY: {
-        array_expression_t *array_expr = (array_expression_t*)expr;
+        binary_expression_t *array_expr = (binary_expression_t*)expr;
 
-        hres = compile_expression(ctx, array_expr->member_expr);
+        hres = compile_expression(ctx, array_expr->expression1);
         if(FAILED(hres))
             return hres;
 
-        hres = compile_expression(ctx, array_expr->expression);
+        hres = compile_expression(ctx, array_expr->expression2);
         if(FAILED(hres))
             return hres;
 
@@ -438,13 +438,13 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t
 
     switch(expr->expression->type) {
     case EXPR_ARRAY: {
-        array_expression_t *array_expr = (array_expression_t*)expr->expression;
+        binary_expression_t *array_expr = (binary_expression_t*)expr->expression;
 
-        hres = compile_expression(ctx, array_expr->member_expr);
+        hres = compile_expression(ctx, array_expr->expression1);
         if(FAILED(hres))
             return hres;
 
-        hres = compile_expression(ctx, array_expr->expression);
+        hres = compile_expression(ctx, array_expr->expression2);
         if(FAILED(hres))
             return hres;
 
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index d3b1334..b6eeaed 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1508,7 +1508,7 @@ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD f
 /* ECMA-262 3rd Edition    11.2.1 */
 HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
 {
-    array_expression_t *expr = (array_expression_t*)_expr;
+    binary_expression_t *expr = (binary_expression_t*)_expr;
     exprval_t exprval;
     VARIANT member, val;
     DISPID id;
@@ -1518,7 +1518,7 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag
 
     TRACE("\n");
 
-    hres = expr_eval(ctx, expr->member_expr, 0, ei, &exprval);
+    hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval);
     if(FAILED(hres))
         return hres;
 
@@ -1527,7 +1527,7 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag
     if(FAILED(hres))
         return hres;
 
-    hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval);
+    hres = expr_eval(ctx, expr->expression2, EXPR_NEWREF, ei, &exprval);
     if(SUCCEEDED(hres)) {
         hres = exprval_to_value(ctx, &exprval, ei, &val);
         exprval_release(&exprval);
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index ffa0fcd..fdc732d 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -499,12 +499,6 @@ typedef struct {
 
 typedef struct {
     expression_t expr;
-    expression_t *member_expr;
-    expression_t *expression;
-} array_expression_t;
-
-typedef struct {
-    expression_t expr;
     expression_t *expression;
     const WCHAR *identifier;
 } member_expression_t;
diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
index f02fc67..25d1fcb 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -129,7 +129,6 @@ static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,paramete
 static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*);
 static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*);
 static expression_t *new_conditional_expression(parser_ctx_t*,expression_t*,expression_t*,expression_t*);
-static expression_t *new_array_expression(parser_ctx_t*,expression_t*,expression_t*);
 static expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*);
 static expression_t *new_new_expression(parser_ctx_t*,expression_t*,argument_list_t*);
 static expression_t *new_call_expression(parser_ctx_t*,expression_t*,argument_list_t*);
@@ -710,7 +709,7 @@ MemberExpression
         : PrimaryExpression     { $$ = $1; }
         | FunctionExpression    { $$ = $1; }
         | MemberExpression '[' Expression ']'
-                                { $$ = new_array_expression(ctx, $1, $3); }
+                                { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); }
         | MemberExpression '.' tIdentifier
                                 { $$ = new_member_expression(ctx, $1, $3); }
         | kNEW MemberExpression Arguments
@@ -723,7 +722,7 @@ CallExpression
         | CallExpression Arguments
                                 { $$ = new_call_expression(ctx, $1, $2); }
         | CallExpression '[' Expression ']'
-                                { $$ = new_array_expression(ctx, $1, $3); }
+                                { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); }
         | CallExpression '.' tIdentifier
                                 { $$ = new_member_expression(ctx, $1, $3); }
 
@@ -1407,16 +1406,6 @@ static expression_t *new_conditional_expression(parser_ctx_t *ctx, expression_t
     return &ret->expr;
 }
 
-static expression_t *new_array_expression(parser_ctx_t *ctx, expression_t *member_expr, expression_t *expression)
-{
-    array_expression_t *ret = new_expression(ctx, EXPR_ARRAY, sizeof(*ret));
-
-    ret->member_expr = member_expr;
-    ret->expression = expression;
-
-    return &ret->expr;
-}
-
 static expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *expression, const WCHAR *identifier)
 {
     member_expression_t *ret = new_expression(ctx, EXPR_MEMBER, sizeof(*ret));