Add some overloads of IRCv3::Replies::Reply#Send.

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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 9a31694359d0bee6de0b1fbcc6667a211ff46293..58b6c05edd9d9437c15a7e03f2617f7543b5657e 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -31,6 +31,7 @@
 #include <map>
 #include <set>
 #include "inspircd.h"
+#include "convto.h"
 
 /*******************************************************
  * This file contains classes and templates that deal
@@ -139,6 +140,21 @@ namespace irc
                 */
                bool GetToken(std::string& token);
 
+               /** Fetch the next numeric token from the stream
+                * @param token The next token from the stream is placed here
+                * @return True if tokens still remain, false if there are none left
+                */
+               template<typename Numeric>
+               bool GetNumericToken(Numeric& token)
+               {
+                       std::string str;
+                       if (!GetToken(str))
+                               return false;
+
+                       token = ConvToNum<Numeric>(str);
+                       return true;
+               }
+
                /** Fetch the entire remaining stream, without tokenizing
                 * @return The remaining part of the stream
                 */
@@ -148,6 +164,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
@@ -186,18 +208,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
+               /** 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);
+
+               /** Retrieves the underlying message. */
+               std::string& GetMessage() { return message; }
+
+               /** 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.
                 */
-               tokenstream(const std::string &source);
+               bool GetMiddle(std::string& token);
 
-               /** Fetch the next token from the stream as a std::string
-                * @param token The next token available, or an empty string 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(std::string &token);
+               bool GetTrailing(std::string& token);
        };
 
        /** The portparser class seperates out a port range into integers.