summaryrefslogtreecommitdiffstats
path: root/core/string/ustring.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/string/ustring.cpp')
-rw-r--r--core/string/ustring.cpp205
1 files changed, 133 insertions, 72 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
index 49c72a9dcf..c276f20f99 100644
--- a/core/string/ustring.cpp
+++ b/core/string/ustring.cpp
@@ -812,15 +812,15 @@ signed char String::nocasecmp_to(const String &p_str) const {
const char32_t *this_str = get_data();
while (true) {
- if (*that_str == 0 && *this_str == 0) {
- return 0; //we're equal
- } else if (*this_str == 0) {
- return -1; //if this is empty, and the other one is not, then we're less.. I think?
- } else if (*that_str == 0) {
- return 1; //otherwise the other one is smaller..
- } else if (_find_upper(*this_str) < _find_upper(*that_str)) { //more than
+ if (*that_str == 0 && *this_str == 0) { // If both strings are at the end, they are equal.
+ return 0;
+ } else if (*this_str == 0) { // If at the end of this, and not of other, we are less.
+ return -1;
+ } else if (*that_str == 0) { // If at end of other, and not of this, we are greater.
+ return 1;
+ } else if (_find_upper(*this_str) < _find_upper(*that_str)) { // If current character in this is less, we are less.
return -1;
- } else if (_find_upper(*this_str) > _find_upper(*that_str)) { //less than
+ } else if (_find_upper(*this_str) > _find_upper(*that_str)) { // If current character in this is greater, we are greater.
return 1;
}
@@ -844,15 +844,15 @@ signed char String::casecmp_to(const String &p_str) const {
const char32_t *this_str = get_data();
while (true) {
- if (*that_str == 0 && *this_str == 0) {
- return 0; //we're equal
- } else if (*this_str == 0) {
- return -1; //if this is empty, and the other one is not, then we're less.. I think?
- } else if (*that_str == 0) {
- return 1; //otherwise the other one is smaller..
- } else if (*this_str < *that_str) { //more than
+ if (*that_str == 0 && *this_str == 0) { // If both strings are at the end, they are equal.
+ return 0;
+ } else if (*this_str == 0) { // If at the end of this, and not of other, we are less.
+ return -1;
+ } else if (*that_str == 0) { // If at end of other, and not of this, we are greater.
+ return 1;
+ } else if (*this_str < *that_str) { // If current character in this is less, we are less.
return -1;
- } else if (*this_str > *that_str) { //less than
+ } else if (*this_str > *that_str) { // If current character in this is greater, we are greater.
return 1;
}
@@ -861,7 +861,48 @@ signed char String::casecmp_to(const String &p_str) const {
}
}
-signed char String::naturalnocasecmp_to(const String &p_str) const {
+static _FORCE_INLINE_ signed char natural_cmp_common(const char32_t *&r_this_str, const char32_t *&r_that_str) {
+ // Keep ptrs to start of numerical sequences.
+ const char32_t *this_substr = r_this_str;
+ const char32_t *that_substr = r_that_str;
+
+ // Compare lengths of both numerical sequences, ignoring leading zeros.
+ while (is_digit(*r_this_str)) {
+ r_this_str++;
+ }
+ while (is_digit(*r_that_str)) {
+ r_that_str++;
+ }
+ while (*this_substr == '0') {
+ this_substr++;
+ }
+ while (*that_substr == '0') {
+ that_substr++;
+ }
+ int this_len = r_this_str - this_substr;
+ int that_len = r_that_str - that_substr;
+
+ if (this_len < that_len) {
+ return -1;
+ } else if (this_len > that_len) {
+ return 1;
+ }
+
+ // If lengths equal, compare lexicographically.
+ while (this_substr != r_this_str && that_substr != r_that_str) {
+ if (*this_substr < *that_substr) {
+ return -1;
+ } else if (*this_substr > *that_substr) {
+ return 1;
+ }
+ this_substr++;
+ that_substr++;
+ }
+
+ return 0;
+}
+
+signed char String::naturalcasecmp_to(const String &p_str) const {
const char32_t *this_str = get_data();
const char32_t *that_str = p_str.get_data();
@@ -889,48 +930,69 @@ signed char String::naturalnocasecmp_to(const String &p_str) const {
return -1;
}
- // Keep ptrs to start of numerical sequences
- const char32_t *this_substr = this_str;
- const char32_t *that_substr = that_str;
-
- // Compare lengths of both numerical sequences, ignoring leading zeros
- while (is_digit(*this_str)) {
- this_str++;
+ signed char ret = natural_cmp_common(this_str, that_str);
+ if (ret) {
+ return ret;
}
- while (is_digit(*that_str)) {
- that_str++;
- }
- while (*this_substr == '0') {
- this_substr++;
- }
- while (*that_substr == '0') {
- that_substr++;
+ } else if (is_digit(*that_str)) {
+ return 1;
+ } else {
+ if (*this_str < *that_str) { // If current character in this is less, we are less.
+ return -1;
+ } else if (*this_str > *that_str) { // If current character in this is greater, we are greater.
+ return 1;
}
- int this_len = this_str - this_substr;
- int that_len = that_str - that_substr;
- if (this_len < that_len) {
+ this_str++;
+ that_str++;
+ }
+ }
+ if (*that_str) {
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+signed char String::naturalnocasecmp_to(const String &p_str) const {
+ const char32_t *this_str = get_data();
+ const char32_t *that_str = p_str.get_data();
+
+ if (this_str && that_str) {
+ while (*this_str == '.' || *that_str == '.') {
+ if (*this_str++ != '.') {
+ return 1;
+ }
+ if (*that_str++ != '.') {
+ return -1;
+ }
+ if (!*that_str) {
+ return 1;
+ }
+ if (!*this_str) {
+ return -1;
+ }
+ }
+
+ while (*this_str) {
+ if (!*that_str) {
+ return 1;
+ } else if (is_digit(*this_str)) {
+ if (!is_digit(*that_str)) {
return -1;
- } else if (this_len > that_len) {
- return 1;
}
- // If lengths equal, compare lexicographically
- while (this_substr != this_str && that_substr != that_str) {
- if (*this_substr < *that_substr) {
- return -1;
- } else if (*this_substr > *that_substr) {
- return 1;
- }
- this_substr++;
- that_substr++;
+ signed char ret = natural_cmp_common(this_str, that_str);
+ if (ret) {
+ return ret;
}
} else if (is_digit(*that_str)) {
return 1;
} else {
- if (_find_upper(*this_str) < _find_upper(*that_str)) { //more than
+ if (_find_upper(*this_str) < _find_upper(*that_str)) { // If current character in this is less, we are less.
return -1;
- } else if (_find_upper(*this_str) > _find_upper(*that_str)) { //less than
+ } else if (_find_upper(*this_str) > _find_upper(*that_str)) { // If current character in this is greater, we are greater.
return 1;
}
@@ -2857,6 +2919,12 @@ String String::insert(int p_at_pos, const String &p_string) const {
return pre + p_string + post;
}
+String String::erase(int p_pos, int p_chars) const {
+ ERR_FAIL_COND_V_MSG(p_pos < 0, "", vformat("Invalid starting position for `String.erase()`: %d. Starting position must be positive or zero.", p_pos));
+ ERR_FAIL_COND_V_MSG(p_chars < 0, "", vformat("Invalid character count for `String.erase()`: %d. Character count must be positive or zero.", p_chars));
+ return left(p_pos) + substr(p_pos + p_chars);
+}
+
String String::substr(int p_from, int p_chars) const {
if (p_chars == -1) {
p_chars = length() - p_from;
@@ -3524,6 +3592,14 @@ String String::replacen(const String &p_key, const String &p_with) const {
String String::repeat(int p_count) const {
ERR_FAIL_COND_V_MSG(p_count < 0, "", "Parameter count should be a positive number.");
+ if (p_count == 0) {
+ return "";
+ }
+
+ if (p_count == 1) {
+ return *this;
+ }
+
int len = length();
String new_string = *this;
new_string.resize(p_count * len + 1);
@@ -4161,13 +4237,11 @@ String String::pad_decimals(int p_digits) const {
}
if (s.length() - (c + 1) > p_digits) {
- s = s.substr(0, c + p_digits + 1);
+ return s.substr(0, c + p_digits + 1);
} else {
- while (s.length() - (c + 1) < p_digits) {
- s += "0";
- }
+ int zeros_to_add = p_digits - s.length() + (c + 1);
+ return s + String("0").repeat(zeros_to_add);
}
- return s;
}
String String::pad_zeros(int p_digits) const {
@@ -4192,12 +4266,8 @@ String String::pad_zeros(int p_digits) const {
return s;
}
- while (end - begin < p_digits) {
- s = s.insert(begin, "0");
- end++;
- }
-
- return s;
+ int zeros_to_add = p_digits - (end - begin);
+ return s.insert(begin, String("0").repeat(zeros_to_add));
}
String String::trim_prefix(const String &p_prefix) const {
@@ -4376,11 +4446,8 @@ String String::path_to(const String &p_path) const {
common_parent--;
- String dir;
-
- for (int i = src_dirs.size() - 1; i > common_parent; i--) {
- dir += "../";
- }
+ int dirs_to_backtrack = (src_dirs.size() - 1) - common_parent;
+ String dir = String("../").repeat(dirs_to_backtrack);
for (int i = common_parent + 1; i < dst_dirs.size(); i++) {
dir += dst_dirs[i] + "/";
@@ -4669,11 +4736,8 @@ String String::rpad(int min_length, const String &character) const {
String s = *this;
int padding = min_length - s.length();
if (padding > 0) {
- for (int i = 0; i < padding; i++) {
- s = s + character;
- }
+ s += character.repeat(padding);
}
-
return s;
}
@@ -4682,11 +4746,8 @@ String String::lpad(int min_length, const String &character) const {
String s = *this;
int padding = min_length - s.length();
if (padding > 0) {
- for (int i = 0; i < padding; i++) {
- s = character + s;
- }
+ s = character.repeat(padding) + s;
}
-
return s;
}