Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 20, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/string/ustring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,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;
Expand All @@ -323,7 +323,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;
Expand All @@ -332,7 +332,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;
Expand Down
52 changes: 26 additions & 26 deletions core/string/ustring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,51 +269,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
}

Expand Down Expand Up @@ -615,33 +615,33 @@ class String {

// 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()); }
Expand Down
1 change: 1 addition & 0 deletions drivers/gles3/effects/feed_effects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

#ifdef GLES3_ENABLED

#include "drivers/gles3/shader_gles3.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover? How it is related to this PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

He explained it in a comment in the PR.

#include "drivers/gles3/shaders/feed.glsl.gen.h"

namespace GLES3 {
Expand Down
Loading