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

 	if (bCaseSensative) return (this->find(str, 0) == Utils::String::npos) ? false : true;
 	String thisLower = this->lower();
 	String strLower = str.lower();
 	return (thisLower.find(strLower, 0) == Utils::String::npos) ? false : true;
+}
+bool String::containsAny(const String &str, bool bCaseSensative) const
+{
+	char *c = (char *)str.c_str();
+	while (*c != 0)
+	{
+		char c1 = *c;
+		if (contains(c1))
+			return true;
+		c++;
+	}
+	return false;
+}
 bool String::isin(const String &str, bool bCaseSensative) const
+{
 	return contains(str, bCaseSensative);
+}
 			f = true;
 			break;
+		}
+	}
 	return f;
 }
 String String::between(const String &before, const String &after) const
+{
 	int pos = this->findPos(before);
 	if ( pos >= 0 ) {
 	return "";
+}
 String String::mid(int start, int end) const
 {
 	return this->substr(start, end - start);
+}
 String String::left(long num) const
+{
 	if ( num < 0 )
 	return this->substr(0, num);
+}
 String String::right(int num) const
 {
 	if ( num > 0 ) num -= (int)this->length();
 	if ( num < -(int)this->length() ) num = -(int)this->length();
 	return this->substr(-num);
+}
 String *String::tokenise(const char *token, int *max) const
+{
 	if ( empty() ) {
 		*max = 0;
 		return NULL;
 	}
 	*max = this->countToken(token);
 	if ( (*max) <= 0 ) {
 		*max = 0;
 		return NULL;
 	}
 	String *newstr = (*max == 1) ? new String : new String[*max];
 	int whichtok = 0;
 	// get first token
 	Utils::String::size_type lastPos = 0;
 	Utils::String::size_type pos     = this->_token_nextPos(token, 0);
 		// get the next token
 		pos = _token_nextPos(token, lastPos);
+	}
 	return newstr;
 }
 const String &String::removeChar(const char *cs)
+{
 	char *current = const_cast<char *>(cs);
 	while ( current[0] != '\0' ) {
 	return (*this);
+}
 const String &String::removeChar(char c)
 {
 	Utils::String::size_type pos = this->find_first_of(c, 0);
 	while(pos != Utils::String::npos) {
 		this->erase(pos, 1);
 		pos = this->find_first_of(c, 0);
 	}
 	return (*this);
 }
 String String::remove(char c) const
+{
 	String newStr = *this;
 		newStr.erase(pos, 1);
 		pos = newStr.find_first_of(c, 0);
+	}
 	return newStr;
 }
 bool String::_isCharNumber(char c) const
+{
 	return (c >= '0' && c <= '9') ? true : false;
+}
 bool String::isCharNumber(int c) const
 {
 	return _isCharNumber(this->at(c));
+}
 bool String::isNumber(bool integer) const
+{
 	else
 		this->clear();
 	return (*this);
+}
 const String &String::removeEndSpace()
 {
 	Utils::String::size_type pos = this->find_last_not_of(" \t\f\v\n\r");
 	if ( pos != Utils::String::npos ) {
 		this->erase(pos + 1);
+	}
 	else
 				else
 					return COMPARE_NEWER;
+			}
 			// failsale, we should never get here
 			return COMPARE_SAME;
 		}
 		// one has more sections, most likly its the newer ones, ie, 1.00 v 1.00.1, 1.00.1 will be newer
 		if ( sNum1.empty() )
 			return COMPARE_NEWER;
 		else if ( sNum2.empty() )
+		{
 			while ( sNum1.length() < sNum2.length() )
 				sNum1 += "0";
 			while ( sNum2.length() < sNum1.length() )
 				sNum2 += "0";
 		}
 		// check the values of the current section
 		int iNum1 = sNum1;
 		int iNum2 = sNum2;
 		if ( iNum1 > iNum2 )
 		// now compare the "letter" version, only test if one has a letter
 		if ( cNum1 || cNum2 )
+		{
 			if ( !cNum1 )
 				return COMPARE_NEWER;
 			if ( !cNum2 )
 				return COMPARE_OLDER;
 			if ( cNum2 > cNum1 )
 				return COMPARE_NEWER;
 		// move to the next section
 		++section;
+	}
 	return COMPARE_SAME;
+}
+bool String::match(const Utils::String &pattern) const
+{
+	enum State {
+		Exact,      // exact match
+		Any,		// ?
+		AnyRepeat   // *
+	};
+	const char *s = this->c_str();
+	const char *p = pattern.c_str();
+	const char *q = 0;
+	int state = 0;
+	bool match = true;
+	while (match && *p) {
+		if (*p == '*') {
+			state = AnyRepeat;
+			q = p + 1;
+		}
+		else if (*p == '?') state = Any;
+		else state = Exact;
+		if (*s == 0) break;
+		switch (state) {
+		case Exact:
+			match = *s == *p;
+			s++;
+			p++;
+			break;
+		case Any:
+			match = true;
+			s++;
+			p++;
+			break;
+		case AnyRepeat:
+			match = true;
+			s++;
+			if (*s == *q) p++;
+			break;
+		}
+	}
+	if (state == AnyRepeat) return (*s == *q);
+	else if (state == Any) return (*s == *p);
+	else return match && (*s == *p);
+}
 }//NAMESPACE

Subversion Repositories spk

(root)//libspk/src/Utils/String.cpp – Rev 126 → 127