godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

GDScript: Don't allow builtin type names as identifiers

Browse Source
This commit is contained in:
George Marques
2021-09-29 11:23:16 -03:00
parent 5e609d0e8c
commit 72c07708e8
9 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gdscript/gdscript_analyzer.cpp
View File

@@ -175,6 +175,11 @@ Error GDScriptAnalyzer::check_native_member_name_conflict(const StringName &p_me
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
if (GDScriptParser::get_builtin_type(p_member_name) != Variant::VARIANT_MAX) {
push_error(vformat(R"(The member "%s" cannot have the same name as a builtin type.)", p_member_name), p_member_node);
return ERR_PARSE_ERROR;
}
return OK; return OK;
} }

5
modules/gdscript/tests/scripts/analyzer/errors/class_name_shadows_builtin_type.gd Normal file
View File

@@ -0,0 +1,5 @@
class Vector2:
pass
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/class_name_shadows_builtin_type.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
The member "Vector2" cannot have the same name as a builtin type.

4
modules/gdscript/tests/scripts/analyzer/errors/constant_name_shadows_builtin_type.gd Normal file
View File

@@ -0,0 +1,4 @@
const Vector2 = 0
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/constant_name_shadows_builtin_type.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
The member "Vector2" cannot have the same name as a builtin type.

4
modules/gdscript/tests/scripts/analyzer/errors/enum_name_shadows_builtin_type.gd Normal file
View File

@@ -0,0 +1,4 @@
enum Vector2 { A, B }
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/enum_name_shadows_builtin_type.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
The member "Vector2" cannot have the same name as a builtin type.

4
modules/gdscript/tests/scripts/analyzer/errors/variable_name_shadows_builtin_type.gd Normal file
View File

@@ -0,0 +1,4 @@
var Vector2
func test():
pass

2
modules/gdscript/tests/scripts/analyzer/errors/variable_name_shadows_builtin_type.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
The member "Vector2" cannot have the same name as a builtin type.