Merge remote-tracking branch 'origin/minishell'

7 files changed, 122 insertions, 4 deletions

diff --git a/src/vec/ft_vecgrow.c b/src/vec/ft_vecgrow.c
index bb8b8c7..2213c88 100644
--- a/src/vec/ft_vecgrow.c
+++ b/src/vec/ft_vecgrow.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 19:13:07 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 21:15:20 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/02 10:43:01 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -35,7 +35,7 @@ t_ftvec		*ft_vecgrow(t_ftvec *vec)
 		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);
+	ft_memcpy(new_data, vec->data, vec->size * sizeof(void*));
 	free(vec->data);
 	vec->data = new_data;
 	vec->capacity = new_capacity;
diff --git a/src/vec/ft_vecinsert.c b/src/vec/ft_vecinsert.c
new file mode 100644
index 0000000..1682daa
--- /dev/null
+++ b/src/vec/ft_vecinsert.c
@@ -0,0 +1,36 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_vecinsert.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/02 10:46:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/02 11:04:19 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_vec.h"
+
+/*
+** \brief       Insert element in vector
+** \param vec   Vector where element is inserted
+** \param i     Index where element should be inserted,
+**              bound checking is performed
+** \param elem  Element to insert
+** \return      Passed vector or NULL on error
+*/
+
+t_ftvec	*ft_vecinsert(t_ftvec *vec, size_t i, void *elem)
+{
+	if (i > vec->size)
+		return (NULL);
+	if (vec->capacity <= vec->size)
+		if (ft_vecgrow(vec) == NULL)
+			return (NULL);
+	ft_memmove(vec->data + i + 1, vec->data + i,
+				(vec->size - i) * sizeof(void*));
+	vec->data[i] = elem;
+	vec->size++;
+	return (vec);
+}
diff --git a/src/vec/ft_vecnew.c b/src/vec/ft_vecnew.c
index 8a8736a..0def9c9 100644
--- a/src/vec/ft_vecnew.c
+++ b/src/vec/ft_vecnew.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 19:03:49 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 20:00:00 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/04 21:24:36 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/vec/ft_vecpush.c b/src/vec/ft_vecpush.c
index fc903ef..026ae3d 100644
--- a/src/vec/ft_vecpush.c
+++ b/src/vec/ft_vecpush.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 19:22:20 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 20:20:06 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/02 10:51:38 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/vec/ft_vecpush_safe.c b/src/vec/ft_vecpush_safe.c
new file mode 100644
index 0000000..8e5a8d4
--- /dev/null
+++ b/src/vec/ft_vecpush_safe.c
@@ -0,0 +1,27 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_vecpush_safe.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 13:29:48 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 14:24:19 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_vec.h"
+
+/*
+** \brief     Wrapper around ft_vecpush which reject null element
+** \param vec  Pushed vector
+** \param pushed  Element pushed which can't be NULL
+** \return        NULL if pushed is NULL, whatever ft_vecpush returns otherwise
+*/
+
+t_ftvec		*ft_vecpush_safe(t_ftvec *vec, void *pushed)
+{
+	if (pushed == NULL)
+		return (NULL);
+	return (ft_vecpush(vec, pushed));
+}
diff --git a/src/vec/ft_vecremove.c b/src/vec/ft_vecremove.c
new file mode 100644
index 0000000..d24ba29
--- /dev/null
+++ b/src/vec/ft_vecremove.c
@@ -0,0 +1,31 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_vecremove.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   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--;
+}
diff --git a/src/vec/ft_vecsort.c b/src/vec/ft_vecsort.c
new file mode 100644
index 0000000..8aa5c2a
--- /dev/null
+++ b/src/vec/ft_vecsort.c
@@ -0,0 +1,24 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_vecsort.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/04 15:53:23 by charles           #+#    #+#             */
+/*   Updated: 2020/04/04 19:30:31 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_vec.h"
+
+/*
+** \brief     Wrapper around ft_qsort
+** \param vec  Vector to sort
+** \param cmp  Function to compare each vector element
+*/
+
+void	ft_vecsort(t_ftvec *vec, t_ftcompar_func cmp)
+{
+	ft_qsort(vec->data, vec->size, sizeof(void*), cmp);
+}