godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Rename String::copy_from functions to their respective encodings (parse_latin1, parse_wstring, parse_utf32).

Browse Source
This commit is contained in:
Lukas Tenbrink
2024-12-15 16:33:09 +01:00
parent ba2c5c1e61
commit df3e9291c6
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/string/ustring.cpp
View File

@@ -304,7 +304,7 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
return OK; 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) { if (p_cstr.len == 0) {
resize(0); resize(0);
return; return;
@@ -323,7 +323,7 @@ void String::copy_from(const StrRange<char> &p_cstr) {
*dst = 0; *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) { if (p_cstr.len == 0) {
resize(0); resize(0);
return; return;
@@ -332,7 +332,7 @@ void String::copy_from(const StrRange<char32_t> &p_cstr) {
copy_from_unchecked(p_cstr.c_str, p_cstr.len); 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) { if (p_char == 0) {
print_unicode_error("NUL character", true); print_unicode_error("NUL character", true);
return; return;

52
core/string/ustring.h
View File

@@ -269,51 +269,51 @@ class String {
static const char32_t _replacement_char; static const char32_t _replacement_char;
// Known-length copy. // Known-length copy.
void copy_from(const StrRange<char> &p_cstr); void parse_latin1(const StrRange<char> &p_cstr);
void copy_from(const StrRange<char32_t> &p_cstr); void parse_utf32(const StrRange<char32_t> &p_cstr);
void copy_from(const char32_t &p_char); void parse_utf32(const char32_t &p_char);
void copy_from_unchecked(const char32_t *p_char, int p_length); 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. // NULL-terminated c string copy - automatically parse the string to find the length.
void copy_from(const char *p_cstr) { void parse_latin1(const char *p_cstr) {
copy_from(StrRange<char>::from_c_str(p_cstr)); parse_latin1(StrRange<char>::from_c_str(p_cstr));
} }
void copy_from(const char *p_cstr, int p_clip_to) { void parse_latin1(const char *p_cstr, int p_clip_to) {
copy_from(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0)); parse_latin1(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
} }
void copy_from(const char32_t *p_cstr) { void parse_utf32(const char32_t *p_cstr) {
copy_from(StrRange<char32_t>::from_c_str(p_cstr)); parse_utf32(StrRange<char32_t>::from_c_str(p_cstr));
} }
void copy_from(const char32_t *p_cstr, int p_clip_to) { void parse_utf32(const char32_t *p_cstr, int p_clip_to) {
copy_from(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0)); parse_utf32(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
} }
// wchar_t copy_from depends on the platform. // 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 #ifdef WINDOWS_ENABLED
// wchar_t is 16-bit, parse as UTF-16 // wchar_t is 16-bit, parse as UTF-16
parse_utf16((const char16_t *)p_cstr.c_str, p_cstr.len); parse_utf16((const char16_t *)p_cstr.c_str, p_cstr.len);
#else #else
// wchar_t is 32-bit, copy directly // wchar_t is 32-bit, copy directly
copy_from((StrRange<char32_t> &)p_cstr); parse_utf32((StrRange<char32_t> &)p_cstr);
#endif #endif
} }
void copy_from(const wchar_t *p_cstr) { void parse_wstring(const wchar_t *p_cstr) {
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
// wchar_t is 16-bit, parse as UTF-16 // wchar_t is 16-bit, parse as UTF-16
parse_utf16((const char16_t *)p_cstr); parse_utf16((const char16_t *)p_cstr);
#else #else
// wchar_t is 32-bit, copy directly // wchar_t is 32-bit, copy directly
copy_from((const char32_t *)p_cstr); parse_utf32((const char32_t *)p_cstr);
#endif #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 #ifdef WINDOWS_ENABLED
// wchar_t is 16-bit, parse as UTF-16 // wchar_t is 16-bit, parse as UTF-16
parse_utf16((const char16_t *)p_cstr, p_clip_to); parse_utf16((const char16_t *)p_cstr, p_clip_to);
#else #else
// wchar_t is 32-bit, copy directly // 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 #endif
} }
@@ -615,33 +615,33 @@ public:
// Constructors for NULL terminated C strings. // Constructors for NULL terminated C strings.
String(const char *p_cstr) { String(const char *p_cstr) {
copy_from(p_cstr); parse_latin1(p_cstr);
} }
String(const wchar_t *p_cstr) { String(const wchar_t *p_cstr) {
copy_from(p_cstr); parse_wstring(p_cstr);
} }
String(const char32_t *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) { 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) { 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) { 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. // Copy assignment for NULL terminated C strings.
void operator=(const char *p_cstr) { void operator=(const char *p_cstr) {
copy_from(p_cstr); parse_latin1(p_cstr);
} }
void operator=(const wchar_t *p_cstr) { void operator=(const wchar_t *p_cstr) {
copy_from(p_cstr); parse_wstring(p_cstr);
} }
void operator=(const char32_t *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()); } 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 #ifdef GLES3_ENABLED
#include "drivers/gles3/shader_gles3.h"
#include "drivers/gles3/shaders/feed.glsl.gen.h" #include "drivers/gles3/shaders/feed.glsl.gen.h"
namespace GLES3 { namespace GLES3 {