raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: normed the source folder

Browse source
This commit is contained in:
Raphael 2024-10-11 16:23:18 +02:00
parent 286796700c
commit 1dfb7f7ef7
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sources/_helper_main.c
View file

@ -27,11 +27,11 @@
#include <sys/types.h> #include <sys/types.h>
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status); 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)) if (line_edit_start(&lstate, get_stdin(), get_stdout(), state->prompt))
return (ERROR); 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); // 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_program_result prog_res;
t_ast_node prog; t_ast_node prog;
prog_res = (t_program_result){.exit = 0}; prog_res = (t_program_result){.exit = 0};
if (state->ast->kind != AST_PROGRAM) 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); vec_ast_push(&prog->data.program.body, state->ast);
state->ast = prog; 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"); printf("Error when execting the Command \n");
ast_free(state->ast); ast_free(state->ast);
} }
void ft_take_args(t_state *state) void ft_take_args(t_state *state)
{ {
while (true) while (true)
{ {
@ -82,7 +83,7 @@ void ft_take_args(t_state *state)
if (parse_str(state)) if (parse_str(state))
{ {
mem_free(state->str_input); mem_free(state->str_input);
continue; continue ;
} }
exec_shcat(state); exec_shcat(state);
mem_free(state->str_input); mem_free(state->str_input);

1
sources/ft_exit.c
View file

@ -14,7 +14,6 @@
#include "me/hashmap/hashmap_env.h" #include "me/hashmap/hashmap_env.h"
#include "me/mem/mem.h" #include "me/mem/mem.h"
void ft_free(void *ptr) void ft_free(void *ptr)
{ {
if (!ptr) if (!ptr)

28
sources/main.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 14:40:38 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 <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
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 ast_print_node(t_ast_node self);
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status); void ft_exit(t_state *maiboyerlpb, t_u8 exit_status);
void exec_shcat(t_state *state); void exec_shcat(t_state *state);
@ -40,11 +40,12 @@ void ft_take_args(t_state *state);
// cle avant le = // cle avant le =
// data apres 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') if (s == NULL || before == NULL || after == NULL || splitter == '\0')
return (ERROR); 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); 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]; t_str temp[2];
i = 0; i = 0;
@ -81,22 +82,21 @@ t_error populate_env(t_hashmap_env *env, t_str envp[])
return (NO_ERROR); 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; t_vec_ast ast;
if (tokenize(state->str_input, &tokens)) if (tokenize(state->str_input, &tokens))
return (ERROR); return (ERROR);
if (ts_apply_passes(tokens, &tokens)) if (ts_apply_passes(tokens, &tokens))
return (ERROR); return (ERROR);
ts_print(&tokens); // TODO: remove
if (yarn(tokens, &ast)) if (yarn(tokens, &ast))
return ((void)printf("failed to ast build\n"), (ERROR)); return ((void)printf("failed to ast build\n"), (ERROR));
if (ast.len != 1) if (ast.len != 1)
return (ERROR); return (ERROR);
vec_ast_pop(&ast, &state->ast); vec_ast_pop(&ast, &state->ast);
ast_print(state->ast); ast_print(state->ast);
printf("\nast\n"); printf("\nast\n");
@ -104,9 +104,9 @@ t_error parse_str(t_state *state)
return (NO_ERROR); 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)argc;
(void)argv; (void)argv;