Jacek Caban : jscript: Get rid of no longer used expr_eval flags.

Alexandre Julliard julliard at winehq.org
Tue Dec 20 13:43:26 CST 2011


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Dec 20 11:46:20 2011 +0100

jscript: Get rid of no longer used expr_eval flags.

---

 dlls/jscript/compile.c |    5 ++---
 dlls/jscript/engine.c  |   40 +++++++++++++++++++---------------------
 dlls/jscript/engine.h  |    2 +-
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 5bfbb09..07bd65f 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -1003,9 +1003,8 @@ static HRESULT init_compiler(parser_ctx_t *parser)
     return S_OK;
 }
 
-HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, BOOL do_ret, unsigned *ret_off)
+HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *ret_off)
 {
-    BOOL no_ret = FALSE;
     HRESULT hres;
 
     hres = init_compiler(parser);
@@ -1013,7 +1012,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, BOOL do_ret,
         return hres;
 
     *ret_off = parser->compiler->code_off;
-    hres = compile_expression_noret(parser->compiler, expr, do_ret ? NULL : &no_ret);
+    hres = compile_expression(parser->compiler, expr);
     if(FAILED(hres))
         return hres;
 
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 2663833..5ed5751 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -29,8 +29,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
-#define EXPR_NOVAL   0x0001
-
 static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0};
 static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0};
 static const WCHAR numberW[] = {'n','u','m','b','e','r',0};
@@ -54,7 +52,7 @@ static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_typ
     return stat->eval(ctx, stat, rt, ret);
 }
 
-static HRESULT expr_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,VARIANT*);
+static HRESULT expr_eval(script_ctx_t*,expression_t*,jsexcept_t*,VARIANT*);
 
 static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v)
 {
@@ -674,7 +672,7 @@ static HRESULT variable_list_eval(script_ctx_t *ctx, variable_declaration_t *var
         if(!iter->expr)
             continue;
 
-        hres = expr_eval(ctx, iter->expr, 0, ei, &val);
+        hres = expr_eval(ctx, iter->expr, ei, &val);
         if(FAILED(hres))
             break;
 
@@ -718,7 +716,7 @@ HRESULT while_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_
 
     while(1) {
         if(test_expr) {
-            hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &tmp);
+            hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp);
             if(FAILED(hres))
                 break;
 
@@ -770,7 +768,7 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t
         if(FAILED(hres))
             return hres;
     }else if(stat->begin_expr) {
-        hres = expr_eval(ctx, stat->begin_expr, 0, &rt->ei, &val);
+        hres = expr_eval(ctx, stat->begin_expr, &rt->ei, &val);
         if(FAILED(hres))
             return hres;
 
@@ -781,7 +779,7 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t
 
     while(1) {
         if(stat->expr) {
-            hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &tmp);
+            hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp);
             if(FAILED(hres))
                 break;
 
@@ -804,7 +802,7 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t
             break;
 
         if(stat->end_expr) {
-            hres = expr_eval(ctx, stat->end_expr, 0, &rt->ei, &val);
+            hres = expr_eval(ctx, stat->end_expr, &rt->ei, &val);
             if(FAILED(hres))
                 break;
 
@@ -847,7 +845,7 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_
             return hres;
     }
 
-    hres = expr_eval(ctx, stat->in_expr, 0, &rt->ei, &val);
+    hres = expr_eval(ctx, stat->in_expr, &rt->ei, &val);
     if(FAILED(hres))
         return hres;
 
@@ -896,7 +894,7 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_
                 hres = member_expression_eval(ctx, stat->expr, &rt->ei, &exprval);
                 break;
             default:
-                hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &tmp);
+                hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp);
                 if(FAILED(hres))
                     break;
 
@@ -985,7 +983,7 @@ HRESULT return_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type
     TRACE("\n");
 
     if(stat->expr) {
-        hres = expr_eval(ctx, stat->expr, 0, &rt->ei, ret);
+        hres = expr_eval(ctx, stat->expr, &rt->ei, ret);
         if(FAILED(hres))
             return hres;
     }else {
@@ -1008,7 +1006,7 @@ HRESULT with_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t
 
     TRACE("\n");
 
-    hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &val);
+    hres = expr_eval(ctx, stat->expr, &rt->ei, &val);
     if(FAILED(hres))
         return hres;
 
@@ -1054,7 +1052,7 @@ HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type
 
     TRACE("\n");
 
-    hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &val);
+    hres = expr_eval(ctx, stat->expr, &rt->ei, &val);
     if(FAILED(hres))
         return hres;
 
@@ -1064,7 +1062,7 @@ HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type
             continue;
         }
 
-        hres = expr_eval(ctx, iter->expr, 0, &rt->ei, &cval);
+        hres = expr_eval(ctx, iter->expr, &rt->ei, &cval);
         if(FAILED(hres))
             break;
 
@@ -1119,7 +1117,7 @@ HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_
 
     TRACE("\n");
 
-    hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &val);
+    hres = expr_eval(ctx, stat->expr, &rt->ei, &val);
     if(FAILED(hres))
         return hres;
 
@@ -1240,11 +1238,11 @@ static HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, jse
 
     TRACE("\n");
 
-    hres = expr_eval(ctx, expr->expression1, 0, ei, &member);
+    hres = expr_eval(ctx, expr->expression1, ei, &member);
     if(FAILED(hres))
         return hres;
 
-    hres = expr_eval(ctx, expr->expression2, 0, ei, &val);
+    hres = expr_eval(ctx, expr->expression2, ei, &val);
     if(SUCCEEDED(hres)) {
         hres = to_object(ctx, &member, &obj);
         if(FAILED(hres))
@@ -1321,7 +1319,7 @@ static HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, js
 
     TRACE("\n");
 
-    hres = expr_eval(ctx, expr->expression, 0, ei, &member);
+    hres = expr_eval(ctx, expr->expression, ei, &member);
     if(FAILED(hres))
         return hres;
 
@@ -2983,7 +2981,7 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ
     return S_OK;
 }
 
-static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, VARIANT *ret)
+static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, jsexcept_t *ei, VARIANT *ret)
 {
     exec_ctx_t *exec_ctx = ctx->exec_ctx;
     unsigned prev_ip, prev_top;
@@ -2994,7 +2992,7 @@ static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jse
     TRACE("\n");
 
     if(expr->instr_off == -1) {
-        hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off);
+        hres = compile_subscript(ctx->exec_ctx->parser, expr, &expr->instr_off);
         if(FAILED(hres))
             return hres;
     }
@@ -3021,7 +3019,7 @@ static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jse
         return hres;
     }
 
-    assert(exec_ctx->top == prev_top+1 || ((flags&EXPR_NOVAL) && exec_ctx->top == prev_top));
+    assert(exec_ctx->top == prev_top+1);
 
     if(exec_ctx->top == prev_top)
         V_VT(ret) = VT_EMPTY;
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index ebcfa45..8c4b666 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -586,5 +586,5 @@ typedef struct {
     prop_val_t *property_list;
 } property_value_expression_t;
 
-HRESULT compile_subscript(parser_ctx_t*,expression_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;
+HRESULT compile_subscript(parser_ctx_t*,expression_t*,unsigned*) DECLSPEC_HIDDEN;
 HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;




More information about the wine-cvs mailing list