Jacek Caban : jscript: Use bytecode for void expression.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Thu Nov 24 14:24:45 2011 +0100

jscript: Use bytecode for void expression.

---

dlls/jscript/compile.c |    2 ++
 dlls/jscript/engine.c  |   23 +++++------------------
 dlls/jscript/engine.h  |    4 ++--
 dlls/jscript/parser.y  |    2 +-
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 0393c6a..4b5b91b 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -225,6 +225,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr)
         return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum);
     case EXPR_THIS:
         return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK;
+    case EXPR_VOID:
+        return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_void);
     default:
         assert(expr->eval != compiled_expression_eval);
         return compile_interp_fallback(ctx, expr);
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 5446fa3..3d9858d 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2459,29 +2459,16 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla
 }

/* ECMA-262 3rd Edition    11.4.2 */
-HRESULT void_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+HRESULT interp_void(exec_ctx_t *ctx)
 {
-    unary_expression_t *expr = (unary_expression_t*)_expr;
-    exprval_t exprval;
-    VARIANT tmp;
-    HRESULT hres;
+    VARIANT v;

TRACE("\n");

-    hres = expr_eval(ctx, expr->expression, 0, ei, &exprval);
-    if(FAILED(hres))
-        return hres;
+    stack_popn(ctx, 1);

-    hres = exprval_to_value(ctx, &exprval, ei, &tmp);
-    exprval_release(&exprval);
-    if(FAILED(hres))
-        return hres;
-
-    VariantClear(&tmp);
-
-    ret->type = EXPRVAL_VARIANT;
-    V_VT(&ret->u.var) = VT_EMPTY;
-    return S_OK;
+    V_VT(&v) = VT_EMPTY;
+    return stack_push(ctx, &v);
 }

/* ECMA-262 3rd Edition    11.4.3 */
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index e7b66ec..c42b2e8 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -57,7 +57,8 @@ typedef struct _func_stack {
     X(this,       1, 0,0)                  \
     X(tonum,      1, 0,0)                  \
     X(tree,       1, ARG_EXPR,   0)        \
-    X(ret,        0, 0,0)
+    X(ret,        0, 0,0)                  \
+    X(void,       1, 0,0)

typedef enum {
 #define X(x,a,b,c) OP_##x,
@@ -545,7 +546,6 @@ HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprva
 HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
-HRESULT void_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT minus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
index a380576..f051c0c 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -1319,7 +1319,7 @@ static const expression_eval_t expression_eval_table[] = {
    div_expression_eval,
    mod_expression_eval,
    delete_expression_eval,
-   void_expression_eval,
+   compiled_expression_eval,
    typeof_expression_eval,
    minus_expression_eval,
    compiled_expression_eval,