*/
-/* $Core */
-
#include "inspircd.h"
-#include "hashcomp.h"
/******************************************************
*
size_t CoreExport irc::hash::operator()(const irc::string &s) const
{
- register size_t t = 0;
+ size_t t = 0;
for (irc::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */
t = 5 * t + national_case_insensitive_map[(unsigned char)*x];
return t;
return (national_case_insensitive_map[*n1] == national_case_insensitive_map[*n2]);
}
+bool irc::insensitive_swo::operator()(const std::string& a, const std::string& b) const
+{
+ const unsigned char* charmap = national_case_insensitive_map;
+ std::string::size_type asize = a.size();
+ std::string::size_type bsize = b.size();
+ std::string::size_type maxsize = std::min(asize, bsize);
+
+ for (std::string::size_type i = 0; i < maxsize; i++)
+ {
+ unsigned char A = charmap[(unsigned char)a[i]];
+ unsigned char B = charmap[(unsigned char)b[i]];
+ if (A > B)
+ return false;
+ else if (A < B)
+ return true;
+ }
+ return (asize < bsize);
+}
+
size_t irc::insensitive::operator()(const std::string &s) const
{
/* XXX: NO DATA COPIES! :)
* only with *x replaced with national_case_insensitive_map[*x].
* This avoids a copy to use hash<const char*>
*/
- register size_t t = 0;
+ size_t t = 0;
for (std::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */
t = 5 * t + national_case_insensitive_map[(unsigned char)*x];
return t;
return (n >= 0) ? s1 : NULL;
}
-irc::tokenstream::tokenstream(const std::string &source) : tokens(source), last_pushed(false)
-{
- /* Record starting position and current position */
- last_starting_position = tokens.begin();
- n = tokens.begin();
-}
-
-irc::tokenstream::~tokenstream()
+irc::tokenstream::tokenstream(const std::string &source) : spacesepstream(source)
{
}
bool irc::tokenstream::GetToken(std::string &token)
{
- std::string::iterator lsp = last_starting_position;
-
- while (n != tokens.end())
- {
- /** Skip multi space, converting " " into " "
- */
- while ((n+1 != tokens.end()) && (*n == ' ') && (*(n+1) == ' '))
- n++;
-
- if ((last_pushed) && (*n == ':'))
- {
- /* If we find a token thats not the first and starts with :,
- * this is the last token on the line
- */
- std::string::iterator curr = ++n;
- n = tokens.end();
- token = std::string(curr, tokens.end());
- return true;
- }
+ bool first = !pos;
- last_pushed = false;
+ if (!spacesepstream::GetToken(token))
+ return false;
- if ((*n == ' ') || (n+1 == tokens.end()))
+ /* This is the last parameter */
+ if (token[0] == ':' && !first)
+ {
+ token.erase(token.begin());
+ if (!StreamEnd())
{
- /* If we find a space, or end of string, this is the end of a token.
- */
- last_starting_position = n+1;
- last_pushed = *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);
-
- token = strip;
- return !token.empty();
+ token += ' ';
+ token += GetRemaining();
}
-
- n++;
+ pos = tokens.length() + 1;
}
- token.clear();
- return false;
+
+ return true;
}
bool irc::tokenstream::GetToken(irc::string &token)
return returnval;
}
-irc::sepstream::sepstream(const std::string &source, char seperator) : tokens(source), sep(seperator)
+irc::sepstream::sepstream(const std::string& source, char separator, bool allowempty)
+ : tokens(source), sep(separator), pos(0), allow_empty(allowempty)
{
- last_starting_position = tokens.begin();
- n = tokens.begin();
}
bool irc::sepstream::GetToken(std::string &token)
{
- std::string::iterator lsp = last_starting_position;
+ if (this->StreamEnd())
+ {
+ token.clear();
+ return false;
+ }
- while (n != tokens.end())
+ if (!this->allow_empty)
{
- if ((*n == sep) || (n+1 == tokens.end()))
+ this->pos = this->tokens.find_first_not_of(this->sep, this->pos);
+ if (this->pos == std::string::npos)
{
- last_starting_position = n+1;
- token = std::string(lsp, n+1 == tokens.end() ? n+1 : n++);
-
- while ((token.length()) && (token.find_last_of(sep) == token.length() - 1))
- token.erase(token.end() - 1);
-
- if (token.empty())
- n++;
-
- return n == tokens.end() ? false : true;
+ this->pos = this->tokens.length() + 1;
+ token.clear();
+ return false;
}
-
- n++;
}
- token.clear();
- return false;
-}
+ size_t p = this->tokens.find(this->sep, this->pos);
+ if (p == std::string::npos)
+ p = this->tokens.length();
-const std::string irc::sepstream::GetRemaining()
-{
- return std::string(n, tokens.end());
-}
+ token.assign(tokens, this->pos, p - this->pos);
+ this->pos = p + 1;
-bool irc::sepstream::StreamEnd()
-{
- return ((n + 1) == tokens.end());
-}
-
-irc::sepstream::~sepstream()
-{
-}
-
-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,"");
+ return true;
}
-void irc::modestacker::PushPlus()
+const std::string irc::sepstream::GetRemaining()
{
- this->Push('+',"");
+ return !this->StreamEnd() ? this->tokens.substr(this->pos) : "";
}
-void irc::modestacker::PushMinus()
+bool irc::sepstream::StreamEnd()
{
- this->Push('-',"");
+ return this->pos > this->tokens.length();
}
-int irc::modestacker::GetStackedLine(std::vector<std::string> &result, int max_line_size)
+std::string irc::stringjoiner(const std::vector<std::string>& sequence, char separator)
{
+ std::string joined;
if (sequence.empty())
- {
- return 0;
- }
-
- unsigned int n = 0;
- int size = 1; /* Account for initial +/- char */
- int nextsize = 0;
- int start = result.size();
- std::string modeline = adding ? "+" : "-";
- result.push_back(modeline);
-
- if (sequence.size() > 1)
- nextsize = sequence[1].length() + 2;
+ return joined; // nothing to do here
- while (!sequence[0].empty() && (sequence.size() > 1) && (n < ServerInstance->Config->Limits.MaxModes) && ((size + nextsize) < max_line_size))
- {
- modeline += *(sequence[0].begin());
- if (!sequence[1].empty())
- {
- result.push_back(sequence[1]);
- size += nextsize; /* Account for mode character and whitespace */
- }
- sequence[0].erase(sequence[0].begin());
- sequence.erase(sequence.begin() + 1);
-
- if (sequence.size() > 1)
- nextsize = sequence[1].length() + 2;
-
- n++;
- }
- result[start] = modeline;
-
- return n;
-}
-
-irc::stringjoiner::stringjoiner(const std::string& seperator, const std::vector<std::string>& sequence, unsigned int begin, unsigned int end)
-{
- if (end < begin)
- return; // nothing to do here
-
- for (unsigned int v = begin; v < end; v++)
- joined.append(sequence[v]).append(seperator);
- joined.append(sequence[end]);
-}
-
-const std::string& irc::stringjoiner::GetJoined() const
-{
+ 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;
}
std::string::size_type dash = x.rfind('-');
if (dash != std::string::npos)
{
- std::string sbegin = x.substr(0, dash);
- std::string send = x.substr(dash+1, x.length());
+ std::string sbegin(x, 0, dash);
range_begin = atoi(sbegin.c_str());
- range_end = atoi(send.c_str());
+ range_end = atoi(x.c_str()+dash+1);
if ((range_begin > 0) && (range_end > 0) && (range_begin < 65536) && (range_end < 65536) && (range_begin < range_end))
{
projects / user / henk / code / inspircd.git / blobdiff