using namespace std;
-#include "inspircd_config.h"
#include "inspircd.h"
-#include <string>
#include "hashcomp.h"
-
#include <ext/hash_map>
-
#define nspace __gnu_cxx
-char lowermap[255];
-
/******************************************************
*
* The hash functions of InspIRCd are the centrepoint
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
* std::string which is not only case-insensitive but
* can also do scandanavian comparisons, e.g. { = [, etc.
*
- * This class depends on the global 'lowermap' which is
- * initialized at startup by inspircd.cpp, and contains
- * the 'scandanavian' casemappings for fast irc compare.
+ * This class depends on the const array 'lowermap'.
*
******************************************************/
irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
{
- /* Remove trailing spaces, these muck up token parsing */
- while (tokens.find_last_of(' ') == tokens.length() - 1)
- tokens.erase(tokens.end() - 1);
-
/* Record starting position and current position */
last_starting_position = tokens.begin();
n = tokens.begin();
*/
last_starting_position = n+1;
last_pushed = true;
- return std::string(lsp, n+1 == tokens.end() ? n+1 : n++);
+
+ std::string strip(lsp, n+1 == tokens.end() ? n+1 : n++);
+ while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1))
+ strip.erase(strip.end() - 1);
+
+ return strip;
}
n++;
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;
- return std::string(lsp, n+1 == tokens.end() ? n+1 : n++);
+ std::string strip = std::string(lsp, n+1 == tokens.end() ? n+1 : n++);
+
+ while ((strip.length()) && (strip.find_last_of(sep) == strip.length() - 1))
+ strip.erase(strip.end() - 1);
+
+ return strip;
}
n++;
return "";
}
-irc::commasepstream::~commasepstream()
+irc::sepstream::~sepstream()
+{
+}
+
+std::string irc::hex(const unsigned char *raw, size_t rawsz)
+{
+ if (!rawsz)
+ return "";
+
+ char buf[rawsz*2+1];
+ size_t i;
+
+ for (i = 0; i < rawsz; i++)
+ {
+ sprintf (&(buf[i*2]), "%02x", raw[i]);
+ }
+ buf[i*2] = 0;
+
+ return buf;
+}
+
+const char* irc::Spacify(char* n)
+{
+ static char x[MAXBUF];
+ strlcpy(x,n,MAXBUF);
+ for (char* y = x; *y; y++)
+ if (*y == '_')
+ *y = ' ';
+ return x;
+}
+
+
+irc::modestacker::modestacker(bool add) : adding(add)
+{
+ sequence.clear();
+ sequence.push_back("");
+}
+
+void irc::modestacker::Push(char modeletter, const std::string ¶meter)
+{
+ *(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]);
}
-void InspIRCd::MakeLowerMap()
-{
- // initialize the lowercase mapping table
- for (unsigned char cn = 0; cn < 255; cn++)
- lowermap[cn] = cn;
- // lowercase the uppercase chars
- for (unsigned char cn = 65; cn < 91; cn++)
- lowermap[cn] = tolower(cn);
- // now replace the specific chars for scandanavian comparison
- lowermap[(unsigned char)'['] = '{';
- lowermap[(unsigned char)']'] = '}';
- lowermap[(unsigned char)'\\'] = '|';
+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;
}