From 55363e0e6fe6a1413d4dc1ab0f8b53c0de3923eb Mon Sep 17 00:00:00 2001 From: David Gailleton Date: Fri, 12 Dec 2025 11:40:02 +0100 Subject: [PATCH] Fix header file includes AND add write for each push swap functions --- stack_utils/push.c | 8 +++++--- stack_utils/rev_rotate.c | 14 ++++++++++---- stack_utils/rotate.c | 14 ++++++++++---- stack_utils/stack_add.c | 4 ++-- stack_utils/stack_remove.c | 4 ++-- stack_utils/swap.c | 30 ++++++++++++++++++++++++++---- 6 files changed, 55 insertions(+), 19 deletions(-) diff --git a/stack_utils/push.c b/stack_utils/push.c index 126ff89..d84ccef 100644 --- a/stack_utils/push.c +++ b/stack_utils/push.c @@ -6,12 +6,13 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 15:09:40 by mteriier #+# #+# */ -/* Updated: 2025/12/09 11:36:36 by mteriier ### ########lyon.fr */ +/* Updated: 2025/12/12 11:39:33 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ -#include "../push_swap.h" +#include "push_swap.h" #include +#include void pa(t_stacks *stacks) { @@ -29,7 +30,7 @@ void pa(t_stacks *stacks) stacks->b = stacks->b->next; } stack_add_front(&(stacks->a), b_push); - + write(1, "pa\n", 3); } #include @@ -50,4 +51,5 @@ void pb(t_stacks *stacks) stacks->a = stacks->a->next; } stack_add_front(&(stacks->b), a_push); + write(1, "pb\n", 3); } diff --git a/stack_utils/rev_rotate.c b/stack_utils/rev_rotate.c index a8aca03..fefa099 100644 --- a/stack_utils/rev_rotate.c +++ b/stack_utils/rev_rotate.c @@ -6,26 +6,32 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:43:45 by dgaillet #+# #+# */ -/* Updated: 2025/12/08 19:37:26 by mteriier ### ########.fr */ +/* Updated: 2025/12/12 11:39:25 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ -#include "../push_swap.h" +#include "push_swap.h" +#include void rra(t_stacks *stacks) { if (stacks && stacks->a && stacks->a->previous) stacks->a = stacks->a->previous; + write(1, "rra\n", 4); } void rrb(t_stacks *stacks) { if (stacks && stacks->b && stacks->b->previous) stacks->b = stacks->b->previous; + write(1, "rrb\n", 4); } void rrr(t_stacks *stacks) { - rra(stacks); - rrb(stacks); + if (stacks && stacks->b && stacks->b->previous) + stacks->b = stacks->b->previous; + if (stacks && stacks->a && stacks->a->previous) + stacks->a = stacks->a->previous; + write(1, "rrr\n", 4); } diff --git a/stack_utils/rotate.c b/stack_utils/rotate.c index d2ce509..627240d 100644 --- a/stack_utils/rotate.c +++ b/stack_utils/rotate.c @@ -6,26 +6,32 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:32:10 by dgaillet #+# #+# */ -/* Updated: 2025/12/08 19:37:44 by mteriier ### ########.fr */ +/* Updated: 2025/12/12 11:39:17 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ -#include "../push_swap.h" +#include "push_swap.h" +#include void ra(t_stacks *stacks) { if (stacks && stacks->a && stacks->a->next) stacks->a = stacks->a->next; + write(1, "ra\n", 3); } void rb(t_stacks *stacks) { if (stacks && stacks->b && stacks->b->next) stacks->b = stacks->b->next; + write(1, "rb\n", 3); } void rr(t_stacks *stacks) { - ra(stacks); - rb(stacks); + if (stacks && stacks->a && stacks->a->next) + stacks->a = stacks->a->next; + if (stacks && stacks->b && stacks->b->next) + stacks->b = stacks->b->next; + write(1, "rr\n", 3); } diff --git a/stack_utils/stack_add.c b/stack_utils/stack_add.c index 761143a..5effe0f 100644 --- a/stack_utils/stack_add.c +++ b/stack_utils/stack_add.c @@ -6,11 +6,11 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 15:52:40 by dgaillet #+# #+# */ -/* Updated: 2025/12/09 08:51:33 by mteriier ### ########lyon.fr */ +/* Updated: 2025/12/12 11:39:09 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ -#include "../push_swap.h" +#include "push_swap.h" #include t_stack *new_stack(int value) diff --git a/stack_utils/stack_remove.c b/stack_utils/stack_remove.c index 2c53bf8..cf23ef8 100644 --- a/stack_utils/stack_remove.c +++ b/stack_utils/stack_remove.c @@ -6,11 +6,11 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 16:05:27 by dgaillet #+# #+# */ -/* Updated: 2025/12/08 19:40:01 by mteriier ### ########.fr */ +/* Updated: 2025/12/12 11:39:02 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ -#include "../push_swap.h" +#include "push_swap.h" #include void stack_clear_all(t_stack *stack, t_stack *first) diff --git a/stack_utils/swap.c b/stack_utils/swap.c index 61fbb6b..2dad2b6 100644 --- a/stack_utils/swap.c +++ b/stack_utils/swap.c @@ -6,11 +6,12 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:48:44 by mteriier #+# #+# */ -/* Updated: 2025/12/08 19:40:49 by mteriier ### ########.fr */ +/* Updated: 2025/12/12 11:38:52 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ -#include "../push_swap.h" +#include "push_swap.h" +#include void sa(t_stacks *stacks) { @@ -23,6 +24,7 @@ void sa(t_stacks *stacks) stock = a->value; a->value = a->next->value; a->next->value = stock; + write(1, "sa\n", 3); } void sb(t_stacks *stacks) @@ -36,10 +38,30 @@ void sb(t_stacks *stacks) stock = b->value; b->value = b->next->value; b->next->value = stock; + write(1, "sb\n", 3); } void ss(t_stacks *stacks) { - sa(stacks); - sb(stacks); + t_stack *b; + t_stack *a; + int stock; + + if (!stacks) + return ; + if (stacks->b && stacks->b->next) + { + b = stacks->b; + stock = b->value; + b->value = b->next->value; + b->next->value = stock; + } + if (stacks->a && stacks->a->next) + { + a = stacks->a; + stock = a->value; + a->value = a->next->value; + a->next->value = stock; + } + write(1, "ss\n", 3); }