From 54fb0cd5aa7d090d5c3da5ab54988c86ba8a2e8e Mon Sep 17 00:00:00 2001 From: danieldg Date: Mon, 16 Nov 2009 17:59:06 +0000 Subject: Use ServiceProvider for inter-module dependencies This will stop dependency chains from preventing module reloads when it is not actually needed; however, it removes some failsafes that will need to be reimplemented in order to avoid unmapped vtables. This deprecates Request as an inter-module signaling mechanism, although SQL still uses it. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12140 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/extra/m_regex_tre.cpp | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'src/modules/extra/m_regex_tre.cpp') diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp index 01c6ebf4a..5a208ec8a 100644 --- a/src/modules/extra/m_regex_tre.cpp +++ b/src/modules/extra/m_regex_tre.cpp @@ -73,35 +73,30 @@ public: } }; +class TREFactory : public RegexFactory { + public: + TREFactory(Module* m) : RegexFactory(m, "regex/tre") {} + Regex* Create(const std::string& expr) + { + return new TRERegex(expr); + } +}; + class ModuleRegexTRE : public Module { + TREFactory trf; public: - ModuleRegexTRE() { - ServerInstance->Modules->PublishInterface("RegularExpression", this); + ModuleRegexTRE() : trf(this) { + ServerInstance->Modules->AddService(trf); } - virtual Version GetVersion() + Version GetVersion() { return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR); } - virtual ~ModuleRegexTRE() + ~ModuleRegexTRE() { - ServerInstance->Modules->UnpublishInterface("RegularExpression", this); - } - - void OnRequest(Request& request) - { - if (strcmp("REGEX-NAME", request.id) == 0) - { - static_cast(request).result = "tre"; - } - else if (strcmp("REGEX", request.id) == 0) - { - RegexFactoryRequest& rfr = (RegexFactoryRequest&)request; - std::string rx = rfr.GetRegex(); - rfr.result = new TRERegex(rx); - } } }; -- cgit v1.2.3