marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: No longer support per-statement compilation.

oldstable
Jacek Caban 2011-12-29 11:09:09 +01:00 committed by Alexandre Julliard
parent 6710e7ec6f
commit b3907c40f7
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/jscript/compile.c
View File

@ -1637,7 +1637,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *re
return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK;
}
HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL compile_block, unsigned *ret_off)
HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned *ret_off)
{
HRESULT hres;
@ -1648,7 +1648,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL com
return hres;
*ret_off = parser->compiler->code_off;
if(compile_block && stat->next)
if(stat->next)
hres = compile_block_statement(parser->compiler, stat);
else
hres = compile_statement(parser->compiler, NULL, stat);

14
dlls/jscript/engine.c
View File

@ -2589,7 +2589,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx)
return hres;
}
HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, VARIANT *ret)
{
exec_ctx_t *exec_ctx = ctx->exec_ctx;
except_frame_t *prev_except_frame;
@ -2602,19 +2602,13 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ
TRACE("\n");
if(stat->instr_off == -1) {
hres = compile_subscript_stat(exec_ctx->parser, stat, FALSE, &stat->instr_off);
if(FAILED(hres))
return hres;
}
prev_rt = exec_ctx->rt;
prev_top = exec_ctx->top;
prev_scope = exec_ctx->scope_chain;
prev_except_frame = exec_ctx->except_frame;
prev_ip = exec_ctx->ip;
prev_ei = exec_ctx->ei;
exec_ctx->ip = stat->instr_off;
exec_ctx->ip = ip;
exec_ctx->rt = rt;
exec_ctx->ei = &rt->ei;
exec_ctx->except_frame = NULL;
@ -2762,9 +2756,9 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so
if(source->statement) {
if(source->statement->instr_off == -1)
hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off);
hres = compile_subscript_stat(ctx->parser, source->statement, &source->statement->instr_off);
if(SUCCEEDED(hres))
hres = compiled_statement_eval(script, source->statement, &rt, &val);
hres = enter_bytecode(script, source->statement->instr_off, &rt, &val);
}
script->exec_ctx = prev_ctx;

2
dlls/jscript/engine.h
View File

@ -591,4 +591,4 @@ typedef struct {
} property_value_expression_t;
HRESULT compile_subscript(parser_ctx_t*,expression_t*,unsigned*) DECLSPEC_HIDDEN;
HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;
HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,unsigned*) DECLSPEC_HIDDEN;