Jacek Caban : jscript: Added with statement implementation.
Alexandre Julliard
julliard at winehq.org
Fri Sep 19 07:14:51 CDT 2008
Module: wine
Branch: master
Commit: dfb867af56f4b15986482deef588d33d2458b101
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb867af56f4b15986482deef588d33d2458b101
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Sep 19 00:43:53 2008 +0200
jscript: Added with statement implementation.
---
dlls/jscript/engine.c | 44 +++++++++++++++++++++++++++++++++++++++++---
dlls/jscript/tests/lang.js | 4 ++++
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index f4b065f..b89d808 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -924,12 +924,50 @@ HRESULT return_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t
return S_OK;
}
-HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
+/* ECMA-262 3rd Edition 12.10 */
+HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret)
{
- FIXME("\n");
- return E_NOTIMPL;
+ with_statement_t *stat = (with_statement_t*)_stat;
+ exprval_t exprval;
+ IDispatch *disp;
+ DispatchEx *obj;
+ VARIANT val;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ 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, &val);
+ exprval_release(&exprval);
+ if(FAILED(hres))
+ return hres;
+
+ hres = to_object(ctx, &val, &disp);
+ VariantClear(&val);
+ if(FAILED(hres))
+ return hres;
+
+ obj = iface_to_jsdisp((IUnknown*)disp);
+ IDispatch_Release(disp);
+ if(!obj) {
+ FIXME("disp id not jsdisp\n");
+ return E_NOTIMPL;
+ }
+
+ hres = scope_push(ctx->scope_chain, obj, &ctx->scope_chain);
+ jsdisp_release(obj);
+ if(FAILED(hres));
+
+ hres = stat_eval(ctx, stat->statement, rt, ret);
+
+ scope_pop(&ctx->scope_chain);
+ return hres;
}
+/* ECMA-262 3rd Edition 12.12 */
HRESULT labelled_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
{
FIXME("\n");
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 4359ca4..9ad1cc3 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -657,4 +657,8 @@ ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test));
for(iter in tmp)
ok(false, "tmp has prop " + iter);
+tmp.testWith = true;
+with(tmp)
+ ok(testWith === true, "testWith !== true");
+
reportSuccess();
More information about the wine-cvs
mailing list