From aecb67a24d83870f6444986c913d2af25cf4d653 Mon Sep 17 00:00:00 2001 From: Maieul BOYER Date: Mon, 12 Feb 2024 20:49:08 +0100 Subject: [PATCH] updated --- mecstd | 2 +- src/app/main_bonus.c | 18 ++++++++++++++---- src/app/moves/rev_rotate.c | 4 ++-- src/app/moves/rotate.c | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/mecstd b/mecstd index caed78a..32a8770 160000 --- a/mecstd +++ b/mecstd @@ -1 +1 @@ -Subproject commit caed78a6223582e876f0fc748ca18350f572f34e +Subproject commit 32a87701115a9134535f0a4e70923a68fdcbcaa0 diff --git a/src/app/main_bonus.c b/src/app/main_bonus.c index 51132f6..305ef73 100644 --- a/src/app/main_bonus.c +++ b/src/app/main_bonus.c @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/08 18:59:33 by maiboyer #+# #+# */ -/* Updated: 2024/02/09 15:51:09 by maiboyer ### ########.fr */ +/* Updated: 2024/02/10 18:55:20 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -70,25 +70,35 @@ int main_checker(t_i32 argc, t_str argv[]) t_state state; t_buffer_str s; bool err; + t_usize count; + (void)(argc--, argv++); + err = false; state = parses_arguments(argc, argv); s = get_next_line(0, &err); - while (!err) + count = 1; + while (!err && s.buf != NULL) { + + if (s.len != 0 && s.buf[s.len - 1] == '\n') + str_pop(&s); + //me_printf("line[%u]: '%s'\n", count, s.buf); if (handle_operation(s, &state)) { + me_printf("KO: error\n"); + me_printf("ERROR[%u] = '%s'\n", count, s.buf); (str_free(s), free_state(state)); - me_printf("KO\n"); return (1); } str_free(s); s = get_next_line(0, &err); + count++; } str_free(s); if (is_sorted(&state.stack_a) && state.stack_b.len == 0) me_printf("OK\n"); else - me_printf("KO\n"); + me_printf("KO: Not sorted\n"); free_state(state); return (0); diff --git a/src/app/moves/rev_rotate.c b/src/app/moves/rev_rotate.c index e10e112..f630ea0 100644 --- a/src/app/moves/rev_rotate.c +++ b/src/app/moves/rev_rotate.c @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/11 16:26:04 by maiboyer #+# #+# */ -/* Updated: 2024/02/08 19:16:59 by maiboyer ### ########.fr */ +/* Updated: 2024/02/10 18:39:03 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ void rev_rotate_inner(t_vec_i64 *stack, t_const_str tag, t_i64 e; (void)(tag); - if (stack->len <= 1) + if (stack->len < 2) return ; vec_i64_pop(stack, &e); vec_i64_push_front(stack, e); diff --git a/src/app/moves/rotate.c b/src/app/moves/rotate.c index 5fb0bbd..ff314ce 100644 --- a/src/app/moves/rotate.c +++ b/src/app/moves/rotate.c @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/11 16:26:04 by maiboyer #+# #+# */ -/* Updated: 2024/02/08 19:17:46 by maiboyer ### ########.fr */ +/* Updated: 2024/02/10 18:38:52 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ void rotate_inner(t_vec_i64 *stack, t_const_str tag, t_const_str print) t_i64 e; (void)(tag); - if (stack->len <= 1) + if (stack->len < 2) return; vec_i64_pop_front(stack, &e); vec_i64_push(stack, e);