pcre* regex;
public:
- PCRERegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+ PCRERegex(const std::string& rx) : Regex(rx)
{
const char* error;
int erroffset;
regex = pcre_compile(rx.c_str(), 0, &error, &erroffset, NULL);
if (!regex)
{
- Me->Logs->Log("REGEX", DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
+ ServerInstance->Logs->Log("REGEX", DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
throw PCREException(rx, error, erroffset);
}
}
}
};
-class ModuleRegexPCRE : public Module
+class PCREFactory : public RegexFactory
{
-public:
- ModuleRegexPCRE(InspIRCd* Me) : Module(Me)
+ public:
+ PCREFactory(Module* m) : RegexFactory(m, "regex/pcre") {}
+ Regex* Create(const std::string& expr)
{
- Me->Modules->PublishInterface("RegularExpression", this);
- Implementation eventlist[] = { I_OnRequest };
- Me->Modules->Attach(eventlist, this, 1);
- }
-
- virtual Version GetVersion()
- {
- return Version("Regex Provider Module for PCRE", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+ return new PCRERegex(expr);
}
+};
- virtual ~ModuleRegexPCRE()
- {
- ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+class ModuleRegexPCRE : public Module
+{
+public:
+ PCREFactory ref;
+ ModuleRegexPCRE() : ref(this) {
+ ServerInstance->Modules->AddService(ref);
}
- virtual const char* OnRequest(Request* request)
+ Version GetVersion()
{
- if (strcmp("REGEX-NAME", request->GetId()) == 0)
- {
- return "pcre";
- }
- else if (strcmp("REGEX", request->GetId()) == 0)
- {
- RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
- std::string rx = rfr->GetRegex();
- rfr->result = new PCRERegex(rx, ServerInstance);
- return "OK";
- }
- return NULL;
+ return Version("Regex Provider Module for PCRE", VF_OPTCOMMON | VF_VENDOR);
}
};