OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Merge pull request #320 from zrax/negative_substring

Browse Source 
Support negative substring indexes
This commit is contained in:
Branan Purvine-Riley
2013-03-14 20:13:23 -07:00
parent 1789e9c9d9 dde3be140c
commit 2715a2169c
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/Plasma/CoreLib/plString.cpp
View File

@ -545,7 +545,7 @@ plString plString::Format(const char *fmt, ...)
return str; return str;
} }
int plString::Find(char ch, CaseSensitivity sense) const ssize_t plString::Find(char ch, CaseSensitivity sense) const
{ {
if (sense == kCaseSensitive) { if (sense == kCaseSensitive) {
const char *cp = strchr(c_str(), ch); const char *cp = strchr(c_str(), ch);
@ -561,7 +561,7 @@ int plString::Find(char ch, CaseSensitivity sense) const
} }
} }
int plString::FindLast(char ch, CaseSensitivity sense) const ssize_t plString::FindLast(char ch, CaseSensitivity sense) const
{ {
if (IsEmpty()) if (IsEmpty())
return -1; return -1;
@ -581,7 +581,7 @@ int plString::FindLast(char ch, CaseSensitivity sense) const
} }
} }
int plString::Find(const char *str, CaseSensitivity sense) const ssize_t plString::Find(const char *str, CaseSensitivity sense) const
{ {
if (!str || !str[0]) if (!str || !str[0])
return -1; return -1;
@ -718,14 +718,18 @@ plString plString::Trim(const char *charset) const
return Substr(lp - c_str(), rp - lp + 1); return Substr(lp - c_str(), rp - lp + 1);
} }
plString plString::Substr(int start, size_t size) const plString plString::Substr(ssize_t start, size_t size) const
{ {
size_t maxSize = GetSize(); size_t maxSize = GetSize();
if (start > maxSize) if (start < 0) {
return Null; // Handle negative indexes from the right of the string
start += maxSize;
if (start < 0) if (start < 0)
start = 0; start = 0;
} else if (static_cast<size_t>(start) > maxSize) {
return Null;
}
if (start + size > maxSize) if (start + size > maxSize)
size = maxSize - start; size = maxSize - start;

19
Sources/Plasma/CoreLib/plString.h
View File

@ -71,6 +71,15 @@ typedef unsigned int UniChar;
# define strlwr hsStrLower # define strlwr hsStrLower
#endif #endif
// ssize_t doesn't exist in MSVC2010
#if _MSC_VER
# ifdef _WIN64
typedef __int64 ssize_t;
# else
typedef int ssize_t;
# endif
#endif
/** Ref-counted string data buffer. /** Ref-counted string data buffer.
* This is used to store actual string data in any (unchecked) encoding format, * This is used to store actual string data in any (unchecked) encoding format,
* including both the internal UTF-8 data of plString itself as well as the * including both the internal UTF-8 data of plString itself as well as the
@ -488,22 +497,22 @@ public:
/** Find the index of the first instance of \a ch in this string. /** Find the index of the first instance of \a ch in this string.
* \return -1 if the character was not found. * \return -1 if the character was not found.
*/ */
int Find(char ch, CaseSensitivity sense = kCaseSensitive) const; ssize_t Find(char ch, CaseSensitivity sense = kCaseSensitive) const;
/** Find the index of the last instance of \a ch in this string. /** Find the index of the last instance of \a ch in this string.
* \return -1 if the character was not found. * \return -1 if the character was not found.
*/ */
int FindLast(char ch, CaseSensitivity sense = kCaseSensitive) const; ssize_t FindLast(char ch, CaseSensitivity sense = kCaseSensitive) const;
/** Find the index of the first instance of \a str in this string. /** Find the index of the first instance of \a str in this string.
* \return -1 if the substring was not found. * \return -1 if the substring was not found.
*/ */
int Find(const char *str, CaseSensitivity sense = kCaseSensitive) const; ssize_t Find(const char *str, CaseSensitivity sense = kCaseSensitive) const;
/** Find the index of the first instance of \a str in this string. /** Find the index of the first instance of \a str in this string.
* \return -1 if the substring was not found. * \return -1 if the substring was not found.
*/ */
int Find(const plString &str, CaseSensitivity sense = kCaseSensitive) const ssize_t Find(const plString &str, CaseSensitivity sense = kCaseSensitive) const
{ return Find(str.c_str(), sense); } { return Find(str.c_str(), sense); }
/** Check that this string matches the specified regular expression. /** Check that this string matches the specified regular expression.
@ -541,7 +550,7 @@ public:
* number of characters left in the string after \a start, Substr will * number of characters left in the string after \a start, Substr will
* return the remainder of the string. * return the remainder of the string.
*/ */
plString Substr(int start, size_t size = kSizeAuto) const; plString Substr(ssize_t start, size_t size = kSizeAuto) const;
/** Return a substring containing at most \a size characters from the left /** Return a substring containing at most \a size characters from the left
* of the string. Equivalent to Substr(0, size). * of the string. Equivalent to Substr(0, size).