ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Make compiler responsible for proper return from regular code vs. eval-interpreted code.

This commit is contained in:
Jacek Caban 2011-12-30 11:14:14 +01:00 committed by Alexandre Julliard
parent 11ccf0f33e
commit dd7a5301e6
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/jscript/compile.c
View File

@ -1688,7 +1688,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, unsigned *ret_off)
HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL from_eval, unsigned *ret_off)
{
unsigned off;
HRESULT hres;
@ -1709,6 +1709,8 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned
resolve_labels(parser->compiler, off);
if(!from_eval && push_instr(parser->compiler, OP_pop) == -1)
return E_OUTOFMEMORY;
if(push_instr(parser->compiler, OP_ret) == -1)
return E_OUTOFMEMORY;

9
dlls/jscript/engine.c
View File

@ -2740,7 +2740,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so
if(source->statement) {
if(source->instr_off == -1) {
hres = compile_subscript_stat(ctx->parser, source->statement, &source->instr_off);
hres = compile_subscript_stat(ctx->parser, source->statement, from_eval, &source->instr_off);
if(FAILED(hres) && is_jscript_error(hres))
hres = throw_syntax_error(script, &rt.ei, hres, NULL);
}
@ -2751,18 +2751,13 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so
script->exec_ctx = prev_ctx;
ctx->parser = prev_parser;
if(rt.type != RT_NORMAL && rt.type != RT_RETURN) {
FIXME("wrong rt %d\n", rt.type);
hres = E_FAIL;
}
*ei = rt.ei;
if(FAILED(hres)) {
VariantClear(&val);
return hres;
}
if(!retv || (!from_eval && rt.type != RT_RETURN))
if(!retv)
VariantClear(&val);
if(retv)
*retv = val;

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*,unsigned*) DECLSPEC_HIDDEN;
HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;