From 8272d72997f0869cc848dfce790fad62d51a201b Mon Sep 17 00:00:00 2001 From: maix0 Date: Sat, 14 Sep 2024 14:38:00 +0000 Subject: [PATCH] update: fixed an issue --- Filelist.sh.mk | 4 ++-- allocator/Filelist.aq.mk | 4 ++-- ast/Filelist.ast.mk | 8 ++++---- exec/Filelist.exec.mk | 14 +++++++------- exec/src/run_ast/_ast_into_str.c | 4 +--- exec/src/run_ast/_ast_into_str4.c | 4 +++- line/Filelist.line.mk | 4 ++-- parser/Filelist.parser.mk | 1 + stdme/Filelist.me.mk | 10 +++++----- 9 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Filelist.sh.mk b/Filelist.sh.mk index 0717d0c1..2a7c700f 100644 --- a/Filelist.sh.mk +++ b/Filelist.sh.mk @@ -1,8 +1,8 @@ SRC_FILES = \ -env \ _env_norm_helper \ -ft_exit \ _helper_main \ +env \ +ft_exit \ main \ node/node \ signal_handler \ diff --git a/allocator/Filelist.aq.mk b/allocator/Filelist.aq.mk index 63698d77..ead60e1c 100644 --- a/allocator/Filelist.aq.mk +++ b/allocator/Filelist.aq.mk @@ -9,11 +9,11 @@ me_alloc/merge_blocks \ me_alloc/pages \ me_alloc/realloc \ vg/dummy_block \ +vg/dummy_mem_status \ vg/dummy_mempool \ vg/dummy_mempool_bis \ -vg/dummy_mem_status \ vg/valgrind_block \ +vg/valgrind_mem_status \ vg/valgrind_mempool \ vg/valgrind_mempool_bis \ -vg/valgrind_mem_status \ diff --git a/ast/Filelist.ast.mk b/ast/Filelist.ast.mk index 327e50c7..00c506a1 100644 --- a/ast/Filelist.ast.mk +++ b/ast/Filelist.ast.mk @@ -1,4 +1,8 @@ SRC_FILES = \ +_here_doc \ +_not_done_boucle_print \ +_not_done_function \ +_not_done_scripting_print \ ast_alloc/ast_alloc \ ast_alloc/ast_alloc_scripting \ ast_free/ast_free \ @@ -19,10 +23,6 @@ from_node/other_node \ from_node/redirect_node \ from_node/scripting_node \ from_node/string_node \ -_here_doc \ -_not_done_boucle_print \ -_not_done_function \ -_not_done_scripting_print \ print_ast/ast_print \ print_ast/ast_print_arithmetic \ print_ast/ast_print_command \ diff --git a/exec/Filelist.exec.mk b/exec/Filelist.exec.mk index c9f88f8f..694e0d16 100644 --- a/exec/Filelist.exec.mk +++ b/exec/Filelist.exec.mk @@ -1,33 +1,33 @@ SRC_FILES = \ -builtins/cd \ builtins/_debug \ +builtins/cd \ builtins/echo \ builtins/env \ builtins/exit \ builtins/export \ builtins/pwd \ builtins/unset \ -run_arithmetic/arithmetic \ -run_arithmetic/arithmetic_operation \ run_arithmetic/_get_op \ -run_arithmetic/operator_bis \ run_arithmetic/_run_arith \ run_arithmetic/_to_ast_node \ +run_arithmetic/arithmetic \ +run_arithmetic/arithmetic_operation \ +run_arithmetic/operator_bis \ run_ast/_ast_into_str \ run_ast/_ast_into_str2 \ run_ast/_ast_into_str3 \ run_ast/_ast_into_str4 \ +run_ast/_run_exit_code \ +run_ast/_run_exp_operators \ +run_ast/_spawn_cmd \ run_ast/run_builtins \ run_ast/run_cmd_sub \ run_ast/run_command \ -run_ast/_run_exit_code \ run_ast/run_expansion \ run_ast/run_expansion_builtin \ -run_ast/_run_exp_operators \ run_ast/run_list \ run_ast/run_pipeline \ run_ast/run_program \ run_ast/run_subshell \ run_ast/run_words \ -run_ast/_spawn_cmd \ diff --git a/exec/src/run_ast/_ast_into_str.c b/exec/src/run_ast/_ast_into_str.c index 6152ece8..cb3fd05b 100644 --- a/exec/src/run_ast/_ast_into_str.c +++ b/exec/src/run_ast/_ast_into_str.c @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/14 12:26:51 by maiboyer #+# #+# */ -/* Updated: 2024/09/14 12:46:11 by maiboyer ### ########.fr */ +/* Updated: 2024/09/14 14:37:25 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -116,8 +116,6 @@ t_error _ast_into_str(t_ast_node self, t_state *state, t_vec_str *append) return (_exp_into_str(self, state, append)); if (self->kind == AST_ARITHMETIC_EXPANSION) return (_arith_into_str(self, state, append)); - if (self->kind == AST_COMMAND_SUBSTITUTION) - return (_cmd_into_str(self, state, append)); if (self->kind == AST_WORD) return (_word_into_str(self, state, append)); if (self->kind == AST_RAW_STRING) diff --git a/exec/src/run_ast/_ast_into_str4.c b/exec/src/run_ast/_ast_into_str4.c index a0a87ed1..27c59f44 100644 --- a/exec/src/run_ast/_ast_into_str4.c +++ b/exec/src/run_ast/_ast_into_str4.c @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/14 12:26:51 by maiboyer #+# #+# */ -/* Updated: 2024/09/14 12:46:00 by maiboyer ### ########.fr */ +/* Updated: 2024/09/14 14:37:04 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,3 +53,5 @@ t_error _arith_into_str(t_ast_node self, t_state *state, t_vec_str *append) return (ERROR); return (NO_ERROR); } + + diff --git a/line/Filelist.line.mk b/line/Filelist.line.mk index 2c93bfb5..4d84cc2e 100644 --- a/line/Filelist.line.mk +++ b/line/Filelist.line.mk @@ -2,11 +2,11 @@ SRC_FILES = \ line \ line_edit_actions \ line_edit_actions2 \ -line_editing \ -line_editing2 \ line_edit_mode \ line_edit_mode_interal \ line_edit_mode_specific_key \ +line_editing \ +line_editing2 \ line_globals \ line_history \ line_internals \ diff --git a/parser/Filelist.parser.mk b/parser/Filelist.parser.mk index c1d3e551..408fd0ab 100644 --- a/parser/Filelist.parser.mk +++ b/parser/Filelist.parser.mk @@ -72,6 +72,7 @@ subtree/subtree_funcs \ subtree/subtree_helper \ subtree/subtree_new \ subtree/subtree_summarize \ +subtree/subtree_summarize_loop \ subtree/subtree_vec_helper \ tree/tree_funcs1 \ tree/tree_funcs2 \ diff --git a/stdme/Filelist.me.mk b/stdme/Filelist.me.mk index 7f234e90..03b7c42f 100644 --- a/stdme/Filelist.me.mk +++ b/stdme/Filelist.me.mk @@ -35,10 +35,10 @@ fs/fs_internal \ fs/getters \ fs/putfd \ gnl/get_next_line \ -hash/hasher \ hash/hash_signed \ hash/hash_str \ hash/hash_unsigned \ +hash/hasher \ hash/sip/sip13 \ hash/sip/sip_utils \ hash/sip/sip_utils2 \ @@ -86,10 +86,6 @@ printf/printf \ printf/printf_fd \ printf/printf_str \ printf/vprintf \ -string/mod \ -string/string_insert \ -string/string_remove \ -string/string_reserve \ str/str_clone \ str/str_compare \ str/str_find_chr \ @@ -106,6 +102,10 @@ str/str_n_find_str \ str/str_split \ str/str_substring \ str/str_trim \ +string/mod \ +string/string_insert \ +string/string_remove \ +string/string_reserve \ GEN_FILES = \ convert/i16_to_str \