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

jscript: Added try statement implementation.

This commit is contained in:
Jacek Caban 2008-09-16 20:44:54 +02:00 committed by Alexandre Julliard
parent 147ec1a1a4
commit 66eb62ada6
2 changed files with 102 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
dlls/jscript/engine.c
View File

@ -144,6 +144,15 @@ HRESULT scope_push(scope_chain_t *scope, DispatchEx *obj, scope_chain_t **ret)
return S_OK;
}
static void scope_pop(scope_chain_t **scope)
{
scope_chain_t *tmp;
tmp = *scope;
*scope = tmp->next;
scope_release(tmp);
}
void scope_release(scope_chain_t *scope)
{
if(--scope->ref)
@ -713,16 +722,74 @@ HRESULT switch_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t
return E_NOTIMPL;
}
HRESULT throw_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
HRESULT throw_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret)
{
FIXME("\n");
return E_NOTIMPL;
}
HRESULT try_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
/* ECMA-262 3rd Edition 12.14 */
static HRESULT catch_eval(exec_ctx_t *ctx, catch_block_t *block, return_type_t *rt, VARIANT *ret)
{
FIXME("\n");
return E_NOTIMPL;
DispatchEx *var_disp;
VARIANT ex, val;
HRESULT hres;
ex = rt->ei.var;
memset(&rt->ei, 0, sizeof(jsexcept_t));
hres = create_dispex(ctx->parser->script, NULL, NULL, &var_disp);
if(SUCCEEDED(hres)) {
hres = jsdisp_propput_name(var_disp, block->identifier, ctx->parser->script->lcid,
&ex, &rt->ei, NULL/*FIXME*/);
if(SUCCEEDED(hres)) {
hres = scope_push(ctx->scope_chain, var_disp, &ctx->scope_chain);
if(SUCCEEDED(hres)) {
hres = stat_eval(ctx, block->statement, rt, &val);
scope_pop(&ctx->scope_chain);
}
}
jsdisp_release(var_disp);
}
VariantClear(&ex);
if(FAILED(hres))
return hres;
*ret = val;
return S_OK;
}
/* ECMA-262 3rd Edition 12.14 */
HRESULT try_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret)
{
try_statement_t *stat = (try_statement_t*)_stat;
VARIANT val;
HRESULT hres;
TRACE("\n");
hres = stat_eval(ctx, stat->try_statement, rt, &val);
if(FAILED(hres)) {
TRACE("EXCEPTION\n");
if(!stat->catch_block)
return hres;
hres = catch_eval(ctx, stat->catch_block, rt, &val);
if(FAILED(hres))
return hres;
}
if(stat->finally_statement) {
VariantClear(&val);
hres = stat_eval(ctx, stat->finally_statement, rt, &val);
if(FAILED(hres))
return hres;
}
*ret = val;
return S_OK;
}
static HRESULT return_bool(exprval_t *ret, DWORD b)

31
dlls/jscript/tests/lang.js
View File

@ -236,4 +236,35 @@ ok(tmp === 1, "decremented tmp is not 1");
String.prototype.test = true;
ok("".test === true, "\"\",test is not true");
var state = "";
try {
ok(state === "", "try: state = " + state);
state = "try";
}catch(ex) {
ok(false, "unexpected catch");
}
ok(state === "try", "state = " + state + " expected try");
state = "";
try {
ok(state === "", "try: state = " + state);
state = "try";
}finally {
ok(state === "try", "funally: state = " + state);
state = "finally";
}
ok(state === "finally", "state = " + state + " expected finally");
state = "";
try {
ok(state === "", "try: state = " + state);
state = "try";
}catch(ex) {
ok(false, "unexpected catch");
}finally {
ok(state === "try", "funally: state = " + state);
state = "finally";
}
ok(state === "finally", "state = " + state + " expected finally");
reportSuccess();