godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Optimize String.count and String.countn by avoiding repeated reallocations.

Browse Source
This commit is contained in:
Lukas Tenbrink
2024-12-12 00:28:13 +01:00
parent a40fc2354a
commit ef3eecd34e
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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; return 0;
} }
int c = 0; int c = 0;
int idx = -1; int idx = 0;
do { while ((idx = p_case_insensitive ? str.findn(p_string, idx) : str.find(p_string, idx)) != -1) {
idx = p_case_insensitive ? str.findn(p_string) : str.find(p_string); // Skip the occurrence itself.
if (idx != -1) { idx += slen;
str = str.substr(idx + slen, str.length() - slen);
++c; ++c;
} }
} while (idx != -1);
return 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; return 0;
} }
int c = 0; int c = 0;
int idx = -1; int idx = 0;
do { while ((idx = p_case_insensitive ? str.findn(p_string, idx) : str.find(p_string, idx)) != -1) {
idx = p_case_insensitive ? str.findn(p_string) : str.find(p_string); // Skip the occurrence itself.
if (idx != -1) { idx += substring_length;
str = str.substr(idx + substring_length, str.length() - substring_length);
++c; ++c;
} }
} while (idx != -1);
return c; return c;
} }