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

 		pos = _token_nextPos(token, lastPos);
+	}
 	return newstr;
+}
+String String::remToken(const char *token, int from) const
+{
+	std::string newstr;
+	int whichtok = 1;
+	std::string::size_type lastPos = 0;
+	std::string::size_type pos     = _token_nextPos(token, 0);
+	while (std::string::npos != pos || std::string::npos != lastPos)
+	{
+		if ( whichtok != from )
+		{
+			if ( newstr != "" ) newstr = newstr + token;
+			newstr = newstr + this->substr(lastPos, pos - lastPos);
+		}
+		// Found a token, add it to the vector.
+		whichtok++;
+		if ( pos >= this->length() )
+			break;
+		// 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;
+}
+String String::word(int word) const
+{
+	return this->token(" ", word);
+}
+String String::words(int from, int to) const
+{
+	return this->tokens(" ", from, to);
+}
 int String::countToken(const char *token) const
+{
 	if ( this->empty() )
 		return 0;
 			return true;
+	}
 	return false;
+}
+int String::findPos(const String &find, int iStartPos) const
+{
+	std::string::size_type pos = this->find(find, iStartPos);
+	if ( pos == std::string::npos ) return -1;
+	return pos;
+}
 bool String::isin(char c, bool bCaseSensative) const
+{
 	bool f = false;
 	for ( unsigned int i = 0; i < this->length(); i++ )
+	{
 		bool bCheck = (bCaseSensative) ? (this->at(i) == c) : (tolower(this->at(i)) == tolower(c));
 			f = true;
 			break;
+		}
+	}
 	return f;
 }
+String String::mid(int start, int end) const
+{
+	return this->substr(start, end - start);
+}
 String String::left(long num) const
+{
 	if ( num < 0 )
 		num = (long)this->length() + num;
 	if ( num > (long)this->length() )
+{
 	if ( num > 0 ) num -= (int)this->length();
 	if ( num < -(int)this->length() ) num = -(int)this->length();
 	return this->substr(-num);
+}
+const String &String::readToEndOfLine(FILE *id, int *line, bool upper)
+{
+	(*this) == "";
+	char c = fgetc ( id );
+	if ( c == -1 )
+		return (*this);
+	while ( (c != 13) && (!feof(id)) && (c != '\n') )
+	{
+		(*this) += c;
+		c = fgetc ( id );
+	}
+	if ( line )
+		++(*line);
+//	if ( upper )
+	//	ToUpper ();
+	return (*this);
+}
 char *String::readToEndOfLine(char *data)
+{
 	return (char *)this->readToEndOfLine((unsigned char *)data);
 			if ( newstr != "" ) newstr = newstr + token;
 			newstr = newstr + this->substr(lastPos, pos - lastPos);
+		}
 		// Found a token, add it to the vector.
 		whichtok++;
 		if ( pos >= this->length() )
 			break;
 		// skip past token
 		size_t i = 0;
 		size_t max = strlen(token);
 		lastPos = pos;
 		while ( (i < max) && (token[i] == this->at(lastPos)) )
+		{
 			++i;
 			++lastPos;
+		}
+	}
 	return newstr;
+}
-const String &String::remove(char c)
+const String &String::removeChar(char c)
+{
 	std::string::size_type pos = this->find_first_of(c, 0);
 	while(pos != std::string::npos) {
 		this->erase(pos, 1);
 		pos = this->find_first_of(c, 0);
+	}
 	return (*this);
+}
-String String::removeChar(char c) const
+String String::remove(char c) const
+{
 	String newStr = *this;
 	std::string::size_type pos = newStr.find_first_of(c, 0);
 	while(pos != std::string::npos) {
 	return true;
+}
 const String &String::removeFirstSpace()
+{
-	std::string::size_type pos = this->find_first_not_of(" ", 0);
+	std::string::size_type pos = this->find_first_not_of(" \t\f\v\n\r", 0);
 	if ( pos != std::string::npos ) {
 		this->erase(0, pos);
+	}
+	return (*this);
+}
+const String &String::removeEndSpace()
+{
+	std::string::size_type pos = this->find_last_not_of(" \t\f\v\n\r");
+	if ( pos != std::string::npos ) {
+		this->erase(pos + 1);
+	}
 	return (*this);
+}
 const String &String::truncate(int iNum)

Subversion Repositories spk

(root)//libspk/src/Utils/String.cpp – Rev 34 → 39