From 2de4506e01609cb325a515d7e3430f9ddf5df006 Mon Sep 17 00:00:00 2001 From: Timerix22 Date: Sun, 17 Jul 2022 17:05:10 +0300 Subject: [PATCH] Autoarr_define --- src/Autoarr/Autoarr.c | 22 +++++++++++----------- src/Autoarr/Autoarr.h | 22 +++++++++++----------- src/Autoarr/Autoarr_declare.h | 2 +- src/Autoarr/Autoarr_define.h | 2 +- src/Hashtable/KeyValuePair.c | 2 +- src/Hashtable/KeyValuePair.h | 2 +- src/String/StringBuilder.c | 2 +- src/String/StringBuilder.h | 2 +- tests/main.cpp | 18 +++++++++--------- tests/test_hash_functions.c | 1 + 10 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/Autoarr/Autoarr.c b/src/Autoarr/Autoarr.c index 074f210..90346bb 100644 --- a/src/Autoarr/Autoarr.c +++ b/src/Autoarr/Autoarr.c @@ -1,16 +1,16 @@ #include "Autoarr.h" -define_Autoarr(uint8) -define_Autoarr(int8) -define_Autoarr(uint16) -define_Autoarr(int16) -define_Autoarr(uint32) -define_Autoarr(int32) -define_Autoarr(uint64) -define_Autoarr(int64) -define_Autoarr(float) -define_Autoarr(double) -define_Autoarr(Unitype) +Autoarr_define(uint8) +Autoarr_define(int8) +Autoarr_define(uint16) +Autoarr_define(int16) +Autoarr_define(uint32); +Autoarr_define(int32); +Autoarr_define(uint64); +Autoarr_define(int64); +Autoarr_define(float); +Autoarr_define(double); +Autoarr_define(Unitype); // right func to clear array of unitype values void Autoarr_free_Unitype(Autoarr(Unitype)* ar){ diff --git a/src/Autoarr/Autoarr.h b/src/Autoarr/Autoarr.h index 9e7d996..89440a4 100644 --- a/src/Autoarr/Autoarr.h +++ b/src/Autoarr/Autoarr.h @@ -7,17 +7,17 @@ extern "C" { #include "Autoarr_declare.h" #include "Autoarr_define.h" -declare_Autoarr(uint8) -declare_Autoarr(int8) -declare_Autoarr(uint16) -declare_Autoarr(int16) -declare_Autoarr(uint32) -declare_Autoarr(int32) -declare_Autoarr(uint64) -declare_Autoarr(int64) -declare_Autoarr(float) -declare_Autoarr(double) -declare_Autoarr(Unitype) +Autoarr_declare(uint8) +Autoarr_declare(int8) +Autoarr_declare(uint16) +Autoarr_declare(int16) +Autoarr_declare(uint32) +Autoarr_declare(int32) +Autoarr_declare(uint64) +Autoarr_declare(int64) +Autoarr_declare(float) +Autoarr_declare(double) +Autoarr_declare(Unitype) // right func to clear array of unitype values void Autoarr_free_Unitype(Autoarr(Unitype)* ar); diff --git a/src/Autoarr/Autoarr_declare.h b/src/Autoarr/Autoarr_declare.h index 5ed5240..80169bd 100644 --- a/src/Autoarr/Autoarr_declare.h +++ b/src/Autoarr/Autoarr_declare.h @@ -6,7 +6,7 @@ extern "C" { #include "../base/base.h" -#define declare_Autoarr(type)\ +#define Autoarr_declare(type)\ \ struct Autoarr_##type;\ \ diff --git a/src/Autoarr/Autoarr_define.h b/src/Autoarr/Autoarr_define.h index 6e81b81..441c9b6 100644 --- a/src/Autoarr/Autoarr_define.h +++ b/src/Autoarr/Autoarr_define.h @@ -6,7 +6,7 @@ extern "C" { #include "../base/base.h" -#define define_Autoarr(type)\ +#define Autoarr_define(type)\ \ void __Autoarr_add_##type(Autoarr_##type* ar, type element){\ if(!ar->values){\ diff --git a/src/Hashtable/KeyValuePair.c b/src/Hashtable/KeyValuePair.c index 8ba43ae..cbe22dd 100644 --- a/src/Hashtable/KeyValuePair.c +++ b/src/Hashtable/KeyValuePair.c @@ -1,6 +1,6 @@ #include "KeyValuePair.h" -define_Autoarr(KVPair) +Autoarr_define(KVPair) // proper way to clear a KVP diff --git a/src/Hashtable/KeyValuePair.h b/src/Hashtable/KeyValuePair.h index ac7a666..19cc277 100644 --- a/src/Hashtable/KeyValuePair.h +++ b/src/Hashtable/KeyValuePair.h @@ -12,7 +12,7 @@ typedef struct KVPair{ Unitype value; } KVPair; -declare_Autoarr(KVPair) +Autoarr_declare(KVPair) // proper way to clear a KVP void KVPair_free(KVPair p); diff --git a/src/String/StringBuilder.c b/src/String/StringBuilder.c index 848a51d..c0b46a9 100644 --- a/src/String/StringBuilder.c +++ b/src/String/StringBuilder.c @@ -1,6 +1,6 @@ #include "StringBuilder.h" -define_Autoarr(string) +Autoarr_define(string) #define BL_C 32 #define BL_L 1024 diff --git a/src/String/StringBuilder.h b/src/String/StringBuilder.h index 1a4e898..8e19420 100644 --- a/src/String/StringBuilder.h +++ b/src/String/StringBuilder.h @@ -7,7 +7,7 @@ extern "C" { #include "../Autoarr/Autoarr.h" #include "string.h" -declare_Autoarr(string) +Autoarr_declare(string) typedef struct StringBuilder{ Autoarr(string)* compl_bufs; diff --git a/tests/main.cpp b/tests/main.cpp index 3f7da09..b480be2 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,15 +1,15 @@ #include "tests.h" void test_all(){ - // test_string(); - // test_safethrow(); - // test_searchtree(); - // test_autoarr(); - // test_autoarr2(); - // test_hash_functions(); - // test_hashtable(); - // test_dtsod(); - test_hashtable2(); + test_string(); + test_safethrow(); + test_searchtree(); + test_autoarr(); + test_hash_functions(); + test_hashtable(); + test_dtsod(); + test_autoarr2(); + // test_hashtable2(); printf("\e[96m--------------------------------------\e[0m\n"); } diff --git a/tests/test_hash_functions.c b/tests/test_hash_functions.c index 57c3f28..10c6aee 100644 --- a/tests/test_hash_functions.c +++ b/tests/test_hash_functions.c @@ -33,6 +33,7 @@ char data[]="iojihiojopijiugbjmoihftytryfdrh"; }\ printf("\e[93m%u \e[94mcollisions detected in %u hashes\n", collisions, COLLISION_TESTS);\ }));\ + Autoarr_free(hashes);\ printf("\e[96m--------------------------------------\n");\ })