Bugfix/double pointers

program_to_test/headers/push_swap.h

@@ -6,7 +6,7 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/08 15:23:33 by umeneses          #+#    #+#             */
-/*   Updated: 2024/06/05 11:50:25 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 13:00:25 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,17 +24,17 @@ typedef struct s_stack
 }					t_stack;
 
 t_stack	*ft_lst_init(int value);
-t_stack	*ft_lst_goto_end(t_stack *list);
-t_stack	*ft_lst_goto_head(t_stack *list);
-t_stack	*ft_lst_goto_before_end(t_stack *list);
-t_stack	*ft_lst_addto_end(t_stack *list, t_stack *new);
-t_stack	*ft_lst_addto_begin(t_stack *list, t_stack *new);
-t_stack	*ft_lst_delat_begin(t_stack *list);
-t_stack	*ft_lst_delat_end(t_stack *list);
-void	ft_lstclear_double_ptr(t_stack **list);
-void	ft_lstclear_single_ptr(t_stack *list);
-void	ft_lst_printf_int_content(char *msg, t_stack *list);
-t_stack	*ft_lts_buildstack_argv(t_stack *stack, char **argv);
+t_stack	*ft_lst_goto_end(t_stack *stack);
+t_stack	*ft_lst_goto_head(t_stack *stack);
+t_stack	*ft_lst_goto_before_end(t_stack *stack);
+t_stack	*ft_lst_addto_end(t_stack **stack, t_stack *new);
+t_stack	*ft_lst_addto_begin(t_stack **stack, t_stack *new);
+t_stack	*ft_lst_delat_begin(t_stack *stack);
+t_stack	*ft_lst_delat_end(t_stack *stack);
+void	ft_lstclear_double_ptr(t_stack **stack);
+void	ft_lstclear_single_ptr(t_stack *stack);
+void	ft_lst_printf_int_content(char *msg, t_stack *stack);
+t_stack	*ft_lts_buildstack_argv(t_stack **stack, char **argv);
 bool	ft_is_sign(int c);
 bool	ft_is_space(int c);
 bool	ft_argv_is_duplicated(char **argv);
@@ -52,11 +52,11 @@ void	ft_reverse_rotate(t_stack **stack);
 void	ft_reverse_rotate_ab(t_stack **stack_a, t_stack **stack_b);
 /* basic push_swap functions */
 
-bool	ft_is_sorted(t_stack *list);
+bool	ft_is_sorted(t_stack *stack);
 /* sorting validation functions */
 
-t_stack	*ft_sort_2_nbrs(t_stack **list);
-t_stack	*ft_sort_3_nbrs(t_stack **list);
+t_stack	*ft_sort_2_nbrs(t_stack **stack);
+t_stack	*ft_sort_3_nbrs(t_stack **stack);
 /* sorting functions */
 
 void	ft_do_swap_a(t_stack **stack);

program_to_test/src/ft_lst_addto.c

