Fix: isEmpty checking wrongly in ArrayList.

huntlabs · Nov 16, 2021 · f907065 · f907065
1 parent bcda079
commit f907065
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/source/hunt/collection/AbstractList.d b/source/hunt/collection/AbstractList.d
@@ -256,9 +256,10 @@ abstract class AbstractList(E) : AbstractCollection!E, List!E {
     override size_t toHash() @trusted nothrow {
         size_t hashCode = 1;
         try {
-            static if (is(E == class)) {
-                foreach (E e; this)
+            static if (is(E == class) || is(E == interface)) {
+                foreach (E e; this) {
                     hashCode = 31 * hashCode + (e is null ? 0 : (cast(Object) e).toHash());
+                }
             } else {
                 foreach (E e; this)
                     hashCode = 31 * hashCode + hashOf(e);

diff --git a/source/hunt/collection/ArrayList.d b/source/hunt/collection/ArrayList.d
@@ -226,7 +226,7 @@ class ArrayList(E) : AbstractList!E {
      * @return <tt>true</tt> if this list contains no elements
      */
     override bool isEmpty() {
-        return _array.length == 0;
+        return _size == 0;
     }
 
     /**

diff --git a/source/hunt/collection/Map.d b/source/hunt/collection/Map.d
@@ -1114,8 +1114,11 @@ abstract class AbstractMapEntry(K, V) : MapEntry!(K,V) {
 
     alias opCmp = Object.opCmp;
 
-
     override size_t toHash() @trusted nothrow {
-        return hashOf(key) ^ hashOf(value);
+        static if(is(V == interface)) {
+            return hashOf(key) ^ hashOf(cast(Object)value);
+        } else {
+            return hashOf(key) ^ hashOf(value);
+        }
     }
 }