RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:17:45 +00:00
Code Issues Activity Actions

LibJS: Convert the ProxyCreate AO to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-10-29 01:06:20 +03:00
parent 84681788c4
commit 92bd64cb56
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibJS/Runtime/ProxyConstructor.cpp
View file

@ -14,17 +14,13 @@
namespace JS { namespace JS {
// 10.5.14 ProxyCreate ( target, handler ), https://tc39.es/ecma262/#sec-proxycreate // 10.5.14 ProxyCreate ( target, handler ), https://tc39.es/ecma262/#sec-proxycreate
static ProxyObject* proxy_create(GlobalObject& global_object, Value target, Value handler) static ThrowCompletionOr<ProxyObject*> proxy_create(GlobalObject& global_object, Value target, Value handler)
{ {
auto& vm = global_object.vm(); auto& vm = global_object.vm();
if (!target.is_object()) { if (!target.is_object())
vm.throw_exception<TypeError>(global_object, ErrorType::ProxyConstructorBadType, "target", target.to_string_without_side_effects()); return vm.throw_completion<TypeError>(global_object, ErrorType::ProxyConstructorBadType, "target", target.to_string_without_side_effects());
return {}; if (!handler.is_object())
} return vm.throw_completion<TypeError>(global_object, ErrorType::ProxyConstructorBadType, "handler", handler.to_string_without_side_effects());
if (!handler.is_object()) {
vm.throw_exception<TypeError>(global_object, ErrorType::ProxyConstructorBadType, "handler", handler.to_string_without_side_effects());
return {};
}
return ProxyObject::create(global_object, target.as_object(), handler.as_object()); return ProxyObject::create(global_object, target.as_object(), handler.as_object());
} }
@ -58,18 +54,13 @@ ThrowCompletionOr<Value> ProxyConstructor::call()
ThrowCompletionOr<Object*> ProxyConstructor::construct(FunctionObject&) ThrowCompletionOr<Object*> ProxyConstructor::construct(FunctionObject&)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
auto* proxy = proxy_create(global_object(), vm.argument(0), vm.argument(1)); return TRY(proxy_create(global_object(), vm.argument(0), vm.argument(1)));
if (auto* exception = vm.exception())
return throw_completion(exception->value());
return proxy;
} }
// 28.2.2.1 Proxy.revocable ( target, handler ), https://tc39.es/ecma262/#sec-proxy.revocable // 28.2.2.1 Proxy.revocable ( target, handler ), https://tc39.es/ecma262/#sec-proxy.revocable
JS_DEFINE_OLD_NATIVE_FUNCTION(ProxyConstructor::revocable) JS_DEFINE_OLD_NATIVE_FUNCTION(ProxyConstructor::revocable)
{ {
auto* proxy = proxy_create(global_object, vm.argument(0), vm.argument(1)); auto* proxy = TRY_OR_DISCARD(proxy_create(global_object, vm.argument(0), vm.argument(1)));
if (vm.exception())
return {};
// 28.2.2.1.1 Proxy Revocation Functions, https://tc39.es/ecma262/#sec-proxy-revocation-functions // 28.2.2.1.1 Proxy Revocation Functions, https://tc39.es/ecma262/#sec-proxy-revocation-functions
auto* revoker = NativeFunction::create(global_object, "", [proxy_handle = make_handle(proxy)](auto&, auto&) -> ThrowCompletionOr<Value> { auto* revoker = NativeFunction::create(global_object, "", [proxy_handle = make_handle(proxy)](auto&, auto&) -> ThrowCompletionOr<Value> {