src/list.c

changeset 1433
81c301a59b7c
parent 1429
6e0c3a8a914a
--- a/src/list.c	Mon Oct 20 19:44:18 2025 +0200
+++ b/src/list.c	Mon Oct 20 20:10:36 2025 +0200
@@ -300,16 +300,17 @@
         const void *data,
         size_t n
 ) {
-    size_t elem_size = list->collection.elem_size;
     const char *src = data;
     size_t i = 0;
     for (; i < n; i++) {
         if (NULL == invoke_list_func(
-            insert_element, list, index + i,
-            src + i * elem_size)
+            insert_element, list, index + i, src)
         ) {
             return i; // LCOV_EXCL_LINE
         }
+        if (src != NULL) {
+            src += list->collection.elem_size;
+        }
     }
     return i;
 }
@@ -596,6 +597,32 @@
     return list->cl->insert_element(list, list->collection.size, NULL);
 }
 
+static bool cx_list_emplace_iterator_valid(const void *it) {
+    const CxIterator *iter = it;
+    return iter->index < iter->elem_count;
+}
+
+CxIterator cxListEmplaceArrayAt(CxList *list, size_t index, size_t n) {
+    list->collection.sorted = false;
+    size_t c = list->cl->insert_array(list, index, NULL, n);
+    CxIterator iter = list->cl->iterator(list, index, false);
+    // tweak the fields of this iterator
+    iter.elem_count = c;
+    iter.index = 0;
+    // replace the valid function to abort iteration when c is reached
+    iter.base.valid = cx_list_emplace_iterator_valid;
+    // if we are storing pointers, we want to return the pure pointers.
+    // therefore, we must unwrap the "current" method
+    if (list->collection.store_pointer) {
+        iter.base.current = iter.base.current_impl;
+    }
+    return iter;
+}
+
+CxIterator cxListEmplaceArray(CxList *list, size_t n) {
+    return cxListEmplaceArrayAt(list, list->collection.size, n);
+}
+
 int cxListInsertSorted(CxList *list, const void *elem) {
     assert(cxCollectionSorted(list));
     list->collection.sorted = true;

mercurial