Merge branch 'master' into add_2op_optimization

1 files changed, 10 insertions, 49 deletions

diff --git a/cmd_optimization.c b/cmd_optimization.c
index 83e20c0..d0928f5 100644
--- a/cmd_optimization.c
+++ b/cmd_optimization.c
@@ -6,11 +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/17 09:41:10 by dkaiser          ###   ########.fr       */
->>>>>>> Stashed changes
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,42 +14,6 @@
 #include "libft/libft.h"
 #include "push_swap.h"
 
-/* void	optimize_commands(t_list **cmds) */
-/* { */
-/* 	int		optimizations; */
-/* 	t_list	*cur; */
-/*     t_list *last; */
-
-/* 	optimizations = 0; */
-/* 	cur = *cmds; */
-/*     last = NULL; */
-/* 	while (cur->next) */
-/* 	{ */
-/* 		if ((*(enum e_pscmd *)cur->content == PA */
-/* 				&& *(enum e_pscmd *)cur->next->content == PB) */
-/* 			|| (*(enum e_pscmd *)cur->content == PA */
-/* 				&& *(enum e_pscmd *)cur->next->content == PB)) */
-/* 		{ */
-/*             if (last) */
-/*                 last->next = cur->next->next; */
-/*             else */
-/*                 (*cmds)->next = cur->next->next; */
-/*             ft_lstdelone(cur->next, free); */
-/*             ft_lstdelone(cur, free); */
-/*             optimizations++; */
-/*         } */
-/*         if (!optimizations) */
-/*         { */
-/*             last = cur; */
-/*             cur = cur->next; */
-/*         } */
-/*         else */
-/*             break; */
-/* 	} */
-/* 	if (optimizations) */
-/* 		optimize_commands(cmds); */
-/* } */
-
 static enum e_pscmd get_cmd(t_list *cmd)
 {
     if (cmd)
@@ -62,19 +22,21 @@ static enum e_pscmd get_cmd(t_list *cmd)
         return NO_CMD;
 }
 
-void optimize_commands(t_list **cmds)
+static void optimize_redundant(t_psdata *data, enum e_pscmd cmd1, enum e_pscmd cmd2)
 {
     t_list *cur;
     t_list *last;
     int optimizations;
 
-    cur = *cmds;
+    cur = data->cmds;
     last = cur;
     optimizations = 0;
 
-    while (cur->next)
+    if (!cur)
+        return ;
+    while (cur && cur->next)
     {
-        if ((get_cmd(cur) == PA && get_cmd(cur->next) == PB) || (get_cmd(cur) == PB && get_cmd(cur->next) == PA))
+        if ((get_cmd(cur) == cmd1 && get_cmd(cur->next) == cmd2) || (get_cmd(cur) == cmd2 && get_cmd(cur->next) == cmd1))
         {
             last->next = cur->next->next;
             ft_lstdelone(cur->next, free);
@@ -82,12 +44,12 @@ void optimize_commands(t_list **cmds)
             optimizations++;
         }
         last = last->next;
-        cur = last->next;
+        if (last)
+            cur = last->next;
+        else
+            cur = NULL;
     }
     if (optimizations)
-<<<<<<< Updated upstream
-        optimize_commands(cmds);
-=======
         optimize_redundant(data, cmd1, cmd2);
 }
 
@@ -127,5 +89,4 @@ void optimize_commands(t_psdata *data)
     optimize_redundant(data, PA, PB);
     optimize_redundant(data, RB, RRB);
     optimize_two_stack_ops(data, RA, RB, RR);
->>>>>>> Stashed changes
 }