From d971bd8d16608f316396aba7a579d0b1f1af5aeb Mon Sep 17 00:00:00 2001 From: nass1pro Date: Fri, 12 Jun 2020 13:52:58 +0200 Subject: Added e_token enum --- test_mini/libft/src/vec/ft_vecdestroy.c | 29 ---------------------- test_mini/libft/src/vec/ft_vecgrow.c | 43 --------------------------------- test_mini/libft/src/vec/ft_veciter.c | 31 ------------------------ test_mini/libft/src/vec/ft_vecnew.c | 38 ----------------------------- test_mini/libft/src/vec/ft_vecpop.c | 28 --------------------- test_mini/libft/src/vec/ft_vecpush.c | 30 ----------------------- test_mini/libft/src/vec/ft_vecremove.c | 31 ------------------------ 7 files changed, 230 deletions(-) delete mode 100644 test_mini/libft/src/vec/ft_vecdestroy.c delete mode 100644 test_mini/libft/src/vec/ft_vecgrow.c delete mode 100644 test_mini/libft/src/vec/ft_veciter.c delete mode 100644 test_mini/libft/src/vec/ft_vecnew.c delete mode 100644 test_mini/libft/src/vec/ft_vecpop.c delete mode 100644 test_mini/libft/src/vec/ft_vecpush.c delete mode 100644 test_mini/libft/src/vec/ft_vecremove.c (limited to 'test_mini/libft/src/vec') diff --git a/test_mini/libft/src/vec/ft_vecdestroy.c b/test_mini/libft/src/vec/ft_vecdestroy.c deleted file mode 100644 index 781e02e..0000000 --- a/test_mini/libft/src/vec/ft_vecdestroy.c +++ /dev/null @@ -1,29 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_vecdestroy.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/01 19:06:22 by charles #+# #+# */ -/* Updated: 2020/04/01 19:09:09 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_vec.h" - -/* -** \brief Destroy a vector -** \param vec Vector to destroy -** \param del Delete function applied to each element of the vector -*/ - -void ft_vecdestroy(t_ftvec *vec, void (*del)(void *elem)) -{ - if (vec == NULL) - return ; - if (del != NULL) - ft_veciter(vec, del); - free(vec->data); - free(vec); -} diff --git a/test_mini/libft/src/vec/ft_vecgrow.c b/test_mini/libft/src/vec/ft_vecgrow.c deleted file mode 100644 index bb8b8c7..0000000 --- a/test_mini/libft/src/vec/ft_vecgrow.c +++ /dev/null @@ -1,43 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_vecgrow.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/01 19:13:07 by charles #+# #+# */ -/* Updated: 2020/04/01 21:15:20 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_vec.h" - -/* -** \brief Vector Growth factor -*/ - -#define FT_VEC_GROWTH_FACTOR 1.5 - -/* -** \brief Grow the vector capacity by a constant factor -** \param vec Vector to grow -** \return Passed vector of NULL on error -*/ - -t_ftvec *ft_vecgrow(t_ftvec *vec) -{ - size_t new_capacity; - void **new_data; - - if (vec->capacity <= 1) - new_capacity = 2; - else - new_capacity = vec->capacity * FT_VEC_GROWTH_FACTOR; - if ((new_data = (void**)malloc(sizeof(void*) * new_capacity)) == NULL) - return (NULL); - ft_memcpy(new_data, vec->data, vec->size); - free(vec->data); - vec->data = new_data; - vec->capacity = new_capacity; - return (vec); -} diff --git a/test_mini/libft/src/vec/ft_veciter.c b/test_mini/libft/src/vec/ft_veciter.c deleted file mode 100644 index ec4a917..0000000 --- a/test_mini/libft/src/vec/ft_veciter.c +++ /dev/null @@ -1,31 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_veciter.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/01 19:09:51 by charles #+# #+# */ -/* Updated: 2020/04/01 20:15:13 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_vec.h" - -/* -** \brief Iterate a function over elements of a vector -** \param vec Iterated vector -** \param f Function applied to each elements -*/ - -void ft_veciter(t_ftvec *vec, void (*f)(void *elem)) -{ - size_t i; - - i = 0; - while (i < vec->size) - { - f(vec->data[i]); - i++; - } -} diff --git a/test_mini/libft/src/vec/ft_vecnew.c b/test_mini/libft/src/vec/ft_vecnew.c deleted file mode 100644 index 8a8736a..0000000 --- a/test_mini/libft/src/vec/ft_vecnew.c +++ /dev/null @@ -1,38 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_vecnew.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/01 19:03:49 by charles #+# #+# */ -/* Updated: 2020/04/01 20:00:00 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_vec.h" - -/* -** \brief Create a new vector -** \param capacity Initial capacity of the underlying array -** Can't be lower than 1 -** \return Created vector or NULL on malloc error -*/ - -t_ftvec *ft_vecnew(size_t capacity) -{ - t_ftvec *vec; - - if ((vec = (t_ftvec*)malloc(sizeof(t_ftvec))) == NULL) - return (NULL); - if (capacity == 0) - capacity = 1; - if ((vec->data = (void**)malloc(sizeof(void*) * capacity)) == NULL) - { - free(vec); - return (NULL); - } - vec->capacity = capacity; - vec->size = 0; - return (vec); -} diff --git a/test_mini/libft/src/vec/ft_vecpop.c b/test_mini/libft/src/vec/ft_vecpop.c deleted file mode 100644 index 5b77b46..0000000 --- a/test_mini/libft/src/vec/ft_vecpop.c +++ /dev/null @@ -1,28 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_vecpop.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/01 19:26:27 by charles #+# #+# */ -/* Updated: 2020/04/01 20:26:34 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_vec.h" - -/* -** \brief Pop last element of a vector -** \param vec Vector poped -** \param del Delete function applied to last element -*/ - -void ft_vecpop(t_ftvec *vec, void (*del)(void *elem)) -{ - if (vec->size == 0) - return ; - if (del != NULL) - del(vec->data[vec->size - 1]); - vec->size--; -} diff --git a/test_mini/libft/src/vec/ft_vecpush.c b/test_mini/libft/src/vec/ft_vecpush.c deleted file mode 100644 index fc903ef..0000000 --- a/test_mini/libft/src/vec/ft_vecpush.c +++ /dev/null @@ -1,30 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_vecpush.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/01 19:22:20 by charles #+# #+# */ -/* Updated: 2020/04/01 20:20:06 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_vec.h" - -/* -** \brief Push element at the end of vector -** \param vec Vector where element will be pushed -** \param pushed Element to push -** \return Passed vector or NULL if couldnt grow vector -*/ - -t_ftvec *ft_vecpush(t_ftvec *vec, void *pushed) -{ - if (vec->capacity <= vec->size) - if (ft_vecgrow(vec) == NULL) - return (NULL); - vec->data[vec->size] = pushed; - vec->size++; - return (vec); -} diff --git a/test_mini/libft/src/vec/ft_vecremove.c b/test_mini/libft/src/vec/ft_vecremove.c deleted file mode 100644 index d24ba29..0000000 --- a/test_mini/libft/src/vec/ft_vecremove.c +++ /dev/null @@ -1,31 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* ft_vecremove.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/01 22:45:07 by charles #+# #+# */ -/* Updated: 2020/04/01 22:58:21 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "libft_vec.h" - -/* -** \brief Remove element from vector -** \param vec Vector to remove from -** \param i Index of the element to remove -** \param del Delete function applied to ith element -*/ - -void ft_vecremove(t_ftvec *vec, size_t i, void (*del)(void *elem)) -{ - if (vec->size == 0 || i > vec->size - 1) - return ; - if (del != NULL) - del(vec->data[i]); - ft_memmove(vec->data + i, vec->data + i + 1, - (vec->size - i - 1) * sizeof(void*)); - vec->size--; -} -- cgit