herbglitch/archeus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

basic vector complete but untested, added destroy callback to vector

Browse source
This commit is contained in:
herbglitch 2024-08-29 05:04:08 -06:00
parent 6e814f12e6
commit 4c0c5d377d
4 changed files with 445 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/std/vector.c
View file

@ -13,7 +13,7 @@ struct ARC_Vector {
void **data;
ARC_Vector_CompareDataFn compareDataFn;
ARC_Vector_DeleteDataFn *deleteDataFn;
ARC_Vector_DestroyDataFn *destroyDataFn;
};
//this is a private function used as the default check for removing data from a given pointer
@ -25,7 +25,7 @@ ARC_Bool ARC_Vector_CompareDataDefaultFn(void *dataA, void *dataB){
return ARC_False;
}
void ARC_Vector_Create(ARC_Vector **vector, ARC_Vector_CompareDataFn *compareDataFn, ARC_Vector_DeleteDataFn *deleteDataFn){
void ARC_Vector_Create(ARC_Vector **vector, ARC_Vector_CompareDataFn *compareDataFn, ARC_Vector_DestroyDataFn *destroyDataFn){
//create the vector
*vector = (ARC_Vector *)malloc(sizeof(ARC_Vector));
@ -41,19 +41,20 @@ void ARC_Vector_Create(ARC_Vector **vector, ARC_Vector_CompareDataFn *compareDat
}
//set NULL as a default for deleteDataFn, then copy the delete data function callback if it exists
(*vector)->deleteDataFn = NULL;
if(deleteDataFn != NULL){
(*vector)->deleteDataFn = (ARC_Vector_DeleteDataFn *)malloc(sizeof(ARC_Vector_DeleteDataFn));
*((*vector)->deleteDataFn) = *deleteDataFn;
(*vector)->destroyDataFn = NULL;
if(destroyDataFn != NULL){
(*vector)->destroyDataFn = (ARC_Vector_DestroyDataFn *)malloc(sizeof(ARC_Vector_DestroyDataFn));
*((*vector)->destroyDataFn) = *destroyDataFn;
}
}
void ARC_Vector_Destroy(ARC_Vector *vector){
//TODO: clear vector before destroying
//remove all the contents before destroying the vector
ARC_Vector_Clear(vector);
//free the delete data function if it exists
if(vector->deleteDataFn){
free(vector->deleteDataFn);
if(vector->destroyDataFn){
free(vector->destroyDataFn);
}
//free everything stored in the vector
@ -112,8 +113,8 @@ void ARC_Vector_RemoveIndex(ARC_Vector *vector, uint32_t index){
}
//call delete data to clean up item if delete data function exists
if(vector->deleteDataFn != NULL){
(*(vector->deleteDataFn))(vector->data[index]);
if(vector->destroyDataFn != NULL){
(*(vector->destroyDataFn))(vector->data[index]);
}
//we will be using index to iterate as we will not use it again, so we can skip the first part of the for loop
@ -135,6 +136,13 @@ void ARC_Vector_RemoveIndex(ARC_Vector *vector, uint32_t index){
vector->data = (void **)realloc(vector->data, sizeof(void *) * vector->currentCapacity);
}
void ARC_Vector_Clear(ARC_Vector *vector){
//remove each item in the vector untill the vector is empty
while(ARC_Vector_GetSize(vector) != 0){
ARC_Vector_RemoveIndex(vector, 0);
}
}
uint32_t ARC_Vector_GetSize(ARC_Vector *vector){
return vector->currentSize;
}