asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
[3.x][GDNative] Expose `String::join()` over to GDNative Core API v1.3
This commit is contained in:
Rémi Verschelde 2022-07-16 17:19:51 +02:00 committed by GitHub
commit e8e040a099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/ustring.cpp
View file

@ -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) {

2
core/ustring.h
View file

@ -274,7 +274,7 @@ public:
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);

17
modules/gdnative/gdnative/string.cpp
View file

@ -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;

8
modules/gdnative/gdnative_api.json
View file

@ -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"]
]
}
]
},

2
modules/gdnative/include/gdnative/string.h
View file

@ -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);