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

update: exec works !

Browse source
This commit is contained in:
maix0 2024-10-10 17:41:23 +02:00
parent 2363fadd02
commit 77e7f65b41
24 changed files with 192 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

32
sources/_helper_main.c
View file

@ -6,13 +6,13 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/06 16:31:41 by rparodi #+# #+# */
/* Updated: 2024/10/03 21:44:22 by maiboyer ### ########.fr */
/* Updated: 2024/10/10 17:39:40 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "app/colors.h"
#include "app/env.h"
//#include "app/node.h"
// #include "app/node.h"
#include "app/signal_handler.h"
#include "app/state.h"
#include "ast/ast.h"
@ -26,12 +26,12 @@
#include <errno.h>
#include <sys/types.h>
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status);
void parse_str(t_state *state);
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status);
void 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);
@ -50,19 +50,25 @@ t_error get_user_input(t_state *state)
return (NO_ERROR);
}
//for the norme line 62: print_node_data(&state->current_node, 0);
void exec_shcat(t_state *state)
// for the norme line 62: print_node_data(&state->current_node, 0);
void exec_shcat(t_state *state)
{
t_program_result prog_res;
t_program_result prog_res;
t_ast_node prog;
prog_res = (t_program_result){.exit = 0};
if (state->ast != NULL && run_program(\
&state->ast->data.program, state, &prog_res))
if (state->ast->kind != AST_PROGRAM)
{
prog = ast_alloc(AST_PROGRAM);
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))
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)
{

72
sources/main.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */
/* Updated: 2024/10/09 12:40:13 by maiboyer ### ########.fr */
/* Updated: 2024/10/10 17:37:45 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -29,23 +29,22 @@
#include <errno.h>
#include <sys/types.h>
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);
void ft_take_args(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);
void ft_take_args(t_state *state);
// Foutre envp dans env
// Chaque elemenet d'envp split au premier =
// 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);
@ -61,9 +60,9 @@ t_error split_str_first(\
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;
@ -82,45 +81,32 @@ t_error populate_env(t_hashmap_env *env, t_str envp[])
return (NO_ERROR);
}
/*
void print_node_data(t_node *t, t_usize depth)
t_error yarn(t_vec_token ts, t_vec_ast *output);
void parse_str(t_state *state)
{
t_usize idx;
idx = 0;
if (t->kind == 7)
return;
printf("\x1b[%im[%-6s](%lu)\x1b[0m", t->field_str == NULL ? \
90 : 32, t->field_str == NULL ? "nil" : t->field_str, t->field);
while (idx++ < depth + 1)
printf("\t");
idx = 0;
printf("%s(%lu) = %s\n", t->kind_str, t->kind, node_getstr(t));
while (idx < t->childs_count)
print_node_data(&t->childs[idx++], depth + 1);
}
*/
t_error yarn(t_vec_token ts, t_vec_token *output);
void parse_str(t_state *state)
{
t_vec_token tokens;
t_vec_token tokens;
t_vec_ast ast;
if (tokenize(state->str_input, &tokens))
return ;
return;
if (ts_apply_passes(tokens, &tokens))
return ;
//if (yarn(tokens, &tokens))
// return ;
printf("\n\nEND TOKENS\n");
return;
// TODO: remove
ts_print(&tokens);
vec_token_free(tokens);
if (yarn(tokens, &ast))
return ((void)printf("failed to ast build\n"));
if (ast.len != 1)
me_abort("Unhandled error: ast.len != 1");
vec_ast_pop(&ast, &state->ast);
ast_print(state->ast);
printf("\nast\n");
vec_ast_free(ast);
}
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;