From c8270dbe2e9eac702a596709584a815f23a84e0f Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 27 Jun 2021 22:15:58 +0200 Subject: [PATCH] LibJS: Rename ScriptFunction => OrdinaryFunctionObject These are basically what the spec calls "ordinary function objects", so let's have the name reflect that. :^) --- Userland/Libraries/LibJS/AST.cpp | 12 +++---- Userland/Libraries/LibJS/Bytecode/Op.cpp | 4 +-- Userland/Libraries/LibJS/CMakeLists.txt | 2 +- Userland/Libraries/LibJS/Interpreter.cpp | 4 +-- .../LibJS/Runtime/FunctionPrototype.cpp | 12 +++---- .../Runtime/GeneratorFunctionConstructor.cpp | 4 +-- .../LibJS/Runtime/GeneratorObject.cpp | 2 +- .../Libraries/LibJS/Runtime/GeneratorObject.h | 6 ++-- .../Libraries/LibJS/Runtime/GlobalObject.cpp | 8 ++--- .../Libraries/LibJS/Runtime/GlobalObject.h | 4 +-- ...unction.cpp => OrdinaryFunctionObject.cpp} | 32 +++++++++---------- ...iptFunction.h => OrdinaryFunctionObject.h} | 12 +++---- Userland/Libraries/LibJS/Runtime/VM.cpp | 2 +- Userland/Libraries/LibJS/Runtime/Value.cpp | 2 +- .../LibWeb/HTML/GlobalEventHandlers.cpp | 4 +-- Userland/Libraries/LibWeb/HTML/WebSocket.cpp | 4 +-- Userland/Utilities/js.cpp | 6 ++-- 17 files changed, 60 insertions(+), 60 deletions(-) rename Userland/Libraries/LibJS/Runtime/{ScriptFunction.cpp => OrdinaryFunctionObject.cpp} (84%) rename Userland/Libraries/LibJS/Runtime/{ScriptFunction.h => OrdinaryFunctionObject.h} (68%) diff --git a/Userland/Libraries/LibJS/AST.cpp b/Userland/Libraries/LibJS/AST.cpp index 1d9660042b4..9ad3feec02c 100644 --- a/Userland/Libraries/LibJS/AST.cpp +++ b/Userland/Libraries/LibJS/AST.cpp @@ -25,10 +25,10 @@ #include #include #include +#include #include #include #include -#include #include #include @@ -68,8 +68,8 @@ static void update_function_name(Value value, FlyString const& name) if (!value.is_function()) return; auto& function = value.as_function(); - if (is(function) && function.name().is_empty()) - static_cast(function).set_name(name); + if (is(function) && function.name().is_empty()) + static_cast(function).set_name(name); } static String get_function_name(GlobalObject& global_object, Value value) @@ -102,7 +102,7 @@ Value FunctionDeclaration::execute(Interpreter& interpreter, GlobalObject&) cons Value FunctionExpression::execute(Interpreter& interpreter, GlobalObject& global_object) const { InterpreterNodeScope node_scope { interpreter, *this }; - return ScriptFunction::create(global_object, name(), body(), parameters(), function_length(), interpreter.lexical_environment(), kind(), is_strict_mode() || interpreter.vm().in_strict_mode(), is_arrow_function()); + return OrdinaryFunctionObject::create(global_object, name(), body(), parameters(), function_length(), interpreter.lexical_environment(), kind(), is_strict_mode() || interpreter.vm().in_strict_mode(), is_arrow_function()); } Value ExpressionStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const @@ -761,8 +761,8 @@ Value ClassExpression::execute(Interpreter& interpreter, GlobalObject& global_ob update_function_name(class_constructor_value, m_name); - VERIFY(class_constructor_value.is_function() && is(class_constructor_value.as_function())); - auto* class_constructor = static_cast(&class_constructor_value.as_function()); + VERIFY(class_constructor_value.is_function() && is(class_constructor_value.as_function())); + auto* class_constructor = static_cast(&class_constructor_value.as_function()); class_constructor->set_is_class_constructor(); Value super_constructor = js_undefined(); if (!m_super_class.is_null()) { diff --git a/Userland/Libraries/LibJS/Bytecode/Op.cpp b/Userland/Libraries/LibJS/Bytecode/Op.cpp index 6ee8a70c212..6429e4494eb 100644 --- a/Userland/Libraries/LibJS/Bytecode/Op.cpp +++ b/Userland/Libraries/LibJS/Bytecode/Op.cpp @@ -16,8 +16,8 @@ #include #include #include +#include #include -#include #include namespace JS::Bytecode { @@ -312,7 +312,7 @@ void Call::execute_impl(Bytecode::Interpreter& interpreter) const void NewFunction::execute_impl(Bytecode::Interpreter& interpreter) const { auto& vm = interpreter.vm(); - interpreter.accumulator() = ScriptFunction::create(interpreter.global_object(), m_function_node.name(), m_function_node.body(), m_function_node.parameters(), m_function_node.function_length(), vm.lexical_environment(), m_function_node.kind(), m_function_node.is_strict_mode(), m_function_node.is_arrow_function()); + interpreter.accumulator() = OrdinaryFunctionObject::create(interpreter.global_object(), m_function_node.name(), m_function_node.body(), m_function_node.parameters(), m_function_node.function_length(), vm.lexical_environment(), m_function_node.kind(), m_function_node.is_strict_mode(), m_function_node.is_arrow_function()); } void Return::execute_impl(Bytecode::Interpreter& interpreter) const diff --git a/Userland/Libraries/LibJS/CMakeLists.txt b/Userland/Libraries/LibJS/CMakeLists.txt index ce2f02c4dda..be06dfe5500 100644 --- a/Userland/Libraries/LibJS/CMakeLists.txt +++ b/Userland/Libraries/LibJS/CMakeLists.txt @@ -104,7 +104,7 @@ set(SOURCES Runtime/RegExpConstructor.cpp Runtime/RegExpObject.cpp Runtime/RegExpPrototype.cpp - Runtime/ScriptFunction.cpp + Runtime/OrdinaryFunctionObject.cpp Runtime/Set.cpp Runtime/SetConstructor.cpp Runtime/SetIterator.cpp diff --git a/Userland/Libraries/LibJS/Interpreter.cpp b/Userland/Libraries/LibJS/Interpreter.cpp index 01cc133c0c5..6805cd6879c 100644 --- a/Userland/Libraries/LibJS/Interpreter.cpp +++ b/Userland/Libraries/LibJS/Interpreter.cpp @@ -13,8 +13,8 @@ #include #include #include +#include #include -#include #include #include @@ -85,7 +85,7 @@ void Interpreter::enter_scope(const ScopeNode& scope_node, ScopeType scope_type, { ScopeGuard guard([&] { for (auto& declaration : scope_node.functions()) { - auto* function = ScriptFunction::create(global_object, declaration.name(), declaration.body(), declaration.parameters(), declaration.function_length(), lexical_environment(), declaration.kind(), declaration.is_strict_mode()); + auto* function = OrdinaryFunctionObject::create(global_object, declaration.name(), declaration.body(), declaration.parameters(), declaration.function_length(), lexical_environment(), declaration.kind(), declaration.is_strict_mode()); vm().set_variable(declaration.name(), function, global_object); } }); diff --git a/Userland/Libraries/LibJS/Runtime/FunctionPrototype.cpp b/Userland/Libraries/LibJS/Runtime/FunctionPrototype.cpp index 7129653fc4e..34ef045af0d 100644 --- a/Userland/Libraries/LibJS/Runtime/FunctionPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/FunctionPrototype.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include namespace JS { @@ -120,11 +120,11 @@ JS_DEFINE_NATIVE_FUNCTION(FunctionPrototype::to_string) String function_parameters; String function_body; - if (is(this_object)) { - auto& script_function = static_cast(*this_object); + if (is(this_object)) { + auto& ordinary_function = static_cast(*this_object); StringBuilder parameters_builder; auto first = true; - for (auto& parameter : script_function.parameters()) { + for (auto& parameter : ordinary_function.parameters()) { // FIXME: Also stringify binding patterns. if (auto* name_ptr = parameter.binding.get_pointer()) { if (!first) @@ -137,10 +137,10 @@ JS_DEFINE_NATIVE_FUNCTION(FunctionPrototype::to_string) } } } - function_name = script_function.name(); + function_name = ordinary_function.name(); function_parameters = parameters_builder.build(); // FIXME: ASTNodes should be able to dump themselves to source strings - something like this: - // auto& body = static_cast(this_object)->body(); + // auto& body = static_cast(this_object)->body(); // function_body = body.to_source(); function_body = " ???"; } else { diff --git a/Userland/Libraries/LibJS/Runtime/GeneratorFunctionConstructor.cpp b/Userland/Libraries/LibJS/Runtime/GeneratorFunctionConstructor.cpp index ee40a273f46..1454de0b2df 100644 --- a/Userland/Libraries/LibJS/Runtime/GeneratorFunctionConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/GeneratorFunctionConstructor.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace JS { @@ -62,7 +62,7 @@ Value GeneratorFunctionConstructor::construct(FunctionObject& new_target) block.dump(executable); } - return ScriptFunction::create(global_object(), function->name(), function->body(), function->parameters(), function->function_length(), vm().lexical_environment(), FunctionKind::Generator, function->is_strict_mode(), false); + return OrdinaryFunctionObject::create(global_object(), function->name(), function->body(), function->parameters(), function->function_length(), vm().lexical_environment(), FunctionKind::Generator, function->is_strict_mode(), false); } } diff --git a/Userland/Libraries/LibJS/Runtime/GeneratorObject.cpp b/Userland/Libraries/LibJS/Runtime/GeneratorObject.cpp index 091ca2920ec..b05f24d6b0c 100644 --- a/Userland/Libraries/LibJS/Runtime/GeneratorObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/GeneratorObject.cpp @@ -13,7 +13,7 @@ namespace JS { -GeneratorObject* GeneratorObject::create(GlobalObject& global_object, Value initial_value, ScriptFunction* generating_function, EnvironmentRecord* generating_scope, Bytecode::RegisterWindow frame) +GeneratorObject* GeneratorObject::create(GlobalObject& global_object, Value initial_value, OrdinaryFunctionObject* generating_function, EnvironmentRecord* generating_scope, Bytecode::RegisterWindow frame) { // This is "g1.prototype" in figure-2 (https://tc39.es/ecma262/img/figure-2.png) auto generating_function_proto_property = generating_function->get(global_object.vm().names.prototype).to_object(global_object); diff --git a/Userland/Libraries/LibJS/Runtime/GeneratorObject.h b/Userland/Libraries/LibJS/Runtime/GeneratorObject.h index 08d722f6648..498b451c794 100644 --- a/Userland/Libraries/LibJS/Runtime/GeneratorObject.h +++ b/Userland/Libraries/LibJS/Runtime/GeneratorObject.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include namespace JS { @@ -15,7 +15,7 @@ class GeneratorObject final : public Object { JS_OBJECT(GeneratorObject, Object); public: - static GeneratorObject* create(GlobalObject&, Value, ScriptFunction*, EnvironmentRecord*, Bytecode::RegisterWindow); + static GeneratorObject* create(GlobalObject&, Value, OrdinaryFunctionObject*, EnvironmentRecord*, Bytecode::RegisterWindow); GeneratorObject(GlobalObject&, Object& prototype); virtual void initialize(GlobalObject&) override; virtual ~GeneratorObject() override; @@ -26,7 +26,7 @@ public: private: EnvironmentRecord* m_environment_record { nullptr }; - ScriptFunction* m_generating_function { nullptr }; + OrdinaryFunctionObject* m_generating_function { nullptr }; Value m_previous_value; Bytecode::RegisterWindow m_frame; bool m_done { false }; diff --git a/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp b/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp index e06db34dca5..d34f68361bb 100644 --- a/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp +++ b/Userland/Libraries/LibJS/Runtime/GlobalObject.cpp @@ -104,9 +104,9 @@ void GlobalObject::initialize_global_object() m_new_object_shape = vm.heap().allocate_without_global_object(*this); m_new_object_shape->set_prototype_without_transition(m_object_prototype); - m_new_script_function_prototype_object_shape = vm.heap().allocate_without_global_object(*this); - m_new_script_function_prototype_object_shape->set_prototype_without_transition(m_object_prototype); - m_new_script_function_prototype_object_shape->add_property_without_transition(vm.names.constructor, Attribute::Writable | Attribute::Configurable); + m_new_ordinary_function_prototype_object_shape = vm.heap().allocate_without_global_object(*this); + m_new_ordinary_function_prototype_object_shape->set_prototype_without_transition(m_object_prototype); + m_new_ordinary_function_prototype_object_shape->add_property_without_transition(vm.names.constructor, Attribute::Writable | Attribute::Configurable); static_cast(m_function_prototype)->initialize(*this); static_cast(m_object_prototype)->initialize(*this); @@ -209,7 +209,7 @@ void GlobalObject::visit_edges(Visitor& visitor) visitor.visit(m_empty_object_shape); visitor.visit(m_new_object_shape); - visitor.visit(m_new_script_function_prototype_object_shape); + visitor.visit(m_new_ordinary_function_prototype_object_shape); visitor.visit(m_proxy_constructor); visitor.visit(m_generator_object_prototype); visitor.visit(m_environment_record); diff --git a/Userland/Libraries/LibJS/Runtime/GlobalObject.h b/Userland/Libraries/LibJS/Runtime/GlobalObject.h index c30f054ac7c..6823676bce3 100644 --- a/Userland/Libraries/LibJS/Runtime/GlobalObject.h +++ b/Userland/Libraries/LibJS/Runtime/GlobalObject.h @@ -28,7 +28,7 @@ public: Shape* empty_object_shape() { return m_empty_object_shape; } Shape* new_object_shape() { return m_new_object_shape; } - Shape* new_script_function_prototype_object_shape() { return m_new_script_function_prototype_object_shape; } + Shape* new_ordinary_function_prototype_object_shape() { return m_new_ordinary_function_prototype_object_shape; } // Not included in JS_ENUMERATE_NATIVE_OBJECTS due to missing distinct prototype ProxyConstructor* proxy_constructor() { return m_proxy_constructor; } @@ -77,7 +77,7 @@ private: Shape* m_empty_object_shape { nullptr }; Shape* m_new_object_shape { nullptr }; - Shape* m_new_script_function_prototype_object_shape { nullptr }; + Shape* m_new_ordinary_function_prototype_object_shape { nullptr }; // Not included in JS_ENUMERATE_NATIVE_OBJECTS due to missing distinct prototype ProxyConstructor* m_proxy_constructor { nullptr }; diff --git a/Userland/Libraries/LibJS/Runtime/ScriptFunction.cpp b/Userland/Libraries/LibJS/Runtime/OrdinaryFunctionObject.cpp similarity index 84% rename from Userland/Libraries/LibJS/Runtime/ScriptFunction.cpp rename to Userland/Libraries/LibJS/Runtime/OrdinaryFunctionObject.cpp index d2e9a9b6875..2ba4b72409c 100644 --- a/Userland/Libraries/LibJS/Runtime/ScriptFunction.cpp +++ b/Userland/Libraries/LibJS/Runtime/OrdinaryFunctionObject.cpp @@ -19,12 +19,12 @@ #include #include #include -#include +#include #include namespace JS { -static ScriptFunction* typed_this(VM& vm, GlobalObject& global_object) +static OrdinaryFunctionObject* typed_this(VM& vm, GlobalObject& global_object) { auto* this_object = vm.this_value(global_object).to_object(global_object); if (!this_object) @@ -33,10 +33,10 @@ static ScriptFunction* typed_this(VM& vm, GlobalObject& global_object) vm.throw_exception(global_object, ErrorType::NotAFunctionNoParam); return nullptr; } - return static_cast(this_object); + return static_cast(this_object); } -ScriptFunction* ScriptFunction::create(GlobalObject& global_object, const FlyString& name, const Statement& body, Vector parameters, i32 m_function_length, EnvironmentRecord* parent_scope, FunctionKind kind, bool is_strict, bool is_arrow_function) +OrdinaryFunctionObject* OrdinaryFunctionObject::create(GlobalObject& global_object, const FlyString& name, const Statement& body, Vector parameters, i32 m_function_length, EnvironmentRecord* parent_scope, FunctionKind kind, bool is_strict, bool is_arrow_function) { Object* prototype = nullptr; switch (kind) { @@ -47,10 +47,10 @@ ScriptFunction* ScriptFunction::create(GlobalObject& global_object, const FlyStr prototype = global_object.generator_function_prototype(); break; } - return global_object.heap().allocate(global_object, global_object, name, body, move(parameters), m_function_length, parent_scope, *prototype, kind, is_strict, is_arrow_function); + return global_object.heap().allocate(global_object, global_object, name, body, move(parameters), m_function_length, parent_scope, *prototype, kind, is_strict, is_arrow_function); } -ScriptFunction::ScriptFunction(GlobalObject& global_object, const FlyString& name, const Statement& body, Vector parameters, i32 function_length, EnvironmentRecord* parent_scope, Object& prototype, FunctionKind kind, bool is_strict, bool is_arrow_function) +OrdinaryFunctionObject::OrdinaryFunctionObject(GlobalObject& global_object, const FlyString& name, const Statement& body, Vector parameters, i32 function_length, EnvironmentRecord* parent_scope, Object& prototype, FunctionKind kind, bool is_strict, bool is_arrow_function) : FunctionObject(is_arrow_function ? vm().this_value(global_object) : Value(), {}, prototype) , m_name(name) , m_body(body) @@ -70,12 +70,12 @@ ScriptFunction::ScriptFunction(GlobalObject& global_object, const FlyString& nam set_this_mode(ThisMode::Global); } -void ScriptFunction::initialize(GlobalObject& global_object) +void OrdinaryFunctionObject::initialize(GlobalObject& global_object) { auto& vm = this->vm(); Base::initialize(global_object); if (!m_is_arrow_function) { - auto* prototype = vm.heap().allocate(global_object, *global_object.new_script_function_prototype_object_shape()); + auto* prototype = vm.heap().allocate(global_object, *global_object.new_ordinary_function_prototype_object_shape()); switch (m_kind) { case FunctionKind::Regular: prototype->define_property(vm.names.constructor, this, Attribute::Writable | Attribute::Configurable); @@ -91,17 +91,17 @@ void ScriptFunction::initialize(GlobalObject& global_object) define_native_property(vm.names.name, name_getter, {}, Attribute::Configurable); } -ScriptFunction::~ScriptFunction() +OrdinaryFunctionObject::~OrdinaryFunctionObject() { } -void ScriptFunction::visit_edges(Visitor& visitor) +void OrdinaryFunctionObject::visit_edges(Visitor& visitor) { Base::visit_edges(visitor); visitor.visit(m_environment); } -FunctionEnvironmentRecord* ScriptFunction::create_environment_record(FunctionObject& function_being_invoked) +FunctionEnvironmentRecord* OrdinaryFunctionObject::create_environment_record(FunctionObject& function_being_invoked) { HashMap variables; for (auto& parameter : m_parameters) { @@ -139,7 +139,7 @@ FunctionEnvironmentRecord* ScriptFunction::create_environment_record(FunctionObj return environment; } -Value ScriptFunction::execute_function_body() +Value OrdinaryFunctionObject::execute_function_body() { auto& vm = this->vm(); @@ -216,7 +216,7 @@ Value ScriptFunction::execute_function_body() } } -Value ScriptFunction::call() +Value OrdinaryFunctionObject::call() { if (m_is_class_constructor) { vm().throw_exception(global_object(), ErrorType::ClassConstructorWithoutNew, m_name); @@ -225,7 +225,7 @@ Value ScriptFunction::call() return execute_function_body(); } -Value ScriptFunction::construct(FunctionObject&) +Value OrdinaryFunctionObject::construct(FunctionObject&) { if (m_is_arrow_function || m_kind == FunctionKind::Generator) { vm().throw_exception(global_object(), ErrorType::NotAConstructor, m_name); @@ -234,7 +234,7 @@ Value ScriptFunction::construct(FunctionObject&) return execute_function_body(); } -JS_DEFINE_NATIVE_GETTER(ScriptFunction::length_getter) +JS_DEFINE_NATIVE_GETTER(OrdinaryFunctionObject::length_getter) { auto* function = typed_this(vm, global_object); if (!function) @@ -242,7 +242,7 @@ JS_DEFINE_NATIVE_GETTER(ScriptFunction::length_getter) return Value(static_cast(function->m_function_length)); } -JS_DEFINE_NATIVE_GETTER(ScriptFunction::name_getter) +JS_DEFINE_NATIVE_GETTER(OrdinaryFunctionObject::name_getter) { auto* function = typed_this(vm, global_object); if (!function) diff --git a/Userland/Libraries/LibJS/Runtime/ScriptFunction.h b/Userland/Libraries/LibJS/Runtime/OrdinaryFunctionObject.h similarity index 68% rename from Userland/Libraries/LibJS/Runtime/ScriptFunction.h rename to Userland/Libraries/LibJS/Runtime/OrdinaryFunctionObject.h index 4e44d8bfa32..53b1bcb73bd 100644 --- a/Userland/Libraries/LibJS/Runtime/ScriptFunction.h +++ b/Userland/Libraries/LibJS/Runtime/OrdinaryFunctionObject.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2020-2021, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ @@ -12,15 +12,15 @@ namespace JS { -class ScriptFunction final : public FunctionObject { - JS_OBJECT(ScriptFunction, FunctionObject); +class OrdinaryFunctionObject final : public FunctionObject { + JS_OBJECT(OrdinaryFunctionObject, FunctionObject); public: - static ScriptFunction* create(GlobalObject&, const FlyString& name, const Statement& body, Vector parameters, i32 m_function_length, EnvironmentRecord* parent_scope, FunctionKind, bool is_strict, bool is_arrow_function = false); + static OrdinaryFunctionObject* create(GlobalObject&, const FlyString& name, const Statement& body, Vector parameters, i32 m_function_length, EnvironmentRecord* parent_scope, FunctionKind, bool is_strict, bool is_arrow_function = false); - ScriptFunction(GlobalObject&, const FlyString& name, const Statement& body, Vector parameters, i32 m_function_length, EnvironmentRecord* parent_scope, Object& prototype, FunctionKind, bool is_strict, bool is_arrow_function = false); + OrdinaryFunctionObject(GlobalObject&, const FlyString& name, const Statement& body, Vector parameters, i32 m_function_length, EnvironmentRecord* parent_scope, Object& prototype, FunctionKind, bool is_strict, bool is_arrow_function = false); virtual void initialize(GlobalObject&) override; - virtual ~ScriptFunction(); + virtual ~OrdinaryFunctionObject(); const Statement& body() const { return m_body; } const Vector& parameters() const { return m_parameters; }; diff --git a/Userland/Libraries/LibJS/Runtime/VM.cpp b/Userland/Libraries/LibJS/Runtime/VM.cpp index de32e8cd89d..e97845629e5 100644 --- a/Userland/Libraries/LibJS/Runtime/VM.cpp +++ b/Userland/Libraries/LibJS/Runtime/VM.cpp @@ -18,9 +18,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/Userland/Libraries/LibJS/Runtime/Value.cpp b/Userland/Libraries/LibJS/Runtime/Value.cpp index 7ded9e79820..a31d56e4124 100644 --- a/Userland/Libraries/LibJS/Runtime/Value.cpp +++ b/Userland/Libraries/LibJS/Runtime/Value.cpp @@ -242,7 +242,7 @@ bool Value::is_constructor() const return false; if (is(as_object())) return static_cast(as_object()).has_constructor(); - // ScriptFunction or BoundFunction + // OrdinaryFunctionObject or BoundFunction return true; } diff --git a/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.cpp b/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.cpp index 6ab8133a33c..d1ff701b957 100644 --- a/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.cpp +++ b/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ void GlobalEventHandlers::set_event_handler_attribute(const FlyString& name, HTM dbgln("Failed to parse script in event handler attribute '{}'", name); return; } - auto* function = JS::ScriptFunction::create(self.script_execution_context()->interpreter().global_object(), name, program->body(), program->parameters(), program->function_length(), nullptr, JS::FunctionKind::Regular, false, false); + auto* function = JS::OrdinaryFunctionObject::create(self.script_execution_context()->interpreter().global_object(), name, program->body(), program->parameters(), program->function_length(), nullptr, JS::FunctionKind::Regular, false, false); VERIFY(function); listener = adopt_ref(*new DOM::EventListener(JS::make_handle(static_cast(function)))); } diff --git a/Userland/Libraries/LibWeb/HTML/WebSocket.cpp b/Userland/Libraries/LibWeb/HTML/WebSocket.cpp index 82273a7bc5e..f1c7164ea22 100644 --- a/Userland/Libraries/LibWeb/HTML/WebSocket.cpp +++ b/Userland/Libraries/LibWeb/HTML/WebSocket.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -246,7 +246,7 @@ void WebSocket::set_event_handler_attribute(const FlyString& name, HTML::EventHa dbgln("Failed to parse script in event handler attribute '{}'", name); return; } - auto* function = JS::ScriptFunction::create(script_execution_context()->interpreter().global_object(), name, program->body(), program->parameters(), program->function_length(), nullptr, JS::FunctionKind::Regular, false, false); + auto* function = JS::OrdinaryFunctionObject::create(script_execution_context()->interpreter().global_object(), name, program->body(), program->parameters(), program->function_length(), nullptr, JS::FunctionKind::Regular, false, false); VERIFY(function); listener = adopt_ref(*new DOM::EventListener(JS::make_handle(static_cast(function)))); } diff --git a/Userland/Utilities/js.cpp b/Userland/Utilities/js.cpp index 50fdb221346..c0a94b73f7c 100644 --- a/Userland/Utilities/js.cpp +++ b/Userland/Utilities/js.cpp @@ -33,11 +33,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -237,8 +237,8 @@ static void print_object(JS::Object& object, HashTable& seen_object static void print_function(const JS::Object& object, HashTable&) { print_type(object.class_name()); - if (is(object)) - out(" {}", static_cast(object).name()); + if (is(object)) + out(" {}", static_cast(object).name()); else if (is(object)) out(" {}", static_cast(object).name()); }