asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed String.ord_at to unicode_at

Browse source
This commit is contained in:
Yuri Roubinsky 2020-11-23 14:47:11 +03:00
parent fa498f6105
commit 38a5d22079
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/string/ustring.cpp
View file

@ -3483,7 +3483,7 @@ String String::right(int p_pos) const {
return substr(p_pos, (length() - p_pos)); return substr(p_pos, (length() - p_pos));
} }
char32_t String::ord_at(int p_idx) const { char32_t String::unicode_at(int p_idx) const {
ERR_FAIL_INDEX_V(p_idx, length(), 0); ERR_FAIL_INDEX_V(p_idx, length(), 0);
return operator[](p_idx); return operator[](p_idx);
} }
@ -3782,20 +3782,20 @@ String String::http_escape() const {
String String::http_unescape() const { String String::http_unescape() const {
String res; String res;
for (int i = 0; i < length(); ++i) { for (int i = 0; i < length(); ++i) {
if (ord_at(i) == '%' && i + 2 < length()) { if (unicode_at(i) == '%' && i + 2 < length()) {
char32_t ord1 = ord_at(i + 1); char32_t ord1 = unicode_at(i + 1);
if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) { if ((ord1 >= '0' && ord1 <= '9') || (ord1 >= 'A' && ord1 <= 'Z')) {
char32_t ord2 = ord_at(i + 2); char32_t ord2 = unicode_at(i + 2);
if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) { if ((ord2 >= '0' && ord2 <= '9') || (ord2 >= 'A' && ord2 <= 'Z')) {
char bytes[3] = { (char)ord1, (char)ord2, 0 }; char bytes[3] = { (char)ord1, (char)ord2, 0 };
res += (char)strtol(bytes, nullptr, 16); res += (char)strtol(bytes, nullptr, 16);
i += 2; i += 2;
} }
} else { } else {
res += ord_at(i); res += unicode_at(i);
} }
} else { } else {
res += ord_at(i); res += unicode_at(i);
} }
} }
return String::utf8(res.ascii()); return String::utf8(res.ascii());

2
core/string/ustring.h
View file

@ -366,7 +366,7 @@ public:
String get_extension() const; String get_extension() const;
String get_basename() const; String get_basename() const;
String plus_file(const String &p_file) const; String plus_file(const String &p_file) const;
char32_t ord_at(int p_idx) const; char32_t unicode_at(int p_idx) const;
void erase(int p_pos, int p_chars); void erase(int p_pos, int p_chars);

2
core/variant/variant_call.cpp
View file

@ -929,7 +929,7 @@ static void _register_variant_builtin_methods() {
bind_method(String, get_extension, sarray(), varray()); bind_method(String, get_extension, sarray(), varray());
bind_method(String, get_basename, sarray(), varray()); bind_method(String, get_basename, sarray(), varray());
bind_method(String, plus_file, sarray("file"), varray()); bind_method(String, plus_file, sarray("file"), varray());
bind_method(String, ord_at, sarray("at"), varray()); bind_method(String, unicode_at, sarray("at"), varray());
bind_method(String, dedent, sarray(), varray()); bind_method(String, dedent, sarray(), varray());
// FIXME: String needs to be immutable when binding // FIXME: String needs to be immutable when binding
//bind_method(String, erase, sarray("position", "chars"), varray()); //bind_method(String, erase, sarray("position", "chars"), varray());

18
doc/classes/String.xml
View file

@ -547,15 +547,6 @@
<description> <description>
</description> </description>
</method> </method>
<method name="ord_at">
<return type="int">
</return>
<argument index="0" name="at" type="int">
</argument>
<description>
Returns the character code at position [code]at[/code].
</description>
</method>
<method name="pad_decimals"> <method name="pad_decimals">
<return type="String"> <return type="String">
</return> </return>
@ -878,6 +869,15 @@
Removes a given string from the end if it ends with it or leaves the string unchanged. Removes a given string from the end if it ends with it or leaves the string unchanged.
</description> </description>
</method> </method>
<method name="unicode_at">
<return type="int">
</return>
<argument index="0" name="at" type="int">
</argument>
<description>
Returns the character code at position [code]at[/code].
</description>
</method>
<method name="xml_escape"> <method name="xml_escape">
<return type="String"> <return type="String">
</return> </return>

2
tests/test_string.h
View file

@ -266,7 +266,7 @@ TEST_CASE("[String] Operator []") {
a[6] = 'C'; a[6] = 'C';
CHECK(a == "Sugar Cane"); CHECK(a == "Sugar Cane");
CHECK(a[1] == 'u'); CHECK(a[1] == 'u');
CHECK(a.ord_at(1) == 'u'); CHECK(a.unicode_at(1) == 'u');
} }
TEST_CASE("[String] Case function test") { TEST_CASE("[String] Case function test") {