RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:48:11 +00:00
Code Issues Activity Actions

LibJS: Fix assignment of const variable on declaration

Browse source 
We were previously assuming that we were reassigning a variable even
when we were not, oops, my bad. :/
This commit is contained in:
0xtechnobabble 2020-03-15 23:57:54 +02:00 • committed by Andreas Kling
parent 2a32330257
commit 7aad10d984
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibJS/AST.cpp
View file

@ -535,7 +535,7 @@ Value VariableDeclaration::execute(Interpreter& interpreter) const
interpreter.declare_variable(name().string(), m_declaration_type); interpreter.declare_variable(name().string(), m_declaration_type);
if (m_initializer) { if (m_initializer) {
auto initalizer_result = m_initializer->execute(interpreter); auto initalizer_result = m_initializer->execute(interpreter);
interpreter.set_variable(name().string(), initalizer_result); interpreter.set_variable(name().string(), initalizer_result, true);
} }
return js_undefined(); return js_undefined();

4
Libraries/LibJS/Interpreter.cpp
View file

@ -108,14 +108,14 @@ void Interpreter::declare_variable(String name, DeclarationType declaration_type
} }
} }
void Interpreter::set_variable(String name, Value value) void Interpreter::set_variable(String name, Value value, bool first_assignment)
{ {
for (ssize_t i = m_scope_stack.size() - 1; i >= 0; --i) { for (ssize_t i = m_scope_stack.size() - 1; i >= 0; --i) {
auto& scope = m_scope_stack.at(i); auto& scope = m_scope_stack.at(i);
auto possible_match = scope.variables.get(name); auto possible_match = scope.variables.get(name);
if (possible_match.has_value()) { if (possible_match.has_value()) {
if (possible_match.value().declaration_type == DeclarationType::Const) if (!first_assignment && possible_match.value().declaration_type == DeclarationType::Const)
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
scope.variables.set(move(name), { move(value), possible_match.value().declaration_type }); scope.variables.set(move(name), { move(value), possible_match.value().declaration_type });

2
Libraries/LibJS/Interpreter.h
View file

@ -71,7 +71,7 @@ public:
void do_return(); void do_return();
Value get_variable(const String& name); Value get_variable(const String& name);
void set_variable(String name, Value); void set_variable(String name, Value, bool first_assignment = false);
void declare_variable(String name, DeclarationType); void declare_variable(String name, DeclarationType);
void gather_roots(Badge<Heap>, HashTable<Cell*>&); void gather_roots(Badge<Heap>, HashTable<Cell*>&);