working on lexer, and updated vector (still needs testing)
This commit is contained in:
parent
cdd6c3976b
commit
6e814f12e6
4 changed files with 195 additions and 3 deletions
|
|
@ -12,7 +12,8 @@ struct ARC_Vector {
|
|||
|
||||
void **data;
|
||||
|
||||
ARC_Vector_CompareDataFn compareDataFn;
|
||||
ARC_Vector_CompareDataFn compareDataFn;
|
||||
ARC_Vector_DeleteDataFn *deleteDataFn;
|
||||
};
|
||||
|
||||
//this is a private function used as the default check for removing data from a given pointer
|
||||
|
|
@ -24,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){
|
||||
void ARC_Vector_Create(ARC_Vector **vector, ARC_Vector_CompareDataFn *compareDataFn, ARC_Vector_DeleteDataFn *deleteDataFn){
|
||||
//create the vector
|
||||
*vector = (ARC_Vector *)malloc(sizeof(ARC_Vector));
|
||||
|
||||
|
|
@ -38,9 +39,23 @@ void ARC_Vector_Create(ARC_Vector **vector, ARC_Vector_CompareDataFn *compareDat
|
|||
if(compareDataFn != NULL){
|
||||
(*vector)->compareDataFn = *compareDataFn;
|
||||
}
|
||||
|
||||
//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;
|
||||
}
|
||||
}
|
||||
|
||||
void ARC_Vector_Destroy(ARC_Vector *vector){
|
||||
//TODO: clear vector before destroying
|
||||
|
||||
//free the delete data function if it exists
|
||||
if(vector->deleteDataFn){
|
||||
free(vector->deleteDataFn);
|
||||
}
|
||||
|
||||
//free everything stored in the vector
|
||||
free(vector->data);
|
||||
|
||||
|
|
@ -96,6 +111,11 @@ void ARC_Vector_RemoveIndex(ARC_Vector *vector, uint32_t index){
|
|||
return;
|
||||
}
|
||||
|
||||
//call delete data to clean up item if delete data function exists
|
||||
if(vector->deleteDataFn != NULL){
|
||||
(*(vector->deleteDataFn))(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
|
||||
for(; index + 1 < vector->currentSize; index++){
|
||||
//override the data from index to the end by shifting it back one
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue