Mercurial > hg > ucx / file diff

--- a/tests/test_iterator.c	Fri Oct 17 15:04:56 2025 +0200
+++ b/tests/test_iterator.c	Fri Oct 17 16:53:24 2025 +0200
@@ -35,24 +35,24 @@
     size_t size = cx_nmemb(array);
     for (unsigned i = 0 ; i < size ; i++) array[i] = i;
 
-    CxIterator iter = cxIterator(array, sizeof(unsigned), size);
+    CxIterator iter = cxIterator(array, sizeof(unsigned), size, true);
     CX_TEST_DO {
         CX_TEST_ASSERT(iter.index == 0);
         CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
         CX_TEST_ASSERT(iter.elem_count == size);
-        CX_TEST_ASSERT(iter.src_handle.c == array);
+        CX_TEST_ASSERT(iter.src_handle == array);
         CX_TEST_ASSERT(iter.elem_handle == &array[0]);
         CX_TEST_ASSERT(cxIteratorValid(iter));
     }
 }
 
 CX_TEST(test_iterator_create_null) {
-    CxIterator iter = cxIterator(NULL, sizeof(unsigned), 47);
+    CxIterator iter = cxIterator(NULL, sizeof(unsigned), 47, true);
     CX_TEST_DO {
         CX_TEST_ASSERT(iter.index == 0);
         CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
         CX_TEST_ASSERT(iter.elem_count == 0);
-        CX_TEST_ASSERT(iter.src_handle.c == NULL);
+        CX_TEST_ASSERT(iter.src_handle == NULL);
         CX_TEST_ASSERT(iter.elem_handle == NULL);
         CX_TEST_ASSERT(!cxIteratorValid(iter));
     }
@@ -63,11 +63,11 @@
     size_t size = cx_nmemb(array);
     for (unsigned i = 0 ; i < size ; i++) array[i] = i;
 
-    CxIterator iter = cxIterator(array, sizeof(unsigned), size);
+    CxIterator iter = cxIterator(array, sizeof(unsigned), size, true);
     CX_TEST_DO {
         CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
         CX_TEST_ASSERT(iter.elem_count == size);
-        CX_TEST_ASSERT(iter.src_handle.c == array);
+        CX_TEST_ASSERT(iter.src_handle == array);
         unsigned expected = 0;
         cx_foreach(unsigned *, e, iter) {
             CX_TEST_ASSERT(iter.index == expected);
@@ -88,11 +88,11 @@
         ptr_array[i] = &array[i];
     }
 
-    CxIterator iter = cxIteratorPtr(ptr_array, size);
+    CxIterator iter = cxIteratorPtr(ptr_array, size, true);
     CX_TEST_DO {
         CX_TEST_ASSERT(iter.elem_size == sizeof(void*));
         CX_TEST_ASSERT(iter.elem_count == size);
-        CX_TEST_ASSERT(iter.src_handle.c == ptr_array);
+        CX_TEST_ASSERT(iter.src_handle == ptr_array);
         unsigned idx = 0;
         cx_foreach(unsigned *, e, iter) {
             CX_TEST_ASSERT(iter.index == idx);
@@ -121,7 +121,7 @@
             0, 2, 4, 6, 8, 10, 12, 14, 16, 18
     };
 
-    CxIterator iter = cxMutIterator(array, sizeof(unsigned), size, true);
+    CxIterator iter = cxIterator(array, sizeof(unsigned), size, true);
     CX_TEST_DO {
         unsigned expected = 0;
         cx_foreach(unsigned *, e, iter) {
@@ -129,7 +129,7 @@
             CX_TEST_ASSERT(iter.index == indices[expected]);
             CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
             CX_TEST_ASSERT(iter.elem_count == elem_counts[expected]);
-            CX_TEST_ASSERT(iter.src_handle.m == array);
+            CX_TEST_ASSERT(iter.src_handle == array);
             CX_TEST_ASSERT(iter.elem_handle == &array[indices[expected]]);
             expected++;
             if (expected % 2 == 0) {
@@ -166,7 +166,7 @@
             15, 6, 14, 7, 13, 8, 12, 9, 11, 10
     };
 
-    CxIterator iter = cxMutIterator(array, sizeof(unsigned), size, false);
+    CxIterator iter = cxIterator(array, sizeof(unsigned), size, false);
     CX_TEST_DO {
         unsigned expected = 0;
         cx_foreach(unsigned *, e, iter) {
@@ -174,7 +174,7 @@
             CX_TEST_ASSERT(iter.index == indices[expected]);
             CX_TEST_ASSERT(iter.elem_size == sizeof(unsigned));
             CX_TEST_ASSERT(iter.elem_count == elem_counts[expected]);
-            CX_TEST_ASSERT(iter.src_handle.m == array);
+            CX_TEST_ASSERT(iter.src_handle == array);
             CX_TEST_ASSERT(iter.elem_handle == &array[indices[expected]]);
             expected++;
             if (expected % 2 == 0) {