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

LibJS: Convert FunctionObject::bind() to ThrowCompletionOr

Browse source
This commit is contained in:
Linus Groh 2022-01-04 22:15:07 +01:00
parent 245d486ba4
commit 62356cff40
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibJS/Runtime/FunctionObject.cpp
View file

@ -6,6 +6,7 @@
#include <LibJS/Interpreter.h> #include <LibJS/Interpreter.h>
#include <LibJS/Runtime/BoundFunction.h> #include <LibJS/Runtime/BoundFunction.h>
#include <LibJS/Runtime/Completion.h>
#include <LibJS/Runtime/FunctionObject.h> #include <LibJS/Runtime/FunctionObject.h>
#include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/GlobalObject.h>
@ -20,7 +21,7 @@ FunctionObject::~FunctionObject()
{ {
} }
BoundFunction* FunctionObject::bind(Value bound_this_value, Vector<Value> arguments) ThrowCompletionOr<BoundFunction*> FunctionObject::bind(Value bound_this_value, Vector<Value> arguments)
{ {
auto& vm = this->vm(); auto& vm = this->vm();
FunctionObject& target_function = is<BoundFunction>(*this) ? static_cast<BoundFunction&>(*this).bound_target_function() : *this; FunctionObject& target_function = is<BoundFunction>(*this) ? static_cast<BoundFunction&>(*this).bound_target_function() : *this;
@ -38,15 +39,15 @@ BoundFunction* FunctionObject::bind(Value bound_this_value, Vector<Value> argume
return TRY(bound_this_value.to_object(global_object())); return TRY(bound_this_value.to_object(global_object()));
} }
}; };
auto bound_this_object = TRY_OR_DISCARD(get_bound_this_object()); auto bound_this_object = TRY(get_bound_this_object());
i32 computed_length = 0; i32 computed_length = 0;
auto length_property = TRY_OR_DISCARD(get(vm.names.length)); auto length_property = TRY(get(vm.names.length));
if (length_property.is_number()) if (length_property.is_number())
computed_length = max(0, length_property.as_i32() - static_cast<i32>(arguments.size())); computed_length = max(0, length_property.as_i32() - static_cast<i32>(arguments.size()));
Object* constructor_prototype = nullptr; Object* constructor_prototype = nullptr;
auto prototype_property = TRY_OR_DISCARD(target_function.get(vm.names.prototype)); auto prototype_property = TRY(target_function.get(vm.names.prototype));
if (prototype_property.is_object()) if (prototype_property.is_object())
constructor_prototype = &prototype_property.as_object(); constructor_prototype = &prototype_property.as_object();

2
Userland/Libraries/LibJS/Runtime/FunctionObject.h
View file

@ -25,7 +25,7 @@ public:
virtual const FlyString& name() const = 0; virtual const FlyString& name() const = 0;
BoundFunction* bind(Value bound_this_value, Vector<Value> arguments); ThrowCompletionOr<BoundFunction*> bind(Value bound_this_value, Vector<Value> arguments);
virtual bool is_strict_mode() const { return false; } virtual bool is_strict_mode() const { return false; }

2
Userland/Libraries/LibJS/Runtime/FunctionPrototype.cpp
View file

@ -72,7 +72,7 @@ JS_DEFINE_NATIVE_FUNCTION(FunctionPrototype::bind)
arguments.remove(0); arguments.remove(0);
} }
return this_function.bind(bound_this_arg, move(arguments)); return TRY(this_function.bind(bound_this_arg, move(arguments)));
} }
// 20.2.3.3 Function.prototype.call ( thisArg, ...args ), https://tc39.es/ecma262/#sec-function.prototype.call // 20.2.3.3 Function.prototype.call ( thisArg, ...args ), https://tc39.es/ecma262/#sec-function.prototype.call