diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-08-27 05:28:15 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2013-08-27 05:28:15 -0700 |
| commit | 620e818578a5e0dbebd07fb27a571d5392c66c24 (patch) | |
| tree | 6d20eef5fd9b98fecd93df2caf197ad08c168562 /src/modules/extra/m_regex_re2.cpp | |
| parent | d9d9cbe025f94523265daa72de7596467d71f5c8 (diff) | |
| parent | eaf658de3d1ef984c9a0b4273a9cfbd3029f8b5b (diff) | |
Merge pull request #619 from SaberUK/master+regex-dedupe
Various regex module improvements.
Diffstat (limited to 'src/modules/extra/m_regex_re2.cpp')
| -rw-r--r-- | src/modules/extra/m_regex_re2.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index 56d80cd68..2525b70ab 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -30,15 +30,6 @@ /* $CompileFlags: -std=c++11 */ /* $LinkerFlags: -lre2 */ -class RE2Exception : public ModuleException -{ - public: - RE2Exception(const std::string& rx, const std::string& error) - : ModuleException(std::string("Error in regex ") + rx + ": " + error) - { - } -}; - class RE2Regex : public Regex { RE2 regexcl; @@ -48,11 +39,11 @@ class RE2Regex : public Regex { if (!regexcl.ok()) { - throw RE2Exception(rx, regexcl.error()); + throw RegexException(rx, regexcl.error()); } } - bool Matches(const std::string& text) + bool Matches(const std::string& text) CXX11_OVERRIDE { return RE2::FullMatch(text, regexcl); } @@ -62,7 +53,7 @@ class RE2Factory : public RegexFactory { public: RE2Factory(Module* m) : RegexFactory(m, "regex/re2") { } - Regex* Create(const std::string& expr) + Regex* Create(const std::string& expr) CXX11_OVERRIDE { return new RE2Regex(expr); } |