X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_tre.cpp;h=590e1c472c0dbe0468639e02b38058941cd8f8c0;hb=703ba72071b970caaa7554b1e58a13def57694dc;hp=0718e5bb10f05981cd6b48ad19ad7d5b8a169419;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 0718e5bb1..590e1c472 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -17,26 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/// $CompilerFlags: find_compiler_flags("tre")
+/// $LinkerFlags: find_linker_flags("tre" "-ltre")
+
+/// $PackageInfo: require_system("arch") pkgconf tre
+/// $PackageInfo: require_system("darwin") pkg-config tre
+/// $PackageInfo: require_system("debian") libtre-dev pkg-config
+/// $PackageInfo: require_system("ubuntu") libtre-dev pkg-config
 
 #include "inspircd.h"
 #include "modules/regex.h"
 #include <sys/types.h>
 #include <tre/regex.h>
 
-/* $ModDesc: Regex Provider Module for TRE Regular Expressions */
-/* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */
-/* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") rpath("pkg-config --libs tre") */
-/* $ModDep: modules/regex.h */
-
-class TRERegexException : public ModuleException
-{
- public:
-	TRERegexException(const std::string& rx, const std::string& error)
-		: ModuleException("Error in regex " + rx + ": " + error)
-	{
-	}
-};
-
 class TRERegex : public Regex
 {
 	regex_t regbuf;
@@ -59,7 +52,7 @@ public:
 			error = errbuf;
 			delete[] errbuf;
 			regfree(&regbuf);
-			throw TRERegexException(rx, error);
+			throw RegexException(rx, error);
 		}
 	}
 
@@ -68,14 +61,9 @@ public:
 		regfree(&regbuf);
 	}
 
-	bool Matches(const std::string& text)
+	bool Matches(const std::string& text)  CXX11_OVERRIDE
 	{
-		if (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0)
-		{
-			// Bang. :D
-			return true;
-		}
-		return false;
+		return (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0);
 	}
 };
 
@@ -83,7 +71,7 @@ class TREFactory : public RegexFactory
 {
  public:
 	TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
-	Regex* Create(const std::string& expr)
+	Regex* Create(const std::string& expr) CXX11_OVERRIDE
 	{
 		return new TRERegex(expr);
 	}
@@ -96,7 +84,6 @@ class ModuleRegexTRE : public Module
  public:
 	ModuleRegexTRE() : trf(this)
 	{
-		ServerInstance->Modules->AddService(trf);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE