Changeset 102084 in webkit

Timestamp:

Dec 5, 2011, 6:17:22 PM (15 years ago)

Author:

andersca@apple.com

Message:

Add HashMap::keys() and HashMap::values() for easy iteration of hash map keys and values in C++11.

Reviewed by Darin Adler.

• wtf/HashMap.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/HashMap.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-12-05  Anders Carlsson  <andersca@apple.com>
+
+        Add HashMap::keys() and HashMap::values() for easy iteration of hash map keys and values in C++11.
+
+        Reviewed by Darin Adler.
+
+        * wtf/HashMap.h:
+
 2011-12-05  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/wtf/HashMap.h

@@ -61 +61 @@
             HashFunctions, ValueTraits, KeyTraits> HashTableType;
 
+        class HashMapKeysProxy;
+        class HashMapValuesProxy;
+
     public:
         typedef HashTableIteratorAdapter<HashTableType, ValueType> iterator;
         typedef HashTableConstIteratorAdapter<HashTableType, ValueType> const_iterator;
 
+    public:
         void swap(HashMap&);
 
@@ -76 +80 @@
         const_iterator begin() const;
         const_iterator end() const;
+
+        HashMapKeysProxy& keys() { return static_cast<HashMapKeysProxy&>(*this); }
+        const HashMapKeysProxy& keys() const { return static_cast<const HashMapKeysProxy&>(*this); }
+
+        HashMapValuesProxy& values() { return static_cast<HashMapValuesProxy&>(*this); }
+        const HashMapValuesProxy& values() const { return static_cast<const HashMapValuesProxy&>(*this); }
 
         iterator find(const KeyType&);
@@ -119 +129 @@
     private:
         pair<iterator, bool> inlineAdd(const KeyType&, MappedPassInReferenceType);
+
+        class HashMapKeysProxy : private HashMap {
+        public:
+            typedef typename HashMap::iterator::Keys iterator;
+            typedef typename HashMap::const_iterator::Keys const_iterator;
+            
+            iterator begin()
+            {
+                return HashMap::begin().keys();
+            }
+            
+            iterator end()
+            {
+                return HashMap::end().keys();
+            }
+
+            const_iterator begin() const
+            {
+                return HashMap::begin().keys();
+            }
+            
+            const_iterator end() const
+            {
+                return HashMap::end().keys();
+            }
+
+        private:
+            friend class HashMap;
+
+            // These are intentionally not implemented.
+            HashMapKeysProxy();
+            HashMapKeysProxy(const HashMapKeysProxy&);
+            HashMapKeysProxy& operator=(const HashMapKeysProxy&);
+            ~HashMapKeysProxy();
+        };
+
+        class HashMapValuesProxy : private HashMap {
+        public:
+            typedef typename HashMap::iterator::Values iterator;
+            typedef typename HashMap::const_iterator::Values const_iterator;
+            
+            iterator begin()
+            {
+                return HashMap::begin().values();
+            }
+            
+            iterator end()
+            {
+                return HashMap::end().values();
+            }
+
+            const_iterator begin() const
+            {
+                return HashMap::begin().values();
+            }
+            
+            const_iterator end() const
+            {
+                return HashMap::end().values();
+            }
+
+        private:
+            friend class HashMap;
+
+            // These are intentionally not implemented.
+            HashMapValuesProxy();
+            HashMapValuesProxy(const HashMapValuesProxy&);
+            HashMapValuesProxy& operator=(const HashMapValuesProxy&);
+            ~HashMapValuesProxy();
+        };
 
         HashTableType m_impl;