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

LibJS: Rename GlobalObject::initialize() => initialize_global_object()

Browse source 
This function was shadowing Object::initialize() which cannot be called
on global objects and has a different set of parameters.
This commit is contained in:
Andreas Kling 2021-03-17 16:52:26 +01:00
parent ea81dc13cf
commit d792200a55
11 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/js.cpp
View file

@ -63,15 +63,15 @@
RefPtr<JS::VM> vm;
Vector<String> repl_statements;
class ReplObject : public JS::GlobalObject {
class ReplObject final : public JS::GlobalObject {
JS_OBJECT(ReplObject, JS::GlobalObject);
public:
ReplObject();
virtual void initialize() override;
virtual void initialize_global_object() override;
virtual ~ReplObject() override;
private:
virtual const char* class_name() const override { return "ReplObject"; }
JS_DECLARE_NATIVE_FUNCTION(exit_interpreter);
JS_DECLARE_NATIVE_FUNCTION(repl_help);
JS_DECLARE_NATIVE_FUNCTION(load_file);
@ -510,9 +510,9 @@ ReplObject::ReplObject()
{
}
void ReplObject::initialize()
void ReplObject::initialize_global_object()
{
GlobalObject::initialize();
Base::initialize_global_object();
define_property("global", this, JS::Attribute::Enumerable);
define_native_function("exit", exit_interpreter);
define_native_function("help", repl_help);

12
Userland/Utilities/test-js.cpp
View file

@ -77,16 +77,16 @@ struct JSTestRunnerCounts {
int files_total { 0 };
};
class TestRunnerGlobalObject : public JS::GlobalObject {
class TestRunnerGlobalObject final : public JS::GlobalObject {
JS_OBJECT(TestRunnerGlobalObject, JS::GlobalObject);
public:
TestRunnerGlobalObject();
virtual ~TestRunnerGlobalObject() override;
virtual void initialize() override;
virtual void initialize_global_object() override;
private:
virtual const char* class_name() const override { return "TestRunnerGlobalObject"; }
JS_DECLARE_NATIVE_FUNCTION(is_strict_mode);
JS_DECLARE_NATIVE_FUNCTION(can_parse_source);
};
@ -141,9 +141,9 @@ TestRunnerGlobalObject::~TestRunnerGlobalObject()
{
}
void TestRunnerGlobalObject::initialize()
void TestRunnerGlobalObject::initialize_global_object()
{
JS::GlobalObject::initialize();
Base::initialize_global_object();
static FlyString global_property_name { "global" };
static FlyString is_strict_mode_property_name { "isStrictMode" };
static FlyString can_parse_source_property_name { "canParseSource" };