Issue 5141 - Convert filter match to C++

compiled/bindings/main.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 16 matching lines @@
 #include "../filter/BlockingFilter.h"
 #include "../filter/WhitelistFilter.h"
 #include "../filter/ElemHideBase.h"
 #include "../filter/ElemHideFilter.h"
 #include "../filter/ElemHideException.h"
 #include "../filter/ElemHideEmulationFilter.h"
 #include "../subscription/Subscription.h"
 #include "../subscription/DownloadableSubscription.h"
 #include "../subscription/UserDefinedSubscription.h"
 #include "../storage/FilterStorage.h"
+#include "../filter/Matcher.h"
 #include "../FilterNotifier.h"
 
 int main()
 {
   try
   {
     class_<Filter>("Filter")
         .property("text", &Filter::GetText)
         .function("serialize", &Filter::Serialize)
         .class_function("fromText", &Filter::FromText)
@@ skipping 77 matching lines @@
         .property("softExpiration", &DownloadableSubscription::GetSoftExpiration, &DownloadableSubscription::SetSoftExpiration)
         .property("lastDownload", &DownloadableSubscription::GetLastDownload, &DownloadableSubscription::SetLastDownload)
         .property("downloadStatus", &DownloadableSubscription::GetDownloadStatus, &DownloadableSubscription::SetDownloadStatus)
         .property("lastSuccess", &DownloadableSubscription::GetLastSuccess, &DownloadableSubscription::SetLastSuccess)
         .property("errors", &DownloadableSubscription::GetErrorCount, &DownloadableSubscription::SetErrorCount)
         .property("version", &DownloadableSubscription::GetDataRevision, &DownloadableSubscription::SetDataRevision)
         .property("requiredVersion", &DownloadableSubscription::GetRequiredVersion, &DownloadableSubscription::SetRequiredVersion)
         .property("downloadCount", &DownloadableSubscription::GetDownloadCount, &DownloadableSubscription::SetDownloadCount)
         .function("serialize", &DownloadableSubscription::Serialize);
 
+    class_<ReMatchResults>("ReMatchResults")
+        .function("push", &ReMatchResults::push);
+
+    class_<CombinedMatcher>("CombinedMatcher")
+        .function("add", &CombinedMatcher::Add)
+        .function("remove", &CombinedMatcher::Remove)
+        .function("matchesAny", &CombinedMatcher::MatchesAny)
+        .function("clear", &CombinedMatcher::Clear)
+        .function("hasFilter", &CombinedMatcher::HasFilter)
+        .function("getKeywordForFilter", &CombinedMatcher::GetKeywordForFilter)
+        .function("findKeyword", &CombinedMatcher::FindKeyword);

[hub, 2017/09/29 16:17:35]

the function bindings are mostly needed for the tests.

+
+    class_<Matcher>("Matcher")
+        .function("add", &Matcher::Add)
+        .function("remove", &Matcher::Remove)
+        .function("matchesAny", &Matcher::MatchesAny)
+        .function("clear", &Matcher::Clear)
+        .function("hasFilter", &Matcher::HasFilter)
+        .function("getKeywordForFilter", &Matcher::GetKeywordForFilter)
+        .function("findKeyword", &Matcher::FindKeyword);
+
     singleton<FilterStorage>("FilterStorage", &FilterStorage::GetInstance)
         .property("subscriptionCount", &FilterStorage::GetSubscriptionCount)
         .function("subscriptionAt", &FilterStorage::SubscriptionAt)
         .function("indexOfSubscription", &FilterStorage::IndexOfSubscription)
         .function("getSubscriptionForFilter", &FilterStorage::GetSubscriptionForFilter)
         .function("addSubscription", &FilterStorage::AddSubscription)
         .function("removeSubscription", &FilterStorage::RemoveSubscription)
         .function("moveSubscription", &FilterStorage::MoveSubscription);
 
     printBindings();
     RegExpFilter::GenerateCustomBindings();
     FilterNotifier::GenerateCustomBindings();
 
     return 0;
   }
   catch (const std::exception& e)
   {
     EM_ASM_ARGS(
       console.error("Error occurred generating JavaScript bindings: " +
           Module.AsciiToString($0)), e.what()
     );
     return 1;
   }
 }