godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

GDScript: Fix handling of scope for local variables

Browse Source
This commit is contained in:
George Marques
2020-10-20 14:34:14 -03:00
parent 48b91b900d
commit 11c05642fe
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gdscript/gdscript_compiler.h
View File

@@ -51,12 +51,11 @@ class GDScriptCompiler {
GDScriptCodeGenerator *generator = nullptr;
Map<StringName, GDScriptCodeGenerator::Address> parameters;
Map<StringName, GDScriptCodeGenerator::Address> locals;
List<Set<StringName>> locals_in_scope;
List<Map<StringName, GDScriptCodeGenerator::Address>> locals_stack;
GDScriptCodeGenerator::Address add_local(const StringName &p_name, const GDScriptDataType &p_type) {
uint32_t addr = generator->add_local(p_name, p_type);
locals[p_name] = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::LOCAL_VARIABLE, addr, p_type);
locals_in_scope.back()->get().insert(p_name);
return locals[p_name];
}
@@ -102,17 +101,14 @@ class GDScriptCompiler {
}
void start_block() {
Set<StringName> scope;
locals_in_scope.push_back(scope);
Map<StringName, GDScriptCodeGenerator::Address> old_locals = locals;
locals_stack.push_back(old_locals);
generator->start_block();
}
void end_block() {
Set<StringName> &scope = locals_in_scope.back()->get();
for (Set<StringName>::Element *E = scope.front(); E; E = E->next()) {
locals.erase(E->get());
}
locals_in_scope.pop_back();
locals = locals_stack.back()->get();
locals_stack.pop_back();
generator->end_block();
}
};