/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2012 ChrisTX <chris@rev-crew.info>
+ * Copyright (C) 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2013, 2016, 2018, 2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
*
* 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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/// $CompilerFlags: -std=c++11
+
+
#include "inspircd.h"
#include "modules/regex.h"
#include <regex>
-/* $CompileFlags: -std=c++11 */
-
class StdRegex : public Regex
{
std::regex regexcl;
public:
StdRegex(const std::string& rx, std::regex::flag_type fltype) : Regex(rx)
{
- try{
+ try
+ {
regexcl.assign(rx, fltype | std::regex::optimize);
}
- catch(std::regex_error rxerr)
+ catch(const std::regex_error& rxerr)
{
throw RegexException(rx, rxerr.what());
}
StdRegexFactory ref;
ModuleRegexStd() : ref(this)
{
- ServerInstance->Modules->AddService(ref);
- OnRehash(NULL);
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Regex Provider Module for std::regex", VF_VENDOR);
+ return Version("Provides a regular expression engine which uses the C++11 std::regex regular expression matching system.", VF_VENDOR);
}
- void OnRehash(User* u) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
ConfigTag* Conf = ServerInstance->Config->ConfValue("stdregex");
- std::string regextype = Conf->getString("type", "ecmascript");
- if(regextype == "bre")
+ const std::string regextype = Conf->getString("type", "ecmascript", 1);
+ if (stdalgo::string::equalsci(regextype, "bre"))
ref.regextype = std::regex::basic;
- else if(regextype == "ere")
+ else if (stdalgo::string::equalsci(regextype, "ere"))
ref.regextype = std::regex::extended;
- else if(regextype == "awk")
+ else if (stdalgo::string::equalsci(regextype, "awk"))
ref.regextype = std::regex::awk;
- else if(regextype == "grep")
+ else if (stdalgo::string::equalsci(regextype, "grep"))
ref.regextype = std::regex::grep;
- else if(regextype == "egrep")
+ else if (stdalgo::string::equalsci(regextype, "egrep"))
ref.regextype = std::regex::egrep;
else
{
- if(regextype != "ecmascript")
- ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Non-existent regex engine '%s' specified. Falling back to ECMAScript.", regextype.c_str());
+ if (!stdalgo::string::equalsci(regextype, "ecmascript"))
+ ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Nonexistent regex engine '%s' specified. Falling back to ECMAScript.", regextype.c_str());
ref.regextype = std::regex::ECMAScript;
}
}