X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=c99b5d64613b3364ab754e1689bbe6e1cd1fd451;hb=3a3ff949670c61a4a8856e1391222e156eb1cd17;hp=ec1cc57649a2b1c901d487d300bbf5ac782135f3;hpb=ba7431b4fd6c62dd04d252e769e825769accb2a9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index ec1cc5764..c99b5d646 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -114,6 +114,11 @@ namespace irc
 		size_t CoreExport operator()(const std::string &s) const;
 	};
 
+	struct insensitive_swo
+	{
+		bool CoreExport operator()(const std::string& a, const std::string& b) const;
+	};
+
 	/** The irc_char_traits class is used for RFC-style comparison of strings.
 	 * This class is used to implement irc::string, a case-insensitive, RFC-
 	 * comparing string class.
@@ -148,7 +153,7 @@ namespace irc
 		 * @return similar to strcmp, zero for equal, less than zero for str1
 		 * being less and greater than zero for str1 being greater than str2.
 		 */
-		static CoreExport int compare(const char* str1, const char* str2, size_t n);
+		static int compare(const char* str1, const char* str2, size_t n);
 
 		/** Find a char within a string up to position n.
 		 * @param s1 String to find in
@@ -156,109 +161,18 @@ namespace irc
 		 * @param c Character to search for
 		 * @return Pointer to the first occurance of c in s1
 		 */
-		static CoreExport const char* find(const char* s1, int  n, char c);
+		static const char* find(const char* s1, int  n, char c);
 	};
 
 	/** This typedef declares irc::string based upon irc_char_traits.
 	 */
 	typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
 
-	/** irc::stringjoiner joins string lists into a string, using
-	 * space as the separator.
-	 * This class can join a vector of std::string.
+	/** Joins the contents of a vector to a string.
+	 * @param sequence Zero or more items to join.
+	 * @separator The character to place between the items.
 	 */
-	class CoreExport stringjoiner
-	{
-	 private:
-
-		/** Output string
-		 */
-		std::string joined;
-
-	 public:
-
-		/** Join all elements of a vector, in the resulting string
-		 * each element will be seperated by a single space character.
-		 * @param sequence Zero or more items to seperate
-		 */
-		stringjoiner(const std::vector<std::string>& sequence);
-
-		/** Get the joined sequence
-		 * @return A constant reference to the joined string
-		 */
-		const std::string& GetJoined() const { return joined; }
-	};
-
-	/** irc::modestacker stacks mode sequences into a list.
-	 * It can then reproduce this list, clamped to a maximum of MAXMODES
-	 * values per line.
-	 */
-	class CoreExport modestacker
-	{
-	 private:
-		/** The mode sequence and its parameters
-		 */
-		std::deque<std::string> sequence;
-
-		/** True if the mode sequence is initially adding
-		 * characters, false if it is initially removing
-		 * them
-		 */
-		bool adding;
-	 public:
-
-		/** Construct a new modestacker.
-		 * @param add True if the stack is adding modes,
-		 * false if it is removing them
-		 */
-		modestacker(bool add);
-
-		/** Push a modeletter and its parameter onto the stack.
-		 * No checking is performed as to if this mode actually
-		 * requires a parameter. If you stack invalid mode
-		 * sequences, they will be tidied if and when they are
-		 * passed to a mode parser.
-		 * @param modeletter The mode letter to insert
-		 * @param parameter The parameter for the mode
-		 */
-		void Push(char modeletter, const std::string &parameter);
-
-		/** Push a modeletter without parameter onto the stack.
-		 * No checking is performed as to if this mode actually
-		 * requires a parameter. If you stack invalid mode
-		 * sequences, they will be tidied if and when they are
-		 * passed to a mode parser.
-		 * @param modeletter The mode letter to insert
-		 */
-		void Push(char modeletter);
-
-		/** Push a '+' symbol onto the stack.
-		 */
-		void PushPlus();
-
-		/** Push a '-' symbol onto the stack.
-		 */
-		void PushMinus();
-
-		/** Return zero or more elements which form the
-		 * mode line. This will be clamped to a max of
-		 * MAXMODES items (MAXMODES-1 mode parameters and
-		 * one mode sequence string), and max_line_size
-		 * characters. As specified below, this function
-		 * should be called in a loop until it returns zero,
-		 * indicating there are no more modes to return.
-		 * @param result The vector to populate. This will not
-		 * be cleared before it is used.
-		 * @param max_line_size The maximum size of the line
-		 * to build, in characters, seperate to MAXMODES.
-		 * @return The number of elements in the deque.
-		 * The function should be called repeatedly until it
-		 * returns 0, in case there are multiple lines of
-		 * mode changes to be obtained.
-		 */
-		int GetStackedLine(std::vector<std::string> &result, int max_line_size = 360);
-
-	};
+   	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