WebSVN – spk – Diff – /libspk/src/Utils/String.cpp

 	return atoi(this->c_str()) ? true : false;
+}
 long SString::toLong() const
+{
 	return static_cast<long>(atoi(this->c_str()));
+}
+long long SString::toLong64() const
+{
+	return static_cast<long long>(atoll(this->c_str()));
+}
 int SString::toInt() const
+{
 	return static_cast<int>(atoi(this->c_str()));
+}
 	return atof(this->c_str());
+}
 float SString::toFloat() const
+{
 	return (float)atof(this->c_str());
 }
 const Utils::WString SString::toWString() const
+{
 	return s2ws(*this);
+}
+const long long SString::lengthLL() const
+{
+	return static_cast<long long>(this->length());
+}
 const SString &SString::operator= ( const char *str )				{ this->assign(str); return (*this); }
 const SString &SString::operator= ( const unsigned char *str )		{ this->assign((const char *)str); return (*this); }
 const SString &SString::operator= ( const SString &str )			{ this->assign((std::string &)str); return (*this); }
 const SString &SString::operator= ( const std::string &str )		{ this->assign(str); return (*this); }
 const SString &SString::operator= ( long l )						{ this->fromLong(l); return (*this); }
 const SString &SString::operator= ( unsigned long l )				{ this->fromLong(l); return (*this); }
 const SString &SString::operator= ( float f )						{ this->fromFloat(f); return (*this); }
 const SString &SString::operator= ( double f )						{ this->fromDouble(f); return (*this); }
-const unsigned char SString::operator[] ( int num ) const			{ return this->at(num); }
+const unsigned char SString::operator[] (size_t num ) const			{ return this->at(num); }
-unsigned char &SString::operator[] ( int num )						{ return (unsigned char &)this->at(num); }
+unsigned char &SString::operator[] (size_t num )						{ return (unsigned char &)this->at(num); }
 const SString &SString::operator+= ( const char *str )				{ this->append(str); return (*this); }
 const SString &SString::operator+= ( const unsigned char *str ) 	{ this->append((const char *)str); return (*this); }
 const SString &SString::operator+= ( const std::string &str )		{ this->append(str); return (*this); }
 const SString &SString::operator+= ( const SString &str )			{ this->append(str); return (*this); }
 		// skip past token
 		size_t i = 0;
 		size_t max = strlen(token);
 		lastPos = pos;
 		while ( (i < max) && (token[i] == this->at(lastPos)) )
 		{
 			++i;
 			++lastPos;
 		}
 		// get the next token
 		pos = _token_nextPos(token, lastPos);
 	}
 	return newstr;
+}
 SString SString::remToken(const char* token, int from) const
+{
 	Utils::SString newstr = *this;
 	Utils::SString::size_type pos = newstr.find(find, 0);
 	while ( pos < Utils::SString::npos ) {
 		newstr.replace(pos, find.length(), replace);
 		pos = newstr.find(find, pos + replace.length());
 	}
 	return newstr;
+}
 SString SString::findRemove(const SString &find) const
 bool SString::isin(const SString &str, bool bCaseSensative) const
+{
 	return contains(str, bCaseSensative);
+}
-int SString::findPos(const SString &find, int iStartPos) const
+long long SString::findPos(const SString &find, size_t iStartPos) const
+{
 	Utils::SString::size_type pos = this->find(find, iStartPos);
 	if ( pos == Utils::SString::npos ) return -1;
-	return pos;
+	return static_cast<long long>(pos);
+}
 bool SString::isin(char c, bool bCaseSensative) const
+{
 	return contains(c, bCaseSensative);
 	return f;
+}
 SString SString::between(const SString &before, const SString &after) const
+{
-	int pos = this->findPos(before);
+	long long lPos = this->findPos(before);
-	if ( pos >= 0 ) {
+	if (lPos >= 0)
+	{
+		size_t pos = static_cast<size_t>(lPos);
 		pos += before.length();
-		int end = this->findPos(after, pos);
+		long long end = this->findPos(after, pos);
-		if ( end >= 0 )	return this->substr(pos, end - pos);
+		if ( end >= 0 )	return this->substr(pos, static_cast<size_t>(end) - pos);
+	}
 	return "";
 }
-SString SString::mid(int start, int end) const
+SString SString::mid(long long start, long long end) const
 {
 	if (end <= 0)
 		end = this->length() + end;
 	return this->substr(start, end - start);
 }
-SString SString::left(long num) const
+SString SString::left(long long num) const
 {
+	const long long len = this->lengthLL();
 	if ( num < 0 )
-		num = (long)this->length() + num;
+		num = len + num;
-	if ( num > (long)this->length() )
+	if ( num > len )
-		num = (long)this->length();
+		num = len;
 	return this->substr(0, num);
+}
-SString SString::right(int num) const
+SString SString::right(long long num) const
+{
-	if ( num > 0 ) num -= (int)this->length();
+	const long long len = this->lengthLL();
+	if ( num > 0 ) num -= len;
-	if ( num < -(int)this->length() ) num = -(int)this->length();
+	if ( num < -len ) num = -len;
 	return this->substr(-num);
+}
 const SString &SString::readToEndOfLine(FILE *id, int *line, bool upper)
 	// remove any rc/beta version
 	int beta1 = 0;
 	int beta2 = 0;
-	int len = 2;
+	long long len = 2;
-	int pos = thisStr.findPos("rc", 0);
+	long long pos = thisStr.findPos("rc", 0);
 	if ( pos == -1 ) { pos = thisStr.findPos("beta", 0); len = 4; }
 //		if ( pos == -1 ) { pos = thisStr.findPos("²", 0); len = 1; }
 	if ( pos != -1 ) {
 		beta1 = -(long)thisStr.right(-(pos + len)).remove(' ');
 		thisStr = thisStr.left(pos).removeEndSpace();

Subversion Repositories spk

(root)/libspk/src/Utils/String.cpp – Rev 196 → 284