tvdu29/push_swap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

the week-end party goes on \o\ /o/

Browse Source 
finished transition to t_psdata format
corrected some pointer formating
started testing on parser function:
	- weird valgrind errors about uninitialised values
	- some read/write/free errors still hanging around

** END TRANSMISSION **
This commit is contained in:
Tanguy MAZE 2019-02-24 18:15:56 +01:00
parent beba6ce86f
commit 62764dc5e7
7 changed files with 78 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ # # By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2019/02/23 14:30:57 by tmaze #+# #+# # # Created: 2019/02/23 14:30:57 by tmaze #+# #+# #
# Updated: 2019/02/23 14:54:34 by tmaze ### ########.fr # # Updated: 2019/02/24 14:17:55 by tmaze ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@ -86,16 +86,16 @@ $(OBJDIR) :
@mkdir -p $(OBJS_DIRS) @mkdir -p $(OBJS_DIRS)
$(LIBDIR)/$(LIBFILE) : $(LIBDIR)/$(LIBFILE) :
@echo -e "$(YEL)===> $(GRE)$(NAME) : $(YEL) Librairy Compilation <===$(DEFOB)" @echo -e "$(YEL)===> $(GRE)$(NAME) : $(YEL) Librairy Compilation <===$(DEF)"
$(MAKE) -C $(LIBDIR) all $(MAKE) -C $(LIBDIR) all
$(NAME1) : $(OBJP1) $(OBJP) $(LIBDIR)/$(LIBFILE) $(NAME1) : $(OBJP1) $(OBJP) $(LIBDIR)/$(LIBFILE)
@echo -e "$(YEL)===> $(GRE)$(NAME) : $(YEL) Binary Compilation <===$(DEF)" @echo -e "$(YEL)===> $(GRE)$(NAME) : $(YEL) Binary Compilation <===$(DEF)"
$(CC) $(FLAGS) -c $@ $^ $(INCP) -L$(LIBDIR) -l$(LIB) $(CC) $(FLAGS) -o $@ $^ $(INCP) -L$(LIBDIR) -l$(LIB)
$(NAME2) : $(OBJP2) $(OBJP) $(LIBDIR)/$(LIBFILE) $(NAME2) : $(OBJP2) $(OBJP) $(LIBDIR)/$(LIBFILE)
@echo -e "$(YEL)===> $(GRE)$(NAME) : $(YEL) Binary Compilation <===$(DEF)" @echo -e "$(YEL)===> $(GRE)$(NAME) : $(YEL) Binary Compilation <===$(DEF)"
$(CC) $(FLAGS) -c $@ $^ $(INCP) -L$(LIBDIR) -l$(LIB) $(CC) $(FLAGS) -o $@ $^ $(INCP) -L$(LIBDIR) -l$(LIB)
# Cleaner rules # Cleaner rules
clean : clean :

