42_adjoly/push_swap
Archived
1
0
Fork 0
Code

finished... supposedly

Browse Source
This commit is contained in:
Adam JOLY
2024-03-16 20:08:56 +01:00
parent 59eaf01b9d
commit 4b86f9672e
8 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
checker_linux
View File

Binary file not shown.

2
libft

Submodule libft updated: 4ce51959ed...0289baf535

1
push_swap-testeur-max

Submodule push_swap-testeur-max deleted from 84c59f165a

1
push_swap_tester

Submodule push_swap_tester deleted from 317339a8b6

55
src/main.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/04 12:14:22 by adjoly #+# #+# */ /* Created: 2024/02/04 12:14:22 by adjoly #+# #+# */
/* Updated: 2024/03/13 14:44:42 by adjoly ### ########.fr */ /* Updated: 2024/03/16 20:07:36 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -24,7 +24,8 @@ void check_invalid_char(char **av)
tmp_args = *tmp; tmp_args = *tmp;
while (*tmp_args) while (*tmp_args)
{ {
if (!ft_isdigit(*tmp_args) && *tmp_args != '-' && *tmp_args != '+' && *tmp_args != 32) if (!ft_isdigit(*tmp_args) && *tmp_args != '-' \
&& *tmp_args != '+' && *tmp_args != 32)
ft_senderror(); ft_senderror();
tmp_args++; tmp_args++;
} }
@ -32,7 +33,6 @@ void check_invalid_char(char **av)
} }
} }
void check_double(t_stack **stack) void check_double(t_stack **stack)
{ {
t_stack *tmp; t_stack *tmp;
@ -55,6 +55,53 @@ void check_double(t_stack **stack)
} }
} }
void check_sign(char **av)
{
char **tmp;
char *tmp_av;
tmp = av;
tmp++;
while (*tmp)
{
tmp_av = *tmp;
while (*tmp_av)
{
if ((*tmp_av == '-' || *tmp_av == '+') \
&& !ft_isdigit(*(tmp_av + 1)))
ft_senderror();
if ((*tmp_av == '-' || *tmp_av == '+') && ft_isdigit(*(tmp_av - 1)))
ft_senderror();
tmp_av++;
}
tmp++;
}
}
void check_empty_args(char **av)
{
char **tmp;
char *tmp_av;
tmp = av;
tmp++;
while (*tmp)
{
tmp_av = *tmp;
if (!*tmp_av)
ft_senderror();
while (*tmp_av)
{
if (*tmp_av != 32)
break ;
tmp_av++;
}
if (!*tmp_av)
ft_senderror();
tmp++;
}
}
int main(int ac, char **av) int main(int ac, char **av)
{ {
t_stack *stack_a; t_stack *stack_a;
@ -62,7 +109,9 @@ int main(int ac, char **av)
if (ac < 2) if (ac < 2)
return (EXIT_SUCCESS); return (EXIT_SUCCESS);
check_empty_args(av);
check_invalid_char(av); check_invalid_char(av);
check_sign(av);
stack_b = NULL; stack_b = NULL;
stack_a = ft_parsing(av); stack_a = ft_parsing(av);
if (ft_stacksize(stack_a) <= 1) if (ft_stacksize(stack_a) <= 1)

8
src/mouv
View File

@ -1,8 +0,0 @@
1 2 3
3 2 1 ra ra
2 3 1 rra
1 3 2 rra sa
3 1 2 ra
2 1 3 sa

2
src/parsing.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/04 12:05:43 by adjoly #+# #+# */ /* Created: 2024/02/04 12:05:43 by adjoly #+# #+# */
/* Updated: 2024/03/13 13:05:17 by adjoly ### ########.fr */ /* Updated: 2024/03/16 15:13:43 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

4
src/utils/print_error.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/11 15:47:05 by adjoly #+# #+# */ /* Created: 2024/03/11 15:47:05 by adjoly #+# #+# */
/* Updated: 2024/03/11 15:54:09 by adjoly ### ########.fr */ /* Updated: 2024/03/16 19:01:15 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,6 +14,6 @@
void ft_senderror(void) void ft_senderror(void)
{ {
ft_putendl_fd("Error", STDOUT_FILENO); ft_putendl_fd("Error", STDERR_FILENO);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }