1 files changed, 5 insertions, 19 deletions

diff --git a/libdimension/dimension/array.h b/libdimension/dimension/array.h
index e383ece..e3dc7b4 100644
--- a/libdimension/dimension/array.h
+++ b/libdimension/dimension/array.h
@@ -84,10 +84,7 @@ dmnsn_array_resize(dmnsn_array *array, size_t length)
 DMNSN_INLINE void
 dmnsn_array_get(const dmnsn_array *array, size_t i, void *obj)
 {
-  if (i >= dmnsn_array_size(array)) {
-    /* Range check failed */
-    dmnsn_error(DMNSN_SEVERITY_HIGH, "Array index out of bounds.");
-  }
+  dmnsn_assert(i < dmnsn_array_size(array), "Array index out of bounds.");
   memcpy(obj, (char *)array->ptr + array->obj_size*i, array->obj_size);
 }
 
@@ -107,10 +104,7 @@ dmnsn_array_set(dmnsn_array *array, size_t i, const void *obj)
 DMNSN_INLINE void *
 dmnsn_array_at(const dmnsn_array *array, size_t i)
 {
-  if (i >= dmnsn_array_size(array)) {
-    /* Resize if i is out of range */
-    dmnsn_error(DMNSN_SEVERITY_HIGH, "Array index out of bounds.");
-  }
+  dmnsn_assert(i < dmnsn_array_size(array), "Array index out of bounds.");
   return (char *)array->ptr + array->obj_size*i;
 }
 
@@ -126,11 +120,7 @@ DMNSN_INLINE void
 dmnsn_array_pop(dmnsn_array *array, void *obj)
 {
   size_t size = dmnsn_array_size(array);
-  if (size <= 0) {
-    /* Range check failed */
-    dmnsn_error(DMNSN_SEVERITY_HIGH, "Array is empty.");
-  }
-
+  dmnsn_assert(size > 0, "Array is empty.");
   dmnsn_array_get(array, size - 1, obj); /* Copy the object */
   dmnsn_array_resize(array, size - 1);   /* Shrink the array */
 }
@@ -157,15 +147,11 @@ DMNSN_INLINE void
 dmnsn_array_remove(dmnsn_array *array, size_t i)
 {
   size_t size = dmnsn_array_size(array);
-  if (i >= size) {
-    /* Range check failed */
-    dmnsn_error(DMNSN_SEVERITY_HIGH, "Array index out of bounds.");
-  }
-
+  dmnsn_assert(i < size, "Array index out of bounds.");
   /* Move the array elements after `i' 1 to the left */
   memmove((char *)array->ptr + array->obj_size*i,
           (char *)array->ptr + array->obj_size*(i + 1),
-          array->obj_size*(size - i));
+          array->obj_size*(size - i - 1));
   /* Decrease the size by 1 */
   dmnsn_array_resize(array, size - 1);
 }