Implement support for WEBIRC attributes.

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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 71f900654bfc12a3f587db36726f949387a47de4..f0e092729d9618cec08e4b01972280721af3a022 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -186,30 +186,30 @@ namespace irc
         * list will be ":item". This is to allow for parsing 'source' fields
         * from data.
         */
-       class CoreExport tokenstream : private spacesepstream
+       class CoreExport tokenstream
        {
-        public:
-               /** Create a tokenstream and fill it with the provided data
-                */
-               tokenstream(const std::string &source);
+       private:
+               /** The message we are parsing tokens from. */
+               std::string message;
 
-               /** Fetch the next token from the stream as a std::string
-                * @param token The next token available, or an empty string if none remain
-                * @return True if tokens are left to be read, false if the last token was just retrieved.
-                */
-               bool GetToken(std::string &token);
+               /** The current position within the message. */
+               size_t position;
+
+        public:
+               /** Create a tokenstream and fill it with the provided data. */
+               tokenstream(const std::string& msg, size_t start = 0);
 
-               /** Fetch the next token from the stream as an integer
-                * @param token The next token available, or undefined if none remain
+               /** Retrieve the next \<middle> token in the token stream.
+                * @param token The next token available, or an empty string if none remain.
                 * @return True if tokens are left to be read, false if the last token was just retrieved.
                 */
-               bool GetToken(int &token);
+               bool GetMiddle(std::string& token);
 
-               /** Fetch the next token from the stream as a long integer
-                * @param token The next token available, or undefined if none remain
+               /** Retrieve the next \<trailing> token in the token stream.
+                * @param token The next token available, or an empty string if none remain.
                 * @return True if tokens are left to be read, false if the last token was just retrieved.
                 */
-               bool GetToken(long &token);
+               bool GetTrailing(std::string& token);
        };
 
        /** The portparser class seperates out a port range into integers.