* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
#ifndef _HASHCOMP_H_
#define _HASHCOMP_H_
-#include "inspircd_config.h"
-#include "socket.h"
+//#include "inspircd_config.h"
+//#include "socket.h"
#include "hash_map.h"
/*******************************************************
* aware of irc::string.
*******************************************************/
-/** Required namespaces and symbols */
-using namespace std;
-
-/** aton() */
-using irc::sockets::insp_aton;
-
-/** nota() */
-using irc::sockets::insp_ntoa;
-
#ifndef LOWERMAP
#define LOWERMAP
/** A mapping of uppercase to lowercase, including scandinavian
/** This typedef declares irc::string based upon irc_char_traits.
*/
- typedef basic_string<char, irc_char_traits, allocator<char> > string;
+ typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
/** irc::stringjoiner joins string lists into a string, using
* the given seperator string.
* This class can join a vector of std::string, a deque of
- * std::string, or a const char** array, using overloaded
+ * std::string, or a const char* const* array, using overloaded
* constructors.
*/
- class CoreExport stringjoiner
+ class CoreExport stringjoiner : public classbase
{
private:
/** Output string
* @param begin The starting element in the sequence to be joined
* @param end The ending element in the sequence to be joined
*/
- stringjoiner(const std::string &seperator, const char** sequence, int begin, int end);
+ stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end);
/** Get the joined sequence
* @return A reference to the joined string
* It can then reproduce this list, clamped to a maximum of MAXMODES
* values per line.
*/
- class CoreExport modestacker
+ class CoreExport modestacker : public classbase
{
private:
+ InspIRCd* ServerInstance;
/** The mode sequence and its parameters
*/
std::deque<std::string> sequence;
* @param add True if the stack is adding modes,
* false if it is removing them
*/
- modestacker(bool add);
+ modestacker(InspIRCd* Instance, bool add);
/** Push a modeletter and its parameter onto the stack.
* No checking is performed as to if this mode actually
* requires a parameter. If you stack invalid mode
* list will be ":item". This is to allow for parsing 'source' fields
* from data.
*/
- class CoreExport tokenstream
+ class CoreExport tokenstream : public classbase
{
private:
/** Original string
virtual ~sepstream();
/** Fetch the next token from the stream
- * @return The next token is returned, or an empty string if none remain
+ * @param token The next token from the stream is placed here
+ * @return True if tokens still remain, false if there are none left
*/
- virtual const std::string GetToken();
-
+ virtual bool GetToken(std::string &token);
+
/** Fetch the entire remaining stream, without tokenizing
* @return The remaining part of the stream
*/
virtual const std::string GetRemaining();
-
+
/** Returns true if the end of the stream has been reached
* @return True if the end of the stream has been reached, otherwise false
*/
* To use this class, you must derive from it.
* This is because each derived instance has its own freebits array
* which can determine what bitfields are allocated on a TYPE BY TYPE
- * basis, e.g. an irc::dynamicbitmask type for userrecs, and one for
- * chanrecs, etc. You should inheret it in a very simple way as follows.
+ * basis, e.g. an irc::dynamicbitmask type for Users, and one for
+ * Channels, etc. You should inheret it in a very simple way as follows.
* The base class will resize and maintain freebits as required, you are
* just required to make the pointer static and specific to this class
* type.
/** Set free bits mask
*/
- virtual void SetFreeBits(unsigned char* freebits) { }
+ virtual void SetFreeBits(unsigned char* freebits) { freebits = freebits; }
};
/** Turn _ characters in a string into spaces
return (leftval == rightval.c_str());
}
+/* Define operators != for irc::string to std::string for easy comparison
+ */
+inline bool operator!= (const irc::string& leftval, const std::string& rightval)
+{
+ return !(leftval == rightval.c_str());
+}
+
+/* Define operators != for std::string to irc::string for easy comparison
+ */
+inline bool operator!= (const std::string& leftval, const irc::string& rightval)
+{
+ return !(leftval.c_str() == rightval);
+}
+
/** Assign an irc::string to a std::string.
*/
inline std::string assign(const irc::string &other) { return other.c_str(); }
/** Hashing stuff is totally different on vc++'s hash_map implementation, so to save a buttload of
* #ifdefs we'll just do it all at once
*/
-namespace nspace
-{
+BEGIN_HASHMAP_NAMESPACE
+
/** Hashing function to hash irc::string
*/
#ifdef WINDOWS
if(s1.length() != s2.length()) return true;
return (irc::irc_char_traits::compare(s1.c_str(), s2.c_str(), s1.length()) < 0);
}
-
+
/** Hash an irc::string value for hash_map
*/
size_t operator()(const irc::string & s) const;
if(s1.length() != s2.length()) return true;
return (irc::irc_char_traits::compare(s1.c_str(), s2.c_str(), s1.length()) < 0);
}
-
+
/** Hash a std::string using RFC1459 case sensitivity rules
* @param s A string to hash
* @return The hash value
size_t operator()(const std::string & s) const;
};
#else
+
template<> struct hash<irc::string>
{
/** Hash an irc::string using RFC1459 case sensitivity rules
size_t operator()(const irc::string &s) const;
};
+ /* XXX FIXME: Implement a hash function overriding std::string's that works with TR1! */
+
+#ifdef HASHMAP_DEPRECATED
+ struct insensitive
+#else
template<> struct hash<std::string>
+#endif
{
- /** Hash a std::string using RFC1459 case sensitivity rules
- * @param s A string to hash
- * @return The hash value
- */
- size_t operator()(const string &s) const;
+ size_t operator()(const std::string &s) const;
};
+
#endif
/** Convert a string to lower case respecting RFC1459
* @param n A string to lowercase
*/
void strlower(char *n);
-}
+
+END_HASHMAP_NAMESPACE
#endif
projects / user / henk / code / inspircd.git / blobdiff