Jacek Caban : jscript: Rename throw opcode to throw_ref.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Dec 28 12:06:03 2011 +0100

jscript: Rename throw opcode to throw_ref.

---

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

diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 585520d..c02db25 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -322,7 +322,7 @@ static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expressio
         if(FAILED(hres))
             return hres;

-        return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN);
+        return push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN);
     }

hres = compile_memberid_expression(ctx, expr->expression, fdexNameEnsure);
@@ -545,7 +545,7 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_
         if(op != OP_LAST && push_instr(ctx, op) == -1)
             return E_OUTOFMEMORY;

-        return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN);
+        return push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN);
     }

hres = compile_memberid_expression(ctx, expr->expression1, fdexNameEnsure);
@@ -1123,7 +1123,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s
         if(FAILED(hres))
             return hres;
     }else {
-        hres = push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN);
+        hres = push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN);
         if(FAILED(hres))
             return hres;

diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index f3268ba..5c4852b 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1250,7 +1250,7 @@ HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_
     return DISP_E_EXCEPTION;
 }

-static HRESULT interp_throw(exec_ctx_t *ctx)
+static HRESULT interp_throw_ref(exec_ctx_t *ctx)
 {
     const HRESULT arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;

diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index b2f2f82..147bcad 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -99,7 +99,7 @@ typedef struct _func_stack {
     X(rshift2,    1, 0,0)                  \
     X(str,        1, ARG_STR,    0)        \
     X(this,       1, 0,0)                  \
-    X(throw,      0, ARG_UINT,   0)        \
+    X(throw_ref,  0, ARG_UINT,   0)        \
     X(throw_type, 0, ARG_UINT,   ARG_STR)  \
     X(tonum,      1, 0,0)                  \
     X(tree,       1, ARG_STAT,   0)        \