@@ -1,43 +1,48 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ft_lst_adds.c                                      :+:      :+:    :+:   */
+/*   ft_lst_addto.c                                     :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/13 14:49:58 by umeneses          #+#    #+#             */
-/*   Updated: 2024/05/23 14:26:44 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 12:59:39 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "push_swap.h"
 
-t_stack	*ft_lst_addto_end(t_stack *list, t_stack *new)
+t_stack	*ft_lst_addto_end(t_stack **stack, t_stack *new)
 {
-	t_stack	*temp;
+	t_stack	*tail;
 
-	if (!list)
+	if (!new)
+		return (*stack);
+	if (!*stack)
 	{
-		list = new;
-		return (list);
+		new->next = NULL;
+		*stack = new;
+		return (new);
 	}
-	if (!new)
-		return (list);
-	temp = ft_lst_goto_end(list);
-	temp->next = new;
-	new->prev = temp;
-	return (list);
+	tail = ft_lst_goto_end(*stack);
+	tail->next = new;
+	new->prev = tail;
+	return (*stack);
 }
 
-t_stack	*ft_lst_addto_begin(t_stack *list, t_stack *new)
+t_stack	*ft_lst_addto_begin(t_stack **stack, t_stack *new)
 {
-	if (!list)
+	if (!new)
+		return (*stack);
+	if (!*stack)
 	{
-		list = new;
-		return (list);
+		new->next = NULL;
+		*stack = new;
+		return (new);
 	}
-	if (!new)
-		return (list);
-	new->next = list;
+	new->next = *stack;
+	(*stack)->prev = new;
+	new->prev = NULL;
+	*stack = new;
 	return (new);
 }

program_to_test/src/ft_lst_deletes.c

@@ -6,39 +6,42 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/13 14:49:58 by umeneses          #+#    #+#             */
-/*   Updated: 2024/06/05 14:52:58 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 14:50:52 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "push_swap.h"
 
-t_stack	*ft_lst_delat_begin(t_stack *list)
+t_stack	*ft_lst_delat_begin(t_stack *stack)
 {
 	t_stack	*temp;
 
-	if (!list || list->next == NULL)
+	if (!stack || !stack->next)
 	{
-		free(list);
-		return (NULL);
+		temp = stack;
+		stack = NULL;
+		free(stack);
+		return (stack);
 	}
-	temp = list->next;
-	ft_lst_goto_head(list);
-	free(list);
+	stack = ft_lst_goto_head(stack);
+	stack->next->prev = NULL;
+	temp = stack->next;
+	free(stack);
 	return (temp);
 }
 
-t_stack	*ft_lst_delat_end(t_stack *list)
+t_stack	*ft_lst_delat_end(t_stack *stack)
 {
 	t_stack	*second_last_node;
 
 	second_last_node = NULL;
-	if (!list || !list->next)
+	if (!stack || !stack->next)
 	{
-		free(list);
+		free(stack);
 		return (NULL);
 	}
-	second_last_node = ft_lst_goto_before_end(list);
+	second_last_node = ft_lst_goto_before_end(stack);
 	free(second_last_node->next);
 	second_last_node->next = NULL;
-	return (list);
+	return (stack);
 }

program_to_test/src/ft_lst_goto.c

@@ -6,7 +6,7 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/13 14:49:58 by umeneses          #+#    #+#             */
-/*   Updated: 2024/05/24 11:47:02 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 12:50:07 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,7 +16,7 @@ t_stack	*ft_lst_goto_end(t_stack *list)
 {
 	if (!list)
 		return (NULL);
-	while (list && (list->next != NULL))
+	while (list && list->next)
 		list = list->next;
 	return (list);
 }
@@ -25,7 +25,7 @@ t_stack	*ft_lst_goto_before_end(t_stack *list)
 {
 	if (!list)
 		return (NULL);
-	while (list && (list->next->next != NULL))
+	while (list && list->next && (list->next->next != NULL))
 		list = list->next;
 	return (list);
 }
@@ -34,7 +34,7 @@ t_stack	*ft_lst_goto_head(t_stack *list)
 {
 	if (!list)
 		return (NULL);
-	while (list && (list->prev != NULL))
+	while (list && list->prev)
 		list = list->prev;
 	return (list);
 }

program_to_test/src/ft_lst_init.c

@@ -6,7 +6,7 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/13 14:49:58 by umeneses          #+#    #+#             */
-/*   Updated: 2024/06/05 14:20:45 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 11:16:25 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,7 +25,7 @@ t_stack	*ft_lst_init(int value)
 	return (new_node);
 }
 
-t_stack	*ft_lts_buildstack_argv(t_stack *stack, char **argv)
+t_stack	*ft_lts_buildstack_argv(t_stack **stack, char **argv)
 {
 	int	userinput;
 	int	index;
@@ -36,9 +36,9 @@ t_stack	*ft_lts_buildstack_argv(t_stack *stack, char **argv)
 	while (argv[++index] != NULL)
 	{
 		userinput = ft_atoi(argv[index]);
-		stack = ft_lst_addto_end(stack, ft_lst_init(userinput));
+		*stack = ft_lst_addto_end(stack, ft_lst_init(userinput));
 	}
-	return (stack);
+	return (*stack);
 }
 
 void	ft_lst_printf_int_content(char *msg, t_stack *list)

program_to_test/src/ft_push.c

@@ -6,7 +6,7 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/22 11:52:34 by umeneses          #+#    #+#             */
-/*   Updated: 2024/05/22 15:37:34 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/05 18:52:29 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,7 +19,7 @@ void	ft_push_a(t_stack **stack_a, t_stack **stack_b)
 	if (*stack_a == NULL || *stack_b == NULL)
 		return ;
 	tobe_pushed = (*stack_b)->nbr;
-	*stack_a = ft_lst_addto_begin(*stack_a, ft_lst_init(tobe_pushed));
+	*stack_a = ft_lst_addto_begin(stack_a, ft_lst_init(tobe_pushed));
 	*stack_b = ft_lst_delat_begin(*stack_b);
 }
 
@@ -30,6 +30,6 @@ void	ft_push_b(t_stack **stack_a, t_stack **stack_b)
 	if (*stack_a == NULL || *stack_b == NULL)
 		return ;
 	tobe_pushed = (*stack_a)->nbr;
-	*stack_b = ft_lst_addto_begin(*stack_b, ft_lst_init(tobe_pushed));
+	*stack_b = ft_lst_addto_begin(stack_b, ft_lst_init(tobe_pushed));
 	*stack_a = ft_lst_delat_begin(*stack_a);
 }

program_to_test/src/ft_rotate.c

@@ -6,7 +6,7 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/23 11:48:11 by umeneses          #+#    #+#             */
-/*   Updated: 2024/06/05 15:34:02 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/05 18:53:01 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -46,7 +46,7 @@ void	ft_reverse_rotate(t_stack **stack)
 	if (*stack == NULL || (*stack)->next == NULL)
 		return ;
 	temp = ft_lst_goto_end(*stack)->nbr;
-	*stack = ft_lst_addto_begin(*stack, ft_lst_init(temp));
+	*stack = ft_lst_addto_begin(stack, ft_lst_init(temp));
 	*stack = ft_lst_delat_end(*stack);
 }
 

program_to_test/src/push_main.c

@@ -6,32 +6,35 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 18:34:31 by umeneses          #+#    #+#             */
-/*   Updated: 2024/06/05 11:39:55 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 15:36:13 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "push_swap.h"
 
 int	main(int argc, char **argv)
 {
-	t_stack	*list;
+	t_stack	*stack_a;
+	t_stack	*stack_b;
 
 	if (argc <= 2)
 	{
 		ft_error_msg("Not enough arguments. Please provide at leats 2 numbers");
 	}
-	list = NULL;
-	list = ft_lts_buildstack_argv(list, argv);
-	ft_lst_printf_int_content("testing main list content:", list);
-	ft_printf("testing main list size: %d\n", ft_lstsize_int((t_list *)list));
-	if (!ft_is_sorted(list))
+	stack_a = NULL;
+	stack_b = NULL;
+	stack_a = ft_lts_buildstack_argv(&stack_a, argv);
+	ft_lst_printf_int_content("testing main content:", stack_a);
+	ft_printf("testing main size: %d\n", ft_lstsize_int((t_list *)stack_a));
+	if (!ft_is_sorted(stack_a))
 	{
-		if (ft_lstsize_int((t_list *)list) == 2)
-		{
-			ft_sort_2_nbrs(&list);
-			ft_lst_printf_int_content("2 nbrs list after sorting:", list);
-		}
+		if (ft_lstsize_int((t_list *)stack_a) == 2)
+			ft_sort_2_nbrs(&stack_a);
+		if (ft_lstsize_int((t_list *)stack_a) == 3)
+			ft_sort_3_nbrs(&stack_a);
+		ft_lst_printf_int_content("updated main content:", stack_a);
 	}
-	ft_lstclear_single_ptr(list);
+	ft_lstclear_single_ptr(stack_a);
+	ft_lstclear_single_ptr(stack_b);
 	return (0);
 }