From 1ce11b6307b1c0cc1ab75547fcb5ea63daf72bfe Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Wed, 12 Apr 2017 21:20:34 +0100 Subject: Add generic list container --- src/list.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/list.h | 48 ++++++++++++++++++++++++++ src/util.c | 1 - test/list.c | 50 +++++++++++++++++++++++++++ 4 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 src/list.c create mode 100644 src/list.h create mode 100644 test/list.c diff --git a/src/list.c b/src/list.c new file mode 100644 index 0000000..03195e0 --- /dev/null +++ b/src/list.c @@ -0,0 +1,111 @@ +/* Copyright (c) 2017 imv authors + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include "list.h" + +struct imv_list *imv_list_create(void) +{ + struct imv_list *list = malloc(sizeof(struct imv_list)); + list->len = 0; + list->cap = 64; + list->items = malloc(sizeof(void*) * list->cap); + return list; +} + +void imv_list_free(struct imv_list *list) +{ + free(list->items); +} + +void imv_list_deep_free(struct imv_list *list) +{ + for(size_t i = 0; i < list->len; ++i) { + free(list->items[i]); + } + imv_list_free(list); +} + +void imv_list_append(struct imv_list *list, void *item) +{ + imv_list_grow(list, list->len + 1); + list->items[list->len++] = item; +} + +void imv_list_grow(struct imv_list *list, size_t min_size) +{ + if(list->cap >= min_size) { + return; + } + + while(list->cap < min_size) { + list->cap *= 2; + } + + list->items = realloc(list->items, sizeof(void*) * list->cap); +} + +void imv_list_remove(struct imv_list *list, size_t index) +{ + if(index >= list->len) { + return; + } + + memmove(&list->items[index], &list->items[index + 1], list->len - index); + + list->len -= 1; +} + +void imv_list_insert(struct imv_list *list, size_t index, void *item) +{ + imv_list_grow(list, list->len + 1); + + if(index > list->len) { + index = list->len; + } + + memmove(&list->items[index + 1], &list->items[index], list->len - index); + list->items[index] = item; + list->len += 1; +} + +struct imv_list *imv_split_string(const char *string, char delim) +{ + struct imv_list *list = imv_list_create(); + + const char *base = string; + + while(*base) { + while(*base && *base == delim) { + ++base; + } + + const char *end = base; + while(*end && *end != delim) { + ++end; + } + + if(*base && base != end) { + char *item = strndup(base, end - base); + imv_list_append(list, item); + base = end; + } + } + + return list; +} + +/* vim:set ts=2 sts=2 sw=2 et: */ diff --git a/src/list.h b/src/list.h new file mode 100644 index 0000000..a329e6d --- /dev/null +++ b/src/list.h @@ -0,0 +1,48 @@ +/* Copyright (c) 2017 imv authors + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef LIST_H +#define LIST_H + +#include +#include + +struct imv_list { + size_t len; + size_t cap; + void **items; +}; + +struct imv_list *imv_list_create(void); + +void imv_list_free(struct imv_list *list); + +void imv_list_deep_free(struct imv_list *list); + +void imv_list_append(struct imv_list *list, void *item); + +void imv_list_grow(struct imv_list *list, size_t min_size); + +void imv_list_remove(struct imv_list *list, size_t index); + +void imv_list_insert(struct imv_list *list, size_t index, void *item); + +struct imv_list *imv_split_string(const char *string, char delim); + +#endif + +/* vim:set ts=2 sts=2 sw=2 et: */ diff --git a/src/util.c b/src/util.c index 75d6910..9b2b867 100644 --- a/src/util.c +++ b/src/util.c @@ -153,5 +153,4 @@ void imv_printf(SDL_Renderer *renderer, TTF_Font *font, int x, int y, va_end(args); } - /* vim:set ts=2 sts=2 sw=2 et: */ diff --git a/test/list.c b/test/list.c new file mode 100644 index 0000000..8c095d6 --- /dev/null +++ b/test/list.c @@ -0,0 +1,50 @@ +#include +#include +#include +#include +#include +#include "list.h" + +static void test_split_string(void **state) +{ + (void)state; + + struct imv_list *list; + + list = imv_split_string("word", ' '); + assert_true(list); + assert_true(list->len == 1); + assert_false(strcmp(list->items[0], "word")); + imv_list_deep_free(list); + + list = imv_split_string("hello world this is a test", ' '); + assert_true(list); + assert_true(list->len == 6); + assert_false(strcmp(list->items[0], "hello")); + assert_false(strcmp(list->items[1], "world")); + assert_false(strcmp(list->items[2], "this")); + assert_false(strcmp(list->items[3], "is")); + assert_false(strcmp(list->items[4], "a")); + assert_false(strcmp(list->items[5], "test")); + imv_list_deep_free(list); + + list = imv_split_string(" odd whitespace test ", ' '); + assert_true(list); + assert_true(list->len == 3); + assert_false(strcmp(list->items[0], "odd")); + assert_false(strcmp(list->items[1], "whitespace")); + assert_false(strcmp(list->items[2], "test")); + imv_list_deep_free(list); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_split_string), + }; + + return cmocka_run_group_tests(tests, NULL, NULL); +} + + +/* vim:set ts=2 sts=2 sw=2 et: */ -- cgit v1.2.3