mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-03-19 23:53:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100434 from Ivorforce/string-copy-from-rename

Browse Source 
Rename `String::copy_from` functions to their respective encodings (`parse_latin1`, `parse_wstring`, `parse_utf32`).
This commit is contained in:
Thaddeus Crews 2024-12-19 19:59:57 -06:00
commit 416a86f47c
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/string/ustring.cpp
View File

@ -299,7 +299,7 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
return OK;
}
void String::copy_from(const StrRange<char> &p_cstr) {
void String::parse_latin1(const StrRange<char> &p_cstr) {
if (p_cstr.len == 0) {
resize(0);
return;
@ -318,7 +318,7 @@ void String::copy_from(const StrRange<char> &p_cstr) {
*dst = 0;
}
void String::copy_from(const StrRange<char32_t> &p_cstr) {
void String::parse_utf32(const StrRange<char32_t> &p_cstr) {
if (p_cstr.len == 0) {
resize(0);
return;
@ -327,7 +327,7 @@ void String::copy_from(const StrRange<char32_t> &p_cstr) {
copy_from_unchecked(p_cstr.c_str, p_cstr.len);
}
void String::copy_from(const char32_t &p_char) {
void String::parse_utf32(const char32_t &p_char) {
if (p_char == 0) {
print_unicode_error("NUL character", true);
return;

52
core/string/ustring.h
View File

@ -267,51 +267,51 @@ class String {
static const char32_t _replacement_char;
// Known-length copy.
void copy_from(const StrRange<char> &p_cstr);
void copy_from(const StrRange<char32_t> &p_cstr);
void copy_from(const char32_t &p_char);
void parse_latin1(const StrRange<char> &p_cstr);
void parse_utf32(const StrRange<char32_t> &p_cstr);
void parse_utf32(const char32_t &p_char);
void copy_from_unchecked(const char32_t *p_char, int p_length);
// NULL-terminated c string copy - automatically parse the string to find the length.
void copy_from(const char *p_cstr) {
copy_from(StrRange<char>::from_c_str(p_cstr));
void parse_latin1(const char *p_cstr) {
parse_latin1(StrRange<char>::from_c_str(p_cstr));
}
void copy_from(const char *p_cstr, int p_clip_to) {
copy_from(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
void parse_latin1(const char *p_cstr, int p_clip_to) {
parse_latin1(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
}
void copy_from(const char32_t *p_cstr) {
copy_from(StrRange<char32_t>::from_c_str(p_cstr));
void parse_utf32(const char32_t *p_cstr) {
parse_utf32(StrRange<char32_t>::from_c_str(p_cstr));
}
void copy_from(const char32_t *p_cstr, int p_clip_to) {
copy_from(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
void parse_utf32(const char32_t *p_cstr, int p_clip_to) {
parse_utf32(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
}
// wchar_t copy_from depends on the platform.
void copy_from(const StrRange<wchar_t> &p_cstr) {
void parse_wstring(const StrRange<wchar_t> &p_cstr) {
#ifdef WINDOWS_ENABLED
// wchar_t is 16-bit, parse as UTF-16
parse_utf16((const char16_t *)p_cstr.c_str, p_cstr.len);
#else
// wchar_t is 32-bit, copy directly
copy_from((StrRange<char32_t> &)p_cstr);
parse_utf32((StrRange<char32_t> &)p_cstr);
#endif
}
void copy_from(const wchar_t *p_cstr) {
void parse_wstring(const wchar_t *p_cstr) {
#ifdef WINDOWS_ENABLED
// wchar_t is 16-bit, parse as UTF-16
parse_utf16((const char16_t *)p_cstr);
#else
// wchar_t is 32-bit, copy directly
copy_from((const char32_t *)p_cstr);
parse_utf32((const char32_t *)p_cstr);
#endif
}
void copy_from(const wchar_t *p_cstr, int p_clip_to) {
void parse_wstring(const wchar_t *p_cstr, int p_clip_to) {
#ifdef WINDOWS_ENABLED
// wchar_t is 16-bit, parse as UTF-16
parse_utf16((const char16_t *)p_cstr, p_clip_to);
#else
// wchar_t is 32-bit, copy directly
copy_from((const char32_t *)p_cstr, p_clip_to);
parse_utf32((const char32_t *)p_cstr, p_clip_to);
#endif
}
@ -613,33 +613,33 @@ public:
// Constructors for NULL terminated C strings.
String(const char *p_cstr) {
copy_from(p_cstr);
parse_latin1(p_cstr);
}
String(const wchar_t *p_cstr) {
copy_from(p_cstr);
parse_wstring(p_cstr);
}
String(const char32_t *p_cstr) {
copy_from(p_cstr);
parse_utf32(p_cstr);
}
String(const char *p_cstr, int p_clip_to_len) {
copy_from(p_cstr, p_clip_to_len);
parse_latin1(p_cstr, p_clip_to_len);
}
String(const wchar_t *p_cstr, int p_clip_to_len) {
copy_from(p_cstr, p_clip_to_len);
parse_wstring(p_cstr, p_clip_to_len);
}
String(const char32_t *p_cstr, int p_clip_to_len) {
copy_from(p_cstr, p_clip_to_len);
parse_utf32(p_cstr, p_clip_to_len);
}
// Copy assignment for NULL terminated C strings.
void operator=(const char *p_cstr) {
copy_from(p_cstr);
parse_latin1(p_cstr);
}
void operator=(const wchar_t *p_cstr) {
copy_from(p_cstr);
parse_wstring(p_cstr);
}
void operator=(const char32_t *p_cstr) {
copy_from(p_cstr);
parse_utf32(p_cstr);
}
explicit operator StrRange<char32_t>() const { return StrRange(get_data(), length()); }

1
drivers/gles3/effects/feed_effects.h
View File

@ -33,6 +33,7 @@
#ifdef GLES3_ENABLED
#include "drivers/gles3/shader_gles3.h"
#include "drivers/gles3/shaders/feed.glsl.gen.h"
namespace GLES3 {