Merge pull request #63073 from kdiduk/gdnative-string-join

[3.x][GDNative] Expose `String::join()` over to GDNative Core API v1.3
godotengine · Jul 16, 2022 · e8e040a · e8e040a
2 parents dc1a355 + 910c67b
commit e8e040a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/core/ustring.cpp b/core/ustring.cpp
@@ -1005,7 +1005,7 @@ Vector<int> String::split_ints_mk(const Vector<String> &p_splitters, bool p_allo
 	return ret;
 }
 
-String String::join(Vector<String> parts) {
+String String::join(const Vector<String> &parts) const {
 	String ret;
 	for (int i = 0; i < parts.size(); ++i) {
 		if (i > 0) {

diff --git a/core/ustring.h b/core/ustring.h
@@ -274,7 +274,7 @@ class String {
 	Vector<int> split_ints(const String &p_splitter, bool p_allow_empty = true) const;
 	Vector<int> split_ints_mk(const Vector<String> &p_splitters, bool p_allow_empty = true) const;
 
-	String join(Vector<String> parts);
+	String join(const Vector<String> &parts) const;
 
 	static CharType char_uppercase(CharType p_char);
 	static CharType char_lowercase(CharType p_char);

diff --git a/modules/gdnative/gdnative/string.cpp b/modules/gdnative/gdnative/string.cpp
@@ -846,6 +846,23 @@ godot_array GDAPI godot_string_split_spaces(const godot_string *p_self) {
 	return result;
 }
 
+godot_string GDAPI godot_string_join(const godot_string *p_self, const godot_array *p_parts) {
+	const String *self = (const String *)p_self;
+
+	const Array *parts_proxy = (const Array *)p_parts;
+	Vector<String> parts;
+	parts.resize(parts_proxy->size());
+	for (int i = 0; i < parts_proxy->size(); i++) {
+		parts.write[i] = (*parts_proxy)[i];
+	}
+
+	godot_string str;
+	String *s = (String *)&str;
+	memnew_placement(s, String);
+	*s = self->join(parts);
+	return str;
+}
+
 godot_int GDAPI godot_string_get_slice_count(const godot_string *p_self, godot_string p_splitter) {
 	const String *self = (const String *)p_self;
 	String *splitter = (String *)&p_splitter;

diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
@@ -137,6 +137,14 @@
               "arguments": [
                 ["godot_pool_color_array *", "p_self"]
               ]
+            },
+            {
+              "name": "godot_string_join",
+              "return_type": "godot_string",
+              "arguments": [
+                ["const godot_string *", "p_self"],
+                ["const godot_array *", "p_parts"]
+              ]
             }
           ]
         },

diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h
@@ -179,6 +179,8 @@ godot_array GDAPI godot_string_split_ints_mk(const godot_string *p_self, const g
 godot_array GDAPI godot_string_split_ints_mk_allows_empty(const godot_string *p_self, const godot_array *p_splitters);
 godot_array GDAPI godot_string_split_spaces(const godot_string *p_self);
 
+godot_string GDAPI godot_string_join(const godot_string *p_self, const godot_array *p_parts);
+
 wchar_t GDAPI godot_string_char_lowercase(wchar_t p_char);
 wchar_t GDAPI godot_string_char_uppercase(wchar_t p_char);
 godot_string GDAPI godot_string_to_lower(const godot_string *p_self);