Add RE2 regex module.

diff --git a/.gitignore b/.gitignore
index 4e53a077a57a0d90a1eb639bfde1d3715b2bee55..5250e62632f8d415efea20187da88b9a6736ebca 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 /src/modules/m_pgsql.cpp
 /src/modules/m_regex_pcre.cpp
 /src/modules/m_regex_posix.cpp
+/src/modules/m_regex_re2.cpp
 /src/modules/m_regex_stdlib.cpp
 /src/modules/m_regex_tre.cpp
 /src/modules/m_sqlite3.cpp

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 9dfdc37c723a64f382344586642936febb4cd3ba..10e1689b38626036da15aeb14c5a8b234accb834 100644 (file)
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1379,6 +1379,12 @@
 # m_rline.
 #<module name="m_regex_pcre.so">
 
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+# Regular Expression Provider for RE2 Regular Expressions.
+# You need libre2 installed and in your include/library paths in order
+# to compile and load this module.
+#<module name="m_regex_re2.so">
+
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Regular Expression Provider for POSIX Regular Expressions.
 # You shouldn't need any additional libraries on a POSIX-compatible

diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
new file mode 100644 (file)
index 0000000..99b490d
--- /dev/null
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -0,0 +1,89 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
+ *   Copyright (C) 2012 ChrisTX <chris@rev-crew.info>
+ *
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#if defined __GNUC__
+# pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+#include "inspircd.h"
+#include "modules/regex.h"
+#include <re2/re2.h>
+
+
+/* $ModDesc: Regex Provider Module for RE2 Regular Expressions */
+/* $CompileFlags: -std=c++11 */
+/* $LinkerFlags: -lre2 */
+/* $ModDep: modules/regex.h */
+
+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;
+
+ public:
+       RE2Regex(const std::string& rx) : Regex(rx), regexcl(rx, RE2::Quiet)
+       {
+               if (!regexcl.ok())
+               {
+                       throw RE2Exception(rx, regexcl.error());
+               }
+       }
+
+       bool Matches(const std::string& text)
+       {
+               return RE2::FullMatch(text, regexcl);
+       }
+};
+
+class RE2Factory : public RegexFactory
+{
+ public:
+       RE2Factory(Module* m) : RegexFactory(m, "regex/re2") { }
+       Regex* Create(const std::string& expr)
+       {
+               return new RE2Regex(expr);
+       }
+};
+
+class ModuleRegexRE2 : public Module
+{
+       RE2Factory ref;
+
+ public:
+       ModuleRegexRE2() : ref(this)
+       {
+               ServerInstance->Modules->AddService(ref);
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Regex Provider Module for RE2", VF_VENDOR);
+       }
+};
+
+MODULE_INIT(ModuleRegexRE2)