mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-27 23:09:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibJS: Don't return the "last computed value" from Interpreter::run()

Browse source 
Only return whatever a "return" statment told us to return.
The last computed value is now available in Interpreter::last_value()
instead, where the REPL can pick it up.
This commit is contained in:
Andreas Kling 2020-04-04 23:45:13 +02:00
parent 97cd1173fa
commit 2db8716a6f
Notes: sideshowbarker 2024-07-19 07:55:29 +09:00
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibJS/Interpreter.cpp
View file

@ -69,18 +69,21 @@ Value Interpreter::run(const Statement& statement, Vector<Argument> arguments, S
auto& block = static_cast<const ScopeNode&>(statement);
enter_scope(block, move(arguments), scope_type);
Value last_value = js_undefined();
m_last_value = {};
for (auto& node : block.children()) {
last_value = node.execute(*this);
m_last_value = node.execute(*this);
if (m_unwind_until != ScopeType::None)
break;
}
bool did_return = m_unwind_until == ScopeType::Function;
if (m_unwind_until == scope_type)
m_unwind_until = ScopeType::None;
exit_scope(block);
return last_value;
return did_return ? m_last_value : js_undefined();
}
void Interpreter::enter_scope(const ScopeNode& scope_node, Vector<Argument> arguments, ScopeType scope_type)
@ -180,6 +183,9 @@ void Interpreter::gather_roots(Badge<Heap>, HashTable<Cell*>& roots)
roots.set(m_exception);
if (m_last_value.is_cell())
roots.set(m_last_value.as_cell());
for (auto& scope : m_scope_stack) {
for (auto& it : scope.variables) {
if (it.value.value.is_cell())