New project architecture in progress: renaming, refactoring and adjustments

tests/unt/unt_cmc_bitset.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_ITSET_H
 #define CMC_TESTS_UNT_CMC_ITSET_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/bitset.h"
+#include "tst_cmc_bitset.h"
 
 struct cmc_alloc_node *bs_alloc_node =
     &(struct cmc_alloc_node){ .malloc = malloc, .calloc = calloc, .realloc = realloc, .free = free };

tests/unt/unt_cmc_deque.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_EQUE_H
 #define CMC_TESTS_UNT_CMC_EQUE_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/deque.h"
+#include "tst_cmc_deque.h"
 
 struct deque_fval *d_fval = &(struct deque_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_hashbidimap.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_ASHBIDIMAP_H
 #define CMC_TESTS_UNT_CMC_ASHBIDIMAP_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/hashbidimap.h"
+#include "tst_cmc_hashbidimap.h"
 
 struct hashbidimap_fkey *hbm_fkey = &(struct hashbidimap_fkey){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_hashmap.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_ASHMAP_H
 #define CMC_TESTS_UNT_CMC_ASHMAP_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/hashmap.h"
+#include "tst_cmc_hashmap.h"
 
 struct hashmap_fkey *hm_fkey = &(struct hashmap_fkey){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_hashmultimap.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_ASHMULTIMAP_H
 #define CMC_TESTS_UNT_CMC_ASHMULTIMAP_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/hashmultimap.h"
+#include "tst_cmc_hashmultimap.h"
 
 struct hashmultimap_fkey *hmm_fkey = &(struct hashmultimap_fkey){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_hashmultiset.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_ASHMULTISET_H
 #define CMC_TESTS_UNT_CMC_ASHMULTISET_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/hashmultiset.h"
+#include "tst_cmc_hashmultiset.h"
 
 struct hashmultiset_fval *hms_fval = &(struct hashmultiset_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_hashset.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_ASHSET_H
 #define CMC_TESTS_UNT_CMC_ASHSET_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/hashset.h"
+#include "tst_cmc_hashset.h"
 
 struct hashset_fval *hs_fval = &(struct hashset_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_heap.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_EAP_H
 #define CMC_TESTS_UNT_CMC_EAP_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/heap.h"
+#include "tst_cmc_heap.h"
 
 struct heap_fval *h_fval = &(struct heap_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_intervalheap.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_NTERVALHEAP_H
 #define CMC_TESTS_UNT_CMC_NTERVALHEAP_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/intervalheap.h"
+#include "tst_cmc_intervalheap.h"
 
 struct intervalheap_fval *ih_fval = &(struct intervalheap_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_linkedlist.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_INKEDLIST_H
 #define CMC_TESTS_UNT_CMC_INKEDLIST_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/linkedlist.h"
+#include "tst_cmc_linkedlist.h"
 
 struct linkedlist_fval *ll_fval = &(struct linkedlist_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_list.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_LIST_H
 #define CMC_TESTS_UNT_CMC_LIST_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/list.h"
+#include "tst_cmc_list.h"
 
 struct list_fval *l_fval = &(struct list_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_queue.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_QUEUE_H
 #define CMC_TESTS_UNT_CMC_QUEUE_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/queue.h"
+#include "tst_cmc_queue.h"
 
 struct queue_fval *q_fval = &(struct queue_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_sortedlist.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_SORTEDLIST_H
 #define CMC_TESTS_UNT_CMC_SORTEDLIST_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/sortedlist.h"
+#include "tst_cmc_sortedlist.h"
 
 struct sortedlist_fval *sl_fval = &(struct sortedlist_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_stack.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_STACK_H
 #define CMC_TESTS_UNT_CMC_STACK_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/stack.h"
+#include "tst_cmc_stack.h"
 
 struct stack_fval *s_fval = &(struct stack_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_treemap.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_TREEMAP_H
 #define CMC_TESTS_UNT_CMC_TREEMAP_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/treemap.h"
+#include "tst_cmc_treemap.h"
 
 struct treemap_fkey *tm_fkey = &(struct treemap_fkey){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_cmc_treeset.h

@@ -1,9 +1,9 @@
 #ifndef CMC_TESTS_UNT_CMC_TREESET_H
 #define CMC_TESTS_UNT_CMC_TREESET_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/treeset.h"
+#include "tst_cmc_treeset.h"
 
 struct treeset_fval *ts_fval = &(struct treeset_fval){
     .cmp = cmc_size_cmp, .cpy = NULL, .str = cmc_size_str, .free = NULL, .hash = cmc_size_hash, .pri = cmc_size_cmp

tests/unt/unt_utl_foreach.h

@@ -1,24 +1,24 @@
 #ifndef CMC_TESTS_UNT_UTL_FOREACH_H
 #define CMC_TESTS_UNT_UTL_FOREACH_H
 
-#include "../utl.h"
+#include "utl.h"
 
-#include "cmc/bitset.h"
-#include "cmc/deque.h"
-#include "cmc/hashbidimap.h"
-#include "cmc/hashmap.h"
-#include "cmc/hashmultimap.h"
-#include "cmc/hashmultiset.h"
-#include "cmc/hashset.h"
-#include "cmc/heap.h"
-#include "cmc/intervalheap.h"
-#include "cmc/linkedlist.h"
-#include "cmc/list.h"
-#include "cmc/queue.h"
-#include "cmc/sortedlist.h"
-#include "cmc/stack.h"
-#include "cmc/treemap.h"
-#include "cmc/treeset.h"
+#include "tst_cmc_bitset.h"
+#include "tst_cmc_deque.h"
+#include "tst_cmc_hashbidimap.h"
+#include "tst_cmc_hashmap.h"
+#include "tst_cmc_hashmultimap.h"
+#include "tst_cmc_hashmultiset.h"
+#include "tst_cmc_hashset.h"
+#include "tst_cmc_heap.h"
+#include "tst_cmc_intervalheap.h"
+#include "tst_cmc_linkedlist.h"
+#include "tst_cmc_list.h"
+#include "tst_cmc_queue.h"
+#include "tst_cmc_sortedlist.h"
+#include "tst_cmc_stack.h"
+#include "tst_cmc_treemap.h"
+#include "tst_cmc_treeset.h"
 
 CMC_CREATE_UNIT(ForEach, true, {
     // CMC_CREATE_TEST(CMC<BitSet>, {

tests/unt/utl.h

@@ -6,11 +6,11 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "cor/hashtable.h"
-#include "utl/assert.h"
-#include "utl/foreach.h"
-#include "utl/futils.h"
-#include "utl/test.h"
+#include "cor_hashtable.h"
+#include "utl_assert.h"
+#include "utl_foreach.h"
+#include "utl_futils.h"
+#include "utl_test.h"
 
 size_t numhash(size_t a)
 {