Added some hax :( to prevent invalid symbols. It seems that instead of returning...

[user/henk/code/inspircd.git] / include / hashcomp.h

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 22e9f14702133fa7e24747674fbd1fa2a1fcab41..714d3286f78ddbdbea1a916f904edbbc72b7eb54 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -40,9 +40,9 @@ using namespace std;
 
 namespace nspace
 {
-        template<> struct hash<in_addr>
+        template<> struct hash<insp_inaddr>
         {
-                size_t operator()(const struct in_addr &a) const;
+                size_t operator()(const insp_inaddr &a) const;
         };
 
         template<> struct hash<std::string>
@@ -68,7 +68,7 @@ namespace irc
        };
 
 
-       /** This class returns true if two in_addr structs match.
+       /** This class returns true if two insp_inaddr structs match.
         * Checking is done by copying both into a size_t then doing a
         * numeric comparison of the two.
         */
@@ -76,9 +76,21 @@ namespace irc
        {
                /** The operator () does the actual comparison in hash_map
                 */
-               bool operator()(const in_addr &s1, const in_addr &s2) const;
+               bool operator()(const insp_inaddr &s1, const insp_inaddr &s2) const;
        };
 
+       /** irc::tokenstream reads a string formatted as per RFC1459 and RFC2812.
+        * It will split the string into 'tokens' each containing one parameter
+        * from the string.
+        * For instance, if it is instantiated with the string:
+        * "PRIVMSG #test :foo bar baz qux"
+        * then each successive call to tokenstream::GetToken() will return
+        * "PRIVMSG", "#test", "foo bar baz qux", "".
+        * Note that if the whole string starts with a colon this is not taken
+        * to mean the string is all one parameter, and the first item in the
+        * list will be ":item". This is to allow for parsing 'source' fields
+        * from data.
+        */
        class tokenstream
        {
         private:
@@ -87,9 +99,39 @@ namespace irc
                std::string::iterator n;
                bool last_pushed;
         public:
+               /** Create a tokenstream and fill it with the provided data
+                */
                tokenstream(const std::string &source);
                ~tokenstream();
 
+               /** Fetch the next token from the stream
+                * @returns The next token is returned, or an empty string if none remain
+                */
+               const std::string GetToken();
+       };
+
+       /** irc::commasepstream allows for splitting comma seperated lists.
+        * Lists passed to irc::commasepstream should not contain spaces
+        * after the commas, or this will be taken to be part of the item
+        * data. Each successive call to commasepstream::GetToken() returns
+        * the next token, until none remain, at which point the method returns
+        * an empty string.
+        */
+       class commasepstream
+       {
+        private:
+               std::string tokens;
+               std::string::iterator last_starting_position;
+               std::string::iterator n;
+        public:
+               /** Create a commasepstream and fill it with the provided data
+                */
+               commasepstream(const std::string &source);
+               ~commasepstream();
+
+               /** Fetch the next token from the stream
+                * @returns The next token is returned, or an empty string if none remain
+                */
                const std::string GetToken();
        };