Changeset 2109Tweet

Timestamp:

Nov 22, 2012, 2:05:40 PM (11 years ago)

Author:

sam

Message:

core: we can now set Map elements using simply map[foo] = bar, no need for
a Set() method. Also, new HasKey() method.

Location:

trunk

Files:

• src/lol/core/map.h (modified) (4 diffs)
• test/Makefile.am (modified) (1 diff)
• test/testsuite.vcxproj (modified) (1 diff)
• test/unit/map.cpp (added)

trunk/src/lol/core/map.h

@@ -21 +21 @@
 {
 
-/* A stupidly linear map for now */
+/* A stupidly linear map for now. */
 template<typename K, typename V> class Map : protected Hash<K>
 {
 public:
+    /* I choose to make this inline because passing the key by reference
+     * is usually suboptimal. */
     inline V const& operator[] (K const &key) const
     {
+        /* Look for the hash in our table and return the value. */
         uint32_t hash = ((Hash<K> const &)*this)(key);
         for (int i = 0; i < m_array.Count(); ++i)
@@ -32 +35 @@
                 if (m_array[i].m2 == key)
                     return m_array[i].m3;
+        /* XXX: this in an error! */
         return V();
     }
@@ -37 +41 @@
     inline V & operator[] (K const &key)
     {
-        return const_cast<V &>((const_cast<Map<K,V> const &>(*this))[key]);
-    }
-
-    inline V & Set(K const &key, V const &val)
-    {
+        /* Look for the hash in our table and return the value if found. */
         uint32_t hash = ((Hash<K> const &)*this)(key);
         for (int i = 0; i < m_array.Count(); ++i)
             if (m_array[i].m1 == hash)
                 if (m_array[i].m2 == key)
-                {
-                    m_array[i].m3.~V();
-                    return m_array[i].m3 = val;
-                }
-
-        m_array.Push(hash, key, val);
+                    return m_array[i].m3;
+        /* If not found, insert a new value. */
+        m_array.Push(hash, key, V());
         return m_array.Last().m3;
     }
@@ -67 +64 @@
     }
 
+    inline bool HasKey(K const &key)
+    {
+        uint32_t hash = ((Hash<K> const &)*this)(key);
+        for (int i = 0; i < m_array.Count(); ++i)
+            if (m_array[i].m1 == hash)
+                if (m_array[i].m2 == key)
+                    return true;
+        return false;
+    }
+
 private:
     Array<uint32_t, K, V> m_array;

trunk/test/Makefile.am

@@ -23 +23 @@
     unit/vector.cpp unit/matrix.cpp unit/half.cpp unit/trig.cpp \
     unit/build.cpp unit/real.cpp unit/image.cpp unit/quat.cpp unit/cmplx.cpp \
-    unit/array.cpp unit/rotation.cpp unit/string.cpp
+    unit/array.cpp unit/rotation.cpp unit/string.cpp unit/map.cpp
 testsuite_CPPFLAGS = @LOL_CFLAGS@
 testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@

trunk/test/testsuite.vcxproj

@@ -42 +42 @@
     <ClCompile Include="unit\half.cpp" />
     <ClCompile Include="unit\image.cpp" />
+    <ClCompile Include="unit\map.cpp" />
     <ClCompile Include="unit\matrix.cpp" />
     <ClCompile Include="unit\quat.cpp" />
     <ClCompile Include="unit\real.cpp" />
     <ClCompile Include="unit\rotation.cpp" />
+    <ClCompile Include="unit\string.cpp" />
     <ClCompile Include="unit\trig.cpp" />
     <ClCompile Include="unit\vector.cpp" />