Extra debugging

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index d0a4ab104bda26fd98cf495537ea984073cf4c96..0908e41b5a318d52c46925b953b44c4e945173a1 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -321,19 +321,63 @@ void irc::modestacker::Push(char modeletter, const std::string &parameter)
        sequence.push_back(parameter);
 }
 
-std::deque<std::string> irc::modestacker::GetStackedLine()
+void irc::modestacker::Push(char modeletter)
 {
-       std::deque<std::string> result;
-       result.push_back("");
+       this->Push(modeletter,"");
+}
+
+void irc::modestacker::PushPlus()
+{
+       this->Push('+',"");
+}
 
-       while (!sequence[0].empty() && (sequence.size() > 1))
+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());
-               result.push_back(sequence[1]);
+               if (!sequence[1].empty())
+                       result.push_back(sequence[1]);
                sequence[0].erase(sequence[0].begin());
                sequence.erase(sequence.begin() + 1);
+               n++;
        }
 
-       return result;
+       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;
 }