14
includes/push_swap.h
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/21 14:13:53 by tmaze #+# #+# */ /* Created: 2019/02/21 14:13:53 by tmaze #+# #+# */
/* Updated: 2019/02/23 15:46:05 by tmaze ### ########.fr */ /* Updated: 2019/02/24 14:56:19 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,6 +17,8 @@
# include <unistd.h> # include <unistd.h>
# include "libft.h" # include "libft.h"
#include <stdio.h>
typedef struct s_stack typedef struct s_stack
{ {
int nb; int nb;
@ -29,12 +31,12 @@ typedef struct s_psdata
t_stack *b; t_stack *b;
size_t size_a; size_t size_a;
size_t size_b; size_t size_b;
t_list op; t_list *op;
} t_psdata; } t_psdata;
t_stack *ps_stknew(int nb); t_stack *ps_stknew(int nb);
void *ps_stkpsh(t_stack **s, t_stack *new); void ps_stkpsh(t_psdata *data, char c, t_stack *new);
t_stack *ps_stkpop(t_stack **s); t_stack *ps_stkpop(t_psdata *data, char c);
void ps_stkclean(t_psdata *data); void ps_stkclean(t_psdata *data);
void ps_swap(t_psdata *data, char c); void ps_swap(t_psdata *data, char c);
@ -42,7 +44,7 @@ void ps_sswap(t_psdata *data);
void ps_push(t_psdata *data, char c); void ps_push(t_psdata *data, char c);
void ps_rot(t_psdata *data, char c); void ps_rot(t_psdata *data, char c);
void ps_rrot(t_psdata *data); void ps_rrot(t_psdata *data);
void ps_rerot(t_stack **s); void ps_rerot(t_psdata *data, char c);
void ps_rrerot(t_stack **a, t_stack **b); void ps_rrerot(t_psdata *data);
#endif #endif

9
srcs/checker.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/23 13:35:15 by tmaze #+# #+# */ /* Created: 2019/02/23 13:35:15 by tmaze #+# #+# */
/* Updated: 2019/02/23 14:55:14 by tmaze ### ########.fr */ /* Updated: 2019/02/24 15:38:10 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -38,7 +38,6 @@ int check_input(char *in, int *ret)
int i; int i;
i = 0; i = 0;
ret = 0;
while (in[i] && ft_iswhitespace(in[i])) while (in[i] && ft_iswhitespace(in[i]))
i++; i++;
if (in[i] && ft_issign(in[i])) if (in[i] && ft_issign(in[i]))
@ -62,16 +61,16 @@ int main(int ac, char **av)
t_psdata data; t_psdata data;
i = ac; i = ac;
while (i > 0) nb = 0;
while (--i > 0)
{ {
if (check_input(av[i], &nb) && (new = ps_stknew(nb)) != NULL) if (check_input(av[i], &nb) && (new = ps_stknew(nb)) != NULL)
ps_stkpsh(&(data.a), new); ps_stkpsh(&data, 'a', new);
else else
{ {
ft_putendl_fd("Error", 2); ft_putendl_fd("Error", 2);
ps_stkclean(&data); ps_stkclean(&data);
return (2); return (2);
} }
i--;
} }
} }

20
srcs/ps_rerot.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/21 16:32:04 by tmaze #+# #+# */ /* Created: 2019/02/21 16:32:04 by tmaze #+# #+# */
/* Updated: 2019/02/23 16:08:12 by tmaze ### ########.fr */ /* Updated: 2019/02/24 13:58:12 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -27,24 +27,24 @@ void ps_rerot(t_psdata *data, char c)
s = data->b; s = data->b;
if (c == 'b') if (c == 'b')
size = data->size_b; size = data->size_b;
if (*s != NULL && size > 2) if (s != NULL && size > 2)
{ {
prec = *s; prec = s;
tmp = (*s)->next; tmp = s->next;
while (tmp->next != NULL) while (tmp->next != NULL)
{ {
tmp = tmp->next; tmp = tmp->next;
prec = prec->next; prec = prec->next;
} }
prec->next = NULL; prec->next = NULL;
ps_stkpsh(s, tmp); ps_stkpsh(data, c, tmp);
} }
else if (*s != NULL && ps_stksize(*s) == 2) else if (s != NULL && size == 2)
ps_swap(s); ps_swap(data, c);
} }
void ps_rrerot(t_stack **a, t_stack **b) void ps_rrerot(t_psdata *data)
{ {
ps_rerot(a); ps_rerot(data, 'a');
ps_rerot(b); ps_rerot(data, 'b');
} }

12
srcs/ps_rot.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/21 16:07:55 by tmaze #+# #+# */ /* Created: 2019/02/21 16:07:55 by tmaze #+# #+# */
/* Updated: 2019/02/23 15:19:59 by tmaze ### ########.fr */ /* Updated: 2019/02/24 13:56:33 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -27,16 +27,16 @@ void ps_rot(t_psdata *data, char c)
s = data->b; s = data->b;
if (c == 'b') if (c == 'b')
size = data->size_b; size = data->size_b;
if (*s != NULL && size > 2) if (s != NULL && size > 2)
{ {
tmp = ps_stkpop(s); tmp = ps_stkpop(data, c);
ind = *s; ind = s;
while (ind->next != NULL) while (ind->next != NULL)
ind = ind->next; ind = ind->next;
ind->next = tmp; ind->next = tmp;
} }
else if (*s != NULL && size == 2) else if (s != NULL && size == 2)
ps_swap(s); ps_swap(data, c);
} }
void ps_rrot(t_psdata *data) void ps_rrot(t_psdata *data)

46
srcs/ps_stktools.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/22 14:41:27 by tmaze #+# #+# */ /* Created: 2019/02/22 14:41:27 by tmaze #+# #+# */
/* Updated: 2019/02/23 13:30:09 by tmaze ### ########.fr */ /* Updated: 2019/02/24 17:41:40 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -24,36 +24,64 @@ t_stack *ps_stknew(int nb)
return (ret); return (ret);
} }
void *ps_stkpsh(t_stack **s, t_stack *new) void ps_stkpsh(t_psdata *data, char c, t_stack *new)
{ {
t_stack *ind; t_stack *ind;
t_stack **s;
size_t size;
if (s != NULL && *s == NULL) s = NULL;
if (data != NULL && new != NULL)
{
if (c == 'a')
s = &(data->a);
if (c == 'a')
size = data->size_a;
if (c == 'b')
s = &(data->b);
if (c == 'b')
size = data->size_b;
if (s != NULL && *s == NULL && (size++))
*s = new; *s = new;
else if (s != NULL) else if (s != NULL && *s != NULL)
{ {
ind = *s; ind = *s;
*s = new; *s = new;
new->next = ind; new->next = ind;
size++;
}
} }
} }
t_stack *ps_stkpop(t_stack **s) t_stack *ps_stkpop(t_psdata *data, char c)
{ {
t_stack *ret; t_stack *ret;
t_stack **s;
size_t size;
if (c == 'a')
s = &(data->a);
if (c == 'a')
size = data->size_a;
if (c == 'b')
s = &(data->b);
if (c == 'b')
size = data->size_b;
else if (c != 'a' && c != 'b')
return (NULL);
ret = NULL; ret = NULL;
if (s != NULL && *s != NULL) if (s != NULL && *s != NULL)
{ {
ret = *s; ret = *s;
*s = ret->next; *s = ret->next;
size--;
} }
return (ret); return (ret);
} }
void ft_lstdelstr(void *content, size_t content_size) void ft_lstdelstr(void *content, size_t content_size)
{ {
ft_strdel(&content); ft_strdel((char**)&content);
content_size = 0; content_size = 0;
} }
@ -66,7 +94,7 @@ void ps_stkclean(t_psdata *data)
{ {
tmp = data->a; tmp = data->a;
data->a = data->a->next; data->a = data->a->next;
ft_memedel(&tmp); ft_memdel((void**)&tmp);
data->size_a--; data->size_a--;
} }
tmp = data->b; tmp = data->b;
@ -74,8 +102,8 @@ void ps_stkclean(t_psdata *data)
{ {
tmp = data->b; tmp = data->b;
data->b = data->b->next; data->b = data->b->next;
ft_memedel(&tmp); ft_memdel((void**)&tmp);
data->size_b--; data->size_b--;
} }
ft_lstdel(&op, &ft_lstdelstr); ft_lstdel(&(data->op), &ft_lstdelstr);
} }

10
srcs/ps_swap.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/21 14:06:40 by tmaze #+# #+# */ /* Created: 2019/02/21 14:06:40 by tmaze #+# #+# */
/* Updated: 2019/02/23 15:24:12 by tmaze ### ########.fr */ /* Updated: 2019/02/24 13:59:48 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -26,11 +26,11 @@ void ps_swap(t_psdata *data, char c)
s = data->b; s = data->b;
if (c == 'b') if (c == 'b')
size = data->size_b; size = data->size_b;
if (*s != NULL && size >= 2) if (s != NULL && size >= 2)
{ {
tmp = (*s)->nb; tmp = s->nb;
(*s)->nb = (*s)->next->nb; s->nb = s->next->nb;
(*s)->next->nb = tmp; s->next->nb = tmp;
} }
} }