diff --git a/Makefile b/Makefile index 0c6fbfb..2718b7f 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ clean: @$(MAKE) -C $(FT_PRINTF_DIR) clean fclean: clean - rm -f $(NAME) + rm -f $(NAME) checker @$(MAKE) -C $(LIBFT_DIR) fclean @$(MAKE) -C $(FT_PRINTF_DIR) fclean diff --git a/src/checker/checker.c b/src/checker/checker.c index 02c16b8..67295b8 100644 --- a/src/checker/checker.c +++ b/src/checker/checker.c @@ -6,7 +6,7 @@ /* By: lgaudin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/06/08 14:58:28 by lgaudin #+# #+# */ -/* Updated: 2023/06/08 16:31:38 by lgaudin ### ########.fr */ +/* Updated: 2023/06/08 18:12:26 by lgaudin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,32 +19,32 @@ * @param stack_a * @param stack_b */ -void parse_instruction(char *instruction, t_stack *stack_a, t_stack *stack_b) +void parse_instruction(char *instruction, t_stack *stack_a, t_stack *stack_b) { - if (!ft_strncmp(instruction, "rr\n", 3)) - rr(stack_a, stack_b, 0); - else if (!ft_strncmp(instruction, "ra\n", 3)) - ra(stack_a, 0); - else if (!ft_strncmp(instruction, "rb\n", 3)) - rb(stack_b, 0); - else if (!ft_strncmp(instruction, "rrr\n", 4)) - rrr(stack_a, stack_b, 0); - else if (!ft_strncmp(instruction, "rra\n", 4)) - rra(stack_a, 0); - else if (!ft_strncmp(instruction, "rrb\n", 4)) - rrb(stack_b, 0); - else if (!ft_strncmp(instruction, "pa\n", 3)) - pa(stack_a, stack_b, 0); - else if (!ft_strncmp(instruction, "pb\n", 3)) - pb(stack_a, stack_b, 0); - else if (!ft_strncmp(instruction, "sa\n", 3)) - sa(stack_a, 0); - else if (!ft_strncmp(instruction, "sb\n", 3)) - sb(stack_b, 0); - else if (!ft_strncmp(instruction, "ss\n", 3)) - ss(stack_a, stack_b, 0); - else - free(instruction); + if (!ft_strncmp(instruction, "rr\n", 3)) + rr(stack_a, stack_b, 0); + else if (!ft_strncmp(instruction, "ra\n", 3)) + ra(stack_a, 0); + else if (!ft_strncmp(instruction, "rb\n", 3)) + rb(stack_b, 0); + else if (!ft_strncmp(instruction, "rrr\n", 4)) + rrr(stack_a, stack_b, 0); + else if (!ft_strncmp(instruction, "rra\n", 4)) + rra(stack_a, 0); + else if (!ft_strncmp(instruction, "rrb\n", 4)) + rrb(stack_b, 0); + else if (!ft_strncmp(instruction, "pa\n", 3)) + pa(stack_a, stack_b, 0); + else if (!ft_strncmp(instruction, "pb\n", 3)) + pb(stack_a, stack_b, 0); + else if (!ft_strncmp(instruction, "sa\n", 3)) + sa(stack_a, 0); + else if (!ft_strncmp(instruction, "sb\n", 3)) + sb(stack_b, 0); + else if (!ft_strncmp(instruction, "ss\n", 3)) + ss(stack_a, stack_b, 0); + else + free(instruction); } /** @@ -79,11 +79,11 @@ int main(int argc, char *argv[]) arguments = ft_split(argv[1], ' '); else arguments = argv + 1; - a = populate_stack(arguments); + a = populate_stack(arguments, argc); if (get_array_length(arguments) == 1 || already_sorted(a) == 1) exit_without_error(a, NULL, arguments); if (!a) - print_error(a, arguments); + print_error(a, arguments, argc); b = initialise_stack(); get_instructions(a, b); if (already_sorted(a) == 1 && b->top < 0) diff --git a/src/stack/free.c b/src/stack/free.c index 8c53dc4..45cc5be 100644 --- a/src/stack/free.c +++ b/src/stack/free.c @@ -6,7 +6,7 @@ /* By: lgaudin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/06/05 14:59:36 by lgaudin #+# #+# */ -/* Updated: 2023/06/08 16:57:29 by lgaudin ### ########.fr */ +/* Updated: 2023/06/08 18:10:21 by lgaudin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,23 +18,21 @@ * * @param arguments The arguments to free. */ -void free_arguments(char **arguments) +void free_arguments(char **arguments) { - int i; + int i; - if (!arguments) - return; - - i = 0; - while (arguments[i]) - { - free(arguments[i]); - i++; - } + if (!arguments) + return ; + i = 0; + while (arguments[i]) + { + free(arguments[i]); + i++; + } free(arguments); } - /** * @brief Free the stack. *