New helper class irc::stringjoiner - it pwns you.

[user/henk/code/inspircd.git] / src / hashcomp.cpp

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 8d19d059a6d8e1de107e367938c8f052443f02a1..0908e41b5a318d52c46925b953b44c4e945173a1 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -80,16 +80,16 @@ size_t nspace::hash<insp_inaddr>::operator()(const insp_inaddr &a) const
 
 size_t nspace::hash<string>::operator()(const string &s) const
 {
-       char a[s.length()];
-       size_t t = 0;
-       static struct hash<const char *> strhash;
-
-       for (const char* x = s.c_str(); *x; x++)        /* Faster to do it this way than */
-               a[t++] = lowermap[(unsigned char)*x];   /* Seperate strlcpy and strlower */
-
-       a[t] = 0;
-
-       return strhash(a);
+       /* XXX: NO DATA COPIES! :)
+        * The hash function here is practically
+        * a copy of the one in STL's hash_fun.h,
+        * only with *x replaced with lowermap[*x].
+        * This avoids a copy to use hash<const char*>
+        */
+       register size_t t = 0;
+       for (std::string::const_iterator x = s.begin(); x != s.end(); x++) /* ++x not x++, so we don't hash the \0 */
+               t = 5 * t + lowermap[(unsigned char)*x];
+       return size_t(t);
 }
 
 bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
@@ -248,24 +248,24 @@ const std::string irc::tokenstream::GetToken()
        return "";
 }
 
-irc::commasepstream::commasepstream(const std::string &source) : tokens(source)
+irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator)
 {
        last_starting_position = tokens.begin();
        n = tokens.begin();
 }
 
-const std::string irc::commasepstream::GetToken()
+const std::string irc::sepstream::GetToken()
 {
        std::string::iterator lsp = last_starting_position;
 
        while (n != tokens.end())
        {
-               if ((*n == ',') || (n+1 == tokens.end()))
+               if ((*n == sep) || (n+1 == tokens.end()))
                {
                        last_starting_position = n+1;
                        std::string strip = std::string(lsp, n+1 == tokens.end() ? n+1  : n++);
 
-                       while ((strip.length()) && (strip.find_last_of(',') == strip.length() - 1))
+                       while ((strip.length()) && (strip.find_last_of(sep) == strip.length() - 1))
                                strip.erase(strip.end() - 1);
 
                        return strip;
@@ -277,7 +277,7 @@ const std::string irc::commasepstream::GetToken()
        return "";
 }
 
-irc::commasepstream::~commasepstream()
+irc::sepstream::~sepstream()
 {
 }
 
@@ -309,3 +309,75 @@ const char* irc::Spacify(char* n)
 }
 
 
+irc::modestacker::modestacker(bool add) : adding(add)
+{
+       sequence.clear();
+       sequence.push_back("");
+}
+
+void irc::modestacker::Push(char modeletter, const std::string &parameter)
+{
+       *(sequence.begin()) += modeletter;
+       sequence.push_back(parameter);
+}
+
+void irc::modestacker::Push(char modeletter)
+{
+       this->Push(modeletter,"");
+}
+
+void irc::modestacker::PushPlus()
+{
+       this->Push('+',"");
+}
+
+void irc::modestacker::PushMinus()
+{
+       this->Push('-',"");
+}
+
+int irc::modestacker::GetStackedLine(std::deque<std::string> &result)
+{
+       int n = 0;
+       result.clear();
+       result.push_back(adding ? "+" : "-");
+
+       while (!sequence[0].empty() && (sequence.size() > 1) && (result.size() < MAXMODES+1))
+       {
+               result[0] += *(sequence[0].begin());
+               if (!sequence[1].empty())
+                       result.push_back(sequence[1]);
+               sequence[0].erase(sequence[0].begin());
+               sequence.erase(sequence.begin() + 1);
+               n++;
+       }
+
+       return n;
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const std::vector<std::string> &sequence, int begin, int end)
+{
+       for (int v = begin; v < end; v++)
+               joined.append(sequence[v]).append(seperator);
+       joined.append(sequence[end]);
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const std::deque<std::string> &sequence, int begin, int end)
+{
+       for (int v = begin; v < end; v++)
+               joined.append(sequence[v]).append(seperator);
+       joined.append(sequence[end]);
+}
+
+irc::stringjoiner::stringjoiner(const std::string &seperator, const char** sequence, int begin, int end)
+{
+       for (int v = begin; v < end; v++)
+               joined.append(sequence[v]).append(seperator);
+       joined.append(sequence[end]);
+}
+
+std::string& irc::stringjoiner::GetJoined()
+{
+       return joined;
+}
+