godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #100294 from Ivorforce/count-no-realloc 

Optimize `String.count` and `String.countn` by avoiding repeated reallocations.
This commit is contained in:
Rémi Verschelde 2024-12-12 14:10:17 +01:00
parent 4cf1b0d94c ef3eecd34e
commit 321bd35317
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/string/ustring.cpp
View File

@ -3735,14 +3735,12 @@ int String::_count(const String &p_string, int p_from, int p_to, bool p_case_ins
return 0;
}
int c = 0;
int idx = -1;
do {
idx = p_case_insensitive ? str.findn(p_string) : str.find(p_string);
if (idx != -1) {
str = str.substr(idx + slen, str.length() - slen);
++c;
}
} while (idx != -1);
int idx = 0;
while ((idx = p_case_insensitive ? str.findn(p_string, idx) : str.find(p_string, idx)) != -1) {
// Skip the occurrence itself.
idx += slen;
++c;
}
return c;
}
@ -3774,14 +3772,12 @@ int String::_count(const char *p_string, int p_from, int p_to, bool p_case_insen
return 0;
}
int c = 0;
int idx = -1;
do {
idx = p_case_insensitive ? str.findn(p_string) : str.find(p_string);
if (idx != -1) {
str = str.substr(idx + substring_length, str.length() - substring_length);
++c;
}
} while (idx != -1);
int idx = 0;
while ((idx = p_case_insensitive ? str.findn(p_string, idx) : str.find(p_string, idx)) != -1) {
// Skip the occurrence itself.
idx += substring_length;
++c;
}
return c;
}