#include "inspircd.h"
#include <string>
#include "hashcomp.h"
-#include "helperfuncs.h"
+
#include <ext/hash_map>
#define nspace __gnu_cxx
-char lowermap[255];
-
/******************************************************
*
* The hash functions of InspIRCd are the centrepoint
* 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++;
irc::commasepstream::~commasepstream()
{
}
-
-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)'\\'] = '|';
-}
-