godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reworked ustring.rsplit to fix behaviour. 

Previous problems include failure to remove the splitter from the last
element found and a possible infinite loop dealing with multi-character
splitter strings.
This commit is contained in:
Ibrahn Sahir 2018-07-17 19:45:29 +01:00
parent f1970e15b9
commit 8ff52c5923
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/ustring.cpp
View File

@ -757,36 +757,32 @@ Vector<String> String::rsplit(const String &p_splitter, bool p_allow_empty, int
Vector<String> ret; Vector<String> ret;
const int len = length(); const int len = length();
int from = len; int remaining_len = len;
while (true) { while (true) {
int end = rfind(p_splitter, from); if (remaining_len < p_splitter.length() || (p_maxsplit > 0 && p_maxsplit == ret.size())) {
if (end < 0) // no room for another splitter or hit max splits, push what's left and we're done
end = 0; if (p_allow_empty || remaining_len > 0) {
ret.push_back(substr(0, remaining_len));
if (p_allow_empty || (end < from)) {
const String str = substr(end > 0 ? end + p_splitter.length() : end, end > 0 ? from - end : from + 2);
if (p_maxsplit <= 0) {
ret.push_back(str);
} else if (p_maxsplit > 0) {
// Put rest of the string and leave cycle.
if (p_maxsplit == ret.size()) {
ret.push_back(substr(0, from + 2));
break;
}
// Otherwise, push items until positive limit is reached.
ret.push_back(str);
} }
break;
} }
if (end == 0) int left_edge = rfind(p_splitter, remaining_len - p_splitter.length());
break;
from = end - p_splitter.length(); if (left_edge < 0) {
// no more splitters, we're done
ret.push_back(substr(0, remaining_len));
break;
}
int substr_start = left_edge + p_splitter.length();
if (p_allow_empty || substr_start < remaining_len) {
ret.push_back(substr(substr_start, remaining_len - substr_start));
}
remaining_len = left_edge;
} }
ret.invert(); ret.invert();