From 3afe50c2fa8281d8fb8563cf477841c31cf0f0e2 Mon Sep 17 00:00:00 2001
From: cdemirer <41021322+cdemirer@users.noreply.github.com>
Date: Wed, 2 Mar 2022 19:05:18 +0800
Subject: Fix logic errors in match-statement Array & Dictionary Patterns

---
 .../scripts/parser/features/match_dictionary.gd    | 43 ++++++++++++++++++++++
 .../scripts/parser/features/match_dictionary.out   | 15 ++++++++
 .../features/match_multiple_patterns_with_array.gd | 26 +++++++++++++
 .../match_multiple_patterns_with_array.out         |  9 +++++
 4 files changed, 93 insertions(+)
 create mode 100644 modules/gdscript/tests/scripts/parser/features/match_dictionary.gd
 create mode 100644 modules/gdscript/tests/scripts/parser/features/match_dictionary.out
 create mode 100644 modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.gd
 create mode 100644 modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.out

(limited to 'modules/gdscript/tests')

diff --git a/modules/gdscript/tests/scripts/parser/features/match_dictionary.gd b/modules/gdscript/tests/scripts/parser/features/match_dictionary.gd
new file mode 100644
index 0000000000..377dd25e9e
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/features/match_dictionary.gd
@@ -0,0 +1,43 @@
+func foo(x):
+    match x:
+        {"key1": "value1", "key2": "value2"}:
+            print('{"key1": "value1", "key2": "value2"}')
+        {"key1": "value1", "key2"}:
+            print('{"key1": "value1", "key2"}')
+        {"key1", "key2": "value2"}:
+            print('{"key1", "key2": "value2"}')
+        {"key1", "key2"}:
+            print('{"key1", "key2"}')
+        {"key1": "value1"}:
+            print('{"key1": "value1"}')
+        {"key1"}:
+            print('{"key1"}')
+        _:
+            print("wildcard")
+
+func bar(x):
+    match x:
+        {0}:
+            print("0")
+        {1}:
+            print("1")
+        {2}:
+            print("2")
+        _:
+            print("wildcard")
+
+func test():
+    foo({"key1": "value1", "key2": "value2"})
+    foo({"key1": "value1", "key2": ""})
+    foo({"key1": "", "key2": "value2"})
+    foo({"key1": "", "key2": ""})
+    foo({"key1": "value1"})
+    foo({"key1": ""})
+    foo({"key1": "value1", "key2": "value2", "key3": "value3"})
+    foo({"key1": "value1", "key3": ""})
+    foo({"key2": "value2"})
+    foo({"key3": ""})
+    bar({0: "0"})
+    bar({1: "1"})
+    bar({2: "2"})
+    bar({3: "3"})
diff --git a/modules/gdscript/tests/scripts/parser/features/match_dictionary.out b/modules/gdscript/tests/scripts/parser/features/match_dictionary.out
new file mode 100644
index 0000000000..4dee886927
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/features/match_dictionary.out
@@ -0,0 +1,15 @@
+GDTEST_OK
+{"key1": "value1", "key2": "value2"}
+{"key1": "value1", "key2"}
+{"key1", "key2": "value2"}
+{"key1", "key2"}
+{"key1": "value1"}
+{"key1"}
+wildcard
+wildcard
+wildcard
+wildcard
+0
+1
+2
+wildcard
diff --git a/modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.gd b/modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.gd
new file mode 100644
index 0000000000..dbe223f5f5
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.gd
@@ -0,0 +1,26 @@
+func foo(x):
+    match x:
+        1, [2]:
+            print('1, [2]')
+        _:
+            print('wildcard')
+
+func bar(x):
+    match x:
+        [1], [2], [3]:
+            print('[1], [2], [3]')
+        [4]:
+            print('[4]')
+        _:
+            print('wildcard')
+
+func test():
+    foo(1)
+    foo([2])
+    foo(2)
+    bar([1])
+    bar([2])
+    bar([3])
+    bar([4])
+    bar([5])
+
diff --git a/modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.out b/modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.out
new file mode 100644
index 0000000000..a12b934d67
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/features/match_multiple_patterns_with_array.out
@@ -0,0 +1,9 @@
+GDTEST_OK
+1, [2]
+1, [2]
+wildcard
+[1], [2], [3]
+[1], [2], [3]
+[1], [2], [3]
+[4]
+wildcard
-- 
cgit v1.2.3