From ce2747692d3d8b0b630f55367017a0891a0cc6af Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 24 Jun 2021 13:28:15 +0200 Subject: [PATCH] LibJS: Remove unused DeclarativeEnvironmentRecord::type() Nothing was using this, and we now have separate classes for the different types of environment records instead. --- .../LibJS/Runtime/DeclarativeEnvironmentRecord.cpp | 13 ------------- .../LibJS/Runtime/DeclarativeEnvironmentRecord.h | 12 ------------ .../LibJS/Runtime/FunctionEnvironmentRecord.cpp | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.cpp b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.cpp index 54a48871c2..a70aa7df8b 100644 --- a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.cpp +++ b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.cpp @@ -18,12 +18,6 @@ DeclarativeEnvironmentRecord::DeclarativeEnvironmentRecord() { } -DeclarativeEnvironmentRecord::DeclarativeEnvironmentRecord(EnvironmentRecordType environment_record_type) - : EnvironmentRecord(nullptr) - , m_environment_record_type(environment_record_type) -{ -} - DeclarativeEnvironmentRecord::DeclarativeEnvironmentRecord(EnvironmentRecord* parent_scope) : EnvironmentRecord(parent_scope) { @@ -35,13 +29,6 @@ DeclarativeEnvironmentRecord::DeclarativeEnvironmentRecord(HashMap variables, EnvironmentRecord* parent_scope, EnvironmentRecordType environment_record_type) - : EnvironmentRecord(parent_scope) - , m_environment_record_type(environment_record_type) - , m_variables(move(variables)) -{ -} - DeclarativeEnvironmentRecord::~DeclarativeEnvironmentRecord() { } diff --git a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.h b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.h index e82a1b3341..c463959399 100644 --- a/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.h +++ b/Userland/Libraries/LibJS/Runtime/DeclarativeEnvironmentRecord.h @@ -25,18 +25,9 @@ class DeclarativeEnvironmentRecord : public EnvironmentRecord { JS_ENVIRONMENT_RECORD(DeclarativeEnvironmentRecord, EnvironmentRecord); public: - enum class EnvironmentRecordType { - Declarative, - Function, - Object, - Module, - }; - DeclarativeEnvironmentRecord(); - DeclarativeEnvironmentRecord(EnvironmentRecordType); explicit DeclarativeEnvironmentRecord(EnvironmentRecord* parent_scope); DeclarativeEnvironmentRecord(HashMap variables, EnvironmentRecord* parent_scope); - DeclarativeEnvironmentRecord(HashMap variables, EnvironmentRecord* parent_scope, EnvironmentRecordType); virtual ~DeclarativeEnvironmentRecord() override; // ^EnvironmentRecord @@ -46,8 +37,6 @@ public: HashMap const& variables() const { return m_variables; } - EnvironmentRecordType type() const { return m_environment_record_type; } - virtual bool has_binding(FlyString const& name) const override; virtual void create_mutable_binding(GlobalObject&, FlyString const& name, bool can_be_deleted) override; virtual void create_immutable_binding(GlobalObject&, FlyString const& name, bool strict) override; @@ -62,7 +51,6 @@ protected: private: virtual bool is_declarative_environment_record() const override { return true; } - EnvironmentRecordType m_environment_record_type : 8 { EnvironmentRecordType::Declarative }; HashMap m_variables; HashMap m_bindings; }; diff --git a/Userland/Libraries/LibJS/Runtime/FunctionEnvironmentRecord.cpp b/Userland/Libraries/LibJS/Runtime/FunctionEnvironmentRecord.cpp index 4047bd9185..47ecfff564 100644 --- a/Userland/Libraries/LibJS/Runtime/FunctionEnvironmentRecord.cpp +++ b/Userland/Libraries/LibJS/Runtime/FunctionEnvironmentRecord.cpp @@ -12,7 +12,7 @@ namespace JS { FunctionEnvironmentRecord::FunctionEnvironmentRecord(EnvironmentRecord* parent_scope, HashMap variables) - : DeclarativeEnvironmentRecord(variables, parent_scope, DeclarativeEnvironmentRecord::EnvironmentRecordType::Function) + : DeclarativeEnvironmentRecord(variables, parent_scope) { }