From 2b4327b7a448228f67a054b4bdaa3f84b9db2164 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 19 Jan 2020 08:38:07 +0100 Subject: refactored stack functions and checking for duplicates in args --- src/checker/check.c | 37 ++++++++++++++++++++----------------- src/checker/checker.h | 17 +++++++++-------- src/checker/main.c | 51 +++++++++++++++++++++++++++------------------------ 3 files changed, 56 insertions(+), 49 deletions(-) (limited to 'src/checker') diff --git a/src/checker/check.c b/src/checker/check.c index 35bd992..125fdb7 100644 --- a/src/checker/check.c +++ b/src/checker/check.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/18 10:16:08 by cacharle #+# #+# */ -/* Updated: 2020/01/18 12:04:41 by cacharle ### ########.fr */ +/* Updated: 2020/01/19 07:11:05 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -45,17 +45,17 @@ t_status read_action(t_stack *a, t_stack *b) } static t_action g_actions[] = { - {"sa", FLAG_ARG_A, {.arg_1 = &swap_a}}, - {"sb", FLAG_ARG_B, {.arg_1 = &swap_b}}, - {"ss", FLAG_ARG_A_B, {.arg_2 = &swap_both}}, - {"pa", FLAG_ARG_A_B, {.arg_2 = &push_a}}, - {"pb", FLAG_ARG_B_A, {.arg_2 = &push_a}}, - {"ra", FLAG_ARG_A, {.arg_1 = &rotate_a}}, - {"rb", FLAG_ARG_B, {.arg_1 = &rotate_b}}, - {"rr", FLAG_ARG_A_B, {.arg_2 = &rotate_both}}, - {"rra", FLAG_ARG_A, {.arg_1 = &reverse_rotate_a}}, - {"rrb", FLAG_ARG_B, {.arg_1 = &reverse_rotate_b}}, - {"rrr", FLAG_ARG_A_B, {.arg_2 = &reverse_rotate_both}}, + {"sa", FLAG_ARG_A, {.arg_1 = &stack_swap}}, + {"sb", FLAG_ARG_B, {.arg_1 = &stack_swap}}, + {"ss", FLAG_ARG_A_B, {.arg_2 = &stack_swap_2}}, + {"pa", FLAG_ARG_A_B, {.arg_2 = &stack_push_to}}, + {"pb", FLAG_ARG_B_A, {.arg_2 = &stack_push_to}}, + {"ra", FLAG_ARG_A, {.arg_1 = &stack_rotate}}, + {"rb", FLAG_ARG_B, {.arg_1 = &stack_rotate}}, + {"rr", FLAG_ARG_A_B, {.arg_2 = &stack_rotate_2}}, + {"rra", FLAG_ARG_A, {.arg_1 = &stack_reverse_rotate}}, + {"rrb", FLAG_ARG_B, {.arg_1 = &stack_reverse_rotate}}, + {"rrr", FLAG_ARG_A_B, {.arg_2 = &stack_reverse_rotate_2}}, }; #define ACTIONS_SIZE (sizeof(g_actions) / sizeof(t_action)) @@ -65,18 +65,21 @@ t_status exec_action(char action_id[ACTION_ID_BUF_SIZE], { int i; - printf("action id %s\n", action_id); i = 0; while (ft_strcmp(action_id, g_actions[i].id) != 0) i++; if (i == ACTIONS_SIZE) return (STATUS_ERROR); - if (g_actions[i].args & FLAG_ARG_A) + if (g_actions[i].args == FLAG_ARG_A) g_actions[i].func.arg_1(a); - else if (g_actions[i].args & FLAG_ARG_B) + else if (g_actions[i].args == FLAG_ARG_B) g_actions[i].func.arg_1(b); - else if (g_actions[i].args & FLAG_ARG_A_B) + else if (g_actions[i].args == FLAG_ARG_A_B) g_actions[i].func.arg_2(a, b); + else if (g_actions[i].args == FLAG_ARG_B_A) + g_actions[i].func.arg_2(b, a); + else + return (STATUS_ERROR); return (STATUS_SUCCESS); } @@ -87,7 +90,7 @@ t_bool stack_sorted(t_stack *stack) if (stack_length(stack) < 2) return (TRUE); i = -1; - while (++i < stack->top - 1) + while (++i < stack->top) if (stack->elements[i] > stack->elements[i + 1]) return (FALSE); return (TRUE); diff --git a/src/checker/checker.h b/src/checker/checker.h index e6973b6..877f669 100644 --- a/src/checker/checker.h +++ b/src/checker/checker.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/18 10:16:12 by cacharle #+# #+# */ -/* Updated: 2020/01/18 12:01:00 by cacharle ### ########.fr */ +/* Updated: 2020/01/19 06:30:04 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include @@ -18,10 +18,7 @@ # include "common.h" # include "libft.h" -# define FLAG_ARG_A (1 << 0) -# define FLAG_ARG_B (1 << 1) -# define FLAG_ARG_A_B (1 << 2) -# define FLAG_ARG_B_A (1 << 3) +# define ACTION_ID_BUF_SIZE 4 typedef enum { @@ -31,9 +28,13 @@ typedef enum STATUS_EOF, } t_status; -# define ACTION_ID_BUF_SIZE 4 - -typedef char t_flag_arg; +typedef enum +{ + FLAG_ARG_A, + FLAG_ARG_B, + FLAG_ARG_A_B, + FLAG_ARG_B_A +} t_flag_arg; typedef struct { diff --git a/src/checker/main.c b/src/checker/main.c index 3866800..3b4b313 100644 --- a/src/checker/main.c +++ b/src/checker/main.c @@ -6,18 +6,31 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/18 10:16:14 by cacharle #+# #+# */ -/* Updated: 2020/01/18 12:04:47 by cacharle ### ########.fr */ +/* Updated: 2020/01/19 08:37:03 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "checker.h" -// need to check duplicate -int main(int argc, char **argv) +t_status has_dup(int *xs, size_t size) { - t_status s; - t_stack *a; - t_stack *b; + int *tmp; + t_status ret; + + if ((tmp = (int*)malloc(size * sizeof(int))) == NULL) + return (STATUS_ERROR); + ft_memcpy(tmp, xs, size * sizeof(int)); + ret = ft_is_set(tmp, size, sizeof(int), &ft_compar_int) ? + STATUS_SUCCESS : STATUS_FAILURE; + free(tmp); + return (ret); +} + +int main(int argc, char **argv) +{ + t_status s; + t_stack *a; + t_stack *b; if (argc == 1) return (0); @@ -25,7 +38,6 @@ int main(int argc, char **argv) return (1); while (--argc >= 1) { - printf("argc %d\n", argc); errno = 0; stack_push(a, ft_strict_atoi(argv[argc])); if (errno != 0) @@ -35,19 +47,18 @@ int main(int argc, char **argv) return (1); } } + + if (has_dup(a->elements, stack_length(a)) != STATUS_SUCCESS) + { + ft_putendl_fd("Error", STDERR_FILENO); + stack_destroy(a); + return (1); + } if ((b = stack_new(stack_length(a))) == NULL) { stack_destroy(a); return (1); } - printf("stack a: "); - for (int i = 0; i <= a->top; i++) - printf("[%d]", a->elements[i]); - printf("\nstack b: "); - for (int i = 0; i <= b->top; i++) - printf("[%d]", b->elements[i]); - printf("\n"); - s = check(a, b); if (s == STATUS_SUCCESS) ft_putendl("OK"); @@ -55,15 +66,7 @@ int main(int argc, char **argv) ft_putendl("KO"); else if (s == STATUS_ERROR) ft_putendl_fd("Error", STDERR_FILENO); - - printf("stack a: "); - for (int i = 0; i <= a->top; i++) - printf("[%d]", a->elements[i]); - printf("\nstack b: "); - for (int i = 0; i <= b->top; i++) - printf("[%d]", b->elements[i]); - printf("\n"); stack_destroy(a); stack_destroy(b); - return 0; + return (0); } -- cgit