Merge pull request #75 from dreamer-coding/main

Cleanup tofu api

Author: dreamer-coding

README.md

@@ -29,7 +29,7 @@ Add the `fossil-tofu.wrap` file in your `subprojects` directory and include the
 ```ini
 [wrap-git]
 url = https://github.com/fossillogic/fossil-tofu.git
-revision = v0.2.1
+revision = v0.2.3
 
 [provide]
 dependency_names = fossil-tofu

code/logic/array.c

@@ -28,8 +28,8 @@
 // Function prototypes
 // *****************************************************************************
 
-fossil_array_t* fossil_array_create_container(char* type) {
-    fossil_array_t* array = (fossil_array_t*)fossil_tofu_alloc(sizeof(fossil_array_t));
+fossil_tofu_array_t* fossil_tofu_array_create_container(char* type) {
+    fossil_tofu_array_t* array = (fossil_tofu_array_t*)fossil_tofu_alloc(sizeof(fossil_tofu_array_t));
     if (array == NULL) {
         return NULL;
     }
@@ -44,12 +44,12 @@ fossil_array_t* fossil_array_create_container(char* type) {
     return array;
 }
 
-fossil_array_t* fossil_array_create_default(void) {
-    return fossil_array_create_container("any");
+fossil_tofu_array_t* fossil_tofu_array_create_default(void) {
+    return fossil_tofu_array_create_container("any");
 }
 
-fossil_array_t* fossil_array_create_copy(const fossil_array_t* other) {
-    fossil_array_t* array = (fossil_array_t*)fossil_tofu_alloc(sizeof(fossil_array_t));
+fossil_tofu_array_t* fossil_tofu_array_create_copy(const fossil_tofu_array_t* other) {
+    fossil_tofu_array_t* array = (fossil_tofu_array_t*)fossil_tofu_alloc(sizeof(fossil_tofu_array_t));
     if (array == NULL) {
         return NULL;
     }
@@ -67,8 +67,8 @@ fossil_array_t* fossil_array_create_copy(const fossil_array_t* other) {
     return array;
 }
 
-fossil_array_t* fossil_array_create_move(fossil_array_t* other) {
-    fossil_array_t* array = (fossil_array_t*)fossil_tofu_alloc(sizeof(fossil_array_t));
+fossil_tofu_array_t* fossil_tofu_array_create_move(fossil_tofu_array_t* other) {
+    fossil_tofu_array_t* array = (fossil_tofu_array_t*)fossil_tofu_alloc(sizeof(fossil_tofu_array_t));
     if (array == NULL) {
         return NULL;
     }
@@ -83,15 +83,15 @@ fossil_array_t* fossil_array_create_move(fossil_array_t* other) {
     return array;
 }
 
-void fossil_array_destroy(fossil_array_t* array) {
+void fossil_tofu_array_destroy(fossil_tofu_array_t* array) {
     if (array == NULL) {
         return;
     }
     fossil_tofu_free(array->data);
     fossil_tofu_free(array);
 }
 
-void fossil_array_push_back(fossil_array_t* array, char *element) {
+void fossil_tofu_array_push_back(fossil_tofu_array_t* array, char *element) {
     if (array == NULL) {
         return;
     }
@@ -110,7 +110,7 @@ void fossil_array_push_back(fossil_array_t* array, char *element) {
     array->data[array->size++] = fossil_tofu_create(array->type, element);
 }
 
-void fossil_array_push_front(fossil_array_t* array, char *element) {
+void fossil_tofu_array_push_front(fossil_tofu_array_t* array, char *element) {
     if (array == NULL) {
         return;
     }
@@ -134,7 +134,7 @@ void fossil_array_push_front(fossil_array_t* array, char *element) {
     array->size++;
 }
 
-void fossil_array_push_at(fossil_array_t* array, size_t index, char *element) {
+void fossil_tofu_array_push_at(fossil_tofu_array_t* array, size_t index, char *element) {
     if (array == NULL || index > array->size) {
         return;
     }
@@ -161,14 +161,14 @@ void fossil_array_push_at(fossil_array_t* array, size_t index, char *element) {
     array->size++;
 }
 
-void fossil_array_pop_back(fossil_array_t* array) {
+void fossil_tofu_array_pop_back(fossil_tofu_array_t* array) {
     if (array == NULL || array->size == 0) {
         return;
     }
     fossil_tofu_destroy(&array->data[--array->size]);
 }
 
-void fossil_array_pop_front(fossil_array_t* array) {
+void fossil_tofu_array_pop_front(fossil_tofu_array_t* array) {
     if (array == NULL || array->size == 0) {
         return;
     }
@@ -179,7 +179,7 @@ void fossil_array_pop_front(fossil_array_t* array) {
     array->size--;
 }
 
-void fossil_array_pop_at(fossil_array_t* array, size_t index) {
+void fossil_tofu_array_pop_at(fossil_tofu_array_t* array, size_t index) {
     if (array == NULL || index >= array->size) {
         return;
     }
@@ -190,7 +190,7 @@ void fossil_array_pop_at(fossil_array_t* array, size_t index) {
     array->size--;
 }
 
-void fossil_array_erase(fossil_array_t* array) {
+void fossil_tofu_array_erase(fossil_tofu_array_t* array) {
     if (array == NULL) {
         return;
     }
@@ -200,68 +200,68 @@ void fossil_array_erase(fossil_array_t* array) {
     array->size = 0;
 }
 
-bool fossil_array_is_cnullptr(const fossil_array_t* array) {
+bool fossil_tofu_array_is_cnullptr(const fossil_tofu_array_t* array) {
     return array == NULL;
 }
 
-bool fossil_array_not_cnullptr(const fossil_array_t* array) {
+bool fossil_tofu_array_not_cnullptr(const fossil_tofu_array_t* array) {
     return array != NULL;
 }
 
-bool fossil_array_is_empty(const fossil_array_t* array) {
+bool fossil_tofu_array_is_empty(const fossil_tofu_array_t* array) {
     return array == NULL || array->size == 0;
 }
 
-bool fossil_array_not_empty(const fossil_array_t* array) {
+bool fossil_tofu_array_not_empty(const fossil_tofu_array_t* array) {
     return array != NULL && array->size > 0;
 }
 
-size_t fossil_array_size(const fossil_array_t* array) {
+size_t fossil_tofu_array_size(const fossil_tofu_array_t* array) {
     return array == NULL ? 0 : array->size;
 }
 
-size_t fossil_array_capacity(const fossil_array_t* array) {
+size_t fossil_tofu_array_capacity(const fossil_tofu_array_t* array) {
     return array == NULL ? 0 : array->capacity;
 }
 
-char *fossil_array_get(const fossil_array_t* array, size_t index) {
+char *fossil_tofu_array_get(const fossil_tofu_array_t* array, size_t index) {
     return array == NULL || index >= array->size ? NULL : fossil_tofu_get_value(&array->data[index]);
 }
 
-char *fossil_array_get_front(const fossil_array_t* array) {
+char *fossil_tofu_array_get_front(const fossil_tofu_array_t* array) {
     return array == NULL || array->size == 0 ? NULL : fossil_tofu_get_value(&array->data[0]);
 }
 
-char *fossil_array_get_back(const fossil_array_t* array) {
+char *fossil_tofu_array_get_back(const fossil_tofu_array_t* array) {
     return array == NULL || array->size == 0 ? NULL : fossil_tofu_get_value(&array->data[array->size - 1]);
 }
 
-char *fossil_array_get_at(const fossil_array_t* array, size_t index) {
+char *fossil_tofu_array_get_at(const fossil_tofu_array_t* array, size_t index) {
     return array == NULL || index >= array->size ? NULL : fossil_tofu_get_value(&array->data[index]);
 }
 
-void fossil_array_set(fossil_array_t* array, size_t index, char *element) {
+void fossil_tofu_array_set(fossil_tofu_array_t* array, size_t index, char *element) {
     if (array == NULL || index >= array->size) {
         return;
     }
     fossil_tofu_set_value(&array->data[index], element);
 }
 
-void fossil_array_set_front(fossil_array_t* array, char *element) {
+void fossil_tofu_array_set_front(fossil_tofu_array_t* array, char *element) {
     if (array == NULL || array->size == 0) {
         return;
     }
     fossil_tofu_set_value(&array->data[0], element);
 }
 
-void fossil_array_set_back(fossil_array_t* array, char *element) {
+void fossil_tofu_array_set_back(fossil_tofu_array_t* array, char *element) {
     if (array == NULL || array->size == 0) {
         return;
     }
     fossil_tofu_set_value(&array->data[array->size - 1], element);
 }
 
-void fossil_array_set_at(fossil_array_t* array, size_t index, char *element) {
+void fossil_tofu_array_set_at(fossil_tofu_array_t* array, size_t index, char *element) {
     if (array == NULL || index >= array->size) {
         return;
     }

code/logic/arraylist.c

@@ -28,15 +28,15 @@
 // Function prototypes
 // *****************************************************************************
 
-fossil_arraylist_t* fossil_arraylist_create_container(char* type, size_t capacity) {
-    fossil_arraylist_t* alist = (fossil_arraylist_t*)fossil_tofu_alloc(sizeof(fossil_arraylist_t));
+fossil_tofu_arraylist_t* fossil_tofu_arraylist_create_container(char* type, size_t capacity) {
+    fossil_tofu_arraylist_t* alist = (fossil_tofu_arraylist_t*)fossil_tofu_alloc(sizeof(fossil_tofu_arraylist_t));
     if (alist == NULL) {
         return NULL;
     }
     alist->type = fossil_tofu_strdup(type);
     alist->size = 0;
     alist->capacity = capacity;
-    alist->items = (fossil_arraylist_node_t*)fossil_tofu_alloc(sizeof(fossil_arraylist_node_t) * capacity);
+    alist->items = (fossil_tofu_arraylist_node_t*)fossil_tofu_alloc(sizeof(fossil_tofu_arraylist_node_t) * capacity);
     if (alist->items == NULL) {
         fossil_tofu_free(alist->type);
         fossil_tofu_free(alist);
@@ -45,13 +45,13 @@ fossil_arraylist_t* fossil_arraylist_create_container(char* type, size_t capacit
     return alist;
 }
 
-fossil_arraylist_t* fossil_arraylist_create_default(void) {
-    return fossil_arraylist_create_container("any", 8);
+fossil_tofu_arraylist_t* fossil_tofu_arraylist_create_default(void) {
+    return fossil_tofu_arraylist_create_container("any", 8);
 }
 
-fossil_arraylist_t* fossil_arraylist_create_copy(const fossil_arraylist_t* other) {
+fossil_tofu_arraylist_t* fossil_tofu_arraylist_create_copy(const fossil_tofu_arraylist_t* other) {
     if (other == NULL) return NULL;
-    fossil_arraylist_t* alist = fossil_arraylist_create_container(other->type, other->capacity);
+    fossil_tofu_arraylist_t* alist = fossil_tofu_arraylist_create_container(other->type, other->capacity);
     if (alist == NULL) return NULL;
     alist->size = other->size;
     for (size_t i = 0; i < other->size; ++i) {
@@ -60,9 +60,9 @@ fossil_arraylist_t* fossil_arraylist_create_copy(const fossil_arraylist_t* other
     return alist;
 }
 
-fossil_arraylist_t* fossil_arraylist_create_move(fossil_arraylist_t* other) {
+fossil_tofu_arraylist_t* fossil_tofu_arraylist_create_move(fossil_tofu_arraylist_t* other) {
     if (other == NULL) return NULL;
-    fossil_arraylist_t* alist = (fossil_arraylist_t*)fossil_tofu_alloc(sizeof(fossil_arraylist_t));
+    fossil_tofu_arraylist_t* alist = (fossil_tofu_arraylist_t*)fossil_tofu_alloc(sizeof(fossil_tofu_arraylist_t));
     if (alist == NULL) return NULL;
     alist->type = other->type;
     alist->size = other->size;
@@ -75,7 +75,7 @@ fossil_arraylist_t* fossil_arraylist_create_move(fossil_arraylist_t* other) {
     return alist;
 }
 
-void fossil_arraylist_destroy(fossil_arraylist_t* alist) {
+void fossil_tofu_arraylist_destroy(fossil_tofu_arraylist_t* alist) {
     if (alist == NULL) return;
     for (size_t i = 0; i < alist->size; ++i) {
         fossil_tofu_destroy(&alist->items[i].data);
@@ -89,11 +89,11 @@ void fossil_arraylist_destroy(fossil_arraylist_t* alist) {
 // Utility functions
 // *****************************************************************************
 
-int32_t fossil_arraylist_insert(fossil_arraylist_t* alist, char *data) {
+int32_t fossil_tofu_arraylist_insert(fossil_tofu_arraylist_t* alist, char *data) {
     if (alist == NULL) return FOSSIL_TOFU_FAILURE;
     if (alist->size >= alist->capacity) {
         size_t new_capacity = alist->capacity * 2;
-        fossil_arraylist_node_t* new_items = (fossil_arraylist_node_t*)fossil_tofu_alloc(sizeof(fossil_arraylist_node_t) * new_capacity);
+        fossil_tofu_arraylist_node_t* new_items = (fossil_tofu_arraylist_node_t*)fossil_tofu_alloc(sizeof(fossil_tofu_arraylist_node_t) * new_capacity);
         if (new_items == NULL) return FOSSIL_TOFU_FAILURE;
         for (size_t i = 0; i < alist->size; ++i) {
             new_items[i] = alist->items[i];
@@ -107,7 +107,7 @@ int32_t fossil_arraylist_insert(fossil_arraylist_t* alist, char *data) {
     return FOSSIL_TOFU_SUCCESS;
 }
 
-int32_t fossil_arraylist_remove(fossil_arraylist_t* alist, size_t index) {
+int32_t fossil_tofu_arraylist_remove(fossil_tofu_arraylist_t* alist, size_t index) {
     if (alist == NULL || index >= alist->size) return FOSSIL_TOFU_FAILURE;
     fossil_tofu_destroy(&alist->items[index].data);
     for (size_t i = index; i < alist->size - 1; ++i) {
@@ -117,60 +117,60 @@ int32_t fossil_arraylist_remove(fossil_arraylist_t* alist, size_t index) {
     return FOSSIL_TOFU_SUCCESS;
 }
 
-size_t fossil_arraylist_size(const fossil_arraylist_t* alist) {
+size_t fossil_tofu_arraylist_size(const fossil_tofu_arraylist_t* alist) {
     return (alist != NULL) ? alist->size : 0;
 }
 
-size_t fossil_arraylist_capacity(const fossil_arraylist_t* alist) {
+size_t fossil_tofu_arraylist_capacity(const fossil_tofu_arraylist_t* alist) {
     return (alist != NULL) ? alist->capacity : 0;
 }
 
-bool fossil_arraylist_not_empty(const fossil_arraylist_t* alist) {
+bool fossil_tofu_arraylist_not_empty(const fossil_tofu_arraylist_t* alist) {
     return (alist != NULL) && (alist->size > 0);
 }
 
-bool fossil_arraylist_not_cnullptr(const fossil_arraylist_t* alist) {
+bool fossil_tofu_arraylist_not_cnullptr(const fossil_tofu_arraylist_t* alist) {
     return alist != NULL;
 }
 
-bool fossil_arraylist_is_empty(const fossil_arraylist_t* alist) {
+bool fossil_tofu_arraylist_is_empty(const fossil_tofu_arraylist_t* alist) {
     return (alist == NULL) || (alist->size == 0);
 }
 
-bool fossil_arraylist_is_cnullptr(const fossil_arraylist_t* alist) {
+bool fossil_tofu_arraylist_is_cnullptr(const fossil_tofu_arraylist_t* alist) {
     return alist == NULL;
 }
 
 // *****************************************************************************
 // Getter and setter functions
 // *****************************************************************************
 
-char *fossil_arraylist_get(const fossil_arraylist_t* alist, size_t index) {
+char *fossil_tofu_arraylist_get(const fossil_tofu_arraylist_t* alist, size_t index) {
     if (alist == NULL || index >= alist->size) return NULL;
     return fossil_tofu_get_value(&alist->items[index].data);
 }
 
-char *fossil_arraylist_get_front(const fossil_arraylist_t* alist) {
+char *fossil_tofu_arraylist_get_front(const fossil_tofu_arraylist_t* alist) {
     if (alist == NULL || alist->size == 0) return NULL;
     return fossil_tofu_get_value(&alist->items[0].data);
 }
 
-char *fossil_arraylist_get_back(const fossil_arraylist_t* alist) {
+char *fossil_tofu_arraylist_get_back(const fossil_tofu_arraylist_t* alist) {
     if (alist == NULL || alist->size == 0) return NULL;
     return fossil_tofu_get_value(&alist->items[alist->size - 1].data);
 }
 
-void fossil_arraylist_set(fossil_arraylist_t* alist, size_t index, char *element) {
+void fossil_tofu_arraylist_set(fossil_tofu_arraylist_t* alist, size_t index, char *element) {
     if (alist == NULL || index >= alist->size) return;
     fossil_tofu_set_value(&alist->items[index].data, element);
 }
 
-void fossil_arraylist_set_front(fossil_arraylist_t* alist, char *element) {
+void fossil_tofu_arraylist_set_front(fossil_tofu_arraylist_t* alist, char *element) {
     if (alist == NULL || alist->size == 0) return;
     fossil_tofu_set_value(&alist->items[0].data, element);
 }
 
-void fossil_arraylist_set_back(fossil_arraylist_t* alist, char *element) {
+void fossil_tofu_arraylist_set_back(fossil_tofu_arraylist_t* alist, char *element) {
     if (alist == NULL || alist->size == 0) return;
     fossil_tofu_set_value(&alist->items[alist->size - 1].data, element);
 }