Use asserts in array

codegen/array/make_array.py

@@ -100,7 +100,11 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
     source = CSource(
         name=header.name,
         decl_types=[*common_decl_types],
-        includes=[CInclude(header, local=True, same_dir=True), CInclude(header="stddef.h")],
+        includes=[
+            CInclude(header, local=True, same_dir=True),
+            CInclude(header="stddef.h"),
+            CInclude(header="assert.h"),
+        ],
         internal_funcs=[],
         funcs=header.funcs
     )

codegen/array/snippets/alloc_capacity

@@ -1,11 +1,7 @@
+  assert(allocator != NULL);
+
   u64 allocation_size = sizeof({ArrayType}) + item_size * capacity;
-  {ArrayType} *array   = NULL;
+  {ArrayType} *array  = wapp_mem_allocator_alloc(allocator, allocation_size);
-
-  if (!allocator) {{
-    goto RETURN_GENERIC_ARRAY_ALLOC;
-  }}
-
-  array = wapp_mem_allocator_alloc(allocator, allocation_size);
   if (!array) {{
     goto RETURN_GENERIC_ARRAY_ALLOC;
   }}

codegen/array/snippets/append_alloc

@@ -1,8 +1,6 @@
-  {ArrayType} *output = array;
+  assert(allocator != NULL && array != NULL);
 
-  if (!allocator || !array) {{
+  {ArrayType} *output = array;
-    goto RETURN_{Tupper}_ARRAY_APPEND_ALLOC;
-  }}
 
   if (array->count >= array->capacity) {{
     u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(array->capacity * 2);

codegen/array/snippets/append_capped

@@ -1,6 +1,4 @@
-  if (!array || array->count >= array->capacity) {{
+  assert(array != NULL && array->count < array->capacity);
-    return;
-  }}
 
   u64 index = (array->count)++;
   wapp_{Tlower}_array_set(array, index, item);

codegen/array/snippets/array_get

@@ -1,6 +1,4 @@
-  if (!array || index >= array->count) {{
+  assert(array != NULL & index < array->count);
-    return NULL;
-  }}
 
   u8 *ptr = (u8 *)(array->items) + (array->item_size * index);
   return ({T} *)ptr;

codegen/array/snippets/array_set

@@ -1,6 +1,3 @@
   {T} *ptr = wapp_{Tlower}_array_get(array, index);
-  if (!ptr) {{
-    return;
-  }}
 
   memcpy((void *)ptr, (void *)item, array->item_size);

codegen/array/snippets/clear

@@ -1,5 +1,2 @@
-  if (!array) {{
+  assert(array != NULL);
-    return;
-  }}
-
   array->count = 0;

codegen/array/snippets/copy_alloc

@@ -1,8 +1,6 @@
-  {ArrayType} *output = dst;
+  assert(allocator != NULL & src != NULL && dst != NULL);
 
-  if (!allocator || !src || !dst) {{
+  {ArrayType} *output = dst;
-    goto RETURN_{Tupper}_ARRAY_COPY_ALLOC;
-  }}
 
   if (src->count >= dst->capacity) {{
     u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);

codegen/array/snippets/copy_capped

@@ -1,6 +1,4 @@
-  if (!src || !dst) {{
+  assert(src != NULL && dst != NULL);
-    return;
-  }}
 
   wapp_{Tlower}_array_clear(dst);
 

codegen/array/snippets/extend_alloc

@@ -1,8 +1,6 @@
-  {ArrayType} *output = array;
+  assert(allocator != NULL && array != NULL && other != NULL);
 
-  if (!allocator || !array || !other) {{
+  {ArrayType} *output = array;
-    goto RETURN_{Tupper}_ARRAY_EXTEND_ALLOC;
-  }}
 
   u64 remaining_capacity = array->capacity - array->count;
   if (other->count >= remaining_capacity) {{

codegen/array/snippets/extend_capped

@@ -1,11 +1,7 @@
-  if (!array || !other) {{
+  assert(array != NULL && other != NULL);
-    return;
-  }}
 
   u64 remaining_capacity = array->capacity - array->count;
-  if (other->count >= remaining_capacity) {{
+  assert(other->count < remaining_capacity);
-    return;
-  }}
 
   {T} *item;
 

tests/array/test_i32_array.c

@@ -86,7 +86,6 @@ TestFuncResult test_i32_array_append_capped(void) {
 
   array = wapp_i32_array(1);
   wapp_i32_array_append_capped(&array, &((i32){10}));
-  wapp_i32_array_append_capped(&array, &((i32){20}));
 
   result = result && array.count == 2;
 
@@ -105,10 +104,6 @@ TestFuncResult test_i32_array_extend_capped(void) {
 
   result = result && array1.count == 6;
 
-  wapp_i32_array_extend_capped(&array1, &array1);
-
-  result = result && array1.count == 6;
-
   return wapp_tester_result(result);
 }