RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-29 05:55:10 +00:00
Code Issues Activity Actions

LibJS: Rename EnvironmentRecord::parent() => outer_environment()

Browse source 
This name matches the spec (corresponds to the [[OuterEnv]] slot.)
This commit is contained in:
Andreas Kling 2021-06-21 23:35:30 +02:00
parent 46f2c23030
commit 5edd259b0a
6 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibJS/AST.cpp
View file

@ -231,7 +231,7 @@ Value CallExpression::execute(Interpreter& interpreter, GlobalObject& global_obj
// and subsequently GetThisEnvironment() instead. // and subsequently GetThisEnvironment() instead.
auto* function_environment = interpreter.current_environment(); auto* function_environment = interpreter.current_environment();
if (!function_environment->current_function()) if (!function_environment->current_function())
function_environment = static_cast<DeclarativeEnvironmentRecord*>(function_environment->parent()); function_environment = static_cast<DeclarativeEnvironmentRecord*>(function_environment->outer_environment());
auto* super_constructor = function_environment->current_function()->prototype(); auto* super_constructor = function_environment->current_function()->prototype();
// FIXME: Functions should track their constructor kind. // FIXME: Functions should track their constructor kind.

2
Userland/Libraries/LibJS/Interpreter.cpp
View file

@ -144,7 +144,7 @@ void Interpreter::exit_scope(const ScopeNode& scope_node)
while (!m_scope_stack.is_empty()) { while (!m_scope_stack.is_empty()) {
auto popped_scope = m_scope_stack.take_last(); auto popped_scope = m_scope_stack.take_last();
if (popped_scope.pushed_environment) if (popped_scope.pushed_environment)
vm().call_frame().environment_record = vm().call_frame().environment_record->parent(); vm().call_frame().environment_record = vm().call_frame().environment_record->outer_environment();
if (popped_scope.scope_node.ptr() == &scope_node) if (popped_scope.scope_node.ptr() == &scope_node)
break; break;
} }

6
Userland/Libraries/LibJS/Runtime/EnvironmentRecord.cpp
View file

@ -9,9 +9,9 @@
namespace JS { namespace JS {
EnvironmentRecord::EnvironmentRecord(EnvironmentRecord* parent) EnvironmentRecord::EnvironmentRecord(EnvironmentRecord* outer_environment)
: Object(vm().environment_record_shape()) : Object(vm().environment_record_shape())
, m_parent(parent) , m_outer_environment(outer_environment)
{ {
} }
@ -23,7 +23,7 @@ EnvironmentRecord::EnvironmentRecord(GlobalObjectTag tag)
void EnvironmentRecord::visit_edges(Visitor& visitor) void EnvironmentRecord::visit_edges(Visitor& visitor)
{ {
Base::visit_edges(visitor); Base::visit_edges(visitor);
visitor.visit(m_parent); visitor.visit(m_outer_environment);
} }
} }

7
Userland/Libraries/LibJS/Runtime/EnvironmentRecord.h
View file

@ -25,8 +25,9 @@ public:
virtual bool has_this_binding() const = 0; virtual bool has_this_binding() const = 0;
virtual Value get_this_binding(GlobalObject&) const = 0; virtual Value get_this_binding(GlobalObject&) const = 0;
EnvironmentRecord* parent() { return m_parent; } // [[OuterEnv]]
EnvironmentRecord const* parent() const { return m_parent; } EnvironmentRecord* outer_environment() { return m_outer_environment; }
EnvironmentRecord const* outer_environment() const { return m_outer_environment; }
protected: protected:
explicit EnvironmentRecord(EnvironmentRecord* parent); explicit EnvironmentRecord(EnvironmentRecord* parent);
@ -35,7 +36,7 @@ protected:
virtual void visit_edges(Visitor&) override; virtual void visit_edges(Visitor&) override;
private: private:
EnvironmentRecord* m_parent { nullptr }; EnvironmentRecord* m_outer_environment { nullptr };
}; };
} }

4
Userland/Libraries/LibJS/Runtime/ObjectEnvironmentRecord.cpp
View file

@ -41,12 +41,12 @@ bool ObjectEnvironmentRecord::delete_from_scope(FlyString const& name)
bool ObjectEnvironmentRecord::has_this_binding() const bool ObjectEnvironmentRecord::has_this_binding() const
{ {
return parent()->has_this_binding(); return outer_environment()->has_this_binding();
} }
Value ObjectEnvironmentRecord::get_this_binding(GlobalObject& global_object) const Value ObjectEnvironmentRecord::get_this_binding(GlobalObject& global_object) const
{ {
return parent()->get_this_binding(global_object); return outer_environment()->get_this_binding(global_object);
} }
} }

