X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=dfd4d992bea6ee6b839bc3af8a4aae4a6ca04bcd;hb=HEAD;hp=9a31694359d0bee6de0b1fbcc6667a211ff46293;hpb=aa6912f1c9845386180df91b20b6ecd3b78ba4b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 9a3169435..dfd4d992b 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -1,12 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2011 Adam <Adam@anope.org>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2005-2009 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2008-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005-2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -24,13 +28,8 @@
 
 #pragma once
 
-#include <cstring>
-#include <string>
-#include <vector>
-#include <deque>
-#include <map>
-#include <set>
 #include "inspircd.h"
+#include "convto.h"
 
 /*******************************************************
  * This file contains classes and templates that deal
@@ -45,7 +44,7 @@
  * mapping arrays internally.
  *******************************************************/
 
-/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
+/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
  * if it must.
  *
  * This is provided as a pointer so that modules can change it to their custom mapping tables,
@@ -108,7 +107,7 @@ namespace irc
 		bool CoreExport operator()(const std::string& a, const std::string& b) const;
 	};
 
-	/** irc::sepstream allows for splitting token seperated lists.
+	/** irc::sepstream allows for splitting token separated lists.
 	 * Each successive call to sepstream::GetToken() returns
 	 * the next token, until none remain, at which point the method returns
 	 * false.
@@ -139,6 +138,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,9 +162,15 @@ 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
+	/** A derived form of sepstream, which separates on commas
 	 */
 	class CoreExport commasepstream : public sepstream
 	{
@@ -162,7 +182,7 @@ namespace irc
 		}
 	};
 
-	/** A derived form of sepstream, which seperates on spaces
+	/** A derived form of sepstream, which separates on spaces
 	 */
 	class CoreExport spacesepstream : public sepstream
 	{
@@ -186,21 +206,36 @@ 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.
+	/** The portparser class separates out a port range into integers.
 	 * A port range may be specified in the input string in the form
 	 * "6660,6661,6662-6669,7020". The end of the stream is indicated by
 	 * a return value of 0 from portparser::GetToken(). If you attempt