libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA: Moving many string methods from Std::String to Common::String

Browse Source
This commit is contained in:
Paul Gilbert 2020-01-28 19:54:32 -08:00 committed by Paul Gilbert
parent b338b8993d
commit a178952464
5 changed files with 147 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
common/str.cpp
View File

@ -434,6 +434,8 @@ void String::deleteChar(uint32 p) {
}
void String::erase(uint32 p, uint32 len) {
if (p == npos)
return;
assert(p < _size);
makeUnique();
@ -452,6 +454,11 @@ void String::erase(uint32 p, uint32 len) {
_size -= len;
}
String::iterator String::erase(iterator it) {
this->deleteChar(it - _str);
return it;
}
void String::clear() {
decRefCount(_extern._refCount);
@ -695,6 +702,95 @@ String String::vformat(const char *fmt, va_list args) {
}
size_t String::find(char c, size_t pos) const {
const char *p = strchr(_str + pos, c);
return p ? p - _str : npos;
}
size_t String::find(const char *s) const {
const char *str = strstr(_str, s);
return str ? str - _str : npos;
}
size_t String::rfind(const char *s) const {
int sLen = strlen(s);
for (int idx = (int)_size - sLen; idx >= 0; --idx) {
if (!strncmp(_str + idx, s, sLen))
return idx;
}
return npos;
}
size_t String::rfind(char c, size_t pos) const {
for (int idx = MIN((int)_size - 1, (int)pos); idx >= 0; --idx) {
if ((*this)[idx] == c)
return idx;
}
return npos;
}
size_t String::find_first_of(char c, size_t pos) const {
const char *strP = (pos >= _size) ? 0 : strchr(_str + pos, c);
return strP ? strP - _str : npos;
}
size_t String::find_first_of(const char *chars, size_t pos) const {
for (uint idx = pos; idx < _size; ++idx) {
if (strchr(chars, (*this)[idx]))
return idx;
}
return npos;
}
size_t String::find_first_not_of(char c, size_t pos) const {
for (uint idx = pos; idx < _size; ++idx) {
if ((*this)[idx] != c)
return idx;
}
return npos;
}
size_t String::find_first_not_of(const char *chars, size_t pos) const {
for (uint idx = pos; idx < _size; ++idx) {
if (!strchr(chars, (*this)[idx]))
return idx;
}
return npos;
}
size_t String::find_last_not_of(char c) const {
for (int idx = (int)_size - 1; idx >= 0; --idx) {
if ((*this)[idx] != c)
return c;
}
return npos;
}
size_t String::find_last_not_of(const char *chars) const {
for (int idx = (int)_size - 1; idx >= 0; --idx) {
if (!strchr(chars, (*this)[idx]))
return idx;
}
return npos;
}
String String::substr(size_t pos, size_t len) const {
if (pos >= _size)
return String();
else if (len == npos)
return String(_str + pos);
else
return String(_str + pos, MIN(_size - pos, len));
}
#pragma mark -
bool String::operator==(const String &x) const {

51
common/str.h
View File

@ -171,8 +171,6 @@ public:
bool contains(const char *x) const;
bool contains(char x) const;
uint32 find(const String &str, uint32 pos = 0) const;
/** Return uint64 corrensponding to String's contents. */
uint64 asUint64() const;
@ -226,6 +224,9 @@ public:
/** Remove all characters from position p to the p + len. If len = String::npos, removes all characters to the end */
void erase(uint32 p, uint32 len = npos);
/** Erases the character at the given iterator location */
iterator erase(iterator it);
/** Set character c at position p, replacing the previous character there. */
void setChar(char c, uint32 p);
@ -306,6 +307,52 @@ public:
*/
static String vformat(const char *fmt, va_list args);
/** Finds the index of a character in the string */
size_t find(char c, size_t pos = 0) const;
/** Does a find for the passed string */
size_t find(const char *s) const;
uint32 find(const String &str, uint32 pos = 0) const;
/** Does a reverse find for the passed string */
size_t rfind(const char *s) const;
size_t rfind(const String &s) const {
return rfind(s.c_str());
}
/** Does a reverse find for a passed character */
size_t rfind(char c, size_t pos = npos) const;
/** Find first character in the string matching the passed character */
size_t find_first_of(char c, size_t pos = 0) const;
/** Find first character in the string that's any character of the passed string */
size_t find_first_of(const char *chars, size_t pos = 0) const;
size_t find_first_of(const String &chars, size_t pos = 0) const {
return find_first_of(chars.c_str(), pos);
}
/** Find first character in the string that's not the specified character */
size_t find_first_not_of(char c, size_t pos = 0) const;
/** Find first character in the string that's not any character of the passed string */
size_t find_first_not_of(const char *chars, size_t pos = 0) const;
size_t find_first_not_of(const String &chars, size_t pos = 0) const {
return find_first_not_of(chars.c_str(), pos);
}
/** Find the last character in the string that's not the specified character */
size_t find_last_not_of(char c) const;
/** Find the last character in the string that's not in any of the passed characters */
size_t find_last_not_of(const char *chars) const;
size_t find_last_not_of(const String &chars) const {
return find_last_not_of(chars.c_str());
}
/** Return a substring of this string */
String substr(size_t pos = 0, size_t len = npos) const;
public:
iterator begin() {

105
engines/ultima/shared/std/string.cpp
View File

@ -34,111 +34,6 @@ string::string(size_t n, char c) : Common::String() {
(*this) += c;
}
size_t string::find(char c, size_t pos) const {
const char *p = strchr(_str + pos, c);
return p ? p - _str : npos;
}
size_t string::find(const char *s) const {
const char *str = strstr(_str, s);
return str ? str - _str : npos;
}
size_t string::rfind(const char *s) const {
int sLen = strlen(s);
for (int idx = (int)_size - sLen; idx >= 0; --idx) {
if (!strncmp(_str + idx, s, sLen))
return idx;
}
return npos;
}
size_t string::rfind(char c, size_t pos) const {
for (int idx = MIN((int)_size - 1, (int)pos); idx >= 0; --idx) {
if ((*this)[idx] == c)
return idx;
}
return npos;
}
size_t string::find_first_of(char c, size_t pos) const {
const char *strP = (pos >= _size) ? 0 : strchr(_str + pos, c);
return strP ? strP - _str : npos;
}
size_t string::find_first_of(const char *chars, size_t pos) const {
for (uint idx = pos; idx < _size; ++idx) {
if (strchr(chars, (*this)[idx]))
return idx;
}
return npos;
}
size_t string::find_first_not_of(char c, size_t pos) const {
for (uint idx = pos; idx < _size; ++idx) {
if ((*this)[idx] != c)
return idx;
}
return npos;
}
size_t string::find_first_not_of(const char *chars, size_t pos) const {
for (uint idx = pos; idx < _size; ++idx) {
if (!strchr(chars, (*this)[idx]))
return idx;
}
return npos;
}
size_t string::find_last_not_of(char c) const {
for (int idx = (int)_size - 1; idx >= 0; --idx) {
if ((*this)[idx] != c)
return c;
}
return npos;
}
size_t string::find_last_not_of(const char *chars) const {
for (int idx = (int)_size - 1; idx >= 0; --idx) {
if (!strchr(chars, (*this)[idx]))
return idx;
}
return npos;
}
string string::substr(size_t pos, size_t len) const {
if (pos >= _size)
return string();
else if (len == npos)
return string(_str + pos);
else
return string(_str + pos, MIN(_size - pos, len));
}
string &string::erase(size_t pos, size_t len) {
if (pos < _size) {
if (len == npos || (pos + len) >= _size)
*this = string(_str, _str + pos);
else
*this = string(_str, _str + pos) + string(_str + pos + len);
}
return *this;
}
string::iterator string::erase(iterator it) {
this->deleteChar(it - _str);
return it;
}
void string::resize(size_t count) {
if (count == 0)
clear();

76
engines/ultima/shared/std/string.h
View File

@ -112,82 +112,6 @@ public:
return compareTo(s);
}
/**
* Finds the index of a character in the string
*/
size_t find(char c, size_t pos = 0) const;
/**
* Does a find for the passed string
*/
size_t find(const char *s) const;
size_t find(const string &s) const { return find(s.c_str()); }
/**
* Does a reverse find for the passed string
*/
size_t rfind(const char *s) const;
size_t rfind(const string &s) const { return rfind(s.c_str()); }
/**
* Does a reverse find for a passed character
*/
size_t rfind(char c, size_t pos = npos) const;
/**
* Find first character in the string matching the passed character
*/
size_t find_first_of(char c, size_t pos = 0) const;
/**
* Find first character in the string that's any character of the passed string
*/
size_t find_first_of(const char *chars, size_t pos = 0) const;
size_t find_first_of(const string &chars, size_t pos = 0) const {
return find_first_of(chars.c_str(), pos);
}
/**
* Find first character in the string that's not the specified character
*/
size_t find_first_not_of(char c, size_t pos = 0) const;
/**
* Find first character in the string that's not any character of the passed string
*/
size_t find_first_not_of(const char *chars, size_t pos = 0) const;
size_t find_first_not_of(const string &chars, size_t pos = 0) const {
return find_first_not_of(chars.c_str(), pos);
}
/**
* Find the last character in the string that's not the specified character
*/
size_t find_last_not_of(char c) const;
/**
* Find the last character in the string that's not in any of the passed characters
*/
size_t find_last_not_of(const char *chars) const;
size_t find_last_not_of(const string &chars) const {
return find_last_not_of(chars.c_str());
}
/**
* Return a substring of this string
*/
string substr(size_t pos = 0, size_t len = npos) const;
/**
* Erases len number of characters from pos
*/
string &erase(size_t pos = 0, size_t len = npos);
/**
* Erases len number of characters from pos
*/
iterator erase(iterator it);
/**
* Resizes a string
*/

3
engines/ultima/ultima8/filesys/idata_source.h
View File

@ -25,6 +25,7 @@
#include "common/file.h"
#include "ultima/shared/std/misc.h"
#include "ultima/shared/std/string.h"
namespace Ultima {
namespace Ultima8 {
@ -91,7 +92,7 @@ public:
}
void readline(Std::string &str) {
str.erase();
str.clear();
while (!eof()) {
char character = static_cast<char>(read1());