Jacek Caban : jscript: Always use bytecode version of literal expressions.
Alexandre Julliard
julliard at winehq.org
Thu Nov 24 15:04:39 CST 2011
Module: wine
Branch: master
Commit: 9050c3725fa278bc9113b35d89f87e4dc40637a5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9050c3725fa278bc9113b35d89f87e4dc40637a5
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 24 14:24:00 2011 +0100
jscript: Always use bytecode version of literal expressions.
---
dlls/jscript/engine.c | 18 ------------------
dlls/jscript/engine.h | 1 -
dlls/jscript/parser.y | 2 +-
3 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index e004ffa..fc19128 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1806,24 +1806,6 @@ HRESULT interp_regexp(exec_ctx_t *ctx)
return stack_push(ctx, &v);
}
-/* ECMA-262 3rd Edition 7.8 */
-HRESULT literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
-{
- literal_expression_t *expr = (literal_expression_t*)_expr;
- VARIANT var;
- HRESULT hres;
-
- TRACE("\n");
-
- hres = literal_to_var(ctx, expr->literal, &var);
- if(FAILED(hres))
- return hres;
-
- ret->type = EXPRVAL_VARIANT;
- ret->u.var = var;
- return S_OK;
-}
-
/* ECMA-262 3rd Edition 11.1.4 */
HRESULT array_literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
{
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index eb67050..c775066 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -530,7 +530,6 @@ HRESULT new_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprva
HRESULT call_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT this_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
-HRESULT literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT property_value_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 0fcba92..7f46e94 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -1362,7 +1362,7 @@ static const expression_eval_t expression_eval_table[] = {
identifier_expression_eval,
array_literal_expression_eval,
property_value_expression_eval,
- literal_expression_eval
+ compiled_expression_eval
};
static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size)
More information about the wine-cvs
mailing list