From cc649031792af1e94c7701decd708aba4091d708 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 29 Jul 2010 18:38:56 -0400 Subject: [PATCH] Rewrote the hashing systems to properly handle the new Anope::strings which we have everywhere. --- include/account.h | 6 +- include/anope.h | 11 ++ include/bots.h | 4 +- include/channels.h | 2 +- include/commands.h | 2 +- include/extensible.h | 2 +- include/hashcomp.h | 208 +++++++++++++++++---------------- include/modules.h | 2 +- include/regchannel.h | 2 +- include/services.h | 2 +- include/users.h | 4 +- modules/core/cs_saset.cpp | 2 +- modules/core/cs_set.cpp | 2 +- modules/core/ns_saset.cpp | 2 +- modules/core/ns_set.cpp | 2 +- modules/extra/hs_request.cpp | 2 +- src/hashcomp.cpp | 220 ++++++++++++++++------------------- src/nickserv.cpp | 4 +- 18 files changed, 240 insertions(+), 239 deletions(-) diff --git a/include/account.h b/include/account.h index 11fcc6767..c625c4e0e 100644 --- a/include/account.h +++ b/include/account.h @@ -7,9 +7,9 @@ class NickAlias; class NickCore; class NickRequest; -typedef unordered_map_namespace::unordered_map nickalias_map; -typedef unordered_map_namespace::unordered_map nickcore_map; -typedef unordered_map_namespace::unordered_map nickrequest_map; +typedef unordered_map_namespace::unordered_map > nickalias_map; +typedef unordered_map_namespace::unordered_map > nickcore_map; +typedef unordered_map_namespace::unordered_map > nickrequest_map; extern CoreExport nickalias_map NickAliasList; extern CoreExport nickcore_map NickCoreList; diff --git a/include/anope.h b/include/anope.h index 003927378..3749005ed 100644 --- a/include/anope.h +++ b/include/anope.h @@ -255,6 +255,17 @@ namespace Anope friend std::ostream &operator<<(std::ostream &os, const string &_str); }; + /** Hash an Anope::string for unorderd_map, passed as the third template arg to unordered_map + */ + struct hash + { + /** Hash an Anope::string for unordered_map + * @param s The string + * @return A hash value for the string + */ + bool operator()(const string &s) const; + }; + inline std::ostream &operator<<(std::ostream &os, const string &_str) { return os << _str._string; } inline const string operator+(char chr, const string &str) { string tmp(chr); tmp += str; return tmp; } diff --git a/include/bots.h b/include/bots.h index 3d35f569e..7dc81d22d 100644 --- a/include/bots.h +++ b/include/bots.h @@ -12,8 +12,8 @@ class BotInfo; -typedef unordered_map_namespace::unordered_map botinfo_map; -typedef unordered_map_namespace::unordered_map botinfo_uid_map; +typedef unordered_map_namespace::unordered_map > botinfo_map; +typedef unordered_map_namespace::unordered_map botinfo_uid_map; extern CoreExport botinfo_map BotListByNick; extern CoreExport botinfo_uid_map BotListByUID; diff --git a/include/channels.h b/include/channels.h index f2785ff01..56fa7cf46 100644 --- a/include/channels.h +++ b/include/channels.h @@ -9,7 +9,7 @@ #ifndef CHANNELS_H #define CHANNELS_H -typedef unordered_map_namespace::unordered_map channel_map; +typedef unordered_map_namespace::unordered_map > channel_map; extern CoreExport channel_map ChannelList; struct UserData diff --git a/include/commands.h b/include/commands.h index 71fee7e42..0c8b7bae1 100644 --- a/include/commands.h +++ b/include/commands.h @@ -18,7 +18,7 @@ class Module; class BotInfo; class Command; -typedef std::map CommandMap; +typedef std::map > CommandMap; /** The return value from commands. */ diff --git a/include/extensible.h b/include/extensible.h index 5ab32c6eb..ffdd395ee 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -60,7 +60,7 @@ template class ExtensibleItemPointerArray : public ExtensibleItemBas class CoreExport Extensible { private: - typedef std::map extensible_map; + typedef std::map extensible_map; extensible_map Extension_Items; public: diff --git a/include/hashcomp.h b/include/hashcomp.h index 3a7dae276..abf29a400 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -34,12 +34,11 @@ namespace Anope } #ifndef _WIN32 -//# ifdef HASHMAP_DEPRECATED /* If gcc ver > 4.3 */ -# if 1 +# ifndef USE_HASHMAP /* GCC4.3+ has deprecated hash_map and uses tr1. But of course, uses a different include to MSVC. */ # include # define unordered_map_namespace std::tr1 -# else +# else /* gcc ver < 4.3 */ # include /* Oddball linux namespace for hash_map */ # define unordered_map_namespace __gnu_cxx @@ -76,19 +75,19 @@ namespace Anope * 'oddities' as specified by RFC1459, e.g. { -> [, and | -> \ */ unsigned const char rfc_case_insensitive_map[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 0-19 */ - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, /* 20-39 */ - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, /* 40-59 */ - 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, /* 60-79 */ - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 94, 95, 96, 97, 98, 99, /* 80-99 */ - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, /* 100-119 */ - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, /* 120-139 */ - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, /* 140-159 */ - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, /* 160-179 */ - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, /* 180-199 */ - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, /* 200-219 */ - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, /* 220-239 */ - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 /* 240-255 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 0-19 */ + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, /* 20-39 */ + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, /* 40-59 */ + 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, /* 60-79 */ + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 94, 95, 96, 97, 98, 99, /* 80-99 */ + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, /* 100-119 */ + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, /* 120-139 */ + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, /* 140-159 */ + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, /* 160-179 */ + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, /* 180-199 */ + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, /* 200-219 */ + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, /* 220-239 */ + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 /* 240-255 */ }; /** Case insensitive map, ASCII rules. @@ -96,19 +95,19 @@ unsigned const char rfc_case_insensitive_map[256] = { * [ != {, but A == a. */ unsigned const char ascii_case_insensitive_map[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 0-19 */ - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, /* 20-39 */ - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, /* 40-59 */ - 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, /* 60-79 */ - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95, 96, 97, 98, 99, /* 80-99 */ - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, /* 100-119 */ - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, /* 120-139 */ - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, /* 140-159 */ - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, /* 160-179 */ - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, /* 180-199 */ - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, /* 200-219 */ - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, /* 220-239 */ - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 /* 240-255 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, /* 0-19 */ + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, /* 20-39 */ + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, /* 40-59 */ + 60, 61, 62, 63, 64, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, /* 60-79 */ + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 91, 92, 93, 94, 95, 96, 97, 98, 99, /* 80-99 */ + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, /* 100-119 */ + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, /* 120-139 */ + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, /* 140-159 */ + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, /* 160-179 */ + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, /* 180-199 */ + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, /* 200-219 */ + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, /* 220-239 */ + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 /* 240-255 */ }; /** The irc namespace contains a number of helper classes. @@ -163,6 +162,18 @@ namespace irc /** This typedef declares irc::string based upon irc_char_traits. */ typedef std::basic_string > string; + + /** Used to hash irc::strings for unordered_map + */ + struct hash + { + /** Hash an irc::string for unordered_map + * @param s The string + * @return A hash value for the string + */ + size_t operator()(const irc::string &s) const; + size_t operator()(const Anope::string &s) const; + }; } /** The ci namespace contains a number of helper classes. @@ -217,6 +228,73 @@ namespace ci /** This typedef declares ci::string based upon ci_char_traits. */ typedef std::basic_string > string; + + /** Used to hash ci::strings for unordered_map + */ + struct hash + { + /** Hash a ci::string for unordered_map + * @param s The string + * @return A hash value for the string + */ + size_t operator()(const ci::string &s) const; + size_t operator()(const Anope::string &s) const; + }; +} + +namespace std +{ + /** An overload for std::equal_to that uses Anope::string, passed for the fourth temmplate + * argument for unordered_map + */ + template<> struct equal_to + { + /** Compare two Anope::strings as ci::strings + * @paarm s1 The first string + * @param s2 The second string + * @return true if they are equal + */ + bool operator()(const Anope::string &s1, const Anope::string &s2) const; + }; + + /** An overload for std::equal_to that uses Anope::string, passed for the fourth template + * argument for unorderd_map + */ + template<> struct equal_to + { + /** Compare two Anope::strings as irc::strings + * @param s1 The first string + * @param s2 The second string + * @return true if they are equal + */ + bool operator()(const Anope::string &s1, const Anope::string &s2) const; + }; + + /** An overload for std::less that uses Anope::string, passed for the third template argument + * to std::map and std::multimap + */ + template<> struct less + { + /** Compare two Anope::strings as ci::strings and find which one is less + * @param s1 The first string + * @param s2 The second string + * @return true if s1 < s2, else false + */ + bool operator()(const Anope::string &s1, const Anope::string &s2) const; + }; + + /** An overload for std;:less that uses Anope::string, passed for the third tempalte argument + * to std::map and std::multimap + */ + template<> struct less + { + /** Compare two Anope::strings as irc::strings and find which one is less + * @param s1 The first string + * @param s2 The second string + * @return true if s1 < s2, else false + */ + bool operator()(const Anope::string &s1, const Anope::string &s2) const; + }; } /* Define operators for using >> and << with irc::string to an ostream on an istream. */ @@ -405,76 +483,4 @@ inline bool operator!=(const ci::string &leftval, const irc::string &rightval) return !(leftval.c_str() == rightval); } -/** Class used to hash a std::string, given as the third argument to the unordered_map template - */ -class CoreExport hash_compare_std_string -{ - public: - enum { bucket_size = 4, min_buckets = 8 }; - - /** Compare two std::string's values for hashing in hash_map - * @param s1 The first string - * @param s2 The second string - * @return similar to strcmp, zero for equal, less than zero for str1 - * being less and greater than zero for str1 being greater than str2. - */ - bool operator()(const std::string &s1, const std::string &s2) const; - bool operator()(const Anope::string &s1, const Anope::string &s2) const; - - /** Return a hash value for a string - * @param s The string - * @return The hash value - */ - size_t operator()(const std::string &s) const; - size_t operator()(const Anope::string &s) const; -}; - -/** Class used to hash a ci::string, given as the third argument to the unordered_map template - */ -class CoreExport hash_compare_ci_string -{ - public: - enum { bucket_size = 4, min_buckets = 8 }; - - /** Compare two ci::string's values for hashing in hash_map - * @param s1 The first string - * @param s2 The second string - * @return similar to strcmp, zero for equal, less than zero for str1 - * being less and greater than zero for str1 being greater than str2. - */ - bool operator()(const ci::string &s1, const ci::string &s2) const; - bool operator()(const Anope::string &s1, const Anope::string &s2) const; - - /** Return a hash value for a string using case insensitivity - * @param s The string - * @return The hash value - */ - size_t operator()(const ci::string &s) const; - size_t operator()(const Anope::string &s) const; -}; - -/** Class used to hash a irc::string, given as the third argument to the unordered_map template - */ -class CoreExport hash_compare_irc_string -{ - public: - enum { bucket_size = 4, min_buckets = 8 }; - - /** Compare two irc::string's values for hashing in hash_map - * @param s1 The first string - * @param s2 The second string - * @return similar to strcmp, zero for equal, less than zero for str1 - * being less and greater than zero for str1 being greater than str2. - */ - bool operator()(const irc::string &s1, const irc::string &s2) const; - bool operator()(const Anope::string &s1, const Anope::string &s2) const; - - /** Return a hash value for a string using RFC1459 case sensitivity rules - * @param s The stirng - * @return The hash value - */ - size_t operator()(const irc::string &s) const; - size_t operator()(const Anope::string &s) const; -}; - #endif // HASHCOMP_H diff --git a/include/modules.h b/include/modules.h index f4b1ad60b..627e04383 100644 --- a/include/modules.h +++ b/include/modules.h @@ -155,7 +155,7 @@ enum Priority { PRIORITY_FIRST, PRIORITY_DONTCARE, PRIORITY_LAST, PRIORITY_BEFOR enum MODType { CORE, PROTOCOL, THIRD, SUPPORTED, QATESTED, ENCRYPTION, DATABASE, SOCKETENGINE }; struct Message; -typedef std::multimap message_map; +typedef std::multimap message_map; extern CoreExport message_map MessageMap; class Module; extern CoreExport std::list Modules; diff --git a/include/regchannel.h b/include/regchannel.h index 68eb08aa1..178b3c32d 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -9,7 +9,7 @@ #ifndef REGCHANNEL_H #define REGCHANNEL_H -typedef unordered_map_namespace::unordered_map registered_channel_map; +typedef unordered_map_namespace::unordered_map > registered_channel_map; extern CoreExport registered_channel_map RegisteredChannelList; /** Flags used for the ChannelInfo class diff --git a/include/services.h b/include/services.h index 73dc205ab..acf6a4ea5 100644 --- a/include/services.h +++ b/include/services.h @@ -837,7 +837,7 @@ struct Exception /*************************************************************************/ -typedef unordered_map_namespace::unordered_map session_map; +typedef unordered_map_namespace::unordered_map session_map; extern CoreExport session_map SessionList; struct Session diff --git a/include/users.h b/include/users.h index c80daa193..8f82981c5 100644 --- a/include/users.h +++ b/include/users.h @@ -11,8 +11,8 @@ /* Hash maps used for users. Note UserListByUID will not be used on non-TS6 IRCds, and should never * be assumed to have users */ -typedef unordered_map_namespace::unordered_map user_map; -typedef unordered_map_namespace::unordered_map user_uid_map; +typedef unordered_map_namespace::unordered_map > user_map; +typedef unordered_map_namespace::unordered_map > user_uid_map; extern CoreExport user_map UserListByNick; extern CoreExport user_uid_map UserListByUID; diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp index 157304b50..ef139e90a 100644 --- a/modules/core/cs_saset.cpp +++ b/modules/core/cs_saset.cpp @@ -15,7 +15,7 @@ class CommandCSSASet : public Command { - typedef std::map subcommand_map; + typedef std::map > subcommand_map; subcommand_map subcommands; public: diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp index b9acb2a53..219fbb3c1 100644 --- a/modules/core/cs_set.cpp +++ b/modules/core/cs_set.cpp @@ -15,7 +15,7 @@ class CommandCSSet : public Command { - typedef std::map subcommand_map; + typedef std::map > subcommand_map; subcommand_map subcommands; public: diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp index 081e1d466..624f25b7b 100644 --- a/modules/core/ns_saset.cpp +++ b/modules/core/ns_saset.cpp @@ -15,7 +15,7 @@ class CommandNSSASet : public Command { - typedef std::map subcommand_map; + typedef std::map > subcommand_map; subcommand_map subcommands; public: diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp index a55adefb4..f05e9ccdb 100644 --- a/modules/core/ns_set.cpp +++ b/modules/core/ns_set.cpp @@ -15,7 +15,7 @@ class CommandNSSet : public Command { - typedef std::map subcommand_map; + typedef std::map > subcommand_map; subcommand_map subcommands; public: diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp index 2f40e6912..5c5a649f0 100644 --- a/modules/extra/hs_request.cpp +++ b/modules/extra/hs_request.cpp @@ -66,7 +66,7 @@ struct HostRequest time_t time; }; -typedef std::map RequestMap; +typedef std::map > RequestMap; RequestMap Requests; static Module *me; diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 72bcf0936..839d65da8 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -10,16 +10,35 @@ #include "anope.h" -/****************************************************** +/* * - * This is the implementation of our special irc::string - * class which is a case-insensitive equivalent to + * This is an implementation of two special string classes: + * + * irc::string which is a case-insensitive equivalent to * std::string which is not only case-insensitive but * can also do scandanavian comparisons, e.g. { = [, etc. * - * This class depends on the const array 'national_case_insensitive_map'. + * ci::string which is a case-insensitive equivalent to + * std::string. * - ******************************************************/ + * These classes depend on rfc_case_insensitive_map and + * ascii_case_insensitive_map + * + */ + +/** Hash an Anope::string for unordered_map + * @param s The string + * @return A hash value for the string + */ +bool Anope::hash::operator()(const Anope::string &s) const +{ + register size_t t = 0; + + for (Anope::string::const_iterator it = s.begin(), it_end = s.end(); it != it_end; ++it) + t = 5 * t + *it; + + return t; +} bool irc::irc_char_traits::eq(char c1st, char c2nd) { @@ -62,6 +81,25 @@ const char *irc::irc_char_traits::find(const char *s1, int n, char c) return n >= 0 ? s1 : NULL; } +/** Hash an irc::string for unordered_map + * @param s The string + * @return A hash value for the string + */ +size_t irc::hash::operator()(const irc::string &s) const +{ + register size_t t = 0; + + for (irc::string::const_iterator it = s.begin(), it_end = s.end(); it != it_end; ++it) + t = 5 * t + rfc_case_insensitive_map[static_cast(*it)]; + + return t; +} + +size_t irc::hash::operator()(const Anope::string &s) const +{ + return operator()(s.irc_str()); +} + bool ci::ci_char_traits::eq(char c1st, char c2nd) { return ascii_case_insensitive_map[static_cast(c1st)] == ascii_case_insensitive_map[static_cast(c2nd)]; @@ -103,6 +141,65 @@ const char *ci::ci_char_traits::find(const char *s1, int n, char c) return n >= 0 ? s1 : NULL; } +/** Hash a ci::string for unordered_map + * @param s The string + * @return A hash value for the string + */ +size_t ci::hash::operator()(const ci::string &s) const +{ + register size_t t = 0; + + for (ci::string::const_iterator it = s.begin(), it_end = s.end(); it != it_end; ++it) + t = 5 * t + ascii_case_insensitive_map[static_cast(*it)]; + + return t; +} + +size_t ci::hash::operator()(const Anope::string &s) const +{ + return operator()(s.ci_str()); +} + +/** Compare two Anope::strings as ci::strings + * @param s1 The first string + * @param s2 The second string + * @return true if they are equal + */ +bool std::equal_to::operator()(const Anope::string &s1, const Anope::string &s2) const +{ + return s1.ci_str() == s2.ci_str(); +} + +/** Compare two Anope::strings as irc::strings + * @param s1 The first string + * @param s2 The second string + * @return true if they are equal + */ +bool std::equal_to::operator()(const Anope::string &s1, const Anope::string &s2) const +{ + return s1.irc_str() == s2.irc_str(); +} + +/** Compare two Anope::strings as ci::strings and find which one is less + * @param s1 The first string + * @param s2 The second string + * @return true if s1 < s2, else false + */ +bool std::less::operator()(const Anope::string &s1, const Anope::string &s2) const +{ + return s1.ci_str().compare(s2.ci_str()) < 0; +} + +/** Compare two Anope::strings as irc::strings and find which one is les + * @param s1 The first string + * @param s2 The second string + * @return true if s1 < s2, else false + */ +bool std::less::operator()(const Anope::string &s1, const Anope::string &s2) const +{ + return s2.irc_str().compare(s2.irc_str()) < 0; +} + sepstream::sepstream(const Anope::string &source, char seperator) : tokens(source), sep(seperator) { last_starting_position = n = tokens.begin(); @@ -144,116 +241,3 @@ bool sepstream::StreamEnd() return n == tokens.end(); } -/** Compare two std::string's values for hashing in hash_map - * @param s1 The first string - * @param s2 The second string - * @return similar to strcmp, zero for equal, less than zero for str1 - * being less and greater than zero for str1 being greater than str2. - */ -bool hash_compare_std_string::operator()(const std::string &s1, const std::string &s2) const -{ - register int i = std::char_traits::compare(s1.c_str(), s2.c_str(), s1.length() < s2.length() ? s1.length() : s2.length()); - if (!i) - return s1.length() < s2.length(); - return i < 0; -} - -bool hash_compare_std_string::operator()(const Anope::string &s1, const Anope::string &s2) const -{ - return operator()(s1.str(), s2.str()); -} - -/** Return a hash value for a string - * @param s The string - * @return The hash value - */ -size_t hash_compare_std_string::operator()(const std::string &s) const -{ - register size_t t = 0; - - for (std::string::const_iterator it = s.begin(), it_end = s.end(); it != it_end; ++it) - t = 5 * t + static_cast(*it); - - return t; -} - -size_t hash_compare_std_string::operator()(const Anope::string &s) const -{ - return operator()(s.str()); -} - -/** Compare two ci::string's values for hashing in hash_map - * @param s1 The first string - * @param s2 The second string - * @return similar to strcmp, zero for equal, less than zero for str1 - * being less and greater than zero for str1 being greater than str2. - */ -bool hash_compare_ci_string::operator()(const ci::string &s1, const ci::string &s2) const -{ - register int i = ci::ci_char_traits::compare(s1.c_str(), s2.c_str(), s1.length() < s2.length() ? s1.length() : s2.length()); - if (!i) - return s1.length() < s2.length(); - return i < 0; -} - -bool hash_compare_ci_string::operator()(const Anope::string &s1, const Anope::string &s2) const -{ - return operator()(s1.ci_str(), s2.ci_str()); -} - -/** Return a hash value for a string using case insensitivity - * @param s The string - * @return The hash value - */ -size_t hash_compare_ci_string::operator()(const ci::string &s) const -{ - register size_t t = 0; - - for (ci::string::const_iterator it = s.begin(), it_end = s.end(); it != it_end; ++it) - t = 5 * t + ascii_case_insensitive_map[static_cast(*it)]; - - return t; -} - -size_t hash_compare_ci_string::operator()(const Anope::string &s) const -{ - return operator()(s.ci_str()); -} - -/** Compare two irc::string's values for hashing in hash_map - * @param s1 The first string - * @param s2 The second string - * @return similar to strcmp, zero for equal, less than zero for str1 - * being less and greater than zero for str1 being greater than str2. - */ -bool hash_compare_irc_string::operator()(const irc::string &s1, const irc::string &s2) const -{ - register int i = irc::irc_char_traits::compare(s1.c_str(), s2.c_str(), s1.length() < s2.length() ? s1.length() : s2.length()); - if (!i) - return s1.length() < s2.length(); - return i < 0; -} - -bool hash_compare_irc_string::operator()(const Anope::string &s1, const Anope::string &s2) const -{ - return operator()(s1.irc_str(), s2.irc_str()); -} - -/** Return a hash value for a string using RFC1459 case sensitivity rules - * @param s The string - * @return The hash value - */ -size_t hash_compare_irc_string::operator()(const irc::string &s) const -{ - register size_t t = 0; - - for (irc::string::const_iterator it = s.begin(), it_end = s.end(); it != it_end; ++it) - t = 5 * t + rfc_case_insensitive_map[static_cast(*it)]; - - return t; -} - -size_t hash_compare_irc_string::operator()(const Anope::string &s) const -{ - return operator()(s.irc_str()); -} diff --git a/src/nickserv.cpp b/src/nickserv.cpp index 0397c8b32..960ae7a97 100644 --- a/src/nickserv.cpp +++ b/src/nickserv.cpp @@ -17,8 +17,8 @@ nickalias_map NickAliasList; nickcore_map NickCoreList; nickrequest_map NickRequestList; -typedef std::map nickservcollides_map; -typedef std::map nickservreleases_map; +typedef std::map nickservcollides_map; +typedef std::map nickservreleases_map; static nickservcollides_map NickServCollides; static nickservreleases_map NickServReleases;