godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72400 from vnen/gdscript-match-release-consistency

Browse Source 
GDScript: Fix match branches return check on release
This commit is contained in:
Rémi Verschelde 2023-01-30 20:27:12 +01:00
commit dc7fb30485
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_parser.cpp
View File

@ -1906,10 +1906,8 @@ GDScriptParser::MatchNode *GDScriptParser::parse_match() {
return match; return match;
} }
#ifdef DEBUG_ENABLED
bool all_have_return = true; bool all_have_return = true;
bool have_wildcard = false; bool have_wildcard = false;
#endif
while (!check(GDScriptTokenizer::Token::DEDENT) && !is_at_end()) { while (!check(GDScriptTokenizer::Token::DEDENT) && !is_at_end()) {
MatchBranchNode *branch = parse_match_branch(); MatchBranchNode *branch = parse_match_branch();
@ -1922,21 +1920,19 @@ GDScriptParser::MatchNode *GDScriptParser::parse_match() {
if (have_wildcard && !branch->patterns.is_empty()) { if (have_wildcard && !branch->patterns.is_empty()) {
push_warning(branch->patterns[0], GDScriptWarning::UNREACHABLE_PATTERN); push_warning(branch->patterns[0], GDScriptWarning::UNREACHABLE_PATTERN);
} }
#endif
have_wildcard = have_wildcard || branch->has_wildcard; have_wildcard = have_wildcard || branch->has_wildcard;
all_have_return = all_have_return && branch->block->has_return; all_have_return = all_have_return && branch->block->has_return;
#endif
match->branches.push_back(branch); match->branches.push_back(branch);
} }
complete_extents(match); complete_extents(match);
consume(GDScriptTokenizer::Token::DEDENT, R"(Expected an indented block after "match" statement.)"); consume(GDScriptTokenizer::Token::DEDENT, R"(Expected an indented block after "match" statement.)");
#ifdef DEBUG_ENABLED
if (all_have_return && have_wildcard) { if (all_have_return && have_wildcard) {
current_suite->has_return = true; current_suite->has_return = true;
} }
#endif
return match; return match;
} }