refactoring
This commit is contained in:
@@ -14,19 +14,19 @@ LLNode(TYPE)* LLNode_##TYPE##_create(TYPE value){ \
|
||||
return node; \
|
||||
} \
|
||||
\
|
||||
void LLNode_##TYPE##_freeMembers(void* _node){ \
|
||||
void LLNode_##TYPE##_destructMembers(void* _node){ \
|
||||
LLNode(TYPE)* node=(LLNode(TYPE)*)_node; \
|
||||
void* value_ptr=&node->value; \
|
||||
if(TYPE_IS_PTR) value_ptr=*(TYPE**)value_ptr; \
|
||||
ktDescriptor_##TYPE.freeMembers(value_ptr); \
|
||||
} \
|
||||
\
|
||||
void LLNode_##TYPE##_free(LLNode(TYPE)* node, bool free_value){ \
|
||||
if(free_value) LLNode_##TYPE##_freeMembers(node); \
|
||||
void LLNode_##TYPE##_destruct(LLNode(TYPE)* node, bool free_value){ \
|
||||
if(free_value) LLNode_##TYPE##_destructMembers(node); \
|
||||
free(node); \
|
||||
} \
|
||||
\
|
||||
kt_define(LLNode_##TYPE, LLNode_##TYPE##_freeMembers, NULL)
|
||||
kt_define(LLNode_##TYPE, LLNode_##TYPE##_destructMembers, NULL)
|
||||
|
||||
|
||||
#define LinkedList_define(TYPE, VALUE_IS_PTR)\
|
||||
@@ -41,10 +41,10 @@ LinkedList(TYPE)* LinkedList_##TYPE##_create(){ \
|
||||
return l; \
|
||||
} \
|
||||
\
|
||||
void LinkedList_##TYPE##_freeMembers(void* _l){ \
|
||||
void LinkedList_##TYPE##_destructMembers(void* _l){ \
|
||||
LinkedList(TYPE)* l=(LinkedList(TYPE)*)_l; \
|
||||
if(l->first_node!=NULL) \
|
||||
LinkedList_foreach(l, node, LLNode_##TYPE##_free(node, true)); \
|
||||
LinkedList_foreach(l, node, LLNode_##TYPE##_destruct(node, true)); \
|
||||
l->first_node=NULL; l->last_node=NULL; l->count=0; \
|
||||
} \
|
||||
\
|
||||
@@ -55,7 +55,7 @@ void LinkedList_##TYPE##_removePrev(LinkedList(TYPE)* llist, LLNode(TYPE)* nextN
|
||||
nextNode->prev=prevNode; \
|
||||
prevNode->next=nextNode; \
|
||||
if(freeRemoved) \
|
||||
LLNode_##TYPE##_free(removedNode, true); \
|
||||
LLNode_##TYPE##_destruct(removedNode, true); \
|
||||
} \
|
||||
\
|
||||
void LinkedList_##TYPE##_removeNext(LinkedList(TYPE)* llist, LLNode(TYPE)* prevNode, bool freeRemoved){ \
|
||||
@@ -65,16 +65,16 @@ void LinkedList_##TYPE##_removeNext(LinkedList(TYPE)* llist, LLNode(TYPE)* prevN
|
||||
prevNode->next=nextNode; \
|
||||
nextNode->prev=prevNode; \
|
||||
if(freeRemoved) \
|
||||
LLNode_##TYPE##_free(removedNode, true); \
|
||||
LLNode_##TYPE##_destruct(removedNode, true); \
|
||||
} \
|
||||
\
|
||||
LinkedList_##TYPE##_functions_t _LinkedList_##TYPE##_functions={ \
|
||||
.freeMembers=LinkedList_##TYPE##_freeMembers, \
|
||||
.freeMembers=LinkedList_##TYPE##_destructMembers, \
|
||||
.removePrev=LinkedList_##TYPE##_removePrev, \
|
||||
.removeNext=LinkedList_##TYPE##_removeNext \
|
||||
}; \
|
||||
\
|
||||
kt_define(LinkedList_##TYPE, LinkedList_##TYPE##_freeMembers, NULL)
|
||||
kt_define(LinkedList_##TYPE, LinkedList_##TYPE##_destructMembers, NULL)
|
||||
|
||||
|
||||
#if __cplusplus
|
||||
|
||||
Reference in New Issue
Block a user