asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #38611 from ThakeeNathees/shadow-var-warning-bug-fix

Browse source 
shadowed var warning in nested block bug fix
This commit is contained in:
Rémi Verschelde 2020-05-14 16:48:56 +02:00 committed by GitHub
commit 963a27f8a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/gdscript/gdscript_parser.cpp
View file

@ -8228,17 +8228,6 @@ void GDScriptParser::_check_function_types(FunctionNode *p_function) {
p_function->return_type.has_type = false; p_function->return_type.has_type = false;
p_function->return_type.may_yield = true; p_function->return_type.may_yield = true;
} }
#ifdef DEBUG_ENABLED
for (Map<StringName, LocalVarNode *>::Element *E = p_function->body->variables.front(); E; E = E->next()) {
LocalVarNode *lv = E->get();
for (int i = 0; i < current_class->variables.size(); i++) {
if (current_class->variables[i].identifier == lv->name) {
_add_warning(GDScriptWarning::SHADOWED_VARIABLE, lv->line, lv->name, itos(current_class->variables[i].line));
}
}
}
#endif // DEBUG_ENABLED
} }
void GDScriptParser::_check_class_blocks_types(ClassNode *p_class) { void GDScriptParser::_check_class_blocks_types(ClassNode *p_class) {
@ -8349,6 +8338,11 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) {
if (lv->datatype.has_type && assign_type.may_yield && lv->assign->type == Node::TYPE_OPERATOR) { if (lv->datatype.has_type && assign_type.may_yield && lv->assign->type == Node::TYPE_OPERATOR) {
_add_warning(GDScriptWarning::FUNCTION_MAY_YIELD, lv->line, _find_function_name(static_cast<OperatorNode *>(lv->assign))); _add_warning(GDScriptWarning::FUNCTION_MAY_YIELD, lv->line, _find_function_name(static_cast<OperatorNode *>(lv->assign)));
} }
for (int i = 0; i < current_class->variables.size(); i++) {
if (current_class->variables[i].identifier == lv->name) {
_add_warning(GDScriptWarning::SHADOWED_VARIABLE, lv->line, lv->name, itos(current_class->variables[i].line));
}
}
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
if (!_is_type_compatible(lv->datatype, assign_type)) { if (!_is_type_compatible(lv->datatype, assign_type)) {