1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 03:57:44 +00:00

LibJS: Make EnvironmentRecord inherit directly from Cell

Previously, EnvironmentRecord was a JS::Object. This was done because
GlobalObject inherited from EnvironmentRecord. Now that this is no
longer the case, we can simplify things by making EnvironmentRecord
inherit from Cell directly.

This also removes the need for environment records to have a shape,
which was awkward. This will be removed in the following patch.
This commit is contained in:
Andreas Kling 2021-06-23 13:04:52 +02:00
parent 7a87e920f2
commit 9ccc2f6c4d
8 changed files with 25 additions and 18 deletions

View file

@ -15,9 +15,12 @@ struct Variable {
DeclarationKind declaration_kind;
};
class EnvironmentRecord : public Object {
JS_OBJECT(EnvironmentRecord, Object);
#define JS_ENVIRONMENT_RECORD(class_, base_class) \
public: \
using Base = base_class; \
virtual char const* class_name() const override { return #class_; }
class EnvironmentRecord : public Cell {
public:
GlobalObject& global_object() { return *m_global_object; }
GlobalObject const& global_object() const { return *m_global_object; }
@ -43,6 +46,15 @@ public:
EnvironmentRecord* outer_environment() { return m_outer_environment; }
EnvironmentRecord const* outer_environment() const { return m_outer_environment; }
virtual bool is_global_environment_record() const { return false; }
virtual bool is_declarative_environment_record() const { return false; }
virtual bool is_function_environment_record() const { return false; }
template<typename T>
bool fast_is() const = delete;
virtual char const* class_name() const override { return "EnvironmentRecord"; }
protected:
explicit EnvironmentRecord(EnvironmentRecord* parent);