(insert_range): New function.

(insert_element): New function.

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index 9050f18f0858a6918b922d9f875c9df4b2bd23db..fa02a8b9406e8cf15741f23f618176770bdbbe3f 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-03  Ben Pfaff  <blp@gnu.org>
+
+       * array.c (insert_range): New function.
+       (insert_element): New function.
+
 2007-04-25  Ben Pfaff  <blp@gnu.org>
 
        * model-checker.c: Don't use type sighandler_t, which is a GNU

diff --git a/src/libpspp/array.c b/src/libpspp/array.c
index db4dbcba01a2af3e2f909465ae8830bb8a1559c8..8af5d8fecec7ce1ccd5891cae5de6364ea3f8c89 100644 (file)
--- a/src/libpspp/array.c
+++ b/src/libpspp/array.c
@@ -360,6 +360,31 @@ remove_element (void *array, size_t count, size_t size,
   remove_range (array, count, size, idx, 1);
 }
 
+/* Makes room for N elements starting at IDX in ARRAY, which
+   initially consists of COUNT elements of SIZE bytes each, by
+   shifting elements IDX...COUNT (exclusive) to the right by N
+   positions. */
+void
+insert_range (void *array_, size_t count, size_t size,
+              size_t idx, size_t n) 
+{
+  char *array = array_;
+
+  assert (idx <= count);
+  memmove (array + (idx + n) * size, array + idx * size, (count - idx) * size);
+}
+
+/* Makes room for a new element at IDX in ARRAY, which initially
+   consists of COUNT elements of SIZE bytes each, by shifting
+   elements IDX...COUNT (exclusive) to the right by one
+   positions. */
+void
+insert_element (void *array, size_t count, size_t size,
+                size_t idx) 
+{
+  insert_range (array, count, size, idx, 1);
+}
+
 /* Moves an element in ARRAY, which consists of COUNT elements of
    SIZE bytes each, from OLD_IDX to NEW_IDX, shifting around
    other elements as needed.  Runs in O(abs(OLD_IDX - NEW_IDX))

diff --git a/src/libpspp/array.h b/src/libpspp/array.h
index c80fb24c5bb5f717a82d7e9a45e0e31685c5d35d..3cfb245a26f7fe84d800329243d5349593503109 100644 (file)
--- a/src/libpspp/array.h
+++ b/src/libpspp/array.h
@@ -108,6 +108,20 @@ void remove_range (void *array, size_t count, size_t size,
 void remove_element (void *array, size_t count, size_t size,
                      size_t idx);
 
+/* Makes room for N elements starting at IDX in ARRAY, which
+   initially consists of COUNT elements of SIZE bytes each, by
+   shifting elements IDX...COUNT (exclusive) to the right by N
+   positions. */
+void insert_range (void *array, size_t count, size_t size,
+                   size_t idx, size_t n);
+
+/* Makes room for a new element at IDX in ARRAY, which initially
+   consists of COUNT elements of SIZE bytes each, by shifting
+   elements IDX...COUNT (exclusive) to the right by one
+   positions. */
+void insert_element (void *array, size_t count, size_t size,
+                     size_t idx);
+
 /* Moves an element in ARRAY, which consists of COUNT elements of
    SIZE bytes each, from OLD_IDX to NEW_IDX, shifting around
    other elements as needed.  Runs in O(abs(OLD_IDX - NEW_IDX))