diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-13 11:18:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-13 11:18:18 +0100 |
| commit | 7b675da618e422d21068f22d82bb2671705b342a (patch) | |
| tree | 18e64b524ddd9d424eb1f1f5ac31ac04f28df60d /modules/gdscript/gdscript_parser.cpp | |
| parent | 7f9a82b944724c0228301ded5fbb8efee12eac4d (diff) | |
| parent | 566895732cd0c7a07971c82c89a45f34bde64c74 (diff) | |
Merge pull request #55889 from Chaosus/fix_warning_duplication
Diffstat (limited to 'modules/gdscript/gdscript_parser.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 98a93a1a53..48f58e51fe 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -827,24 +827,9 @@ GDScriptParser::VariableNode *GDScriptParser::parse_variable(bool p_allow_proper return nullptr; } - GDScriptParser::IdentifierNode *identifier = parse_identifier(); - -#ifdef DEBUG_ENABLED - List<MethodInfo> gdscript_funcs; - GDScriptLanguage::get_singleton()->get_public_functions(&gdscript_funcs); - for (MethodInfo &info : gdscript_funcs) { - if (info.name == identifier->name) { - push_warning(identifier, GDScriptWarning::SHADOWED_GLOBAL_IDENTIFIER, "local variable", identifier->name, "built-in function"); - } - } - if (Variant::has_utility_function(identifier->name)) { - push_warning(identifier, GDScriptWarning::SHADOWED_GLOBAL_IDENTIFIER, "local variable", identifier->name, "built-in function"); - } -#endif - VariableNode *variable = alloc_node<VariableNode>(); - variable->identifier = identifier; - variable->export_info.name = identifier->name; + variable->identifier = parse_identifier(); + variable->export_info.name = variable->identifier->name; if (match(GDScriptTokenizer::Token::COLON)) { if (check(GDScriptTokenizer::Token::NEWLINE)) { @@ -1097,24 +1082,8 @@ GDScriptParser::ParameterNode *GDScriptParser::parse_parameter() { return nullptr; } - GDScriptParser::IdentifierNode *identifier = parse_identifier(); -#ifdef DEBUG_ENABLED - List<MethodInfo> gdscript_funcs; - GDScriptLanguage::get_singleton()->get_public_functions(&gdscript_funcs); - for (MethodInfo &info : gdscript_funcs) { - if (info.name == identifier->name) { - push_warning(identifier, GDScriptWarning::SHADOWED_GLOBAL_IDENTIFIER, "parameter", identifier->name, "built-in function"); - } - } - if (Variant::has_utility_function(identifier->name)) { - push_warning(identifier, GDScriptWarning::SHADOWED_GLOBAL_IDENTIFIER, "parameter", identifier->name, "built-in function"); - } else if (ClassDB::class_exists(identifier->name)) { - push_warning(identifier, GDScriptWarning::SHADOWED_GLOBAL_IDENTIFIER, "parameter", identifier->name, "global class"); - } -#endif - ParameterNode *parameter = alloc_node<ParameterNode>(); - parameter->identifier = identifier; + parameter->identifier = parse_identifier(); if (match(GDScriptTokenizer::Token::COLON)) { if (check((GDScriptTokenizer::Token::EQUAL))) { |