X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=483910cb793d123fdfa2c3e8e1de64b071c11ad6;hb=2ba32afa9a9aca7c82966b66bda16c3c3dbfbba5;hp=ddd590db2689e255cfbd84a9d95e71e555973be2;hpb=200062cd5e17bb3be02eb2a6fe593c9d4bfc763e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/hashcomp.h b/include/hashcomp.h index ddd590db2..483910cb7 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -1,12 +1,17 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2011 Adam + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2013, 2018-2019 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2013, 2016 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2007, 2009 Dennis Friis - * Copyright (C) 2005-2009 Craig Edwards - * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2008-2009 Robin Burchell * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005-2010 Craig Edwards * * 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 +29,8 @@ #pragma once -#include -#include -#include -#include -#include -#include #include "inspircd.h" +#include "convto.h" /******************************************************* * This file contains classes and templates that deal @@ -40,14 +40,12 @@ * treat [ identical to {, ] identical to }, and \ * as identical to |. * - * Our hashing functions are designed to accept - * std::string and compare/hash them as type irc::string - * by converting them internally. This makes them - * backwards compatible with other code which is not - * aware of irc::string. + * There are functors that accept std::string and + * compare/hash them as type irc::string by using + * 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, @@ -66,15 +64,10 @@ CoreExport extern unsigned const char rfc_case_insensitive_map[256]; */ CoreExport extern unsigned const char ascii_case_insensitive_map[256]; -/** Case sensitive (identity) map. - */ -CoreExport extern unsigned const char rfc_case_sensitive_map[256]; - /** The irc namespace contains a number of helper classes. */ namespace irc { - /** Check if two IRC object (e.g. nick or channel) names are equal. * This function uses national_case_insensitive_map to determine equality, which, by default does comparison * according to RFC 1459, treating certain otherwise non-identical characters as identical. @@ -84,6 +77,13 @@ namespace irc */ CoreExport bool equals(const std::string& s1, const std::string& s2); + /** Check whether \p needle exists within \p haystack. + * @param haystack The string to search within. + * @param needle The string to search for. + * @return Either the index at which \p needle was found or std::string::npos. + */ + CoreExport size_t find(const std::string& haystack, const std::string& needle); + /** This class returns true if two strings match. * Case sensitivity is ignored, and the RFC 'character set' * is adhered to @@ -108,65 +108,10 @@ namespace irc 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. - */ - struct CoreExport irc_char_traits : public std::char_traits - { - /** Check if two chars match. - * @param c1st First character - * @param c2nd Second character - * @return true if the characters are equal - */ - static bool eq(char c1st, char c2nd); - - /** Check if two chars do NOT match. - * @param c1st First character - * @param c2nd Second character - * @return true if the characters are unequal - */ - static bool ne(char c1st, char c2nd); - - /** Check if one char is less than another. - * @param c1st First character - * @param c2nd Second character - * @return true if c1st is less than c2nd - */ - static bool lt(char c1st, char c2nd); - - /** Compare two strings of size n. - * @param str1 First string - * @param str2 Second string - * @param n Length to compare to - * @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 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 - * @param n Position to search up to - * @param c Character to search for - * @return Pointer to the first occurance of c in s1 - */ - 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 > 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. - */ - std::string CoreExport stringjoiner(const std::vector& sequence, char separator = ' '); - - /** 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 - * an empty string. + * false. */ class CoreExport sepstream { @@ -194,6 +139,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 + bool GetNumericToken(Numeric& token) + { + std::string str; + if (!GetToken(str)) + return false; + + token = ConvToNum(str); + return true; + } + /** Fetch the entire remaining stream, without tokenizing * @return The remaining part of the stream */ @@ -203,9 +163,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 { @@ -217,7 +183,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 { @@ -241,33 +207,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 - */ - 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 \ 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 \ 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. + /** 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 @@ -321,75 +290,3 @@ namespace irc long GetToken(); }; } - -/* Define operators for using >> and << with irc::string to an ostream on an istream. */ -/* This was endless fun. No. Really. */ -/* It was also the first core change Ommeh made, if anyone cares */ - -/** Operator << for irc::string - */ -inline std::ostream& operator<<(std::ostream &os, const irc::string &str) { return os << str.c_str(); } - -/** Operator >> for irc::string - */ -inline std::istream& operator>>(std::istream &is, irc::string &str) -{ - std::string tmp; - is >> tmp; - str = tmp.c_str(); - return is; -} - -/* Define operators for + and == with irc::string to std::string for easy assignment - * and comparison - * - * Operator + - */ -inline std::string operator+ (std::string& leftval, irc::string& rightval) -{ - return leftval + std::string(rightval.c_str()); -} - -/* Define operators for + and == with irc::string to std::string for easy assignment - * and comparison - * - * Operator + - */ -inline irc::string operator+ (irc::string& leftval, std::string& rightval) -{ - return leftval + irc::string(rightval.c_str()); -} - -/* Define operators for + and == with irc::string to std::string for easy assignment - * and comparison - * - * Operator == - */ -inline bool operator== (const std::string& leftval, const irc::string& rightval) -{ - return (leftval.c_str() == rightval); -} - -/* Define operators for + and == with irc::string to std::string for easy assignment - * and comparison - * - * Operator == - */ -inline bool operator== (const irc::string& leftval, const std::string& rightval) -{ - return (leftval == rightval.c_str()); -} - -/* Define operators != for irc::string to std::string for easy comparison - */ -inline bool operator!= (const irc::string& leftval, const std::string& rightval) -{ - return !(leftval == rightval.c_str()); -} - -/* Define operators != for std::string to irc::string for easy comparison - */ -inline bool operator!= (const std::string& leftval, const irc::string& rightval) -{ - return !(leftval.c_str() == rightval); -}