Add the time tag on the server the message originates from.

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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index bda85182f2bd26463d5c998f0ed8d4c74ef7f855..453e28c4572d6e1dd8f050c9f9a838d1119849ad 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -108,13 +108,6 @@ namespace irc
                bool CoreExport operator()(const std::string& a, const std::string& b) const;
        };
 
-       /** Joins the contents of a vector to a string.
-        * @param sequence Zero or more items to join.
-        * @param separator The character to place between the items, defaults to ' ' (space).
-        * @return Joined string.
-        */
-       std::string CoreExport stringjoiner(const std::vector<std::string>& sequence, char separator = ' ');
-
        /** irc::sepstream allows for splitting token seperated lists.
         * Each successive call to sepstream::GetToken() returns
         * the next token, until none remain, at which point the method returns
@@ -155,6 +148,12 @@ namespace irc
                 * @return True if the end of the stream has been reached, otherwise false
                 */
                bool StreamEnd();
+
+               /** Returns true if the specified value exists in the stream
+                * @param value The value to search for
+                * @return True if the value was found, False otherwise
+                */
+               bool Contains(const std::string& value);
        };
 
        /** A derived form of sepstream, which seperates on commas
@@ -193,30 +192,33 @@ namespace irc
         * list will be ":item". This is to allow for parsing 'source' fields
         * from data.
         */
-       class CoreExport tokenstream : private spacesepstream
+       class CoreExport tokenstream
        {
+       private:
+               /** The message we are parsing tokens from. */
+               std::string message;
+
+               /** The current position within the message. */
+               size_t position;
+
         public:
-               /** Create a tokenstream and fill it with the provided data
-                */
-               tokenstream(const std::string &source);
+               /** Create a tokenstream and fill it with the provided data. */
+               tokenstream(const std::string& msg, size_t start = 0, size_t end = std::string::npos);
 
-               /** 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);
+               /** Retrieves the underlying message. */
+               std::string& GetMessage() { return message; }
 
-               /** 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.