mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 16:57:46 +00:00
LibJS: Make DeclarativeEnvironment based on bindings instead of indices
This will allow other environments which extend DeclarativeEnvironment to provide their own custom bindings.
This commit is contained in:
parent
faf1430ce4
commit
2484bbc4e0
2 changed files with 73 additions and 35 deletions
|
@ -54,9 +54,13 @@ public:
|
|||
return names;
|
||||
}
|
||||
|
||||
ThrowCompletionOr<void> initialize_binding_direct(VM&, size_t index, Value);
|
||||
ThrowCompletionOr<Value> get_binding_value_direct(VM&, size_t index, bool strict);
|
||||
ThrowCompletionOr<void> set_mutable_binding_direct(VM&, size_t index, Value, bool strict);
|
||||
ThrowCompletionOr<Value> get_binding_value_direct(VM&, size_t index, bool strict);
|
||||
|
||||
private:
|
||||
ThrowCompletionOr<void> initialize_binding_direct(VM&, Binding&, Value);
|
||||
ThrowCompletionOr<Value> get_binding_value_direct(VM&, Binding&, bool strict);
|
||||
ThrowCompletionOr<void> set_mutable_binding_direct(VM&, Binding&, Value, bool strict);
|
||||
|
||||
protected:
|
||||
DeclarativeEnvironment();
|
||||
|
@ -65,10 +69,37 @@ protected:
|
|||
|
||||
virtual void visit_edges(Visitor&) override;
|
||||
|
||||
private:
|
||||
virtual bool is_declarative_environment() const override { return true; }
|
||||
class BindingAndIndex {
|
||||
public:
|
||||
Binding& binding()
|
||||
{
|
||||
if (m_referenced_binding)
|
||||
return *m_referenced_binding;
|
||||
return m_temporary_binding;
|
||||
}
|
||||
|
||||
Optional<size_t> find_binding_index(FlyString const& name) const
|
||||
BindingAndIndex(Binding* binding, Optional<size_t> index)
|
||||
: m_referenced_binding(binding)
|
||||
, m_index(move(index))
|
||||
{
|
||||
}
|
||||
|
||||
explicit BindingAndIndex(Binding temporary_binding)
|
||||
: m_temporary_binding(move(temporary_binding))
|
||||
{
|
||||
}
|
||||
|
||||
Optional<size_t> const& index() const { return m_index; }
|
||||
|
||||
private:
|
||||
Binding* m_referenced_binding { nullptr };
|
||||
Binding m_temporary_binding {};
|
||||
Optional<size_t> m_index;
|
||||
};
|
||||
|
||||
friend class ModuleEnvironment;
|
||||
|
||||
virtual Optional<BindingAndIndex> find_binding_and_index(FlyString const& name) const
|
||||
{
|
||||
auto it = m_bindings.find_if([&](auto const& binding) {
|
||||
return binding.name == name;
|
||||
|
@ -76,9 +107,13 @@ private:
|
|||
|
||||
if (it == m_bindings.end())
|
||||
return {};
|
||||
return it.index();
|
||||
|
||||
return BindingAndIndex { const_cast<Binding*>(&(*it)), it.index() };
|
||||
}
|
||||
|
||||
private:
|
||||
virtual bool is_declarative_environment() const override { return true; }
|
||||
|
||||
Vector<Binding> m_bindings;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue