/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
- * Copyright (C) 2012 ChrisTX <chris@rev-crew.info>
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013-2014, 2016-2017, 2019 Sadie Powell <sadie@witchery.services>
*
* 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: find_compiler_flags("re2" "-std=c++11")
+/// $LinkerFlags: find_linker_flags("re2" "-lre2")
+
+/// $PackageInfo: require_system("arch") pkgconf re2
+/// $PackageInfo: require_system("darwin") pkg-config re2
+/// $PackageInfo: require_system("debian" "8.0") libre2-dev pkg-config
+/// $PackageInfo: require_system("ubuntu" "15.10") libre2-dev pkg-config
-#if defined __GNUC__
-# pragma GCC diagnostic ignored "-Wshadow"
-#endif
#include "inspircd.h"
#include "modules/regex.h"
-#include <re2/re2.h>
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+#endif
-/* $CompileFlags: -std=c++11 */
-/* $LinkerFlags: -lre2 */
+// Fix warnings about the use of `long long` on C++03 and
+// shadowing on GCC.
+#if defined __clang__
+# pragma clang diagnostic ignored "-Wc++11-long-long"
+#elif defined __GNUC__
+# pragma GCC diagnostic ignored "-Wlong-long"
+# pragma GCC diagnostic ignored "-Wshadow"
+#endif
-class RE2Exception : public ModuleException
-{
- public:
- RE2Exception(const std::string& rx, const std::string& error)
- : ModuleException(std::string("Error in regex ") + rx + ": " + error)
- {
- }
-};
+#include <re2/re2.h>
+
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
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);
}
{
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);
}
public:
ModuleRegexRE2() : ref(this)
{
- ServerInstance->Modules->AddService(ref);
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Regex Provider Module for RE2", VF_VENDOR);
+ return Version("Provides the re2 regular expression engine which uses the RE2 library.", VF_VENDOR);
}
};