godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #59863 from cdemirer/fix-match-multiple-bind-single-pattern

Browse Source 
Fix issues with multiple bind patterns in match statement
This commit is contained in:
Rémi Verschelde
2022-05-11 14:18:02 +02:00
committed by GitHub
parent c171f675c8 3c5b9d1be3
commit 9963ae3553
5 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gdscript/gdscript_parser.cpp
View File

@@ -1863,7 +1863,7 @@ GDScriptParser::MatchBranchNode *GDScriptParser::parse_match_branch() {
if (pattern == nullptr) { if (pattern == nullptr) {
continue; continue;
} }
if (pattern->pattern_type == PatternNode::PT_BIND) { if (pattern->binds.size() > 0) {
has_bind = true; has_bind = true;
} }
if (branch->patterns.size() > 0 && has_bind) { if (branch->patterns.size() > 0 && has_bind) {
@@ -1899,6 +1899,7 @@ GDScriptParser::MatchBranchNode *GDScriptParser::parse_match_branch() {
for (const StringName &E : binds) { for (const StringName &E : binds) {
SuiteNode::Local local(branch->patterns[0]->binds[E], current_function); SuiteNode::Local local(branch->patterns[0]->binds[E], current_function);
local.type = SuiteNode::Local::PATTERN_BIND;
suite->add_local(local); suite->add_local(local);
} }
} }

4
modules/gdscript/tests/scripts/parser/errors/match_multiple_variable_binds_in_branch.gd Normal file
View File

@@ -0,0 +1,4 @@
func test():
match 1:
[[[var a]]], 2:
pass

2
modules/gdscript/tests/scripts/parser/errors/match_multiple_variable_binds_in_branch.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Cannot use a variable bind with multiple patterns.

6
modules/gdscript/tests/scripts/parser/features/match_multiple_variable_binds_in_pattern.gd Normal file
View File

@@ -0,0 +1,6 @@
func test():
match [1, 2, 3]:
[var a, var b, var c]:
print(a == 1)
print(b == 2)
print(c == 3)

4
modules/gdscript/tests/scripts/parser/features/match_multiple_variable_binds_in_pattern.out Normal file
View File

@@ -0,0 +1,4 @@
GDTEST_OK
true
true
true