X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=483910cb793d123fdfa2c3e8e1de64b071c11ad6;hb=2ba32afa9a9aca7c82966b66bda16c3c3dbfbba5;hp=bda85182f2bd26463d5c998f0ed8d4c74ef7f855;hpb=35b70631f0532a5828b04a8e0c02092a285f331a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/hashcomp.h b/include/hashcomp.h index bda85182f..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 @@ -45,7 +45,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,14 +108,7 @@ 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& 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 * false. @@ -146,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 */ @@ -155,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 { @@ -169,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 { @@ -193,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