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

update

Browse source
This commit is contained in:
Maieul BOYER 2024-08-03 16:18:15 +02:00
parent 709c124028
commit 8ee24b1bcf
No known key found for this signature in database
5 changed files with 161 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sources/ft_exit.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/29 11:35:51 by rparodi #+# #+# */
/* Updated: 2024/08/02 12:09:53 by rparodi ### ########.fr */
/* Updated: 2024/08/03 15:18:33 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -37,11 +37,9 @@ void ft_free_utils(t_state *s)
{
if (s->str_input)
mem_free(s->str_input);
if (s->path)
ft_free_strs(s->path);
if (s->env)
hmap_env_free(s->env);
ts_parser_delete(s->parser.parser);
ts_parser_delete(s->parser);
}
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status)

89
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/08/02 23:00:50 by maiboyer ### ########.fr */
/* Updated: 2024/08/03 16:16:12 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,6 +16,7 @@
#include "app/signal_handler.h"
#include "app/state.h"
#include "ast/ast.h"
#include "exec/_run_ast.h"
#include "line/line.h"
#include "me/hashmap/hashmap_env.h"
#include "me/str/str.h"
@ -25,7 +26,7 @@
#include <errno.h>
#include <sys/types.h>
t_error ast_from_node(t_parse_node node, t_str input, t_ast_node *out);
t_error ast_from_node(t_parse_node node, t_str input, t_ast_node *out);
void ast_print_node(t_ast_node self);
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status);
@ -34,13 +35,12 @@ void ft_exit(t_state *maiboyerlpb, t_u8 exit_status);
// cle avant le =
// data apres le =
t_language *tree_sitter_sh(void);
t_language *tree_sitter_sh(void);
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);
@ -56,9 +56,9 @@ t_error split_str_first(t_const_str s, char splitter, \
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;
@ -77,13 +77,13 @@ t_error populate_env(t_hashmap_env *env, t_str envp[])
return (NO_ERROR);
}
void print_node_data(t_node *t, t_usize depth)
void print_node_data(t_node *t, t_usize depth)
{
t_usize idx;
t_usize idx;
idx = 0;
if (t->kind == 7)
return ;
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");
@ -93,38 +93,40 @@ void print_node_data(t_node *t, t_usize depth)
print_node_data(&t->childs[idx++], depth + 1);
}
t_node parse_to_nodes(t_first_parser *parser, t_const_str input)
t_node parse_str(t_state *state)
{
t_first_tree *tree;
t_parse_node node;
t_node ret;
t_ast_node out;
t_first_tree *tree;
t_parse_node node;
t_node ret;
t_ast_node out;
tree = ts_parser_parse_string(parser, NULL, input, str_len(input));
tree = ts_parser_parse_string(state->parser, NULL, state->str_input, str_len(state->str_input));
node = ts_tree_root_node(tree);
if (ast_from_node(node, (t_str)input, &out))
printf("Error when building node\n");
printf("BUILDING AST\n");
if (ast_from_node(node, state->str_input, &out))
(state->ast = NULL, printf("Error when building node\n"));
else
(ast_print_node(out), printf("\n"), ast_free(out));
ret = build_node(node, input);
state->ast = out;
ret = build_node(node, state->str_input);
ts_tree_delete(tree);
return (ret);
}
t_node parse_str(t_parser *parser, t_const_str input)
void exec_shcat(t_state *state)
{
return (parse_to_nodes(parser->parser, input));
t_program_result prog_res;
prog_res = (t_program_result){.exit = 0};
print_node_data(&state->current_node, 0);
free_node(state->current_node);
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 exec_shcat(t_state *shcat)
t_error get_user_input(t_state *state)
{
print_node_data(&shcat->current_node, 0);
free_node(shcat->current_node);
}
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);
@ -143,7 +145,7 @@ t_error get_user_input(t_state *state)
return (NO_ERROR);
}
void ft_take_args(t_state *state)
void ft_take_args(t_state *state)
{
while (true)
{
@ -153,43 +155,36 @@ void ft_take_args(t_state *state)
if (state->str_input == NULL)
ft_exit(state, 0);
line_history_add(state->str_input);
state->current_node = parse_str(&state->parser, state->str_input);
state->current_node = parse_str(state);
exec_shcat(state);
mem_free(state->str_input);
}
}
t_parser create_myparser(void)
t_first_parser *create_myparser(void)
{
t_language *lang;
t_first_parser *parser;
t_language *lang;
t_first_parser *parser;
lang = tree_sitter_sh();
parser = ts_parser_new();
ts_parser_set_language(parser, lang);
return ((t_parser){.parser = parser});
return (parser);
}
void free_myparser(t_parser self)
t_i32 main(t_i32 argc, t_str argv[], t_str envp[])
{
ts_parser_delete(self.parser);
}
// char truc[] = COLB_YELLOW "42sh" COL_GREEN ">" COL_WHITE "$ " RESET;
t_i32 main(t_i32 argc, t_str argv[], t_str envp[])
{
t_state state;
t_state state;
(void)argc;
(void)argv;
(void)envp;
me_abort("abort");
if (install_signal())
me_abort("Unable to install signals");
state = (t_state){};
state.parser = create_myparser();
state.env = create_env_map();
state.tmp_var = create_env_map();
if (populate_env(state.env, envp))
me_abort("Unable to build env hashmap");
state.prompt = COLB_YELLOW "42sh" COL_GREEN ">" COL_WHITE "$ " RESET;