breaking changes in type system

src/Autoarr/Autoarr_define.h

@@ -6,79 +6,79 @@ extern "C" {
 
 #include "../base/base.h"
 
-#define Autoarr_define(type)\
+#define Autoarr_define(type) \
 \
-ktid_define(Autoarr_##type);\
+kt_define(Autoarr_##type, ____Autoarr_free_##type, NULL); \
 \
-void __Autoarr_add_##type(Autoarr_##type* ar, type element){\
-    if(!ar->values){\
-        ar->values=malloc(ar->max_blocks_count*sizeof(type*));\
-        goto create_block;\
-    }\
-    if(ar->block_length==ar->max_block_length){\
-        if (ar->blocks_count>=ar->max_blocks_count) throw(ERR_MAXLENGTH);\
-        ar->block_length=0;\
-create_block:\
-        ar->values[ar->blocks_count]=malloc(ar->max_block_length*sizeof(type));\
-        ar->blocks_count++;\
-    }\
-    ar->values[ar->blocks_count-1][ar->block_length]=element;\
-    ar->block_length++;\
-}\
+void __Autoarr_add_##type(Autoarr_##type* ar, type element){ \
+    if(!ar->values){ \
+        ar->values=malloc(ar->max_blocks_count*sizeof(type*)); \
+        goto create_block; \
+    } \
+    if(ar->block_length==ar->max_block_length){ \
+        if (ar->blocks_count>=ar->max_blocks_count) throw(ERR_MAXLENGTH); \
+        ar->block_length=0; \
+create_block: \
+        ar->values[ar->blocks_count]=malloc(ar->max_block_length*sizeof(type)); \
+        ar->blocks_count++; \
+    } \
+    ar->values[ar->blocks_count-1][ar->block_length]=element; \
+    ar->block_length++; \
+} \
 \
-type __Autoarr_get_##type(Autoarr_##type* ar, u32 index){\
-    if(index>=Autoarr_length(ar)) throw(ERR_WRONGINDEX);\
-    return ar->values[index/ar->max_block_length][index%ar->max_block_length];\
-}\
+type __Autoarr_get_##type(Autoarr_##type* ar, u32 index){ \
+    if(index>=Autoarr_length(ar)) throw(ERR_WRONGINDEX); \
+    return ar->values[index/ar->max_block_length][index%ar->max_block_length]; \
+} \
 \
-type* __Autoarr_getptr_##type(Autoarr_##type* ar, u32 index){\
-    if(index>=Autoarr_length(ar)) throw(ERR_WRONGINDEX);\
-    return ar->values[index/ar->max_block_length]+(index%ar->max_block_length);\
-}\
+type* __Autoarr_getptr_##type(Autoarr_##type* ar, u32 index){ \
+    if(index>=Autoarr_length(ar)) throw(ERR_WRONGINDEX); \
+    return ar->values[index/ar->max_block_length]+(index%ar->max_block_length); \
+} \
 \
-void __Autoarr_set_##type(Autoarr_##type* ar, u32 index, type element){\
-    if(index>=Autoarr_length(ar)) throw(ERR_WRONGINDEX);\
-    ar->values[index/ar->max_block_length][index%ar->max_block_length]=element;\
-}\
+void __Autoarr_set_##type(Autoarr_##type* ar, u32 index, type element){ \
+    if(index>=Autoarr_length(ar)) throw(ERR_WRONGINDEX); \
+    ar->values[index/ar->max_block_length][index%ar->max_block_length]=element; \
+} \
 \
-void __Autoarr_free_##type(Autoarr_##type* ar, bool freePtr){\
-    for(u16 i=0; i<ar->blocks_count;i++)\
+void __Autoarr_free_##type(Autoarr_##type* ar, bool freePtr){ \
+    for(u16 i=0; i<ar->blocks_count;i++) \
         free(ar->values[i]); \
-    free(ar->values);\
-    if(freePtr) free(ar);\
-}\
-void ____Autoarr_free_##type(void* ar){\
-    __Autoarr_free_##type((Autoarr_##type*)ar, false);\
-}\
+    free(ar->values); \
+    if(freePtr) free(ar); \
+} \
+void ____Autoarr_free_##type(void* ar){ \
+    __Autoarr_free_##type((Autoarr_##type*)ar, false); \
+} \
 \
-type* __Autoarr_toArray_##type(Autoarr_##type* ar){\
-    u32 length=Autoarr_length(ar);\
-    type* array=malloc(length * sizeof(type));\
-    for(u32 i=0; i<length; i++)\
-        array[i]=__Autoarr_get_##type(ar, i);\
-    return array;\
-}\
+type* __Autoarr_toArray_##type(Autoarr_##type* ar){ \
+    u32 length=Autoarr_length(ar); \
+    type* array=malloc(length * sizeof(type)); \
+    for(u32 i=0; i<length; i++) \
+        array[i]=__Autoarr_get_##type(ar, i); \
+    return array; \
+} \
 \
-__functions_list_t_##type __functions_list_##type={\
-    &__Autoarr_add_##type,\
-    &__Autoarr_get_##type,\
-    &__Autoarr_getptr_##type,\
-    &__Autoarr_set_##type,\
-    &__Autoarr_free_##type,\
-    &__Autoarr_toArray_##type\
-};\
+__functions_list_t_##type __functions_list_##type={ \
+    &__Autoarr_add_##type, \
+    &__Autoarr_get_##type, \
+    &__Autoarr_getptr_##type, \
+    &__Autoarr_set_##type, \
+    &__Autoarr_free_##type, \
+    &__Autoarr_toArray_##type \
+}; \
 \
-Autoarr_##type* __Autoarr_create_##type(u16 max_blocks_count, u16 max_block_length){\
-    Autoarr_##type* ar=malloc(sizeof(Autoarr_##type));\
-    *ar=(Autoarr_##type){\
-        .max_blocks_count=max_blocks_count,\
-        .blocks_count=0,\
-        .max_block_length=max_block_length,\
-        .block_length=0,\
-        .values=NULL,\
-        .functions=&__functions_list_##type\
-    };\
-    return ar;\
+Autoarr_##type* __Autoarr_create_##type(u16 max_blocks_count, u16 max_block_length){ \
+    Autoarr_##type* ar=malloc(sizeof(Autoarr_##type)); \
+    *ar=(Autoarr_##type){ \
+        .max_blocks_count=max_blocks_count, \
+        .blocks_count=0, \
+        .max_block_length=max_block_length, \
+        .block_length=0, \
+        .values=NULL, \
+        .functions=&__functions_list_##type \
+    }; \
+    return ar; \
 }
 
 #if __cplusplus