Merge branch 'minishell'

20 files changed, 267 insertions, 267 deletions

diff --git a/test/src/lst/test_ft_lstadd_back.c b/test/src/lst/test_ft_lstadd_back.c
deleted file mode 100644
index 42e749c..0000000
--- a/test/src/lst/test_ft_lstadd_back.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "libft_test.h"
-
-TEST_GROUP(ft_lstadd_back);
-
-TEST_SETUP(ft_lstadd_back)
-{}
-
-TEST_TEAR_DOWN(ft_lstadd_back)
-{}
-
-TEST(ft_lstadd_back, basic)
-{
-	t_ftlst *lst;
-	int a = 1;
-	int b = 2;
-	int c = 2;
-
-	lst = ft_lstnew(&a);
-	TEST_ASSERT_NOT_NULL(lst);
-
-	ft_lstadd_back(&lst, ft_lstnew(&b));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->next->content);
-
-	ft_lstadd_back(&lst, ft_lstnew(&c));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->next->next->content);
-
-	ft_lstclear(&lst, NULL);
-}
diff --git a/test/src/lst/test_ft_lstadd_front.c b/test/src/lst/test_ft_lstadd_front.c
deleted file mode 100644
index 21b7617..0000000
--- a/test/src/lst/test_ft_lstadd_front.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "libft_test.h"
-
-TEST_GROUP(ft_lstadd_front);
-
-TEST_SETUP(ft_lstadd_front)
-{}
-
-TEST_TEAR_DOWN(ft_lstadd_front)
-{}
-
-TEST(ft_lstadd_front, basic)
-{
-	t_ftlst *lst;
-	int a = 1;
-	int b = 2;
-	int c = 2;
-
-	lst = ft_lstnew(&a);
-	TEST_ASSERT_NOT_NULL(lst);
-
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->next->content);
-
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->next->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->next->next->content);
-
-	ft_lstclear(&lst, NULL);
-}
diff --git a/test/src/lst/test_ft_lstbsearch.c b/test/src/lst/test_ft_lstbsearch.c
index 218f0bf..81f2578 100644
--- a/test/src/lst/test_ft_lstbsearch.c
+++ b/test/src/lst/test_ft_lstbsearch.c
@@ -17,10 +17,10 @@ TEST(ft_lstbsearch, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 
 	found = ft_lstbsearch(lst, ft_compar_int, &c);
 	TEST_ASSERT_NOT_NULL(found);
@@ -33,5 +33,5 @@ TEST(ft_lstbsearch, basic)
 	found = ft_lstbsearch(lst, ft_compar_int, &d);
 	TEST_ASSERT_NULL(found);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstclear.c b/test/src/lst/test_ft_lstclear.c
deleted file mode 100644
index acffb17..0000000
--- a/test/src/lst/test_ft_lstclear.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "libft_test.h"
-
-TEST_GROUP(ft_lstclear);
-
-TEST_SETUP(ft_lstclear)
-{}
-
-TEST_TEAR_DOWN(ft_lstclear)
-{}
-
-TEST(ft_lstclear, basic)
-{
-	TEST_PASS();  // how to test free?
-}
diff --git a/test/src/lst/test_ft_lstdestroy.c b/test/src/lst/test_ft_lstdestroy.c
new file mode 100644
index 0000000..e7b98c5
--- /dev/null
+++ b/test/src/lst/test_ft_lstdestroy.c
@@ -0,0 +1,14 @@
+#include "libft_test.h"
+
+TEST_GROUP(ft_lstdestroy);
+
+TEST_SETUP(ft_lstdestroy)
+{}
+
+TEST_TEAR_DOWN(ft_lstdestroy)
+{}
+
+TEST(ft_lstdestroy, basic)
+{
+	TEST_PASS();  // how to test free?
+}
diff --git a/test/src/lst/test_ft_lstiter.c b/test/src/lst/test_ft_lstiter.c
index c8bf90d..53b1380 100644
--- a/test/src/lst/test_ft_lstiter.c
+++ b/test/src/lst/test_ft_lstiter.c
@@ -26,27 +26,27 @@ TEST(ft_lstiter, basic)
 	ft_lstiter(lst, square_iter_func);
 	TEST_ASSERT_NULL(lst);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(4, *(int*)lst->content);
+	TEST_ASSERT_EQUAL(4, *(int*)lst->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(9, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(16, *(int*)lst->next->content);
+	TEST_ASSERT_EQUAL(9, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(16, *(int*)lst->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(16, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(81, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(256, *(int*)lst->next->next->content);
+	TEST_ASSERT_EQUAL(16, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(81, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(256, *(int*)lst->next->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	ft_lstiter(lst, square_iter_func);
-	TEST_ASSERT_EQUAL(25, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(256, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(81 * 81, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(256 * 256, *(int*)lst->next->next->next->content);
+	TEST_ASSERT_EQUAL(25, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(256, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(81 * 81, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(256 * 256, *(int*)lst->next->next->next->data);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstlast.c b/test/src/lst/test_ft_lstlast.c
index 6b44c28..82c8096 100644
--- a/test/src/lst/test_ft_lstlast.c
+++ b/test/src/lst/test_ft_lstlast.c
@@ -16,14 +16,14 @@ TEST(ft_lstlast, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL_PTR(lst, ft_lstlast(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	TEST_ASSERT_EQUAL_PTR(lst->next, ft_lstlast(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	TEST_ASSERT_EQUAL_PTR(lst->next->next, ft_lstlast(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	TEST_ASSERT_EQUAL_PTR(lst->next->next->next, ft_lstlast(lst));
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstlfind.c b/test/src/lst/test_ft_lstlfind.c
index 493a8ad..1851436 100644
--- a/test/src/lst/test_ft_lstlfind.c
+++ b/test/src/lst/test_ft_lstlfind.c
@@ -29,13 +29,13 @@ TEST(ft_lstlfind, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 
 	found = ft_lstlfind(lst, ft_compar_int, &c);
 	TEST_ASSERT_EQUAL_PTR(lst->next->next->next, found);
@@ -51,5 +51,5 @@ TEST(ft_lstlfind, basic)
 	found = ft_lstlfind(lst, ft_compar_int, &d);
 	TEST_ASSERT_NULL(found);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstlsearch.c b/test/src/lst/test_ft_lstlsearch.c
index c9f9c64..83a8f4e 100644
--- a/test/src/lst/test_ft_lstlsearch.c
+++ b/test/src/lst/test_ft_lstlsearch.c
@@ -29,13 +29,13 @@ TEST(ft_lstlsearch, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 
 	found = ft_lstlsearch(lst, ft_compar_int, &c);
 	TEST_ASSERT_EQUAL_PTR(lst->next->next->next, found);
@@ -51,5 +51,5 @@ TEST(ft_lstlsearch, basic)
 	found = ft_lstlsearch(lst, ft_compar_int, &d);
 	TEST_ASSERT_EQUAL_PTR(ft_lstlast(lst), found);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstmap.c b/test/src/lst/test_ft_lstmap.c
index 4abdddc..53c2f7a 100644
--- a/test/src/lst/test_ft_lstmap.c
+++ b/test/src/lst/test_ft_lstmap.c
@@ -29,54 +29,54 @@ TEST(ft_lstmap, basic)
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NULL(mapped);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->data);
 	TEST_ASSERT_NULL(mapped->next);
-	ft_lstclear(&mapped, free);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(9, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(9, *(int*)mapped->data);
 	TEST_ASSERT_NOT_NULL(mapped->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->data);
 	TEST_ASSERT_NULL(mapped->next->next);
-	ft_lstclear(&mapped, free);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(16, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(16, *(int*)mapped->data);
 	TEST_ASSERT_NOT_NULL(mapped->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->content);
-	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->data);
+	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->data);
 	TEST_ASSERT_NOT_NULL(mapped->next->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->data);
 	TEST_ASSERT_NULL(mapped->next->next->next);
-	ft_lstclear(&mapped, free);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	mapped = ft_lstmap(lst, f_square, free);
 	TEST_ASSERT_NOT_NULL(mapped);
-	TEST_ASSERT_NOT_NULL(mapped->content);
-	TEST_ASSERT_EQUAL(25, *(int*)mapped->content);
+	TEST_ASSERT_NOT_NULL(mapped->data);
+	TEST_ASSERT_EQUAL(25, *(int*)mapped->data);
 	TEST_ASSERT_NOT_NULL(mapped->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->content);
-	TEST_ASSERT_EQUAL(16, *(int*)mapped->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->data);
+	TEST_ASSERT_EQUAL(16, *(int*)mapped->next->data);
 	TEST_ASSERT_NOT_NULL(mapped->next->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->next->content);
-	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->next->content);
+	TEST_ASSERT_NOT_NULL(mapped->next->next->data);
+	TEST_ASSERT_EQUAL(9, *(int*)mapped->next->next->data);
 	TEST_ASSERT_NOT_NULL(mapped->next->next->next);
-	TEST_ASSERT_NOT_NULL(mapped->next->next->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->next->content);
-	ft_lstclear(&mapped, free);
+	TEST_ASSERT_NOT_NULL(mapped->next->next->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)mapped->next->next->next->data);
+	ft_lstdestroy(&mapped, free);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstnew.c b/test/src/lst/test_ft_lstnew.c
index bdb0066..518c885 100644
--- a/test/src/lst/test_ft_lstnew.c
+++ b/test/src/lst/test_ft_lstnew.c
@@ -15,11 +15,11 @@ TEST(ft_lstnew, basic)
 
 	lst = ft_lstnew(&a);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL(a, *(int*)lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->data);
 
 	/* free(lst); */
 	lst = ft_lstnew(NULL);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_NULL(lst->content);
+	TEST_ASSERT_NULL(lst->data);
 }
diff --git a/test/src/lst/test_ft_lstpop_front.c b/test/src/lst/test_ft_lstpop_front.c
index 18815d4..827afe6 100644
--- a/test/src/lst/test_ft_lstpop_front.c
+++ b/test/src/lst/test_ft_lstpop_front.c
@@ -15,16 +15,16 @@ TEST(ft_lstpop_front, basic)
 	int b = 2;
 	int c = 3;
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 
 	ft_lstpop_front(&lst, NULL);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
 
 	ft_lstpop_front(&lst, NULL);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
 
 	ft_lstpop_front(&lst, NULL);
 	TEST_ASSERT_NULL(lst);
diff --git a/test/src/lst/test_ft_lstpush_back.c b/test/src/lst/test_ft_lstpush_back.c
new file mode 100644
index 0000000..9f0d97b
--- /dev/null
+++ b/test/src/lst/test_ft_lstpush_back.c
@@ -0,0 +1,41 @@
+#include "libft_test.h"
+
+TEST_GROUP(ft_lstpush_back);
+
+TEST_SETUP(ft_lstpush_back)
+{}
+
+TEST_TEAR_DOWN(ft_lstpush_back)
+{}
+
+TEST(ft_lstpush_back, basic)
+{
+	t_ftlst *lst;
+	int a = 1;
+	int b = 2;
+	int c = 2;
+
+	lst = ft_lstnew(&a);
+	TEST_ASSERT_NOT_NULL(lst);
+
+	ft_lstpush_back(&lst, ft_lstnew(&b));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->next->data);
+
+	ft_lstpush_back(&lst, ft_lstnew(&c));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->next->next->data);
+
+	ft_lstdestroy(&lst, NULL);
+}
diff --git a/test/src/lst/test_ft_lstpush_front.c b/test/src/lst/test_ft_lstpush_front.c
new file mode 100644
index 0000000..4a6af9f
--- /dev/null
+++ b/test/src/lst/test_ft_lstpush_front.c
@@ -0,0 +1,41 @@
+#include "libft_test.h"
+
+TEST_GROUP(ft_lstpush_front);
+
+TEST_SETUP(ft_lstpush_front)
+{}
+
+TEST_TEAR_DOWN(ft_lstpush_front)
+{}
+
+TEST(ft_lstpush_front, basic)
+{
+	t_ftlst *lst;
+	int a = 1;
+	int b = 2;
+	int c = 2;
+
+	lst = ft_lstnew(&a);
+	TEST_ASSERT_NOT_NULL(lst);
+
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->next->data);
+
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	TEST_ASSERT_NOT_NULL(lst);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->next->data);
+	TEST_ASSERT_EQUAL(a, *(int*)lst->next->next->data);
+
+	ft_lstdestroy(&lst, NULL);
+}
diff --git a/test/src/lst/test_ft_lstremove_if.c b/test/src/lst/test_ft_lstremove_if.c
index e32a262..a79016b 100644
--- a/test/src/lst/test_ft_lstremove_if.c
+++ b/test/src/lst/test_ft_lstremove_if.c
@@ -16,14 +16,14 @@ TEST(ft_lstremove_if, basic)
 	int c = 3;
 	int d = 4;
 
-	ft_lstadd_back(&lst, ft_lstnew(&a));
-	ft_lstadd_back(&lst, ft_lstnew(&b));
-	ft_lstadd_back(&lst, ft_lstnew(&c));
-	ft_lstadd_back(&lst, ft_lstnew(&d));
-	ft_lstadd_back(&lst, ft_lstnew(&d));
-	ft_lstadd_back(&lst, ft_lstnew(&d));
-	ft_lstadd_back(&lst, ft_lstnew(&a));
-	ft_lstadd_back(&lst, ft_lstnew(&a));
+	ft_lstpush_back(&lst, ft_lstnew(&a));
+	ft_lstpush_back(&lst, ft_lstnew(&b));
+	ft_lstpush_back(&lst, ft_lstnew(&c));
+	ft_lstpush_back(&lst, ft_lstnew(&d));
+	ft_lstpush_back(&lst, ft_lstnew(&d));
+	ft_lstpush_back(&lst, ft_lstnew(&d));
+	ft_lstpush_back(&lst, ft_lstnew(&a));
+	ft_lstpush_back(&lst, ft_lstnew(&a));
 
 	ft_lstremove_if(&lst, ft_compar_int, &a, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
@@ -31,39 +31,39 @@ TEST(ft_lstremove_if, basic)
 	TEST_ASSERT_NOT_NULL(lst->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next->next);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->next->next->content);
-	TEST_ASSERT_EQUAL(b, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->next->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->next->next->data);
+	TEST_ASSERT_EQUAL(b, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->next->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &b, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
 	TEST_ASSERT_NOT_NULL(lst->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(d, *(int*)lst->next->next->next->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &d, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &d, NULL);
 	TEST_ASSERT_NOT_NULL(lst);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_EQUAL(c, *(int*)lst->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_EQUAL(c, *(int*)lst->data);
 
 	ft_lstremove_if(&lst, ft_compar_int, &c, NULL);
 	TEST_ASSERT_NULL(lst);
diff --git a/test/src/lst/test_ft_lstreverse.c b/test/src/lst/test_ft_lstreverse.c
index d22bfdc..a0a7d4e 100644
--- a/test/src/lst/test_ft_lstreverse.c
+++ b/test/src/lst/test_ft_lstreverse.c
@@ -19,27 +19,27 @@ TEST(ft_lstreverse, basic)
 	ft_lstreverse(&lst);
 	TEST_ASSERT_NULL(lst);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	ft_lstreverse(&lst);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->content);
-	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->data);
+	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->data);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstreverse_ret.c b/test/src/lst/test_ft_lstreverse_ret.c
index 6a85ddf..e6fc278 100644
--- a/test/src/lst/test_ft_lstreverse_ret.c
+++ b/test/src/lst/test_ft_lstreverse_ret.c
@@ -19,27 +19,27 @@ TEST(ft_lstreverse_ret, basic)
 	lst = ft_lstreverse_ret(lst);
 	TEST_ASSERT_NULL(lst);
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->content);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->next->next->data);
 
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	lst = ft_lstreverse_ret(lst);
-	TEST_ASSERT_EQUAL_PTR(&c, lst->content);
-	TEST_ASSERT_EQUAL_PTR(&a, lst->next->content);
-	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->content);
-	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->content);
+	TEST_ASSERT_EQUAL_PTR(&c, lst->data);
+	TEST_ASSERT_EQUAL_PTR(&a, lst->next->data);
+	TEST_ASSERT_EQUAL_PTR(&b, lst->next->next->data);
+	TEST_ASSERT_EQUAL_PTR(&d, lst->next->next->next->data);
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstsize.c b/test/src/lst/test_ft_lstsize.c
index c80bc7c..d3b78bb 100644
--- a/test/src/lst/test_ft_lstsize.c
+++ b/test/src/lst/test_ft_lstsize.c
@@ -16,22 +16,22 @@ TEST(ft_lstsize, basic)
 	TEST_ASSERT_EQUAL(0, ft_lstsize(lst));
 	lst = ft_lstnew(&a);
 	TEST_ASSERT_EQUAL(1, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(2, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(3, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(4, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(5, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(6, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(7, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(8, ft_lstsize(lst));
-	ft_lstadd_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
 	TEST_ASSERT_EQUAL(9, ft_lstsize(lst));
 
-	ft_lstclear(&lst, NULL);
+	ft_lstdestroy(&lst, NULL);
 }
diff --git a/test/src/lst/test_ft_lstsort.c b/test/src/lst/test_ft_lstsort.c
index e1e1566..3b771ae 100644
--- a/test/src/lst/test_ft_lstsort.c
+++ b/test/src/lst/test_ft_lstsort.c
@@ -16,23 +16,23 @@ TEST(ft_lstsort, basic)
 	int c = 4;
 	int d = -3;
 
-	ft_lstadd_front(&lst, ft_lstnew(&a));
-	ft_lstadd_front(&lst, ft_lstnew(&b));
-	ft_lstadd_front(&lst, ft_lstnew(&c));
-	ft_lstadd_front(&lst, ft_lstnew(&d));
+	ft_lstpush_front(&lst, ft_lstnew(&a));
+	ft_lstpush_front(&lst, ft_lstnew(&b));
+	ft_lstpush_front(&lst, ft_lstnew(&c));
+	ft_lstpush_front(&lst, ft_lstnew(&d));
 	ft_lstsort(&lst, ft_compar_int);
 
 	TEST_ASSERT_NOT_NULL(lst);
 	TEST_ASSERT_NOT_NULL(lst->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next);
 	TEST_ASSERT_NOT_NULL(lst->next->next->next);
-	TEST_ASSERT_NOT_NULL(lst->content);
-	TEST_ASSERT_NOT_NULL(lst->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->content);
-	TEST_ASSERT_NOT_NULL(lst->next->next->next->content);
+	TEST_ASSERT_NOT_NULL(lst->data);
+	TEST_ASSERT_NOT_NULL(lst->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->data);
+	TEST_ASSERT_NOT_NULL(lst->next->next->next->data);
 
-	TEST_ASSERT_EQUAL(-3, *(int*)lst->content);
-	TEST_ASSERT_EQUAL(-1, *(int*)lst->next->content);
-	TEST_ASSERT_EQUAL(1, *(int*)lst->next->next->content);
-	TEST_ASSERT_EQUAL(4, *(int*)lst->next->next->next->content);
+	TEST_ASSERT_EQUAL(-3, *(int*)lst->data);
+	TEST_ASSERT_EQUAL(-1, *(int*)lst->next->data);
+	TEST_ASSERT_EQUAL(1, *(int*)lst->next->next->data);
+	TEST_ASSERT_EQUAL(4, *(int*)lst->next->next->next->data);
 }
diff --git a/test/src/lst/test_ft_lstsorted_merge.c b/test/src/lst/test_ft_lstsorted_merge.c
index 4c548c9..9839cd7 100644
--- a/test/src/lst/test_ft_lstsorted_merge.c
+++ b/test/src/lst/test_ft_lstsorted_merge.c
@@ -18,23 +18,23 @@ TEST(ft_lstsorted_merge, basic)
 	int d = 4;
 	int e = 5;
 
-