From 1dfb7f7ef777e15fcf985e1db801efd9b69b0ca6 Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 11 Oct 2024 16:23:18 +0200 Subject: [PATCH] style: normed the source folder --- sources/_helper_main.c | 19 ++++++++++--------- sources/ft_exit.c | 1 - sources/main.c | 28 ++++++++++++++-------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sources/_helper_main.c b/sources/_helper_main.c index d43121b2..d064c78a 100644 --- a/sources/_helper_main.c +++ b/sources/_helper_main.c @@ -27,11 +27,11 @@ #include void ft_exit(t_state *maiboyerlpb, t_u8 exit_status); -t_error parse_str(t_state *state); +t_error parse_str(t_state *state); -t_error get_user_input(t_state *state) +t_error get_user_input(t_state *state) { - t_line_state lstate; + t_line_state lstate; if (line_edit_start(&lstate, get_stdin(), get_stdout(), state->prompt)) return (ERROR); @@ -52,10 +52,10 @@ t_error get_user_input(t_state *state) } // for the norme line 62: print_node_data(&state->current_node, 0); -void exec_shcat(t_state *state) +void exec_shcat(t_state *state) { - t_program_result prog_res; - t_ast_node prog; + t_program_result prog_res; + t_ast_node prog; prog_res = (t_program_result){.exit = 0}; if (state->ast->kind != AST_PROGRAM) @@ -64,12 +64,13 @@ void exec_shcat(t_state *state) vec_ast_push(&prog->data.program.body, state->ast); state->ast = prog; } - if (state->ast != NULL && run_program(&state->ast->data.program, state, &prog_res)) + if (state->ast != NULL && run_program(&state->ast->data.program, state, + &prog_res)) printf("Error when execting the Command \n"); ast_free(state->ast); } -void ft_take_args(t_state *state) +void ft_take_args(t_state *state) { while (true) { @@ -82,7 +83,7 @@ void ft_take_args(t_state *state) if (parse_str(state)) { mem_free(state->str_input); - continue; + continue ; } exec_shcat(state); mem_free(state->str_input); diff --git a/sources/ft_exit.c b/sources/ft_exit.c index e91642fd..b3004a56 100644 --- a/sources/ft_exit.c +++ b/sources/ft_exit.c @@ -14,7 +14,6 @@ #include "me/hashmap/hashmap_env.h" #include "me/mem/mem.h" - void ft_free(void *ptr) { if (!ptr) diff --git a/sources/main.c b/sources/main.c index d54ff042..ca3af2cd 100644 --- a/sources/main.c +++ b/sources/main.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */ -/* Updated: 2024/10/10 17:47:24 by maiboyer ### ########.fr */ +/* Updated: 2024/10/11 16:21:01 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -29,7 +29,7 @@ #include #include -t_error get_user_input(t_state *state); +t_error get_user_input(t_state *state); void ast_print_node(t_ast_node self); void ft_exit(t_state *maiboyerlpb, t_u8 exit_status); void exec_shcat(t_state *state); @@ -40,11 +40,12 @@ void ft_take_args(t_state *state); // cle avant le = // data apres le = -void ast_free(t_ast_node node); +void ast_free(t_ast_node node); -t_error split_str_first(t_const_str s, char splitter, t_str *before, t_str *after) +t_error split_str_first(t_const_str s, char splitter, t_str *before, + t_str *after) { - t_usize i; + t_usize i; if (s == NULL || before == NULL || after == NULL || splitter == '\0') return (ERROR); @@ -60,9 +61,9 @@ t_error split_str_first(t_const_str s, char splitter, t_str *before, t_str *afte return (NO_ERROR); } -t_error populate_env(t_hashmap_env *env, t_str envp[]) +t_error populate_env(t_hashmap_env *env, t_str envp[]) { - t_usize i; + t_usize i; t_str temp[2]; i = 0; @@ -81,22 +82,21 @@ t_error populate_env(t_hashmap_env *env, t_str envp[]) return (NO_ERROR); } -t_error yarn(t_vec_token ts, t_vec_ast *output); +t_error yarn(t_vec_token ts, t_vec_ast *output); -t_error parse_str(t_state *state) +t_error parse_str(t_state *state) { - t_vec_token tokens; + t_vec_token tokens; t_vec_ast ast; if (tokenize(state->str_input, &tokens)) return (ERROR); if (ts_apply_passes(tokens, &tokens)) return (ERROR); - ts_print(&tokens); // TODO: remove if (yarn(tokens, &ast)) return ((void)printf("failed to ast build\n"), (ERROR)); if (ast.len != 1) - return (ERROR); + return (ERROR); vec_ast_pop(&ast, &state->ast); ast_print(state->ast); printf("\nast\n"); @@ -104,9 +104,9 @@ t_error parse_str(t_state *state) return (NO_ERROR); } -t_i32 main(t_i32 argc, t_str argv[], t_str envp[]) +t_i32 main(t_i32 argc, t_str argv[], t_str envp[]) { - t_state state; + t_state state; (void)argc; (void)argv;