summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibJS/Runtime/VM.h
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2021-06-21 23:17:24 +0200
committerAndreas Kling <kling@serenityos.org>2021-06-21 23:49:50 +0200
commit6c6dbcfc36e4603e40f403964207142664b96e46 (patch)
treee36afd55a79f2a9c01878368b3b04fce789a846b /Userland/Libraries/LibJS/Runtime/VM.h
parente9b4a0a8309098ea47a35cfac45be7fff5955140 (diff)
downloadserenity-6c6dbcfc36e4603e40f403964207142664b96e46.zip
LibJS: Rename Environment Records so they match the spec :^)
This patch makes the following name changes: - ScopeObject => EnvironmentRecord - LexicalEnvironment => DeclarativeEnvironmentRecord - WithScope => ObjectEnvironmentRecord
Diffstat (limited to 'Userland/Libraries/LibJS/Runtime/VM.h')
-rw-r--r--Userland/Libraries/LibJS/Runtime/VM.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/VM.h b/Userland/Libraries/LibJS/Runtime/VM.h
index ef2510cf21..fb47a002fb 100644
--- a/Userland/Libraries/LibJS/Runtime/VM.h
+++ b/Userland/Libraries/LibJS/Runtime/VM.h
@@ -49,7 +49,7 @@ struct CallFrame {
Value this_value;
Vector<Value> arguments;
Array* arguments_object { nullptr };
- ScopeObject* scope { nullptr };
+ EnvironmentRecord* environment_record { nullptr };
bool is_strict_mode { false };
};
@@ -122,8 +122,8 @@ public:
const Vector<CallFrame*>& call_stack() const { return m_call_stack; }
Vector<CallFrame*>& call_stack() { return m_call_stack; }
- const ScopeObject* current_scope() const { return call_frame().scope; }
- ScopeObject* current_scope() { return call_frame().scope; }
+ const EnvironmentRecord* current_scope() const { return call_frame().environment_record; }
+ EnvironmentRecord* current_scope() { return call_frame().environment_record; }
bool in_strict_mode() const;
@@ -192,11 +192,11 @@ public:
FlyString unwind_until_label() const { return m_unwind_until_label; }
Value get_variable(const FlyString& name, GlobalObject&);
- void set_variable(const FlyString& name, Value, GlobalObject&, bool first_assignment = false, ScopeObject* specific_scope = nullptr);
+ void set_variable(const FlyString& name, Value, GlobalObject&, bool first_assignment = false, EnvironmentRecord* specific_scope = nullptr);
bool delete_variable(FlyString const& name);
- void assign(const Variant<NonnullRefPtr<Identifier>, NonnullRefPtr<BindingPattern>>& target, Value, GlobalObject&, bool first_assignment = false, ScopeObject* specific_scope = nullptr);
- void assign(const FlyString& target, Value, GlobalObject&, bool first_assignment = false, ScopeObject* specific_scope = nullptr);
- void assign(const NonnullRefPtr<BindingPattern>& target, Value, GlobalObject&, bool first_assignment = false, ScopeObject* specific_scope = nullptr);
+ void assign(const Variant<NonnullRefPtr<Identifier>, NonnullRefPtr<BindingPattern>>& target, Value, GlobalObject&, bool first_assignment = false, EnvironmentRecord* specific_scope = nullptr);
+ void assign(const FlyString& target, Value, GlobalObject&, bool first_assignment = false, EnvironmentRecord* specific_scope = nullptr);
+ void assign(const NonnullRefPtr<BindingPattern>& target, Value, GlobalObject&, bool first_assignment = false, EnvironmentRecord* specific_scope = nullptr);
Reference get_reference(const FlyString& name);
@@ -223,7 +223,7 @@ public:
String join_arguments(size_t start_index = 0) const;
Value resolve_this_binding(GlobalObject&) const;
- const ScopeObject* find_this_scope() const;
+ const EnvironmentRecord* find_this_scope() const;
Value get_new_target() const;
template<typename... Args>
@@ -240,7 +240,7 @@ public:
CommonPropertyNames names;
- Shape& scope_object_shape() { return *m_scope_object_shape; }
+ Shape& environment_record_shape() { return *m_environment_record_shape; }
void run_queued_promise_jobs();
void enqueue_promise_job(NativeFunction&);
@@ -286,7 +286,7 @@ private:
JS_ENUMERATE_WELL_KNOWN_SYMBOLS
#undef __JS_ENUMERATE
- Shape* m_scope_object_shape { nullptr };
+ Shape* m_environment_record_shape { nullptr };
bool m_underscore_is_last_value { false };