diff --git a/src/core/strings/str8/str8.c b/src/core/strings/str8/str8.c index 59d82e3..b86e2ac 100644 --- a/src/core/strings/str8/str8.c +++ b/src/core/strings/str8/str8.c @@ -433,3 +433,7 @@ Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *d return output; } + +u64 wapp_str8_list_total_size(const Str8List *list) { + +} diff --git a/src/core/strings/str8/str8.h b/src/core/strings/str8/str8.h index 894e4c2..725b65d 100644 --- a/src/core/strings/str8/str8.h +++ b/src/core/strings/str8/str8.h @@ -91,8 +91,9 @@ Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8R /** * Str8 list utilities */ -#define wapp_str8_node_from_cstr(STRING) ((Str8Node){.string = &wapp_str8_lit(STRING)}) -#define wapp_str8_node_from_str8(STRING) ((Str8Node){.string = &(STRING)}) +#define wapp_str8_node_from_cstr(STRING) ((Str8Node){.item = &wapp_str8_lit(STRING)}) +#define wapp_str8_node_from_str8(STRING) ((Str8Node){.item = &(STRING)}) +u64 wapp_str8_list_total_size(const Str8List *list); #ifdef __cplusplus END_C_LINKAGE diff --git a/src/core/strings/str8/str8_list.c b/src/core/strings/str8/str8_list.c index a3cebbe..98f9f94 100644 --- a/src/core/strings/str8/str8_list.c +++ b/src/core/strings/str8/str8_list.c @@ -23,11 +23,10 @@ Str8Node *wapp_str8_list_get(const Str8List *list, u64 index) { output = current; return output; - } void wapp_str8_list_push_front(Str8List *list, Str8Node *node) { - if (!list || !node || !(node->string)) { + if (!list || !node || !(node->item)) { return; } @@ -38,7 +37,6 @@ void wapp_str8_list_push_front(Str8List *list, Str8Node *node) { return; } - list->total_size += node_list.total_size; list->node_count += node_list.node_count; Str8Node *first = list->first; @@ -48,11 +46,10 @@ void wapp_str8_list_push_front(Str8List *list, Str8Node *node) { list->first = node_list.first; node_list.last->next = first; - } void wapp_str8_list_push_back(Str8List *list, Str8Node *node) { - if (!list || !node || !(node->string)) { + if (!list || !node || !(node->item)) { return; } @@ -63,7 +60,6 @@ void wapp_str8_list_push_back(Str8List *list, Str8Node *node) { return; } - list->total_size += node_list.total_size; list->node_count += node_list.node_count; Str8Node *last = list->last; @@ -73,11 +69,10 @@ void wapp_str8_list_push_back(Str8List *list, Str8Node *node) { list->last = node_list.last; node_list.first->prev = last; - } void wapp_str8_list_insert(Str8List *list, Str8Node *node, u64 index) { - if (!list || !node || !(node->string)) { + if (!list || !node || !(node->item)) { return; } @@ -96,7 +91,6 @@ void wapp_str8_list_insert(Str8List *list, Str8Node *node, u64 index) { Str8List node_list = str8_node_to_list(node); - list->total_size += node_list.total_size; list->node_count += node_list.node_count; Str8Node *prev = dst_node->prev; @@ -106,7 +100,6 @@ void wapp_str8_list_insert(Str8List *list, Str8Node *node, u64 index) { node_list.first->prev = prev; node_list.last->next = dst_node; - } Str8Node *wapp_str8_list_pop_front(Str8List *list) { @@ -124,14 +117,12 @@ Str8Node *wapp_str8_list_pop_front(Str8List *list) { } --(list->node_count); - list->total_size -= output->string->size; list->first = output->next; output->prev = output->next = NULL; RETURN_STR8_LIST_POP_FRONT: return output; - } Str8Node *wapp_str8_list_pop_back(Str8List *list) { @@ -149,14 +140,12 @@ Str8Node *wapp_str8_list_pop_back(Str8List *list) { } --(list->node_count); - list->total_size -= output->string->size; list->last = output->prev; output->prev = output->next = NULL; RETURN_STR8_LIST_POP_BACK: return output; - } Str8Node *wapp_str8_list_remove(Str8List *list, u64 index) { @@ -182,13 +171,11 @@ Str8Node *wapp_str8_list_remove(Str8List *list, u64 index) { output->next->prev = output->prev; --(list->node_count); - list->total_size -= output->string->size; output->prev = output->next = NULL; RETURN_STR8_LIST_REMOVE: return output; - } void wapp_str8_list_empty(Str8List *list) { @@ -200,25 +187,21 @@ void wapp_str8_list_empty(Str8List *list) { for (u64 i = 0; i < count; ++i) { wapp_str8_list_pop_back(list); } - } internal Str8List str8_node_to_list(Str8Node *node) { - Str8List output = {.first = node, .last = node, .total_size = node->string->size, .node_count = 1}; + Str8List output = {.first = node, .last = node, .node_count = 1}; while (output.first->prev != NULL) { - output.total_size += output.first->prev->string->size; output.first = output.first->prev; ++(output.node_count); } while (output.last->next != NULL) { - output.total_size += output.last->next->string->size; output.last = output.last->next; ++(output.node_count); } return output; - } diff --git a/src/core/strings/str8/str8_list.h b/src/core/strings/str8/str8_list.h index 2476871..529c5c0 100644 --- a/src/core/strings/str8/str8_list.h +++ b/src/core/strings/str8/str8_list.h @@ -15,7 +15,7 @@ typedef struct str8 Str8; typedef struct Str8Node Str8Node; struct Str8Node { - Str8 *string; + Str8 *item; Str8Node *prev; Str8Node *next; }; @@ -24,7 +24,6 @@ typedef struct Str8List Str8List; struct Str8List { Str8Node *first; Str8Node *last; - u64 total_size; u64 node_count; };