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

LibJS: Pass Realm to GlobalObject::initialize_global_object()

Browse source 
Global object initialization is tightly coupled to realm creation, so
simply pass it to the function instead of relying on the non-standard
'associated realm' concept, which I'd like to remove later.

This works essentially the same way as regular Object::initialize() now.

Additionally this allows us to forward the realm to GlobalObject's
add_constructor() / initialize_constructor() helpers, so they set the
correct realm on the allocated constructor function object.
This commit is contained in:
Linus Groh 2022-08-22 18:56:16 +01:00
parent b465f46e00
commit 7c468b5a77
18 changed files with 76 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/js.cpp
View file

@ -96,7 +96,7 @@ public:
: GlobalObject(realm)
{
}
virtual void initialize_global_object() override;
virtual void initialize_global_object(JS::Realm&) override;
virtual ~ReplObject() override = default;
private:
@ -117,7 +117,7 @@ public:
: JS::GlobalObject(realm)
{
}
virtual void initialize_global_object() override;
virtual void initialize_global_object(JS::Realm&) override;
virtual ~ScriptObject() override = default;
private:
@ -1297,9 +1297,9 @@ static JS::ThrowCompletionOr<JS::Value> load_json_impl(JS::VM& vm)
return JS::JSONObject::parse_json_value(vm, json.value());
}
void ReplObject::initialize_global_object()
void ReplObject::initialize_global_object(JS::Realm& realm)
{
Base::initialize_global_object();
Base::initialize_global_object(realm);
define_direct_property("global", this, JS::Attribute::Enumerable);
u8 attr = JS::Attribute::Configurable | JS::Attribute::Writable | JS::Attribute::Enumerable;
define_native_function("exit", exit_interpreter, 0, attr);
@ -1375,9 +1375,9 @@ JS_DEFINE_NATIVE_FUNCTION(ReplObject::print)
return JS::js_undefined();
}
void ScriptObject::initialize_global_object()
void ScriptObject::initialize_global_object(JS::Realm& realm)
{
Base::initialize_global_object();
Base::initialize_global_object(realm);
define_direct_property("global", this, JS::Attribute::Enumerable);
u8 attr = JS::Attribute::Configurable | JS::Attribute::Writable | JS::Attribute::Enumerable;
define_native_function("loadINI", load_ini, 1, attr);