mirror of
https://github.com/RGBCube/serenity
synced 2025-05-28 22:25:07 +00:00
LibJS: Rework how native functions are called to improve |this| value
Native functions now only get the Interpreter& as an argument. They can then extract |this| along with any indexed arguments it wants from it. This forces functions that want |this| to actually deal with calling interpreter.this_value().to_object(), and dealing with the possibility of a non-object |this|. This is still not great but let's keep massaging it forward.
This commit is contained in:
parent
c209ea1985
commit
7c4e53f31e
25 changed files with 145 additions and 102 deletions
|
@ -35,39 +35,40 @@ ObjectConstructor::ObjectConstructor()
|
|||
{
|
||||
put("prototype", interpreter().object_prototype());
|
||||
|
||||
put_native_function("getPrototypeOf", [this](Object*, const Vector<Value>& arguments) -> Value {
|
||||
if (arguments.size() < 1)
|
||||
return {};
|
||||
auto object = arguments[0].to_object(heap());
|
||||
if (interpreter().exception())
|
||||
return {};
|
||||
if (!object.is_object())
|
||||
return {};
|
||||
return object.as_object()->prototype();
|
||||
});
|
||||
|
||||
put_native_function("setPrototypeOf", [this](Object*, const Vector<Value>& arguments) -> Value {
|
||||
if (arguments.size() < 2)
|
||||
return {};
|
||||
auto object = arguments[0].to_object(heap());
|
||||
if (interpreter().exception())
|
||||
return {};
|
||||
if (!object.is_object())
|
||||
return {};
|
||||
if (!arguments[1].is_object())
|
||||
return {};
|
||||
const_cast<Object*>(object.as_object())->set_prototype(const_cast<Object*>(arguments[1].as_object()));
|
||||
return {};
|
||||
});
|
||||
put_native_function("getPrototypeOf", get_prototype_of);
|
||||
put_native_function("setPrototypeOf", set_prototype_of);
|
||||
}
|
||||
|
||||
ObjectConstructor::~ObjectConstructor()
|
||||
{
|
||||
}
|
||||
|
||||
Value ObjectConstructor::call(Interpreter& interpreter, const Vector<Value>&)
|
||||
Value ObjectConstructor::call(Interpreter& interpreter)
|
||||
{
|
||||
return interpreter.heap().allocate<Object>();
|
||||
}
|
||||
|
||||
Value ObjectConstructor::get_prototype_of(Interpreter& interpreter)
|
||||
{
|
||||
if (interpreter.call_frame().arguments.size() < 1)
|
||||
return {};
|
||||
auto* object = interpreter.call_frame().arguments[0].to_object(interpreter.heap());
|
||||
if (interpreter.exception())
|
||||
return {};
|
||||
return object->prototype();
|
||||
}
|
||||
|
||||
Value ObjectConstructor::set_prototype_of(Interpreter& interpreter)
|
||||
{
|
||||
if (interpreter.call_frame().arguments.size() < 2)
|
||||
return {};
|
||||
if (!interpreter.call_frame().arguments[1].is_object())
|
||||
return {};
|
||||
auto* object = interpreter.call_frame().arguments[0].to_object(interpreter.heap());
|
||||
if (interpreter.exception())
|
||||
return {};
|
||||
object->set_prototype(const_cast<Object*>(interpreter.call_frame().arguments[1].as_object()));
|
||||
return {};
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue