Jacek Caban : jscript: Added return statement implementation.
Alexandre Julliard
julliard at winehq.org
Thu Sep 11 08:00:40 CDT 2008
Module: wine
Branch: master
Commit: a273e35f9bd00b01c970c426d7614e3c0a80b229
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a273e35f9bd00b01c970c426d7614e3c0a80b229
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 10 21:05:37 2008 +0200
jscript: Added return statement implementation.
---
dlls/jscript/engine.c | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 5119bb7..fa15b40 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -584,10 +584,32 @@ HRESULT break_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *
return E_NOTIMPL;
}
-HRESULT return_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
+/* ECMA-262 3rd Edition 12.9 */
+HRESULT return_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret)
{
- FIXME("\n");
- return E_NOTIMPL;
+ expression_statement_t *stat = (expression_statement_t*)_stat;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ if(stat->expr) {
+ exprval_t exprval;
+
+ hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval);
+ if(FAILED(hres))
+ return hres;
+
+ hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, ret);
+ exprval_release(&exprval);
+ if(FAILED(hres))
+ return hres;
+ }else {
+ V_VT(ret) = VT_EMPTY;
+ }
+
+ TRACE("= %s\n", debugstr_variant(ret));
+ rt->type = RT_RETURN;
+ return S_OK;
}
HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
More information about the wine-cvs
mailing list