godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104049 from Ivorforce/string-dedup-char32

Browse Source 
De-duplicate `String` single-char constructor
This commit is contained in:
Thaddeus Crews
2025-03-14 10:06:12 -05:00
parent e68ac1c89d 626ff950fb
commit 1700a84275
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/string/ustring.cpp
View File

@@ -347,29 +347,6 @@ void String::parse_utf32(const Span<char32_t> &p_cstr) {
*dst = 0;
}
void String::parse_utf32(const char32_t &p_char) {
if (p_char == 0) {
print_unicode_error("NUL character", true);
return;
}
resize(2);
char32_t *dst = ptrw();
if ((p_char & 0xfffff800) == 0xd800) {
print_unicode_error(vformat("Unpaired surrogate (%x)", (uint32_t)p_char));
dst[0] = _replacement_char;
} else if (p_char > 0x10ffff) {
print_unicode_error(vformat("Invalid unicode codepoint (%x)", (uint32_t)p_char));
dst[0] = _replacement_char;
} else {
dst[0] = p_char;
}
dst[1] = 0;
}
// assumes the following have already been validated:
// p_char != nullptr
// p_length > 0

3
core/string/ustring.h
View File

@@ -436,7 +436,7 @@ public:
static String num_uint64(uint64_t p_num, int base = 10, bool capitalize_hex = false);
static String chr(char32_t p_char) {
String string;
string.parse_utf32(p_char);
string.parse_utf32(Span(&p_char, 1));
return string;
}
static String md5(const uint8_t *p_md5);
@@ -540,7 +540,6 @@ public:
static String utf16(const Span<char16_t> &p_range) { return utf16(p_range.ptr(), p_range.size()); }
void parse_utf32(const Span<char32_t> &p_cstr);
void parse_utf32(const char32_t &p_char);
static uint32_t hash(const char32_t *p_cstr, int p_len); /* hash the string */
static uint32_t hash(const char32_t *p_cstr); /* hash the string */