Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #104127 from Ivorforce/360-noclip

Browse source 
Remove `String` clipping constructors.
This commit is contained in:
Rémi Verschelde 2025-03-19 12:27:10 +01:00
commit 2fa721b1bc
No known key found for this signature in database
GPG key ID: C3336907360768E1
12 changed files with 24 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/io/plist.cpp
View file

@ -631,7 +631,7 @@ bool PList::load_file(const String &p_filename) {
unsigned char magic[8]; unsigned char magic[8];
fb->get_buffer(magic, 8); fb->get_buffer(magic, 8);
if (String((const char *)magic, 8) == "bplist00") { if (String::ascii(Span((const char *)magic, 8)) == "bplist00") {
fb->seek_end(-26); fb->seek_end(-26);
trailer.offset_size = fb->get_8(); trailer.offset_size = fb->get_8();
trailer.ref_size = fb->get_8(); trailer.ref_size = fb->get_8();

29
core/string/ustring.h
View file

@ -252,15 +252,9 @@ class String {
void parse_latin1(const char *p_cstr) { void parse_latin1(const char *p_cstr) {
parse_latin1(Span(p_cstr, p_cstr ? strlen(p_cstr) : 0)); parse_latin1(Span(p_cstr, p_cstr ? strlen(p_cstr) : 0));
} }
void parse_latin1(const char *p_cstr, int p_clip_to) {
parse_latin1(Span(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
}
void parse_utf32(const char32_t *p_cstr) { void parse_utf32(const char32_t *p_cstr) {
parse_utf32(Span(p_cstr, p_cstr ? strlen(p_cstr) : 0)); parse_utf32(Span(p_cstr, p_cstr ? strlen(p_cstr) : 0));
} }
void parse_utf32(const char32_t *p_cstr, int p_clip_to) {
parse_utf32(Span(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 parse_wstring(const Span<wchar_t> &p_cstr) { void parse_wstring(const Span<wchar_t> &p_cstr) {
@ -281,15 +275,6 @@ class String {
parse_utf32((const char32_t *)p_cstr); parse_utf32((const char32_t *)p_cstr);
#endif #endif
} }
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
parse_utf32((const char32_t *)p_cstr, p_clip_to);
#endif
}
bool _base_is_subsequence_of(const String &p_string, bool case_insensitive) const; bool _base_is_subsequence_of(const String &p_string, bool case_insensitive) const;
int _count(const String &p_string, int p_from, int p_to, bool p_case_insensitive) const; int _count(const String &p_string, int p_from, int p_to, bool p_case_insensitive) const;
@ -543,6 +528,11 @@ public:
static String utf16(const Span<char16_t> &p_range) { return utf16(p_range.ptr(), p_range.size()); } 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 Span<char32_t> &p_cstr);
static String utf32(const Span<char32_t> &p_span) {
String string;
string.parse_utf32(p_span);
return string;
}
static uint32_t hash(const char32_t *p_cstr, int p_len); /* hash the string */ 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 */ static uint32_t hash(const char32_t *p_cstr); /* hash the string */
@ -639,15 +629,6 @@ public:
String(const char32_t *p_cstr) { String(const char32_t *p_cstr) {
parse_utf32(p_cstr); parse_utf32(p_cstr);
} }
String(const char *p_cstr, int p_clip_to_len) {
parse_latin1(p_cstr, p_clip_to_len);
}
String(const wchar_t *p_cstr, int p_clip_to_len) {
parse_wstring(p_cstr, p_clip_to_len);
}
String(const char32_t *p_cstr, int 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) {

4
core/variant/variant_call.cpp
View file

@ -716,7 +716,7 @@ struct _VariantCall {
String s; String s;
if (p_instance->size() > 0) { if (p_instance->size() > 0) {
const uint8_t *r = p_instance->ptr(); const uint8_t *r = p_instance->ptr();
s = String((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t))); s.parse_utf32(Span((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t))));
} }
return s; return s;
} }
@ -728,7 +728,7 @@ struct _VariantCall {
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
s.parse_utf16((const char16_t *)r, floor((double)p_instance->size() / (double)sizeof(char16_t))); s.parse_utf16((const char16_t *)r, floor((double)p_instance->size() / (double)sizeof(char16_t)));
#else #else
s = String((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t))); s.parse_utf32(Span((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t))));
#endif #endif
} }
return s; return s;

2
drivers/d3d12/rendering_device_driver_d3d12.cpp
View file

@ -3543,7 +3543,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec
ComPtr<ID3DBlob> error_blob; ComPtr<ID3DBlob> error_blob;
HRESULT res = D3DX12SerializeVersionedRootSignature(context_driver->lib_d3d12, &root_sig_desc, D3D_ROOT_SIGNATURE_VERSION_1_1, root_sig_blob.GetAddressOf(), error_blob.GetAddressOf()); HRESULT res = D3DX12SerializeVersionedRootSignature(context_driver->lib_d3d12, &root_sig_desc, D3D_ROOT_SIGNATURE_VERSION_1_1, root_sig_blob.GetAddressOf(), error_blob.GetAddressOf());
ERR_FAIL_COND_V_MSG(!SUCCEEDED(res), Vector<uint8_t>(), ERR_FAIL_COND_V_MSG(!SUCCEEDED(res), Vector<uint8_t>(),
"Serialization of root signature failed with error " + vformat("0x%08ux", (uint64_t)res) + " and the following message:\n" + String((char *)error_blob->GetBufferPointer(), error_blob->GetBufferSize())); "Serialization of root signature failed with error " + vformat("0x%08ux", (uint64_t)res) + " and the following message:\n" + String::ascii(Span((char *)error_blob->GetBufferPointer(), error_blob->GetBufferSize())));
binary_data.root_signature_crc = crc32(0, nullptr, 0); binary_data.root_signature_crc = crc32(0, nullptr, 0);
binary_data.root_signature_crc = crc32(binary_data.root_signature_crc, (const Bytef *)root_sig_blob->GetBufferPointer(), root_sig_blob->GetBufferSize()); binary_data.root_signature_crc = crc32(binary_data.root_signature_crc, (const Bytef *)root_sig_blob->GetBufferPointer(), root_sig_blob->GetBufferSize());

6
modules/gdscript/gdscript_tokenizer.cpp
View file

@ -366,7 +366,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::make_token(Token::Type p_type) {
token.end_column = column; token.end_column = column;
token.leftmost_column = leftmost_column; token.leftmost_column = leftmost_column;
token.rightmost_column = rightmost_column; token.rightmost_column = rightmost_column;
token.source = String(_start, _current - _start); token.source = String::utf32(Span(_start, _current - _start));
if (p_type != Token::ERROR && cursor_line > -1) { if (p_type != Token::ERROR && cursor_line > -1) {
// Also count whitespace after token. // Also count whitespace after token.
@ -588,7 +588,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::potential_identifier() {
return token; return token;
} }
String name(_start, len); String name = String::utf32(Span(_start, len));
if (len < MIN_KEYWORD_LENGTH || len > MAX_KEYWORD_LENGTH) { if (len < MIN_KEYWORD_LENGTH || len > MAX_KEYWORD_LENGTH) {
// Cannot be a keyword, as the length doesn't match any. // Cannot be a keyword, as the length doesn't match any.
return make_identifier(name); return make_identifier(name);
@ -863,7 +863,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::number() {
// Create a string with the whole number. // Create a string with the whole number.
int len = _current - _start; int len = _current - _start;
String number = String(_start, len).remove_char('_'); String number = String::utf32(Span(_start, len)).remove_char('_');
// Convert to the appropriate literal type. // Convert to the appropriate literal type.
if (base == 16) { if (base == 16) {

2
modules/gdscript/gdscript_tokenizer_buffer.cpp
View file

@ -182,7 +182,7 @@ Error GDScriptTokenizerBuffer::set_code_buffer(const Vector<uint8_t> &p_buffer)
cs.write[j] = decode_uint32(tmp); cs.write[j] = decode_uint32(tmp);
} }
String s(reinterpret_cast<const char32_t *>(cs.ptr()), len); String s = String::utf32(Span(reinterpret_cast<const char32_t *>(cs.ptr()), len));
b += len * 4; b += len * 4;
total_len -= len * 4; total_len -= len * 4;
identifiers.write[i] = s; identifiers.write[i] = s;

3
modules/mbedtls/crypto_mbedtls.cpp
View file

@ -212,7 +212,8 @@ String X509CertificateMbedTLS::save_to_string() {
int ret = mbedtls_pem_write_buffer(PEM_BEGIN_CRT, PEM_END_CRT, cert.raw.p, cert.raw.len, w, sizeof(w), &wrote); int ret = mbedtls_pem_write_buffer(PEM_BEGIN_CRT, PEM_END_CRT, cert.raw.p, cert.raw.len, w, sizeof(w), &wrote);
ERR_FAIL_COND_V_MSG(ret != 0 || wrote == 0, String(), "Error saving the certificate."); ERR_FAIL_COND_V_MSG(ret != 0 || wrote == 0, String(), "Error saving the certificate.");
buffer += String((char *)w, wrote); // PEM is base64, aka ascii
buffer += String::ascii(Span((char *)w, wrote));
crt = crt->next; crt = crt->next;
} }
if (buffer.length() <= PEM_MIN_SIZE) { if (buffer.length() <= PEM_MIN_SIZE) {

2
modules/regex/regex.cpp
View file

@ -326,7 +326,7 @@ int RegEx::_sub(const String &p_subject, const String &p_replacement, int p_offs
pcre2_match_context_free_32(mctx); pcre2_match_context_free_32(mctx);
if (res >= 0) { if (res >= 0) {
r_output = String(output.ptr(), olength) + p_subject.substr(length); r_output = String::utf32(Span(output.ptr(), olength)) + p_subject.substr(length);
} }
return res; return res;

4
modules/websocket/wsl_peer.cpp
View file

@ -151,7 +151,7 @@ Error WSLPeer::accept_stream(Ref<StreamPeer> p_stream) {
} }
bool WSLPeer::_parse_client_request() { bool WSLPeer::_parse_client_request() {
Vector<String> psa = String((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4).split("\r\n"); Vector<String> psa = String::ascii(Span((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4)).split("\r\n");
int len = psa.size(); int len = psa.size();
ERR_FAIL_COND_V_MSG(len < 4, false, "Not enough response headers, got: " + itos(len) + ", expected >= 4."); ERR_FAIL_COND_V_MSG(len < 4, false, "Not enough response headers, got: " + itos(len) + ", expected >= 4.");
@ -416,7 +416,7 @@ void WSLPeer::_do_client_handshake() {
} }
bool WSLPeer::_verify_server_response() { bool WSLPeer::_verify_server_response() {
Vector<String> psa = String((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4).split("\r\n"); Vector<String> psa = String::ascii(Span((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4)).split("\r\n");
int len = psa.size(); int len = psa.size();
ERR_FAIL_COND_V_MSG(len < 4, false, "Not enough response headers. Got: " + itos(len) + ", expected >= 4."); ERR_FAIL_COND_V_MSG(len < 4, false, "Not enough response headers. Got: " + itos(len) + ", expected >= 4.");

3
platform/macos/os_macos.mm
View file

@ -809,7 +809,8 @@ String OS_MacOS::get_system_ca_certificates() {
Error err = CryptoCore::b64_encode(pba.ptrw(), pba.size(), &b64len, (unsigned char *)CFDataGetBytePtr(der), derlen); Error err = CryptoCore::b64_encode(pba.ptrw(), pba.size(), &b64len, (unsigned char *)CFDataGetBytePtr(der), derlen);
CFRelease(der); CFRelease(der);
ERR_CONTINUE(err != OK); ERR_CONTINUE(err != OK);
certs += "-----BEGIN CERTIFICATE-----\n" + String((char *)pba.ptr(), b64len) + "\n-----END CERTIFICATE-----\n"; // Certificate is bas64 encoded, aka ascii.
certs += "-----BEGIN CERTIFICATE-----\n" + String::ascii(Span((char *)pba.ptr(), b64len)) + "\n-----END CERTIFICATE-----\n";
} }
CFRelease(result); CFRelease(result);
return certs; return certs;

6
platform/windows/os_windows.cpp
View file

@ -966,7 +966,7 @@ static void _append_to_pipe(char *p_bytes, int p_size, String *r_pipe, Mutex *p_
// Let's hope it's compatible with UTF-8. // Let's hope it's compatible with UTF-8.
(*r_pipe) += String::utf8(p_bytes, p_size); (*r_pipe) += String::utf8(p_bytes, p_size);
} else { } else {
(*r_pipe) += String(wchars.ptr(), total_wchars); (*r_pipe) += String::utf16((char16_t *)wchars.ptr(), total_wchars);
} }
if (p_pipe_mutex) { if (p_pipe_mutex) {
p_pipe_mutex->unlock(); p_pipe_mutex->unlock();
@ -2234,7 +2234,7 @@ String OS_Windows::get_user_data_dir(const String &p_user_dir) const {
String OS_Windows::get_unique_id() const { String OS_Windows::get_unique_id() const {
HW_PROFILE_INFOA HwProfInfo; HW_PROFILE_INFOA HwProfInfo;
ERR_FAIL_COND_V(!GetCurrentHwProfileA(&HwProfInfo), ""); ERR_FAIL_COND_V(!GetCurrentHwProfileA(&HwProfInfo), "");
return String((HwProfInfo.szHwProfileGuid), HW_PROFILE_GUIDLEN); return String::ascii(Span((HwProfInfo.szHwProfileGuid), HW_PROFILE_GUIDLEN));
} }
bool OS_Windows::_check_internal_feature_support(const String &p_feature) { bool OS_Windows::_check_internal_feature_support(const String &p_feature) {
@ -2307,7 +2307,7 @@ String OS_Windows::get_system_ca_certificates() {
PackedByteArray pba; PackedByteArray pba;
pba.resize(size); pba.resize(size);
CryptBinaryToStringA(curr->pbCertEncoded, curr->cbCertEncoded, CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, (char *)pba.ptrw(), &size); CryptBinaryToStringA(curr->pbCertEncoded, curr->cbCertEncoded, CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, (char *)pba.ptrw(), &size);
certs += String((char *)pba.ptr(), size); certs += String::ascii(Span((char *)pba.ptr(), size));
curr = CertEnumCertificatesInStore(cert_store, curr); curr = CertEnumCertificatesInStore(cert_store, curr);
} }
CertCloseStore(cert_store, 0); CertCloseStore(cert_store, 0);

2
tests/core/string/test_string.h
View file

@ -59,7 +59,7 @@ TEST_CASE("[String] Assign from Latin-1 char string (copycon)") {
const String &t1(s); const String &t1(s);
CHECK(u32scmp(t1.get_data(), U"Sheep") == 0); CHECK(u32scmp(t1.get_data(), U"Sheep") == 0);
String t2 = String("Sheep", 3); String t2 = String::latin1(Span("Sheep", 3));
CHECK(u32scmp(t2.get_data(), U"She") == 0); CHECK(u32scmp(t2.get_data(), U"She") == 0);
} }