38
Userland/Libraries/LibJS/Runtime/VM.cpp
View file

@ -135,10 +135,10 @@ void VM::set_variable(const FlyString& name, Value value, GlobalObject& global_o
{ {
Optional<Variable> possible_match; Optional<Variable> possible_match;
if (!specific_scope && m_call_stack.size()) { if (!specific_scope && m_call_stack.size()) {
for (auto* scope = current_scope(); scope; scope = scope->parent()) { for (auto* environment_record = current_scope(); environment_record; environment_record = environment_record->outer_environment()) {
possible_match = scope->get_from_scope(name); possible_match = environment_record->get_from_scope(name);
if (possible_match.has_value()) { if (possible_match.has_value()) {
specific_scope = scope; specific_scope = environment_record;
break; break;
} }
} }
@ -167,10 +167,10 @@ bool VM::delete_variable(FlyString const& name)
EnvironmentRecord* specific_scope = nullptr; EnvironmentRecord* specific_scope = nullptr;
Optional<Variable> possible_match; Optional<Variable> possible_match;
if (!m_call_stack.is_empty()) { if (!m_call_stack.is_empty()) {
for (auto* scope = current_scope(); scope; scope = scope->parent()) { for (auto* environment_record = current_scope(); environment_record; environment_record = environment_record->outer_environment()) {
possible_match = scope->get_from_scope(name); possible_match = environment_record->get_from_scope(name);
if (possible_match.has_value()) { if (possible_match.has_value()) {
specific_scope = scope; specific_scope = environment_record;
break; break;
} }
} }
@ -376,8 +376,8 @@ Value VM::get_variable(const FlyString& name, GlobalObject& global_object)
return call_frame().arguments_object; return call_frame().arguments_object;
} }
for (auto* scope = current_scope(); scope; scope = scope->parent()) { for (auto* environment_record = current_scope(); environment_record; environment_record = environment_record->outer_environment()) {
auto possible_match = scope->get_from_scope(name); auto possible_match = environment_record->get_from_scope(name);
if (exception()) if (exception())
return {}; return {};
if (possible_match.has_value()) if (possible_match.has_value())
@ -393,10 +393,10 @@ Value VM::get_variable(const FlyString& name, GlobalObject& global_object)
Reference VM::get_reference(const FlyString& name) Reference VM::get_reference(const FlyString& name)
{ {
if (m_call_stack.size()) { if (m_call_stack.size()) {
for (auto* scope = current_scope(); scope; scope = scope->parent()) { for (auto* environment_record = current_scope(); environment_record; environment_record = environment_record->outer_environment()) {
if (is<GlobalObject>(scope)) if (is<GlobalObject>(environment_record))
break; break;
auto possible_match = scope->get_from_scope(name); auto possible_match = environment_record->get_from_scope(name);
if (possible_match.has_value()) if (possible_match.has_value())
return { Reference::LocalVariable, name }; return { Reference::LocalVariable, name };
} }
@ -508,9 +508,9 @@ Value VM::resolve_this_binding(GlobalObject& global_object) const
const EnvironmentRecord* VM::find_this_scope() const const EnvironmentRecord* VM::find_this_scope() const
{ {
// We will always return because the Global environment will always be reached, which has a |this| binding. // We will always return because the Global environment will always be reached, which has a |this| binding.
for (auto* scope = current_scope(); scope; scope = scope->parent()) { for (auto* environment_record = current_scope(); environment_record; environment_record = environment_record->outer_environment()) {
if (scope->has_this_binding()) if (environment_record->has_this_binding())
return scope; return environment_record;
} }
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
@ -624,11 +624,11 @@ void VM::dump_backtrace() const
void VM::dump_scope_chain() const void VM::dump_scope_chain() const
{ {
for (auto* scope = current_scope(); scope; scope = scope->parent()) { for (auto* environment_record = current_scope(); environment_record; environment_record = environment_record->outer_environment()) {
dbgln("+> {} ({:p})", scope->class_name(), scope); dbgln("+> {} ({:p})", environment_record->class_name(), environment_record);
if (is<DeclarativeEnvironmentRecord>(*scope)) { if (is<DeclarativeEnvironmentRecord>(*environment_record)) {
auto& environment_record = static_cast<DeclarativeEnvironmentRecord const&>(*scope); auto& declarative_environment_record = static_cast<DeclarativeEnvironmentRecord const&>(*environment_record);
for (auto& variable : environment_record.variables()) { for (auto& variable : declarative_environment_record.variables()) {
dbgln(" {}", variable.key); dbgln(" {}", variable.key);
} }
} }