macros for function declartion

This commit is contained in:
2020-08-02 15:43:52 +02:00
parent 14009a6e25
commit b141b10f70
6 changed files with 37 additions and 23 deletions

View File

@ -1,10 +1,16 @@
#ifndef _acl_array_h #ifndef _acl_array_h
#define _acl_array_h #define _acl_array_h
#include <stddef.h> #include <stddef.h>
size_t acl_arraylist_len(void *arraylist); #define acl_arraylist_len_d size_t acl_arraylist_len(void *arraylist)
void acl_arraylist_free(void *arraylist); acl_arraylist_len_d;
void* acl_arraylist_remove(void *arraylist_void, size_t index); #define acl_arraylist_free_d void acl_arraylist_free(void *arraylist)
void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element); acl_arraylist_free_d;
void* acl_arraylist_append(void *arraylist_void, void *element_void); #define acl_arraylist_remove_d void* acl_arraylist_remove(void *arraylist_void, size_t index)
void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element); acl_arraylist_remove_d;
#define acl_arraylist_create_d void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element)
acl_arraylist_create_d;
#define acl_arraylist_append_d void* acl_arraylist_append(void *arraylist_void, void *element)
acl_arraylist_append_d;
#define acl_arraylist_append_ptr_d void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element)
acl_arraylist_append_ptr_d;
#endif #endif

View File

@ -1,5 +1,6 @@
#ifndef _acl_file_h #ifndef _acl_file_h
#define _acl_file_h #define _acl_file_h
#include <stdbool.h> #include <stdbool.h>
char* acl_ReadTextFile(const char *filePath, bool *sucess); #define acl_ReadTextFile_d char* acl_ReadTextFile(const char *filePath, bool *sucess)
acl_ReadTextFile_d;
#endif #endif

View File

@ -10,6 +10,8 @@ union acl_hashmap_meta {
}; };
}; };
/* set keySize to NULL for a dynamic keySize */ /* set keySize to NULL for a dynamic keySize */
union acl_hashmap_meta* acl_hashmap_create(size_t bucketCount, size_t sizeOneElement, size_t keySize); #define acl_hashmap_create_d union acl_hashmap_meta* acl_hashmap_create(size_t bucketCount, size_t sizeOneElement, size_t keySize)
void acl_hashmap_put(union acl_hashmap_meta *hashmap_meta, void *key, void *element); acl_hashmap_create_d;
#define acl_hashmap_put_d void acl_hashmap_put(union acl_hashmap_meta *hashmap_meta, void *key, void *element)
acl_hashmap_put_d;
#endif #endif

View File

@ -17,7 +17,7 @@ union arraylist_meta {
}; };
}; };
void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) { acl_arraylist_create_d {
union arraylist_meta *arraylist_new = malloc(array_size * sizeof_one_element + sizeof*arraylist_new); union arraylist_meta *arraylist_new = malloc(array_size * sizeof_one_element + sizeof*arraylist_new);
if(arraylist_new == NULL) return NULL; if(arraylist_new == NULL) return NULL;
arraylist_new->len = array_size; arraylist_new->len = array_size;
@ -26,7 +26,7 @@ void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) {
return arraylist_new+1; return arraylist_new+1;
} }
void* acl_arraylist_append(void *arraylist_void, void *element) { acl_arraylist_append_d {
void *append_pointer; void *append_pointer;
void **element_append = &append_pointer; void **element_append = &append_pointer;
union arraylist_meta *arraylist = acl_arraylist_append_ptr(arraylist_void, element_append); union arraylist_meta *arraylist = acl_arraylist_append_ptr(arraylist_void, element_append);
@ -35,7 +35,7 @@ void* acl_arraylist_append(void *arraylist_void, void *element) {
memcpy(*element_append, element, arraylist->sizeof_one_element); memcpy(*element_append, element, arraylist->sizeof_one_element);
return arraylist + 1; return arraylist + 1;
} }
void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element) { acl_arraylist_append_ptr_d {
union arraylist_meta *arraylist = arraylist_void; union arraylist_meta *arraylist = arraylist_void;
--arraylist; --arraylist;
if(arraylist->len == arraylist->cap) { if(arraylist->len == arraylist->cap) {
@ -49,11 +49,11 @@ void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element) {
return arraylist + 1; return arraylist + 1;
} }
void acl_arraylist_free(void *arraylist) { acl_arraylist_free_d {
free((union arraylist_meta*)arraylist-1); free((union arraylist_meta*)arraylist-1);
} }
void* acl_arraylist_remove(void *arraylist_void, size_t index) { acl_arraylist_remove_d {
union arraylist_meta *arraylist = (union arraylist_meta*)arraylist_void - 1; union arraylist_meta *arraylist = (union arraylist_meta*)arraylist_void - 1;
char *arraylist_char = arraylist_void; char *arraylist_char = arraylist_void;
if(index != arraylist->len - 1) { if(index != arraylist->len - 1) {
@ -67,6 +67,6 @@ void* acl_arraylist_remove(void *arraylist_void, size_t index) {
return arraylist; return arraylist;
} }
size_t acl_arraylist_len(void *arraylist) { acl_arraylist_len_d {
return ((union arraylist_meta*)arraylist - 1)->len; return ((union arraylist_meta*)arraylist - 1)->len;
} }

View File

@ -1,7 +1,8 @@
#include <stdio.h> #include <stdio.h>
#include <acl/file.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
char* acl_ReadTextFile(const char *filePath, bool *sucess){ acl_ReadTextFile_d {
FILE *fp = fopen(filePath, "rb"); FILE *fp = fopen(filePath, "rb");
size_t lSize; size_t lSize;
char *buffer; char *buffer;

View File

@ -53,21 +53,25 @@ size_t acl_hash(void *data, size_t dataSize, size_t bucketBits) {
} }
} }
union acl_hashmap_meta* acl_hashmap_create(size_t bucketCount, size_t sizeOneElement, size_t keySize) { acl_hashmap_create_d {
union acl_hashmap_meta *hashmap_meta = malloc(sizeof *hashmap_meta + bucketCount * sizeof(void*)); union acl_hashmap_meta *hashmap_meta = malloc(sizeof *hashmap_meta + bucketCount * sizeof(void*));
hashmap_meta->bucketCount = bucketCount; hashmap_meta->bucketCount = bucketCount;
hashmap_meta->sizeOneElement = sizeOneElement; hashmap_meta->sizeOneElement = sizeOneElement;
hashmap_meta->keyBits = log2(keySize); hashmap_meta->keyBits = log2(keySize);
void **hashmap_buckets = (void**)(hashmap_meta + 1); void **hashmap_buckets = (void**)(hashmap_meta + 1);
for(size_t i; i < bucketCount; ++i) { for(size_t i = 0; i < bucketCount; ++i) {
hashmap_buckets[i] = acl_arraylist_create(0, sizeOneElement); hashmap_buckets[i] = acl_arraylist_create(0, sizeOneElement + sizeof(size_t));
if(hashmap_buckets[i] == NULL) {
for(size_t j = 0; j < i; ++j) {
acl_arraylist_free(hashmap_buckets[j]);
}
return NULL;
}
} }
return hashmap_meta; return hashmap_meta;
} }
void acl_hashmap_put(union acl_hashmap_meta *hashmap_meta, void *key, void *element) { acl_hashmap_put_d {
void **hashmap_buckets = (void**)(hashmap_meta + 1); void **hashmap_buckets = (void**)(hashmap_meta + 1);
}
int main() {
} }