]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/hashcomp.cpp
Merge tag 'v2.0.27' into master.
[user/henk/code/inspircd.git] / src / hashcomp.cpp
index aa06759a4d91e910b92732c37d6923a405fb964c..8febcbb5f6b08784a3d5d92a0595cec4e80a340c 100644 (file)
@@ -128,6 +128,38 @@ bool irc::equals(const std::string& s1, const std::string& s2)
        return (national_case_insensitive_map[*n1] == national_case_insensitive_map[*n2]);
 }
 
+size_t irc::find(const std::string& haystack, const std::string& needle)
+{
+       // The haystack can't contain the needle if it is smaller than it.
+       if (needle.length() > haystack.length())
+               return std::string::npos;
+
+       // The inner loop checks the characters between haystack_last and the end of the haystack.
+       size_t haystack_last = haystack.length() - needle.length();
+       for (size_t hpos = 0; hpos <= haystack_last; ++hpos)
+       {
+               // Check for the needle at the current haystack position.
+               bool found = true;
+               for (size_t npos = 0; npos < needle.length(); ++npos)
+               {
+                       if (national_case_insensitive_map[(unsigned char)needle[npos]] != national_case_insensitive_map[(unsigned char)haystack[hpos + npos]])
+                       {
+                               // Uh-oh, characters at the current haystack position don't match.
+                               found = false;
+                               break;
+                       }
+               }
+
+               // The entire needle was found in the haystack!
+               if (found)
+                       return hpos;
+       }
+
+       // We didn't find anything.
+       return std::string::npos;
+}
+
+
 bool irc::insensitive_swo::operator()(const std::string& a, const std::string& b) const
 {
        const unsigned char* charmap = national_case_insensitive_map;
@@ -161,98 +193,54 @@ size_t irc::insensitive::operator()(const std::string &s) const
        return t;
 }
 
-/******************************************************
- *
- * This is the implementation of our special irc::string
- * class which is a case-insensitive equivalent to
- * std::string which is not only case-insensitive but
- * can also do scandanavian comparisons, e.g. { = [, etc.
- *
- * This class depends on the const array 'national_case_insensitive_map'.
- *
- ******************************************************/
-
-bool irc::irc_char_traits::eq(char c1st, char c2nd)
+irc::tokenstream::tokenstream(const std::string& msg, size_t start)
+       : message(msg, start)
+       , position(0)
 {
-       return national_case_insensitive_map[(unsigned char)c1st] == national_case_insensitive_map[(unsigned char)c2nd];
 }
 
-bool irc::irc_char_traits::ne(char c1st, char c2nd)
+bool irc::tokenstream::GetMiddle(std::string& token)
 {
-       return national_case_insensitive_map[(unsigned char)c1st] != national_case_insensitive_map[(unsigned char)c2nd];
-}
-
-bool irc::irc_char_traits::lt(char c1st, char c2nd)
-{
-       return national_case_insensitive_map[(unsigned char)c1st] < national_case_insensitive_map[(unsigned char)c2nd];
-}
-
-int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
-{
-       for(unsigned int i = 0; i < n; i++)
+       // If we are past the end of the string we can't do anything.
+       if (position >= message.length())
        {
-               if(national_case_insensitive_map[(unsigned char)*str1] > national_case_insensitive_map[(unsigned char)*str2])
-                       return 1;
-
-               if(national_case_insensitive_map[(unsigned char)*str1] < national_case_insensitive_map[(unsigned char)*str2])
-                       return -1;
-
-               if(*str1 == 0 || *str2 == 0)
-                       return 0;
-
-               str1++;
-               str2++;
+               token.clear();
+               return false;
        }
-       return 0;
-}
 
-const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
-{
-       while(n-- > 0 && national_case_insensitive_map[(unsigned char)*s1] != national_case_insensitive_map[(unsigned char)c])
-               s1++;
-       return (n >= 0) ? s1 : NULL;
-}
+       // If we can't find another separator this is the last token in the message.
+       size_t separator = message.find(' ', position);
+       if (separator == std::string::npos)
+       {
+               token.assign(message, position, std::string::npos);
+               position = message.length();
+               return true;
+       }
 
-irc::tokenstream::tokenstream(const std::string &source) : spacesepstream(source)
-{
+       token.assign(message, position, separator - position);
+       position = message.find_first_not_of(' ', separator);
+       return true;
 }
 
-bool irc::tokenstream::GetToken(std::string &token)
+bool irc::tokenstream::GetTrailing(std::string& token)
 {
-       bool first = !pos;
-
-       if (!spacesepstream::GetToken(token))
+       // If we are past the end of the string we can't do anything.
+       if (position >= message.length())
+       {
+               token.clear();
                return false;
+       }
 
-       /* This is the last parameter */
-       if (token[0] == ':' && !first)
+       // If this is true then we have a <trailing> token!
+       if (message[position] == ':')
        {
-               token.erase(token.begin());
-               if (!StreamEnd())
-               {
-                       token += ' ';
-                       token += GetRemaining();
-               }
-               pos = tokens.length() + 1;
+               token.assign(message, position + 1, std::string::npos);
+               position = message.length();
+               return true;
        }
 
-       return true;
-}
-
-bool irc::tokenstream::GetToken(int &token)
-{
-       std::string tok;
-       bool returnval = GetToken(tok);
-       token = ConvToInt(tok);
-       return returnval;
-}
-
-bool irc::tokenstream::GetToken(long &token)
-{
-       std::string tok;
-       bool returnval = GetToken(tok);
-       token = ConvToInt(tok);
-       return returnval;
+       // There is no <trailing> token so it must be a <middle> token.
+       return GetMiddle(token);
 }
 
 irc::sepstream::sepstream(const std::string& source, char separator, bool allowempty)
@@ -299,18 +287,6 @@ bool irc::sepstream::StreamEnd()
        return this->pos > this->tokens.length();
 }
 
-std::string irc::stringjoiner(const std::vector<std::string>& sequence, char separator)
-{
-       std::string joined;
-       if (sequence.empty())
-               return joined; // nothing to do here
-
-       for (std::vector<std::string>::const_iterator i = sequence.begin(); i != sequence.end(); ++i)
-               joined.append(*i).push_back(separator);
-       joined.erase(joined.end()-1);
-       return joined;
-}
-
 irc::portparser::portparser(const std::string &source, bool allow_overlapped)
        : sep(source), in_range(0), range_begin(0), range_end(0), overlapped(allow_overlapped)
 {