Issue 5141 - Generalize Map class to allow non-strings as keys

compiled/StringMap.h

 /*
  * 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 <cstddef>
 
 #include "Map.h"
 #include "String.h"
 
 namespace StringMap_internal
 {
   struct StringSetEntry
   {
-    typedef String key_type;
+    typedef DependentString key_type;
+    typedef const String& key_type_cref;
     typedef size_t size_type;
 
-    DependentString first;
+    key_type first;
 
-    StringSetEntry() {}
-    StringSetEntry(const key_type& key)
-        : first(key)
+    StringSetEntry(key_type_cref key = key_type())
     {
+      if (!key.is_invalid())
+        first.reset(key);
     }
 
-    bool equals(const key_type& other) const
+    bool equals(key_type_cref other) const
     {
       return first.equals(other);
     }
 
     bool is_invalid() const
     {
       return first.is_invalid();
     }
 
     bool is_deleted() const
     {
       return first.is_deleted();
     }
 
     void erase()
     {
       first.erase();
     }
 
-    static size_type hash(const key_type& key)
+    static size_type hash(key_type_cref key)
     {
       // FNV-1a hash function
       size_type result = 2166136261;
       for (String::size_type i = 0; i < key.length(); i++)
         result = (result ^ key[i]) * 16777619;
       return result;
     }
   };
 
   template<typename Value>
   struct StringMapEntry : StringSetEntry
   {
     typedef StringSetEntry super;
     typedef Value value_type;
 
-    Value second;
+    value_type second;
 
-    StringMapEntry()
-        : StringSetEntry(), second()
-    {
-    }
-    StringMapEntry(const key_type& key)
-        : StringSetEntry(key), second()
-    {
-    }
-    StringMapEntry(const key_type& key, value_type value)
-        : StringSetEntry(key), second(value)
+    StringMapEntry(key_type_cref key = DependentString(),
+                   value_type value = value_type())
+        : super(key), second(value)
     {
     }
 
     void erase()
     {
       super::erase();
       second = value_type();

[Wladimir Palant, 2017/10/10 14:33:59]

This is a logic change. Previously, StringMap::erase() would merely invalidate
the key but not remove the value. This meant that a filter pointer would keep a
reference to a filter even after the entry was removed.

[sergei, 2017/10/11 10:03:21]

The new version looks better.

     }
   };
 }
 
-class StringSet : public Set<StringMap_internal::StringSetEntry>
-{
-};
+using StringSet = Set<StringMap_internal::StringSetEntry>;
 
 template<typename Value>
-class StringMap : public Map<StringMap_internal::StringMapEntry<Value>, Value>
-{
-public:
-  typedef Map<StringMap_internal::StringMapEntry<Value>, Value> super;
-  typedef typename super::entry_type entry_type;
-  typedef typename super::size_type size_type;
-
-  explicit StringMap(size_type expectedEntries = 0)
-      : super(expectedEntries)
-  {
-  }
-
-  StringMap(std::initializer_list<entry_type> list)
-      : super(list.size())
-  {
-    for (const auto& item : list)
-      super::insert(item);
-  }
-};
+using StringMap = Map<StringMap_internal::StringMapEntry<Value>>;