diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-29 17:04:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 17:04:24 +0200 |
| commit | 27d4e2f09fe76e06e6b4751025acc79d993c61e5 (patch) | |
| tree | fa201954cdeb3c77151dc707604c33cf955ad530 /modules/gdscript/gdscript_analyzer.cpp | |
| parent | bd573f8abac3122a4b2362a1e0224b79e8d9f2fc (diff) | |
| parent | 72c07708e82c3594172083c567e949cc5d9d5e27 (diff) | |
Merge pull request #53216 from vnen/gdscript-builtin-type-not-id
Diffstat (limited to 'modules/gdscript/gdscript_analyzer.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 23e88ae059..aa62ad20ff 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -175,6 +175,11 @@ Error GDScriptAnalyzer::check_native_member_name_conflict(const StringName &p_me 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; } |