Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve the UTF8 Find and RFind function

Browse Source 
Fix a bad behavior in RFind when pos is greater than the string's size
This commit is contained in:
Victor Levasseur
2015-05-09 11:24:11 +02:00
parent 543210b32a
commit fc2191bfe1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Core/GDCore/Utf8Tools.cpp
View File

@@ -161,7 +161,7 @@ std::size_t GD_CORE_API Find( const std::string &utf8str, const std::string &sea
}
catch(const std::exception &exc)
{
return -1;
return std::string::npos;
}
//Search using the standard method
@@ -182,9 +182,10 @@ std::size_t GD_CORE_API RFind( const std::string &utf8str, const std::string &se
::utf8::advance(it, pos + 1, utf8str.end()); //We need to get to the next character (because it will be included in the search)
--it; //Make it pointing to the end of the previous codepoint (that's why we needed the character next to "pos")
}
catch(const std::exception &exc)
catch(const ::utf8::not_enough_room &exc)
{
return -1;
//If the position is after the end of the string, we need to search the whole string
it = utf8str.end();
}
//Search using the standard method