Issue 5141 - Convert filter match to C++

compiled/filter/Matcher.h

Index: compiled/filter/Matcher.h
===================================================================
new file mode 100644
--- /dev/null
+++ b/compiled/filter/Matcher.h
@@ -0,0 +1,81 @@
+/*
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <vector>
+
+#include "../debug.h"
+#include "../bindings/runtime.h"
+#include "../StringMap.h"
+#include "Filter.h"
+
+class MatcherBase : public ref_counted

[hub, 2017/09/26 21:49:00]

the base class exposing the interface. Regular matcher and CombinedMatcher
implements it much like it is done in JavaScript. But this is hidden from the
interface clients.

+{
+private:
+  static MatcherBase* mInstance;
+
+public:
+  virtual ~MatcherBase()
+  {
+  }
+
+  static MatcherBase* BINDINGS_EXPORTED GetDefaultInstance()
+  {
+    return mInstance;
+  }
+  virtual void BINDINGS_EXPORTED Add(const FilterPtr&) = 0;
+  virtual void BINDINGS_EXPORTED Remove(const FilterPtr&) = 0;
+  virtual void BINDINGS_EXPORTED Clear() = 0;
+  virtual bool BINDINGS_EXPORTED HasFilter(const FilterPtr&) const = 0;
+  virtual const String& BINDINGS_EXPORTED GetKeywordForFilter(const FilterPtr& filter) = 0;
+  virtual Filter* BINDINGS_EXPORTED MatchesAny(const String& location,
+    int typeMask, DependentString& docDomain, bool thirdParty,
+    const String& sitekey, bool specificOnly) = 0;
+  virtual OwnedString FindKeyword(const FilterPtr&) = 0;
+};
+
+typedef intrusive_ptr<MatcherBase> MatcherPtr;
+
+class Matcher : public MatcherBase

[hub, 2017/09/26 21:49:00]

now that I re-read this I ponder whether this `Matcher` should be moved to the
cpp file.

[hub, 2017/09/27 15:28:25]

We need it in a public header as notification.js want to instantiate directly.

+{
+private:
+  friend class CombinedMatcher;
+  StringMap<std::vector<FilterPtr>> mFilterByKeyword;
+  StringMap<OwnedString> mKeywordByFilter;
+  int mFilterReId;
+  int mOptionsReId;
+  int mCandidatesReId;
+public:
+  Matcher();
+  ~Matcher();
+
+  void BINDINGS_EXPORTED Add(const FilterPtr&) override;
+  void BINDINGS_EXPORTED Remove(const FilterPtr&) override;
+  void BINDINGS_EXPORTED Clear() override ;
+  bool BINDINGS_EXPORTED HasFilter(const FilterPtr&) const override;
+  const String& BINDINGS_EXPORTED GetKeywordForFilter(const FilterPtr& filter) override;
+  Filter* BINDINGS_EXPORTED MatchesAny(const String& location,
+    int typeMask, DependentString& docDomain, bool thirdParty,
+    const String& sitekey, bool specificOnly) override;
+  OwnedString FindKeyword(const FilterPtr&) override;
+private:
+  Filter* _CheckEntryMatch(const String& keyword,
+    const String& location,
+    int typeMask, DependentString& docDomain, bool thirdParty,
+    const String& sitekey, bool specificOnly);
+};