Issue 4127 - [emscripten] Convert subscription classes to C++ - Part 2

compiled/subscription/UserDefinedSubscription.cpp

+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2017 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/>.
+ */
+
+#include <cstdlib>
+
 #include "UserDefinedSubscription.h"
 
-int UserDefinedSubscription::filterTypeToDefaults[] = {
-  UserDefinedSubscription::Defaults::BLOCKING,   // UNKNOWN
-  UserDefinedSubscription::Defaults::BLOCKING,   // INVALID
-  UserDefinedSubscription::Defaults::BLOCKING,   // COMMENT
-  UserDefinedSubscription::Defaults::BLOCKING,   // BLOCKING
-  UserDefinedSubscription::Defaults::WHITELIST,  // WHITELIST
-  UserDefinedSubscription::Defaults::ELEMHIDE,   // ELEMHIDE
-  UserDefinedSubscription::Defaults::ELEMHIDE,   // ELEMHIDEEXCEPTION
-  UserDefinedSubscription::Defaults::ELEMHIDE,   // ELEMHIDEEMULATION
-};
+namespace
+{
+  enum FilterCategory
+  {
+    WHITELIST = 1,
+    BLOCKING = 2,
+    ELEMHIDE = 4,
+  };
+
+  const FilterCategory filterTypeToCategory[] = {
+    FilterCategory::BLOCKING,   // UNKNOWN
+    FilterCategory::BLOCKING,   // INVALID
+    FilterCategory::BLOCKING,   // COMMENT
+    FilterCategory::BLOCKING,   // BLOCKING
+    FilterCategory::WHITELIST,  // WHITELIST
+    FilterCategory::ELEMHIDE,   // ELEMHIDE
+    FilterCategory::ELEMHIDE,   // ELEMHIDEEXCEPTION
+    FilterCategory::ELEMHIDE,   // ELEMHIDEEMULATION
+  };
+
+  static_assert(
+    sizeof(filterTypeToCategory) / sizeof(filterTypeToCategory[0]) == Filter::Type::VALUE_COUNT,
+    "Unexpected number of filter types, was a new type added?"
+  );
+}
 
 UserDefinedSubscription::UserDefinedSubscription(const String& id)
     : Subscription(Type::USERDEFINED, id), mDefaults(0)
 {
 }
 
 bool UserDefinedSubscription::IsDefaultFor(const Filter* filter) const
 {
-  return mDefaults & filterTypeToDefaults[filter->mType];
+  if (filter->mType >= Filter::Type::VALUE_COUNT)
+  {
+    assert(false, "Filter type exceeds valid range");
+    abort();
+  }
+  return mDefaults & filterTypeToCategory[filter->mType];
 }
 
 void UserDefinedSubscription::MakeDefaultFor(const Filter* filter)
 {
-  mDefaults |= filterTypeToDefaults[filter->mType];
+  if (filter->mType >= Filter::Type::VALUE_COUNT)
+  {
+    assert(false, "Filter type exceeds valid range");
+    abort();
+  }
+  mDefaults |= filterTypeToCategory[filter->mType];
 }
 
 void UserDefinedSubscription::InsertFilterAt(Filter* filter, unsigned pos)
 {
   if (pos >= mFilters.size())
     mFilters.emplace_back(filter);
   else
     mFilters.emplace(mFilters.begin() + pos, filter);
 }
 
 bool UserDefinedSubscription::RemoveFilterAt(unsigned pos)
 {
   if (pos >= mFilters.size())
     return false;
 
   mFilters.erase(mFilters.begin() + pos);
   return true;
 }
 
 OwnedString UserDefinedSubscription::Serialize() const
 {
   OwnedString result(Subscription::Serialize());
   if (mDefaults)
   {
     result.append(u"defaults="_str);
-    if (mDefaults & Defaults::BLOCKING)
+    if (mDefaults & FilterCategory::BLOCKING)
       result.append(u" blocking"_str);
-    if (mDefaults & Defaults::WHITELIST)
+    if (mDefaults & FilterCategory::WHITELIST)
       result.append(u" whitelist"_str);
-    if (mDefaults & Defaults::ELEMHIDE)
+    if (mDefaults & FilterCategory::ELEMHIDE)
       result.append(u" elemhide"_str);
     result.append(u'\n');
   }
   return result;
 }