diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-19 21:18:42 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-19 21:18:42 +0200 |
| commit | c211c22abc8320a38ecb66a977fff4df10ccdd5b (patch) | |
| tree | 4b02a05cbed146fc6cb9d86b2f43a46a4c8b9776 /modules/gdscript/tests | |
| parent | ae00187b58cc5ec20ceb2c00c912820c756ed275 (diff) | |
| parent | fcdd92688108f1a56c9cfa8e90e2e7307e5d849b (diff) | |
| download | redot-engine-c211c22abc8320a38ecb66a977fff4df10ccdd5b.tar.gz | |
Merge pull request #78389 from rune-scape/rune-match-stringnames
GDScript: Strings and StringNames match
Diffstat (limited to 'modules/gdscript/tests')
4 files changed, 32 insertions, 17 deletions
diff --git a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.gd b/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.gd deleted file mode 100644 index 55be021a90..0000000000 --- a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.gd +++ /dev/null @@ -1,14 +0,0 @@ -# https://github.com/godotengine/godot/issues/60145 - -func test(): - match "abc": - &"abc": - print("String matched StringName") - _: - print("no match") - - match &"abc": - "abc": - print("StringName matched String") - _: - print("no match") diff --git a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.out b/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.out deleted file mode 100644 index 9d5a18da3d..0000000000 --- a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.out +++ /dev/null @@ -1,3 +0,0 @@ -GDTEST_OK -String matched StringName -StringName matched String diff --git a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd index f8bd46523e..0dd40520b0 100644 --- a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd +++ b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd @@ -1,4 +1,8 @@ # https://github.com/godotengine/godot/issues/64171 +# https://github.com/godotengine/godot/issues/60145 + +var s = "abc" +var sn = &"abc" func test(): print("Compare ==: ", "abc" == &"abc") @@ -9,3 +13,27 @@ func test(): print("Concat: ", "abc" + &"def") print("Concat: ", &"abc" + "def") print("Concat: ", &"abc" + &"def") + + match "abc": + &"abc": + print("String matched StringName literal") + _: + print("no Match") + + match &"abc": + "abc": + print("StringName matched String literal") + _: + print("no Match") + + match "abc": + sn: + print("String matched StringName") + _: + print("no match") + + match &"abc": + s: + print("StringName matched String") + _: + print("no match") diff --git a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out index 7e9c364b60..440b613099 100644 --- a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out +++ b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out @@ -6,3 +6,7 @@ Compare !=: false Concat: abcdef Concat: abcdef Concat: abcdef +String matched StringName literal +StringName matched String literal +String matched StringName +StringName matched String |