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

Merge pull request #62701 from cdemirer/for-variable-conflict

Browse Source
This commit is contained in:
Rémi Verschelde
2022-07-06 16:02:49 +02:00
committed by GitHub
parent fdff28e1a2 dbdf0174b4
commit f0eb3ac5d3
5 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_parser.cpp
View File

@@ -1777,6 +1777,10 @@ GDScriptParser::ForNode *GDScriptParser::parse_for() {
SuiteNode *suite = alloc_node<SuiteNode>(); SuiteNode *suite = alloc_node<SuiteNode>();
if (n_for->variable) { if (n_for->variable) {
const SuiteNode::Local &local = current_suite->get_local(n_for->variable->name);
if (local.type != SuiteNode::Local::UNDEFINED) {
push_error(vformat(R"(There is already a %s named "%s" declared in this scope.)", local.get_name(), n_for->variable->name), n_for->variable);
}
suite->add_local(SuiteNode::Local(n_for->variable, current_function)); suite->add_local(SuiteNode::Local(n_for->variable, current_function));
} }
suite->parent_for = n_for; suite->parent_for = n_for;

4
modules/gdscript/tests/scripts/parser/errors/variable_conflicts_for_variable.gd Normal file
View File

@@ -0,0 +1,4 @@
func test():
var TEST = 1
for TEST in 2:
pass

2
modules/gdscript/tests/scripts/parser/errors/variable_conflicts_for_variable.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
There is already a variable named "TEST" declared in this scope.

3
modules/gdscript/tests/scripts/parser/errors/variable_conflicts_variable.gd Normal file
View File

@@ -0,0 +1,3 @@
func test():
var TEST = 1
var TEST = 2

2
modules/gdscript/tests/scripts/parser/errors/variable_conflicts_variable.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
There is already a variable named "TEST" declared in this scope.