godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56630 from Pineapple/replace-find-last

Browse Source
This commit is contained in:
Rémi Verschelde
2022-01-18 16:36:52 +01:00
committed by GitHub
parent 11a3fabc92 22750b1c03
commit c938104a88
18 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/ustring.cpp
View File

@@ -2443,15 +2443,7 @@ String String::substr(int p_from, int p_chars) const {
}
int String::find_last(const String &p_str) const {
int pos = -1;
int findfrom = 0;
int findres = -1;
while ((findres = find(p_str, findfrom)) != -1) {
pos = findres;
findfrom = pos + 1;
}
return pos;
return rfind(p_str);
}
int String::find(const String &p_str, int p_from) const {
@@ -4062,7 +4054,7 @@ String String::get_base_dir() const {
}
String String::get_file() const {
int sep = MAX(find_last("/"), find_last("\\"));
int sep = MAX(rfind("/"), rfind("\\"));
if (sep == -1) {
return *this;
}
@@ -4071,8 +4063,8 @@ String String::get_file() const {
}
String String::get_extension() const {
int pos = find_last(".");
if (pos < 0 || pos < MAX(find_last("/"), find_last("\\"))) {
int pos = rfind(".");
if (pos < 0 || pos < MAX(rfind("/"), rfind("\\"))) {
return "";
}
@@ -4171,8 +4163,8 @@ String String::validate_node_name() const {
}
String String::get_basename() const {
int pos = find_last(".");
if (pos < 0 || pos < MAX(find_last("/"), find_last("\\"))) {
int pos = rfind(".");
if (pos < 0 || pos < MAX(rfind("/"), rfind("\\"))) {
return *this;
}