X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=58b6c05edd9d9437c15a7e03f2617f7543b5657e;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=bda85182f2bd26463d5c998f0ed8d4c74ef7f855;hpb=5d3b128ca2a63d7c04b51f58c0e9c390255a9365;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index bda85182f..58b6c05ed 100644
--- 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
@@ -108,13 +109,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
@@ -146,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
 		 */
@@ -155,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
@@ -193,30 +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
-		 */
-		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.