From 52bc8e4bc799d38e92d38d497a2bd055950841bb Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 2 Apr 2014 13:06:48 -0400 Subject: Remove regex mods, use std::regex instead --- modules/extra/m_regex_pcre.cpp | 54 -------------------------------------- modules/extra/m_regex_posix.cpp | 56 ---------------------------------------- modules/extra/m_regex_tre.cpp | 57 ----------------------------------------- 3 files changed, 167 deletions(-) delete mode 100644 modules/extra/m_regex_pcre.cpp delete mode 100644 modules/extra/m_regex_posix.cpp delete mode 100644 modules/extra/m_regex_tre.cpp (limited to 'modules/extra') diff --git a/modules/extra/m_regex_pcre.cpp b/modules/extra/m_regex_pcre.cpp deleted file mode 100644 index a7c9d4ba8..000000000 --- a/modules/extra/m_regex_pcre.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* RequiredLibraries: pcre */ - -#include "module.h" -#include - -class PCRERegex : public Regex -{ - pcre *regex; - - public: - PCRERegex(const Anope::string &expr) : Regex(expr) - { - const char *error; - int erroffset; - this->regex = pcre_compile(expr.c_str(), PCRE_CASELESS, &error, &erroffset, NULL); - if (!this->regex) - throw RegexException("Error in regex " + expr + " at offset " + stringify(erroffset) + ": " + error); - } - - ~PCRERegex() - { - pcre_free(this->regex); - } - - bool Matches(const Anope::string &str) - { - return pcre_exec(this->regex, NULL, str.c_str(), str.length(), 0, 0, NULL, 0) > -1; - } -}; - -class PCRERegexProvider : public RegexProvider -{ - public: - PCRERegexProvider(Module *creator) : RegexProvider(creator, "regex/pcre") { } - - Regex *Compile(const Anope::string &expression) override - { - return new PCRERegex(expression); - } -}; - -class ModuleRegexPCRE : public Module -{ - PCRERegexProvider pcre_regex_provider; - - public: - ModuleRegexPCRE(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), - pcre_regex_provider(this) - { - this->SetPermanent(true); - } -}; - -MODULE_INIT(ModuleRegexPCRE) diff --git a/modules/extra/m_regex_posix.cpp b/modules/extra/m_regex_posix.cpp deleted file mode 100644 index 933ee59af..000000000 --- a/modules/extra/m_regex_posix.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "module.h" -#include -#include - -class POSIXRegex : public Regex -{ - regex_t regbuf; - - public: - POSIXRegex(const Anope::string &expr) : Regex(expr) - { - int err = regcomp(&this->regbuf, expr.c_str(), REG_EXTENDED | REG_NOSUB); - if (err) - { - char buf[BUFSIZE]; - regerror(err, &this->regbuf, buf, sizeof(buf)); - regfree(&this->regbuf); - throw RegexException("Error in regex " + expr + ": " + buf); - } - } - - ~POSIXRegex() - { - regfree(&this->regbuf); - } - - bool Matches(const Anope::string &str) - { - return regexec(&this->regbuf, str.c_str(), 0, NULL, 0) == 0; - } -}; - -class POSIXRegexProvider : public RegexProvider -{ - public: - POSIXRegexProvider(Module *creator) : RegexProvider(creator, "regex/posix") { } - - Regex *Compile(const Anope::string &expression) override - { - return new POSIXRegex(expression); - } -}; - -class ModuleRegexPOSIX : public Module -{ - POSIXRegexProvider posix_regex_provider; - - public: - ModuleRegexPOSIX(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), - posix_regex_provider(this) - { - this->SetPermanent(true); - } -}; - -MODULE_INIT(ModuleRegexPOSIX) diff --git a/modules/extra/m_regex_tre.cpp b/modules/extra/m_regex_tre.cpp deleted file mode 100644 index 0f5c0eaf7..000000000 --- a/modules/extra/m_regex_tre.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* RequiredLibraries: tre */ - -#include "module.h" -#include - -class TRERegex : public Regex -{ - regex_t regbuf; - - public: - TRERegex(const Anope::string &expr) : Regex(expr) - { - int err = regcomp(&this->regbuf, expr.c_str(), REG_EXTENDED | REG_NOSUB); - if (err) - { - char buf[BUFSIZE]; - regerror(err, &this->regbuf, buf, sizeof(buf)); - regfree(&this->regbuf); - throw RegexException("Error in regex " + expr + ": " + buf); - } - } - - ~TRERegex() - { - regfree(&this->regbuf); - } - - bool Matches(const Anope::string &str) - { - return regexec(&this->regbuf, str.c_str(), 0, NULL, 0) == 0; - } -}; - -class TRERegexProvider : public RegexProvider -{ - public: - TRERegexProvider(Module *creator) : RegexProvider(creator, "regex/tre") { } - - Regex *Compile(const Anope::string &expression) override - { - return new TRERegex(expression); - } -}; - -class ModuleRegexTRE : public Module -{ - TRERegexProvider tre_regex_provider; - - public: - ModuleRegexTRE(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR), - tre_regex_provider(this) - { - this->SetPermanent(true); - } -}; - -MODULE_INIT(ModuleRegexTRE) -- cgit