diff options
| author | kobewi <kobewi4e@gmail.com> | 2022-08-05 03:41:48 +0200 |
|---|---|---|
| committer | kobewi <kobewi4e@gmail.com> | 2022-08-22 22:42:36 +0200 |
| commit | 8be27dc59e3e330e10079ba8cbc999c80cab0ddc (patch) | |
| tree | 17ef499a4e116aea2ede5e0f89ed2b15ec8dbc94 /modules/regex | |
| parent | b9ea0e1338b1364fc6ecfd5731d038c32170e660 (diff) | |
Replace Array return types with TypedArray
Diffstat (limited to 'modules/regex')
| -rw-r--r-- | modules/regex/doc_classes/RegEx.xml | 2 | ||||
| -rw-r--r-- | modules/regex/regex.cpp | 4 | ||||
| -rw-r--r-- | modules/regex/regex.h | 2 | ||||
| -rw-r--r-- | modules/regex/tests/test_regex.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/regex/doc_classes/RegEx.xml b/modules/regex/doc_classes/RegEx.xml index 9adb6acd9c..56404f796c 100644 --- a/modules/regex/doc_classes/RegEx.xml +++ b/modules/regex/doc_classes/RegEx.xml @@ -76,7 +76,7 @@ </description> </method> <method name="get_names" qualifiers="const"> - <return type="Array" /> + <return type="PackedStringArray" /> <description> Returns an array of names of named capturing groups in the compiled pattern. They are ordered by appearance. </description> diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp index 569066867a..b2e6ea1004 100644 --- a/modules/regex/regex.cpp +++ b/modules/regex/regex.cpp @@ -351,8 +351,8 @@ int RegEx::get_group_count() const { return count; } -Array RegEx::get_names() const { - Array result; +PackedStringArray RegEx::get_names() const { + PackedStringArray result; ERR_FAIL_COND_V(!is_valid(), result); diff --git a/modules/regex/regex.h b/modules/regex/regex.h index 9296de929f..6920d2634d 100644 --- a/modules/regex/regex.h +++ b/modules/regex/regex.h @@ -94,7 +94,7 @@ public: bool is_valid() const; String get_pattern() const; int get_group_count() const; - Array get_names() const; + PackedStringArray get_names() const; RegEx(); RegEx(const String &p_pattern); diff --git a/modules/regex/tests/test_regex.h b/modules/regex/tests/test_regex.h index 91af393db1..c81094d3ae 100644 --- a/modules/regex/tests/test_regex.h +++ b/modules/regex/tests/test_regex.h @@ -46,7 +46,7 @@ TEST_CASE("[RegEx] Initialization") { CHECK(re1.get_pattern() == pattern); CHECK(re1.get_group_count() == 1); - Array names = re1.get_names(); + PackedStringArray names = re1.get_names(); CHECK(names.size() == 1); CHECK(names[0] == "vowel"); |