Adding the files normed (Not possible yet for the from node)
This commit is contained in:
parent
e7e395ed10
commit
1c840b41fd
8 changed files with 141 additions and 138 deletions
|
|
@ -6,7 +6,7 @@
|
|||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/07/26 10:55:52 by rparodi #+# #+# */
|
||||
/* Updated: 2024/08/01 13:48:22 by maiboyer ### ########.fr */
|
||||
/* Updated: 2024/08/02 12:54:11 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -74,13 +74,13 @@ sym_while_statement
|
|||
sym_word
|
||||
*/
|
||||
|
||||
t_ast_node ast_alloc(t_ast_node_kind kind);
|
||||
t_ast_node ast_alloc(t_ast_node_kind kind);
|
||||
|
||||
void ast_set_term(t_ast_node *node, t_ast_terminator_kind term)
|
||||
void ast_set_term(t_ast_node *node, t_ast_terminator_kind term)
|
||||
{
|
||||
t_ast_terminator_kind void_storage;
|
||||
t_ast_terminator_kind *ptr;
|
||||
t_ast_node val;
|
||||
t_ast_terminator_kind void_storage;
|
||||
t_ast_terminator_kind *ptr;
|
||||
t_ast_node val;
|
||||
|
||||
if (node == NULL)
|
||||
return ((void)printf("node == NULL\n"));
|
||||
|
|
@ -104,7 +104,7 @@ void ast_set_term(t_ast_node *node, t_ast_terminator_kind term)
|
|||
(void)(void_storage);
|
||||
}
|
||||
|
||||
t_vec_ast *_vec_command(t_ast_command *val, t_usize i)
|
||||
t_vec_ast *_vec_command(t_ast_command *val, t_usize i)
|
||||
{
|
||||
if (i == 0)
|
||||
return (&val->prefixes);
|
||||
|
|
@ -116,10 +116,10 @@ t_vec_ast *_vec_command(t_ast_command *val, t_usize i)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
void _add_negation(t_ast_node *node)
|
||||
void _add_negation(t_ast_node *node)
|
||||
{
|
||||
if (node == NULL || *node == NULL)
|
||||
return;
|
||||
return ;
|
||||
if ((*node)->kind == AST_PIPELINE)
|
||||
(*node)->data.pipeline.bang = true;
|
||||
if ((*node)->kind == AST_COMMAND)
|
||||
|
|
@ -132,12 +132,13 @@ void _add_negation(t_ast_node *node)
|
|||
(*node)->data.variable_assignment.bang = true;
|
||||
}
|
||||
|
||||
void _append_redirection(t_ast_node node, t_ast_node redirection)
|
||||
void _append_redirection(t_ast_node node, t_ast_node redirection)
|
||||
{
|
||||
t_vec_ast *vec;
|
||||
t_vec_ast *vec;
|
||||
|
||||
vec = NULL;
|
||||
if (!(redirection->kind == AST_FILE_REDIRECTION || redirection->kind == AST_HEREDOC_REDIRECTION))
|
||||
if (!(redirection->kind == AST_FILE_REDIRECTION || \
|
||||
redirection->kind == AST_HEREDOC_REDIRECTION))
|
||||
return (ast_free(redirection));
|
||||
if (node->kind == AST_CASE)
|
||||
vec = &node->data.case_.suffixes_redirections;
|
||||
|
|
@ -165,9 +166,9 @@ void _append_redirection(t_ast_node node, t_ast_node redirection)
|
|||
ast_free(redirection);
|
||||
}
|
||||
|
||||
t_ast_terminator_kind _select_term(t_parse_node node)
|
||||
t_ast_terminator_kind _select_term(t_parse_node node)
|
||||
{
|
||||
t_symbol symbol;
|
||||
t_symbol symbol;
|
||||
|
||||
symbol = ts_node_grammar_symbol(ts_node_child(node, 0));
|
||||
if (symbol == anon_sym_SEMI)
|
||||
|
|
@ -178,10 +179,10 @@ t_ast_terminator_kind _select_term(t_parse_node node)
|
|||
return (AST_TERM_NONE);
|
||||
}
|
||||
|
||||
t_str _extract_str(t_parse_node self, t_const_str input)
|
||||
t_str _extract_str(t_parse_node self, t_const_str input)
|
||||
{
|
||||
t_usize start;
|
||||
t_usize end;
|
||||
t_usize start;
|
||||
t_usize end;
|
||||
t_str result;
|
||||
|
||||
start = ts_node_start_byte(self);
|
||||
|
|
@ -206,10 +207,10 @@ t_str _extract_str(t_parse_node self, t_const_str input)
|
|||
E_OP_LARGEST_SUFFIX, // ${var%%pattern}
|
||||
*/
|
||||
|
||||
t_ast_expansion_operator _extract_exp_op(t_parse_node self)
|
||||
t_ast_expansion_operator _extract_exp_op(t_parse_node self)
|
||||
{
|
||||
t_ast_expansion_operator kind;
|
||||
t_symbol symbol;
|
||||
t_ast_expansion_operator kind;
|
||||
t_symbol symbol;
|
||||
|
||||
kind = E_OP_NONE;
|
||||
symbol = ts_node_grammar_symbol(self);
|
||||
|
|
@ -252,9 +253,9 @@ if (symbol == anon_sym_GT_PIPE)
|
|||
if (symbol == anon_sym_LT_GT)
|
||||
return (AST_REDIR_INPUT_OUTPUT);
|
||||
*/
|
||||
t_ast_redirection_kind _get_redirection_op(t_parse_node self)
|
||||
t_ast_redirection_kind _get_redirection_op(t_parse_node self)
|
||||
{
|
||||
t_symbol symbol;
|
||||
t_symbol symbol;
|
||||
|
||||
symbol = ts_node_grammar_symbol(self);
|
||||
if (symbol == anon_sym_LT)
|
||||
|
|
@ -269,9 +270,9 @@ t_ast_redirection_kind _get_redirection_op(t_parse_node self)
|
|||
}
|
||||
|
||||
// RAPH
|
||||
t_ast_arithmetic_operator _parse_operator(t_parse_node self)
|
||||
t_ast_arithmetic_operator _parse_operator(t_parse_node self)
|
||||
{
|
||||
t_symbol symbol;
|
||||
t_symbol symbol;
|
||||
|
||||
symbol = ts_node_grammar_symbol(self);
|
||||
if (symbol == anon_sym_PLUS)
|
||||
|
|
@ -293,48 +294,48 @@ t_ast_arithmetic_operator _parse_operator(t_parse_node self)
|
|||
return (me_abort("invalid arithmetic operator"), 0);
|
||||
}
|
||||
|
||||
t_error ast_from_node(t_parse_node node, t_const_str input, t_ast_node *out);
|
||||
t_error ast_from_node(t_parse_node node, t_const_str input, t_ast_node *out);
|
||||
|
||||
/* FUNCTION THAT ARE DONE */
|
||||
|
||||
t_error build_sym_case_item(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_case_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_command(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_command_name(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_comment(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_compound_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_elif_clause(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_else_clause(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_extglob_pattern(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_file_redirect(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_for_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_function_definition(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_if_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_list(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_negated_command(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_number(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_pipeline(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_program(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_raw_string(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_redirected_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_regex(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_simple_expansion(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_string_content(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_subshell(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_variable_assignment(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_while_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_word(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_expansion(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_command_substitution(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_case_item(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_case_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_command(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_command_name(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_comment(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_compound_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_elif_clause(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_else_clause(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_extglob_pattern(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_file_redirect(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_for_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_function_definition(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_if_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_list(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_negated_command(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_number(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_pipeline(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_program(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_raw_string(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_redirected_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_regex(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_simple_expansion(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_string_content(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_subshell(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_variable_assignment(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_while_statement(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_word(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_expansion(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_command_substitution(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
|
||||
/* FUNCTION DONE BUT BY RAPH */
|
||||
t_error build_sym_arithmetic_binary_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_literal(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_parenthesized_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_postfix_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_ternary_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_unary_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_expansion(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_binary_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_literal(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_parenthesized_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_postfix_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_ternary_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_unary_expression(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
t_error build_sym_arithmetic_expansion(t_parse_node self, t_const_str input, t_ast_node *out);
|
||||
|
||||
/* FUNCTION THAT ARE NOT DONE */
|
||||
|
||||
|
|
|
|||
15
flake.lock
generated
15
flake.lock
generated
|
|
@ -227,14 +227,17 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
|
||||
"path": "/nix/store/qgbn0imyridkb9527v6gnv6z3jzzprb9-source",
|
||||
"type": "path"
|
||||
"lastModified": 1722523718,
|
||||
"narHash": "sha256-QygJr6Nk5Fuc9LNGcdyiqAchIwTzN/9m/3cVJp3qH/4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "849492e6e2fae04a8add2e2fe692503f96ad1587",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
description = "Flake utils demo";
|
||||
|
||||
inputs.nixpkgs.url = "github:nixos/nixpkgs";
|
||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||
inputs.generic_c.url = "github:Maix0/generic_c";
|
||||
inputs.c_formatter_42.url = "github:Maix0/c_formatter_42-flake";
|
||||
|
|
@ -40,9 +41,6 @@
|
|||
c_formatter_42.packages.${system}.default
|
||||
llvmPackages.bintools
|
||||
norminette
|
||||
rust-bin.stable.latest.default
|
||||
#(tree-sitter.override {webUISupport = true;})
|
||||
nodejs
|
||||
];
|
||||
VALGRIND_INC_OPT = "${pkgs.valgrind.dev}/include";
|
||||
ASAN_OPTIONS = "strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1";
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue