September 2008 - Wine-commits

Jacek Caban : jscript: Added '/=' expression implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 43f760ba1751430aa4543c94d1b259d9bdfd577a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f760ba1751430aa4543c94d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:47:27 2008 +0200 jscript: Added '/=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/lex.c | 2 +- dlls/jscript/tests/lang.js | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d9ababa..93cfc6c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2144,10 +2144,14 @@ HRESULT assign_mul_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return assign_oper_eval(ctx, expr->expression1, expr->expression2, mul_eval, ei, ret); } -HRESULT assign_div_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, div_eval, ei, ret); } HRESULT assign_mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 0aea118..ed73202 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -666,7 +666,7 @@ int parser_lex(void *lval, parser_ctx_t *ctx) if(++ctx->ptr < ctx->end) { if(*ctx->ptr == '=') { /* /= */ ctx->ptr++; - *(int*)lval = EXPR_ASSIGNMUL; + *(int*)lval = EXPR_ASSIGNDIV; return tAssignOper; } } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5b55cd3..911aa40 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -220,6 +220,10 @@ tmp = 2; ok((tmp *= 1.5) === 3, "tmp *= 1.5 !== 3"); ok(tmp === 3, "tmp !=== 3"); +tmp = 5; +ok((tmp /= 2) === 2.5, "tmp /= 2 !== 2.5"); +ok(tmp === 2.5, "tmp !=== 2.5"); + tmp = 3 || ok(false, "second or expression called"); ok(tmp === 3, "3 || (...) is not 3");

1 0

Jacek Caban : jscript: Added minus expression implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 5c1c923d5efd86a03bbddb9e574dc90727485691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1c923d5efd86a03bbddb9e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:47:43 2008 +0200 jscript: Added minus expression implementation. --- dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 93cfc6c..b700d33 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1674,10 +1674,33 @@ HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return S_OK; } -HRESULT minus_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.7 */ +HRESULT minus_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + exprval_t exprval; + VARIANT val, num; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx->parser->script, &val, ei, &num); + VariantClear(&val); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + num_set_val(&ret->u.var, -num_val(&num)); + return S_OK; } HRESULT plus_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 911aa40..bd2cfc9 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -181,6 +181,10 @@ tmp = 4.5-2; ok(tmp === 2.5, "4.5-2 !== 2.5"); ok(getVT(tmp) === "VT_R8", "getVT(4-2) !== VT_R8"); +tmp = -2; +ok(tmp === 0-2, "-2 !== 0-2"); +ok(getVT(tmp) === "VT_I4", "getVT(-2) !== VT_I4"); + tmp = 2*3; ok(tmp === 6, "2*3 !== 6"); ok(getVT(tmp) === "VT_I4", "getVT(2*3) !== VT_I4");

1 0

Jacek Caban : jscript: Added '/' expression implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 323e11b4abb0bfa8f347da1789f233e52ca6ed13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323e11b4abb0bfa8f347da178… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:47:06 2008 +0200 jscript: Added '/' expression implementation. --- dlls/jscript/engine.c | 28 +++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 82474ba..d9ababa 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1558,10 +1558,32 @@ HRESULT mul_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return binary_expr_eval(ctx, expr, mul_eval, ei, ret); } -HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.5.2 */ +static HRESULT div_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT lnum, rnum; + HRESULT hres; + + hres = to_number(ctx->parser->script, lval, ei, &lnum); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx->parser->script, rval, ei, &rnum); + if(FAILED(hres)) + return hres; + + num_set_val(retv, num_val(&lnum) / num_val(&rnum)); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.5.2 */ +HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, div_eval, ei, ret); } HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 14bf7a9..5b55cd3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -193,6 +193,18 @@ tmp = 2.5*3.5; ok(tmp === 8.75, "2.5*3.5 !== 8.75"); ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); +tmp = 4/2; +ok(tmp === 2, "4/2 !== 2"); +ok(getVT(tmp) === "VT_I4", "getVT(4/2) !== VT_I4"); + +tmp = 4.5/1.5; +ok(tmp === 3, "4.5/1.5 !== 3"); +ok(getVT(tmp) === "VT_I4", "getVT(4.5/1.5) !== VT_I4"); + +tmp = 3/2; +ok(tmp === 1.5, "3/2 !== 1.5"); +ok(getVT(tmp) === "VT_R8", "getVT(3/2) !== VT_R8"); + tmp = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");

1 0

Jacek Caban : jscript: Added '*' expression implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 2385f8d494ca7a848309760381f321d04b83ebd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2385f8d494ca7a84830976038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:46:33 2008 +0200 jscript: Added '*' expression implementation. --- dlls/jscript/engine.c | 28 +++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 12 ++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a566f81..fbb86c5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1530,10 +1530,32 @@ HRESULT sub_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return binary_expr_eval(ctx, expr, sub_eval, ei, ret); } -HRESULT mul_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.5.1 */ +static HRESULT mul_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT lnum, rnum; + HRESULT hres; + + hres = to_number(ctx->parser->script, lval, ei, &lnum); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx->parser->script, rval, ei, &rnum); + if(FAILED(hres)) + return hres; + + num_set_val(retv, num_val(&lnum) * num_val(&rnum)); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.5.1 */ +HRESULT mul_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, mul_eval, ei, ret); } HRESULT div_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 64d3bbd..c216932 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -181,6 +181,18 @@ tmp = 4.5-2; ok(tmp === 2.5, "4.5-2 !== 2.5"); ok(getVT(tmp) === "VT_R8", "getVT(4-2) !== VT_R8"); +tmp = 2*3; +ok(tmp === 6, "2*3 !== 6"); +ok(getVT(tmp) === "VT_I4", "getVT(2*3) !== VT_I4"); + +tmp = 2*3.5; +ok(tmp === 7, "2*3.5 !== 7"); +ok(getVT(tmp) === "VT_I4", "getVT(2*3.5) !== VT_I4"); + +tmp = 2.5*3.5; +ok(tmp === 8.75, "2.5*3.5 !== 8.75"); +ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); + tmp = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");

1 0

Jacek Caban : jscript: Added '*=' expression implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 01a4acbd8c377bebd03c9767a4bc3aa5d3c081b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a4acbd8c377bebd03c9767a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:46:49 2008 +0200 jscript: Added '*=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fbb86c5..82474ba 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2112,10 +2112,14 @@ HRESULT assign_sub_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return assign_oper_eval(ctx, expr->expression1, expr->expression2, sub_eval, ei, ret); } -HRESULT assign_mul_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_mul_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, mul_eval, ei, ret); } HRESULT assign_div_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c216932..14bf7a9 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -204,6 +204,10 @@ tmp = 2; ok((tmp -= 1) === 1, "tmp -= 1 !== 1"); ok(tmp === 1, "tmp !=== 1"); +tmp = 2; +ok((tmp *= 1.5) === 3, "tmp *= 1.5 !== 3"); +ok(tmp === 3, "tmp !=== 3"); + tmp = 3 || ok(false, "second or expression called"); ok(tmp === 3, "3 || (...) is not 3");

1 0

Jacek Caban : jscript: Added to_object(number) implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 1a97632a4e1a5f653fbfacb695b6c2b6bf9af73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a97632a4e1a5f653fbfacb69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:45:45 2008 +0200 jscript: Added to_object(number) implementation. --- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 8 ++++++++ dlls/jscript/number.c | 17 +++++++++++++++++ dlls/jscript/tests/lang.js | 4 ++++ 4 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 8f14e63..4b384c7 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -135,6 +135,7 @@ HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); HRESULT create_regexp_str(script_ctx_t*,const WCHAR*,DWORD,const WCHAR*,DWORD,DispatchEx**); HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**); HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**); +HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**); HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 01b0ef7..616369e 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -260,6 +260,14 @@ HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp) *disp = (IDispatch*)_IDispatchEx_(dispex); break; + case VT_I4: + case VT_R8: + hres = create_number(ctx->parser->script, v, &dispex); + if(FAILED(hres)) + return hres; + + *disp = (IDispatch*)_IDispatchEx_(dispex); + break; case VT_DISPATCH: IDispatch_AddRef(V_DISPATCH(v)); *disp = V_DISPATCH(v); diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index b4db863..108cfff 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -24,6 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; + + VARIANT num; } NumberInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -165,3 +167,18 @@ HRESULT create_number_constr(script_ctx_t *ctx, DispatchEx **ret) jsdisp_release(&number->dispex); return hres; } + +HRESULT create_number(script_ctx_t *ctx, VARIANT *num, DispatchEx **ret) +{ + NumberInstance *number; + HRESULT hres; + + hres = alloc_number(ctx, TRUE, &number); + if(FAILED(hres)) + return hres; + + number->num = *num; + + *ret = &number->dispex; + return S_OK; +} diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 3ca57c0..e099df9 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -239,6 +239,10 @@ ok("".test === true, "\"\".test is not true"); Boolean.prototype.test = true; ok(true.test === true, "true.test is not true"); +Number.prototype.test = true; +ok((0).test === true, "(0).test is not true"); +ok((0.5).test === true, "(0.5).test is not true"); + var state = ""; try { ok(state === "", "try: state = " + state);

1 0

Jacek Caban : jscript: Added '-' expression implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: c3af87180a7cd6f9ffeff848737a1abed69b47ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3af87180a7cd6f9ffeff8487… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:46:01 2008 +0200 jscript: Added '-' expression implementation. --- dlls/jscript/engine.c | 28 +++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 8 ++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e554dd8..9b6ace9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1502,10 +1502,32 @@ HRESULT add_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j return binary_expr_eval(ctx, expr, add_eval, ei, ret); } -HRESULT sub_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.6.2 */ +static HRESULT sub_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT lnum, rnum; + HRESULT hres; + + hres = to_number(ctx->parser->script, lval, ei, &lnum); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx->parser->script, rval, ei, &rnum); + if(FAILED(hres)) + return hres; + + num_set_val(retv, num_val(&lnum) - num_val(&rnum)); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.6.2 */ +HRESULT sub_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, sub_eval, ei, ret); } HRESULT mul_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index e099df9..96df517 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -173,6 +173,14 @@ tmp = 1.5+2.5; ok(tmp === 4, "1.4+2.5 !== 4"); ok(getVT(tmp) === "VT_I4", "getVT(1.5+2.5) !== VT_I4"); +tmp = 4-2; +ok(tmp === 2, "4-2 !== 2"); +ok(getVT(tmp) === "VT_I4", "getVT(4-2) !== VT_I4"); + +tmp = 4.5-2; +ok(tmp === 2.5, "4.5-2 !== 2.5"); +ok(getVT(tmp) === "VT_R8", "getVT(4-2) !== VT_R8"); + tmp = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\"");

1 0

Jacek Caban : jscript: Added '-=' expression implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 2a672e334e1655e400beb9eca1179dc49cd417f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a672e334e1655e400beb9eca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:46:17 2008 +0200 jscript: Added '-=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9b6ace9..a566f81 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2080,10 +2080,14 @@ HRESULT assign_add_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return assign_oper_eval(ctx, expr->expression1, expr->expression2, add_eval, ei, ret); } -HRESULT assign_sub_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_sub_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, sub_eval, ei, ret); } HRESULT assign_mul_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 96df517..64d3bbd 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -188,6 +188,10 @@ tmp = 1; ok((tmp += 1) === 2, "tmp += 1 !== 2"); ok(tmp === 2, "tmp !== 2"); +tmp = 2; +ok((tmp -= 1) === 1, "tmp -= 1 !== 1"); +ok(tmp === 1, "tmp !=== 1"); + tmp = 3 || ok(false, "second or expression called"); ok(tmp === 3, "3 || (...) is not 3");

1 0

Jacek Caban : jscript: Added throw statement implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: e7903ecfa9aaa07ecf6ad32ffc5a15eb9cf73353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7903ecfa9aaa07ecf6ad32ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:45:13 2008 +0200 jscript: Added throw statement implementation. --- dlls/jscript/engine.c | 21 +++++++++++- dlls/jscript/tests/lang.js | 76 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f73f3bc..e554dd8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -722,10 +722,27 @@ HRESULT switch_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t return E_NOTIMPL; } +/* ECMA-262 3rd Edition 12.13 */ HRESULT throw_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; + exprval_t exprval; + 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; + + rt->ei.var = val; + return DISP_E_EXCEPTION; } /* ECMA-262 3rd Edition 12.14 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d55aa17..e4c4a2c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -267,4 +267,80 @@ try { } ok(state === "finally", "state = " + state + " expected finally"); +var state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; + throw "except"; +}catch(ex) { + ok(state === "try", "catch: state = " + state); + ok(ex === "except", "ex is not \"except\""); + state = "catch"; +} +ok(state === "catch", "state = " + state + " expected catch"); + +var state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; + throw true; +}catch(ex) { + ok(state === "try", "catch: state = " + state); + ok(ex === true, "ex is not true"); + state = "catch"; +}finally { + ok(state === "catch", "funally: state = " + state); + state = "finally"; +} +ok(state === "finally", "state = " + state + " expected finally"); + +var state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; + try { throw true; } finally {} +}catch(ex) { + ok(state === "try", "catch: state = " + state); + ok(ex === true, "ex is not true"); + state = "catch"; +}finally { + ok(state === "catch", "funally: state = " + state); + state = "finally"; +} +ok(state === "finally", "state = " + state + " expected finally"); + +var state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; + try { throw "except"; } catch(ex) { throw true; } +}catch(ex) { + ok(state === "try", "catch: state = " + state); + ok(ex === true, "ex is not true"); + state = "catch"; +}finally { + ok(state === "catch", "funally: state = " + state); + state = "finally"; +} +ok(state === "finally", "state = " + state + " expected finally"); + +function throwFunc(x) { + throw x; +} + +var state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; + throwFunc(true); +}catch(ex) { + ok(state === "try", "catch: state = " + state); + ok(ex === true, "ex is not true"); + state = "catch"; +}finally { + ok(state === "catch", "funally: state = " + state); + state = "finally"; +} +ok(state === "finally", "state = " + state + " expected finally"); + reportSuccess();

1 0

Jacek Caban : jscript: Added to_object(VT_BOOL) implementation.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 7fa373e364320369eed110f51baad7639be4a8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa373e364320369eed110f51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:45:29 2008 +0200 jscript: Added to_object(VT_BOOL) implementation. --- dlls/jscript/bool.c | 17 +++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 7 +++++++ dlls/jscript/tests/lang.js | 5 ++++- 4 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index a98a4ff..1add8ef 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -24,6 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; + + VARIANT_BOOL val; } BoolInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -145,3 +147,18 @@ HRESULT create_bool_constr(script_ctx_t *ctx, DispatchEx **ret) jsdisp_release(&bool->dispex); return hres; } + +HRESULT create_bool(script_ctx_t *ctx, VARIANT_BOOL b, DispatchEx **ret) +{ + BoolInstance *bool; + HRESULT hres; + + hres = alloc_bool(ctx, TRUE, &bool); + if(FAILED(hres)) + return hres; + + bool->val = b; + + *ret = &bool->dispex; + return S_OK; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a098b82..8f14e63 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -134,6 +134,7 @@ HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); HRESULT create_regexp_str(script_ctx_t*,const WCHAR*,DWORD,const WCHAR*,DWORD,DispatchEx**); HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**); +HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**); HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 2b0c31e..01b0ef7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -264,6 +264,13 @@ HRESULT to_object(exec_ctx_t *ctx, VARIANT *v, IDispatch **disp) IDispatch_AddRef(V_DISPATCH(v)); *disp = V_DISPATCH(v); break; + case VT_BOOL: + hres = create_bool(ctx->parser->script, V_BOOL(v), &dispex); + if(FAILED(hres)) + return hres; + + *disp = (IDispatch*)_IDispatchEx_(dispex); + break; default: FIXME("unsupported vt %d\n", V_VT(v)); return E_NOTIMPL; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index e4c4a2c..3ca57c0 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -234,7 +234,10 @@ ok(tmp-- === 2, "tmp-- (2) is not 2"); ok(tmp === 1, "decremented tmp is not 1"); String.prototype.test = true; -ok("".test === true, "\"\",test is not true"); +ok("".test === true, "\"\".test is not true"); + +Boolean.prototype.test = true; +ok(true.test === true, "true.test is not true"); var state = ""; try {

1 0