Merge branch 'master' into add_2op_optimization

diff --cc cmd_optimization.c
index 83e20c0f5f2b6ceed68cc2a0921d4f1df0c8cf8a,993ec1baca2ec05c2137ad7a0dedfb4211461319..d0928f5b13da4580e8c7f7cc2655aed218eb68e9
--- 1/cmd_optimization.c
--- 2/cmd_optimization.c
+++ b/cmd_optimization.c
@@@ -6,11 -6,7 +6,7 @@@
  /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/04/13 16:42:34 by dkaiser           #+#    #+#             */
- <<<<<<< Updated upstream
- /*   Updated: 2024/04/13 17:31:18 by dkaiser          ###   ########.fr       */
- =======
 -/*   Updated: 2024/04/16 18:10:15 by dkaiser          ###   ########.fr       */
 +/*   Updated: 2024/04/17 09:41:10 by dkaiser          ###   ########.fr       */
- >>>>>>> Stashed changes
  /*                                                                            */
  /* ************************************************************************** */
  
@@@ -125,7 -56,4 +87,6 @@@ static void optimize_two_stack_ops(t_ps
  void optimize_commands(t_psdata *data)
  {
      optimize_redundant(data, PA, PB);
- >>>>>>> Stashed changes
 +    optimize_redundant(data, RB, RRB);
 +    optimize_two_stack_ops(data, RA, RB, RR);
  }

diff --cc main.c
index ed2a579e8f031bece65d71d0faf625557f728c76,221aefe9e3911164b3a3c1d5d43b10c632d3936c..3881df03ddbfcd50e98b745ebb2ff9d5a2758d58
--- 1/main.c
--- 2/main.c
+++ b/main.c
@@@ -6,55 -6,73 +6,73 @@@
  /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/04/12 17:03:30 by dkaiser           #+#    #+#             */
- <<<<<<< Updated upstream
- /*   Updated: 2024/04/15 17:53:19 by dkaiser          ###   ########.fr       */
- =======
 -/*   Updated: 2024/04/16 17:54:56 by dkaiser          ###   ########.fr       */
 +/*   Updated: 2024/04/17 09:42:43 by dkaiser          ###   ########.fr       */
- >>>>>>> Stashed changes
  /*                                                                            */
  /* ************************************************************************** */
  
  #include "libft/ft_printf.h"
  #include "push_swap.h"
  
- int   main(int argc, char *argv[])
+ static void free_data(t_psdata *data)
  {
-       t_stack *stack_a;
-       t_stack *stack_b;
-       t_list  *pscmds;
- 
-       stack_a = create_stack(argc, argv);
-       if (!stack_a)
+       if (data)
        {
-               ft_putendl_fd("Error", 2);
-               return (1);
+               if (data->a)
+               {
+                       if (data->a->stack)
+                               free(data->a->stack);
+                       free(data->a);
+               }
+               if (data->b)
+               {
+                       if (data->b->stack)
+                               free(data->b->stack);
+                       free(data->b);
+               }
+               free(data);
        }
- <<<<<<< Updated upstream
+ }
+ 
+ static t_psdata *initialize_data(int argc, char *argv[])
+ {
+       t_psdata *result;
  
-       stack_b = malloc(sizeof(t_stack));
-       if (!stack_b)
+       result = malloc(sizeof(t_psdata));
+       if (result)
        {
-               //free everything
+               result->a = create_stack(argc, argv);
+               if (result->a)
+               {
+                       result->b = malloc(sizeof(t_stack));
+                       if (result->b)
+                       {
+                               result->b->stack = malloc(sizeof(int) * (argc - 1));
+                               if (result->b->stack)
+                               {
+                                       result->b->size = 0;
+                                       return result;
+                               }
+                       }
+               }
        }
-       stack_b->stack = malloc(sizeof(int) * (argc - 1));
-       if (!stack_b->stack)
+       free_data(result);
+       return NULL;
+ }
+ 
+ int   main(int argc, char *argv[])
+ {
+       t_psdata *data;
+ 
+       data = initialize_data(argc, argv);
+       if (!data)
        {
-               //free everything
+               ft_putendl_fd("Error", 2);
+               return (1);
        }
-       stack_b->size = 0;
-       stack_optimize(stack_a);
-       pscmds = stack_sort(stack_a, stack_b);
-       /* optimize_commands(&pscmds); */
-       print_commands(pscmds);
-       ft_printf("\nA: ");
-       stack_print(stack_a);
-       ft_printf("B: ");
-       stack_print(stack_b);
- =======
        stack_optimize(data->a);
        stack_sort(data);
 -      /* optimize_commands(data); */
 -      /* print_commands(data->cmds); */
 +      optimize_commands(data);
 +      print_commands(data->cmds);
        /* ft_printf("\nA: "); */
        /* stack_print(data->a); */
        /* ft_printf("B: "); */