jscript: Added '||' expression implementation.
This commit is contained in:
parent
50c7c4b719
commit
6d541ecc5d
|
@ -1225,10 +1225,49 @@ HRESULT comma_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags,
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT logical_or_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
|
/* ECMA-262 3rd Edition 11.11 */
|
||||||
|
HRESULT logical_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
|
||||||
{
|
{
|
||||||
FIXME("\n");
|
binary_expression_t *expr = (binary_expression_t*)_expr;
|
||||||
return E_NOTIMPL;
|
exprval_t exprval;
|
||||||
|
VARIANT_BOOL b;
|
||||||
|
VARIANT val;
|
||||||
|
HRESULT hres;
|
||||||
|
|
||||||
|
TRACE("\n");
|
||||||
|
|
||||||
|
hres = expr_eval(ctx, expr->expression1, 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_boolean(&val, &b);
|
||||||
|
if(SUCCEEDED(hres) && b) {
|
||||||
|
ret->type = EXPRVAL_VARIANT;
|
||||||
|
ret->u.var = val;
|
||||||
|
return S_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
VariantClear(&val);
|
||||||
|
if(FAILED(hres))
|
||||||
|
return hres;
|
||||||
|
|
||||||
|
hres = expr_eval(ctx, expr->expression2, 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;
|
||||||
|
|
||||||
|
ret->type = EXPRVAL_VARIANT;
|
||||||
|
ret->u.var = val;
|
||||||
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT logical_and_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
|
HRESULT logical_and_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
|
||||||
|
|
|
@ -180,4 +180,10 @@ tmp = 1;
|
||||||
ok((tmp += 1) === 2, "tmp += 1 !== 2");
|
ok((tmp += 1) === 2, "tmp += 1 !== 2");
|
||||||
ok(tmp === 2, "tmp !== 2");
|
ok(tmp === 2, "tmp !== 2");
|
||||||
|
|
||||||
|
tmp = 3 || ok(false, "second or expression called");
|
||||||
|
ok(tmp === 3, "3 || (...) is not 3");
|
||||||
|
|
||||||
|
tmp = false || 2;
|
||||||
|
ok(tmp === 2, "false || 2 is not 2");
|
||||||
|
|
||||||
reportSuccess();
|
reportSuccess();
|
||||||
|
|
Loading…
Reference in New Issue