From 9e6c83620771e71f4113d9471cf9493de0c77d18 Mon Sep 17 00:00:00 2001 From: Klemen Plestenjak Date: Thu, 16 Nov 2023 06:26:24 +0100 Subject: [PATCH] Rename ...New/...Free to ...Create/...Destroy --- engine/breeze/utils/array.c | 4 ++-- engine/breeze/utils/array.h | 10 +++++----- engine/breeze/utils/heap.c | 4 ++-- engine/breeze/utils/heap.h | 8 ++++---- engine/breeze/utils/tokenizer.c | 4 ++-- engine/breeze/utils/tokenizer.h | 4 ++-- engine/tests/array_test.c | 20 ++++++++++---------- engine/tests/heap_test.c | 4 ++-- game/entity_map.c | 4 ++-- game/main.c | 2 +- game/pathfinding.c | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/engine/breeze/utils/array.c b/engine/breeze/utils/array.c index bc58a00..004b01e 100644 --- a/engine/breeze/utils/array.c +++ b/engine/breeze/utils/array.c @@ -10,7 +10,7 @@ typedef struct BzArrayHead { #define ARRAY_HEAD(array) (((BzArrayHead *) array) -1) -void *_bzArrayNew(i32 startCapacity, i32 stride) { +void *_bzArrayCreate(i32 startCapacity, i32 stride) { BzArrayHead *head = bzAlloc(sizeof(*head) + startCapacity * stride); BZ_ASSERT(startCapacity > 0); head[0] = (BzArrayHead) { @@ -20,7 +20,7 @@ void *_bzArrayNew(i32 startCapacity, i32 stride) { }; return &head[1]; } -void _bzArrayFree(void *arr) { +void _bzArrayDestroy(void *arr) { bzFree(ARRAY_HEAD(arr)); } void _bzArrayClear(void *arr) { diff --git a/engine/breeze/utils/array.h b/engine/breeze/utils/array.h index 3b3118f..78a99ca 100644 --- a/engine/breeze/utils/array.h +++ b/engine/breeze/utils/array.h @@ -3,8 +3,8 @@ #include "../defines.h" -void *_bzArrayNew(i32 startCapacity, i32 stride); -void _bzArrayFree(void *arr); +void *_bzArrayCreate(i32 startCapacity, i32 stride); +void _bzArrayDestroy(void *arr); void _bzArrayClear(void *arr); i32 _bzArraySize(void *arr); @@ -21,9 +21,9 @@ i32 _bzArrayIns(void *arr, i32 idx); i32 _bzArraySet(void *arr, i32 idx); i32 _bzArrayPop(void *arr); -#define bzArrayNew(T, n) (T*) _bzArrayNew(n, sizeof(T)) -#define bzArrayFree(arr) do { \ - _bzArrayFree(arr); \ +#define bzArrayCreate(T, n) (T*) _bzArrayCreate(n, sizeof(T)) +#define bzArrayDestroy(arr) do { \ + _bzArrayDestroy(arr); \ arr = NULL; \ } while(0) #define bzArrayClear(arr) _bzArrayClear(arr) diff --git a/engine/breeze/utils/heap.c b/engine/breeze/utils/heap.c index e8f7cb7..d157c1f 100644 --- a/engine/breeze/utils/heap.c +++ b/engine/breeze/utils/heap.c @@ -20,7 +20,7 @@ static void heapSiftDown(BzHeapHead *head, void *heap); -void *_bzHeapNew(i32 startCapacity, i32 stride, i32 weightOffset) { +void *_bzHeapCreate(i32 startCapacity, i32 stride, i32 weightOffset) { i32 numBytes = sizeof(BzHeapHead) + (startCapacity + 1) * stride; BzHeapHead *heap = bzAlloc(numBytes); heap[0] = (BzHeapHead) { @@ -33,7 +33,7 @@ void *_bzHeapNew(i32 startCapacity, i32 stride, i32 weightOffset) { return &heap[1]; } -void _bzHeapFree(void *heap) { +void _bzHeapDestroy(void *heap) { bzFree(HEAP_HEAD(heap)); } void _bzHeapClear(void *heap) { diff --git a/engine/breeze/utils/heap.h b/engine/breeze/utils/heap.h index 36c8c1b..4e7d67e 100644 --- a/engine/breeze/utils/heap.h +++ b/engine/breeze/utils/heap.h @@ -3,8 +3,8 @@ #include "../defines.h" -void *_bzHeapNew(i32 startCapacity, i32 stride, i32 weightOffset); -void _bzHeapFree(void *heap); +void *_bzHeapCreate(i32 startCapacity, i32 stride, i32 weightOffset); +void _bzHeapDestroy(void *heap); void _bzHeapClear(void *heap); i32 _bzHeapSize(void *heap); @@ -13,8 +13,8 @@ i32 _bzHeapPop(void *heap); void _bzHeapPush(void *heap); i32 _bzHeapPushTmpIdx(void *heap); -#define bzHeapNew(T, n) (T *) ((T *)_bzHeapNew((n), sizeof(T), offsetof(T, weight))) -#define bzHeapFree(heap) _bzHeapFree((void *) (heap)) +#define bzHeapCreate(T, n) (T *) ((T *)_bzHeapCreate((n), sizeof(T), offsetof(T, weight))) +#define bzHeapDestroy(heap) _bzHeapDestroy((void *) (heap)) #define bzHeapClear(heap) _bzHeapClear((void *) (heap)) #define bzHeapSize(heap) _bzHeapSize((void *) (heap)) diff --git a/engine/breeze/utils/tokenizer.c b/engine/breeze/utils/tokenizer.c index 8dc90f0..1171ca7 100644 --- a/engine/breeze/utils/tokenizer.c +++ b/engine/breeze/utils/tokenizer.c @@ -1,6 +1,6 @@ #include "tokenizer.h" -Tokenizer initTokenizer(const char *source) { +Tokenizer tokenizerCreate(const char *source) { int line = source ? 1 : 0; return (Tokenizer) {source, line}; } @@ -29,7 +29,7 @@ static void skipWhitespace(Tokenizer *tokenizer) { } } -Token scanToken(Tokenizer *tokenizer) { +Token tokenizerScan(Tokenizer *tokenizer) { skipWhitespace(tokenizer); Token token = {tokenizer->current, 0, tokenizer->line}; diff --git a/engine/breeze/utils/tokenizer.h b/engine/breeze/utils/tokenizer.h index f0fa343..4668413 100644 --- a/engine/breeze/utils/tokenizer.h +++ b/engine/breeze/utils/tokenizer.h @@ -14,7 +14,7 @@ typedef struct Tokenizer { int line; } Tokenizer; -Tokenizer initTokenizer(const char *source); -Token scanToken(Tokenizer *tokenizer); +Tokenizer tokenizerCreate(const char *source); +Token tokenizerScan(Tokenizer *tokenizer); #endif //BREEZE_TOKENIZER_H diff --git a/engine/tests/array_test.c b/engine/tests/array_test.c index 055beb3..08b58f6 100644 --- a/engine/tests/array_test.c +++ b/engine/tests/array_test.c @@ -4,7 +4,7 @@ int main(void) { bzLoggerInit(); - int *arr = bzArrayNew(int, 5); + int *arr = bzArrayCreate(int, 5); int i, j; @@ -12,8 +12,8 @@ int main(void) { for (i = 0; i < 20000; i += 50) { for (j = 0; j < i; ++j) bzArrayPush(arr, j); - bzArrayFree(arr); - arr = bzArrayNew(int, 5); + bzArrayDestroy(arr); + arr = bzArrayCreate(int, 5); } for (i = 0; i < 4; ++i) { @@ -22,15 +22,15 @@ int main(void) { bzArrayPush(arr, 3); bzArrayPush(arr, 4); bzArrayDel(arr, i); - bzArrayFree(arr); - arr = bzArrayNew(int, 5); + bzArrayDestroy(arr); + arr = bzArrayCreate(int, 5); bzArrayPush(arr, 1); bzArrayPush(arr, 2); bzArrayPush(arr, 3); bzArrayPush(arr, 4); //darray_delswap(arr, i); - bzArrayFree(arr); - arr = bzArrayNew(int, 5); + bzArrayDestroy(arr); + arr = bzArrayCreate(int, 5); } for (i = 0; i < 5; ++i) { @@ -50,10 +50,10 @@ int main(void) { printf("\n\n"); if (i < 4) BZ_ASSERT(bzArrayGet(arr, 4) == 4); - bzArrayFree(arr); - arr = bzArrayNew(int, 5); + bzArrayDestroy(arr); + arr = bzArrayCreate(int, 5); } - bzArrayFree(arr); + bzArrayDestroy(arr); return 0; diff --git a/engine/tests/heap_test.c b/engine/tests/heap_test.c index f7776c0..a325659 100644 --- a/engine/tests/heap_test.c +++ b/engine/tests/heap_test.c @@ -8,7 +8,7 @@ int main() { i32 weight; } Node; - Node *heap = bzHeapNew(Node, 20); + Node *heap = bzHeapCreate(Node, 20); bzHeapPush(heap, (Node) {3}); bzHeapPush(heap, (Node) {2}); bzHeapPush(heap, (Node) {1}); @@ -29,7 +29,7 @@ int main() { printf("%d\n", node.weight); } - bzHeapFree(heap); + bzHeapDestroy(heap); return 0; diff --git a/game/entity_map.c b/game/entity_map.c index 91deb8d..13b9856 100644 --- a/game/entity_map.c +++ b/game/entity_map.c @@ -15,14 +15,14 @@ EntityMap entityMapCreate(const EntityMapDesc *desc) { size_t numBytes = sizeof(EntityMapCell) * map.width * map.height * map.cellDepth; map.cells = bzAlloc(numBytes); bzMemSet(map.cells, 0, numBytes); - map.entities = bzArrayNew(EntityMapEntry, 512); + map.entities = bzArrayCreate(EntityMapEntry, 512); return map; } void entityMapDestroy(EntityMap *entityMap) { bzFree(entityMap->cells); entityMap->cells = NULL; - bzArrayFree(entityMap->entities); + bzArrayDestroy(entityMap->entities); entityMap->entities = NULL; } diff --git a/game/main.c b/game/main.c index 6e61db2..c9cebfd 100644 --- a/game/main.c +++ b/game/main.c @@ -206,7 +206,7 @@ void render(float dt, void *userData) { static PathNode *heap = NULL; if (!heap) - heap = bzHeapNew(PathNode, game->map.width * game->map.height); + heap = bzHeapCreate(PathNode, game->map.width * game->map.height); game->path.waypoints = game->waypoints; game->path.maxWaypoints = 128; findPath(&(PathfindingDesc) { diff --git a/game/pathfinding.c b/game/pathfinding.c index 993d09f..ef1a80a 100644 --- a/game/pathfinding.c +++ b/game/pathfinding.c @@ -26,7 +26,7 @@ bool findPath(const PathfindingDesc *desc) { bzMemSet(visited, 0, sizeof(visited)); PathNode *heap = desc->heap; - if (!heap) heap = bzHeapNew(PathNode, map->width * map->height); + if (!heap) heap = bzHeapCreate(PathNode, map->width * map->height); else bzHeapClear(heap); i32 toTargetCost = dst(desc->start, desc->target); @@ -115,7 +115,7 @@ bool findPath(const PathfindingDesc *desc) { } if (!desc->heap) { - bzHeapFree(heap); + bzHeapDestroy(heap); heap = NULL; }