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

Adding the files normed (Not possible yet for the from node)

Browse source
This commit is contained in:
Raphael 2024-08-02 12:55:03 +02:00
parent e7e395ed10
commit 1c840b41fd
8 changed files with 141 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

26
sources/env.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/04 18:32:50 by maiboyer #+# #+# */
/* Updated: 2024/05/21 14:55:11 by maiboyer ### ########.fr */
/* Updated: 2024/08/02 12:09:05 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,9 +22,9 @@
#include "me/vec/vec_str.h"
#include <stdlib.h>
static void _hash_str(t_hasher *hasher, t_str *s)
static void _hash_str(t_hasher *hasher, t_str *s)
{
t_usize len;
t_usize len;
len = str_len(*s);
hasher_write_u64(hasher, (t_u64)len);
@ -32,12 +32,12 @@ static void _hash_str(t_hasher *hasher, t_str *s)
hasher_write_u8(hasher, 0);
}
static bool _cmp_str(t_str *s1, t_str *s2)
static bool _cmp_str(t_str *s1, t_str *s2)
{
return (str_compare(*s1, *s2));
}
static void _free_env(t_kv_env kv)
static void _free_env(t_kv_env kv)
{
if (kv.key)
mem_free(kv.key);
@ -45,20 +45,20 @@ static void _free_env(t_kv_env kv)
mem_free(kv.val);
}
t_hashmap_env *create_env_map(void)
t_hashmap_env *create_env_map(void)
{
return (hmap_env_new(_hash_str, _cmp_str, _free_env));
}
t_error _build_envp_iterator(t_usize idx, const t_str *key, t_str *val,
void *ctx)
t_error _build_envp_iterator(t_usize idx, const t_str *key, t_str *val,
void *ctx)
{
struct s_build_envp_state *s;
t_str push;
struct s_build_envp_state *s;
t_str push;
(void)(idx);
s = ctx;
if (string_push(&s->buf, *key) || string_push(&s->buf, "=") ||
if (string_push(&s->buf, *key) || string_push(&s->buf, "=") || \
string_push(&s->buf, *val))
return (vec_str_free(s->out), ERROR);
push = str_clone(s->buf.buf);
@ -68,9 +68,9 @@ t_error _build_envp_iterator(t_usize idx, const t_str *key, t_str *val,
return (NO_ERROR);
}
t_error build_envp(t_hashmap_env *envs, t_vec_str *envp)
t_error build_envp(t_hashmap_env *envs, t_vec_str *envp)
{
struct s_build_envp_state state;
struct s_build_envp_state state;
state.buf = string_new(8096);
state.out = vec_str_new(1024, (void (*)(t_str))mem_free);

14
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/07/31 17:08:05 by maiboyer ### ########.fr */
/* Updated: 2024/08/02 12:09:53 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,17 +15,17 @@
#include "me/mem/mem.h"
#include "parser/api.h"
void ts_parser_delete(t_first_parser *self);
void ts_parser_delete(t_first_parser *self);
void ft_free(void *ptr)
void ft_free(void *ptr)
{
if (!ptr)
mem_free(ptr);
}
void ft_free_strs(t_str *strs)
void ft_free_strs(t_str *strs)
{
t_usize i;
t_usize i;
i = 0;
while (strs[i])
@ -33,7 +33,7 @@ void ft_free_strs(t_str *strs)
ft_free(strs);
}
void ft_free_utils(t_state *s)
void ft_free_utils(t_state *s)
{
if (s->str_input)
mem_free(s->str_input);
@ -44,7 +44,7 @@ void ft_free_utils(t_state *s)
ts_parser_delete(s->parser.parser);
}
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status)
void ft_exit(t_state *maiboyerlpb, t_u8 exit_status)
{
if (maiboyerlpb != NULL)
ft_free_utils(maiboyerlpb);

61
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/07/31 17:07:37 by maiboyer ### ########.fr */
/* Updated: 2024/08/02 12:16:09 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
@ -25,7 +25,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,9 +34,13 @@ void ft_exit(t_state *maiboyerlpb, t_u8 exit_status);
// cle avant le =
// data apres le =
t_error split_str_first(t_const_str s, char splitter, t_str *before, t_str *after)
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_usize i;
t_usize i;
if (s == NULL || before == NULL || after == NULL || splitter == '\0')
return (ERROR);
@ -52,9 +56,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;
@ -73,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");
@ -89,14 +93,12 @@ 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_to_nodes(t_first_parser *parser, t_const_str input)
{
void ast_free(t_ast_node node);
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));
node = ts_tree_root_node(tree);
@ -109,20 +111,20 @@ t_node parse_to_nodes(t_first_parser *parser, t_const_str input)
return (ret);
}
t_node parse_str(t_parser *parser, t_const_str input)
t_node parse_str(t_parser *parser, t_const_str input)
{
return (parse_to_nodes(parser->parser, input));
}
void exec_shcat(t_state *shcat)
void exec_shcat(t_state *shcat)
{
print_node_data(&shcat->current_node, 0);
free_node(shcat->current_node);
}
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);
@ -141,7 +143,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)
{
@ -157,12 +159,10 @@ void ft_take_args(t_state *state)
}
}
t_language *tree_sitter_sh(void);
t_parser create_myparser(void)
t_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();
@ -170,15 +170,16 @@ t_parser create_myparser(void)
return ((t_parser){.parser = parser});
}
void free_myparser(t_parser self)
void free_myparser(t_parser self)
{
ts_parser_delete(self.parser);
}
t_i32 main(t_i32 argc, t_str argv[], t_str envp[])
// 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;
// char truc[] = COLB_YELLOW "42sh" COL_GREEN ">" COL_WHITE "$ " RESET;
t_state state;
(void)argc;
(void)argv;

28
sources/node/node.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/28 18:36:40 by maiboyer #+# #+# */
/* Updated: 2024/07/02 13:11:18 by maiboyer ### ########.fr */
/* Updated: 2024/08/02 12:17:33 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,15 +16,15 @@
#include "parser/api.h"
#include <stdio.h>
t_node build_node(t_parse_node current, t_const_str input);
t_node build_node(t_parse_node current, t_const_str input);
t_language *tree_sitter_bash(void);
t_language *tree_sitter_bash(void);
t_node *build_childs(t_parse_node parent, t_const_str input, t_usize count)
t_node *build_childs(t_parse_node parent, t_const_str input, t_usize count)
{
t_node *ret;
t_usize idx;
t_parse_node child;
t_node *ret;
t_usize idx;
t_parse_node child;
ret = mem_alloc_array(sizeof(*ret), count);
if (ret == NULL)
@ -41,9 +41,9 @@ t_node *build_childs(t_parse_node parent, t_const_str input, t_usize count)
return (ret);
}
t_node build_node(t_parse_node curr, t_const_str input)
t_node build_node(t_parse_node curr, t_const_str input)
{
t_node out;
t_node out;
out.kind = ts_node_symbol(curr);
out.kind_str = ts_node_type(curr);
@ -61,10 +61,10 @@ t_node build_node(t_parse_node curr, t_const_str input)
return (out);
}
t_str node_getstr(t_node *node)
t_str node_getstr(t_node *node)
{
t_usize start;
t_usize end;
t_usize start;
t_usize end;
t_str ret;
if (node->single_str == NULL)
@ -80,9 +80,9 @@ t_str node_getstr(t_node *node)
return (node->single_str);
}
void free_node(t_node self)
void free_node(t_node self)
{
t_usize idx;
t_usize idx;
if (self.single_str)
mem_free(self.single_str);

6
sources/signal_handler.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/02 13:22:14 by maiboyer #+# #+# */
/* Updated: 2024/07/24 16:02:17 by maiboyer ### ########.fr */
/* Updated: 2024/08/02 12:17:50 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,9 +17,9 @@
#include <stdio.h>
#include <stdlib.h>
t_error install_signal(void)
t_error install_signal(void)
{
struct sigaction data;
struct sigaction data;
data = (struct sigaction){};
data.sa_handler = SIG_IGN;