From 567192b77194a5f5c66e70e424e94d18a86bb845 Mon Sep 17 00:00:00 2001 From: "william.valenduc" Date: Thu, 29 Jan 2026 11:18:33 +0000 Subject: [PATCH 01/33] feat(vars): unit tests --- tests/unit/utils/vars.c | 85 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 tests/unit/utils/vars.c diff --git a/tests/unit/utils/vars.c b/tests/unit/utils/vars.c new file mode 100644 index 0000000..73784cf --- /dev/null +++ b/tests/unit/utils/vars.c @@ -0,0 +1,85 @@ +#define _POSIX_C_SOURCE 200809L +#include "../../../src/utils/vars/vars.h" + +#include +#include +#include +#include +#include + +#include "../../../src/utils/hash_map/hash_map.h" +#include "../../../src/utils/string_utils/string_utils.h" + +TestSuite(utils_vars); + +Test(utils_vars, init_free) +{ + struct hash_map *map = vars_init(); + cr_expect_not_null(map); + hash_map_free(&map); +} + +Test(utils_vars, get_defaults) +{ + struct hash_map *map = vars_init(); + cr_expect_not_null(map); + cr_assert_str_eq(get_var(map, "?"), "0"); + char int_str[11]; + int_to_str((int)getpid(), int_str); + cr_assert_str_eq(get_var(map, "$"), int_str); + int_to_str((int)getuid(), int_str); + cr_assert_str_eq(get_var(map, "UID"), int_str); + + hash_map_free(&map); +} + +Test(utils_vars, set_vars) +{ + struct hash_map *map = vars_init(); + cr_expect_not_null(map); + set_var_copy(map, "key1", "value1"); + cr_assert_str_eq(get_var(map, "key1"), "value1"); + set_var_copy(map, "key2", "value2"); + cr_assert_str_eq(get_var(map, "key2"), "value2"); + + hash_map_free(&map); +} + +Test(utils_vars, get_env_vars) +{ + struct hash_map *map = vars_init(); + cr_expect_not_null(map); + cr_assert_eq(get_var_or_env(map, "ENV_TEST"), NULL); + setenv("ENV_TEST", "value1", 0); + cr_assert_str_eq(get_var_or_env(map, "ENV_TEST"), "value1"); + setenv("ENV_TEST", "value2", 1); + cr_assert_str_eq(get_var_or_env(map, "ENV_TEST"), "value2"); + + hash_map_free(&map); +} + +Test(utils_vars, set_vars_update) +{ + struct hash_map *map = vars_init(); + cr_expect_not_null(map); + set_var_copy(map, "key", "value1"); + cr_assert_str_eq(get_var(map, "key"), "value1"); + set_var_copy(map, "key", "value2"); + cr_assert_str_eq(get_var(map, "key"), "value2"); + + hash_map_free(&map); +} + +Test(utils_vars, set_vars_int) +{ + struct hash_map *map = vars_init(); + cr_expect_not_null(map); + set_var_int(map, "key1", 100); + cr_assert_str_eq(get_var(map, "key1"), "100"); + set_var_int(map, "key1", 200); + cr_assert_str_eq(get_var(map, "key1"), "200"); + set_var_int(map, "key2", 10); + cr_assert_str_eq(get_var(map, "key2"), "10"); + + hash_map_free(&map); +} From 4870caa45914ecd5086fa2f364b61d784df70853 Mon Sep 17 00:00:00 2001 From: Matteo Flebus Date: Fri, 30 Jan 2026 20:18:10 +0100 Subject: [PATCH 02/33] fix(lexer): and is now detected properly --- src/lexer/lexer_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c index 02f0a3f..3c6c361 100644 --- a/src/lexer/lexer_utils.c +++ b/src/lexer/lexer_utils.c @@ -298,7 +298,7 @@ ssize_t len_op_sepchar(char *stream, ssize_t i) return 2; // AND - if (stream[i] == '|' && stream[i + 1] == '|') + if (stream[i] == '&' && stream[i + 1] == '&') return 2; // special chars From 828b0e8be30104cbcca4638840d125ac358805e8 Mon Sep 17 00:00:00 2001 From: Matteo Flebus Date: Fri, 30 Jan 2026 20:28:38 +0100 Subject: [PATCH 03/33] fix: coverage tests and hash_map_free on NULL --- src/Makefile.am | 2 +- src/utils/hash_map/hash_map.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3015877..210cac1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,13 +36,13 @@ check_PROGRAMS = testsuite testsuite_SOURCES = ../tests/unit/utils/utils_tests.c \ ../tests/unit/expansion/parse_var.c \ - ../tests/unit/io_backend/io_backend.c \ ../tests/unit/utils/args.c \ ../tests/unit/utils/hash_map.c \ ../tests/unit/utils/insert_into.c # ../tests/unit/lexer/lexer_tests.c # ../tests/unit/expansion/expand.c +# ../tests/unit/io_backend/io_backend.c testsuite_CPPFLAGS = $(42sh_CPPFLAGS) diff --git a/src/utils/hash_map/hash_map.c b/src/utils/hash_map/hash_map.c index 6f9a513..b07b63d 100644 --- a/src/utils/hash_map/hash_map.c +++ b/src/utils/hash_map/hash_map.c @@ -116,8 +116,8 @@ void hash_map_free(struct hash_map **hash_map) } free((*hash_map)->data); free(*hash_map); + *hash_map = NULL; } - *hash_map = NULL; } void hash_map_foreach(struct hash_map *hash_map, From 9e522b2a68247f54c49dca5177a8ee3fc407009c Mon Sep 17 00:00:00 2001 From: "Gu://em_" Date: Fri, 30 Jan 2026 22:55:07 +0100 Subject: [PATCH 04/33] feat: lexer support for loops keywords --- src/lexer/lexer_utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c index 3c6c361..babf9da 100644 --- a/src/lexer/lexer_utils.c +++ b/src/lexer/lexer_utils.c @@ -72,6 +72,16 @@ static void set_token_keyword(struct token *tok, char *begin, ssize_t size) tok->type = TOKEN_ELSE; else if (strncmp(begin, "elif", size) == 0 && size == 4) tok->type = TOKEN_ELIF; + else if (strncmp(begin, "for", size) == 0 && size == 3) + tok->type = TOKEN_FOR; + else if (strncmp(begin, "while", size) == 0 && size == 5) + tok->type = TOKEN_WHILE; + else if (strncmp(begin, "until", size) == 0 && size == 4) + tok->type = TOKEN_UNTIL; + else if (strncmp(begin, "do", size) == 0 && size == 2) + tok->type = TOKEN_DO; + else if (strncmp(begin, "done", size) == 0 && size == 4) + tok->type = TOKEN_DONE; else if (strncmp(begin, "export", size) == 0 && size == 6) tok->type = TOKEN_EXPORT; From f31fca4204c5036b843687bc7091b46bada06494 Mon Sep 17 00:00:00 2001 From: "Gu://em_" Date: Fri, 30 Jan 2026 23:43:49 +0100 Subject: [PATCH 05/33] feat: full while/until loops support, important bug fixes and more tests --- src/execution/execution.c | 6 +-- src/execution/execution_helpers.c | 14 ++++-- src/execution/execution_helpers.h | 1 + src/parser/grammar.c | 84 +++++++++++++++++++++---------- src/utils/ast/ast.c | 6 +++ tests/functional/run-tests.sh | 11 ++-- 6 files changed, 85 insertions(+), 37 deletions(-) diff --git a/src/execution/execution.c b/src/execution/execution.c index cf751f7..46bbfcb 100644 --- a/src/execution/execution.c +++ b/src/execution/execution.c @@ -1,17 +1,13 @@ #define _POSIX_C_SOURCE 200809L #include "execution.h" -#include #include #include -#include -#include #include #include #include #include "../expansion/expansion.h" -#include "../utils/ast/ast.h" #include "../utils/hash_map/hash_map.h" // Refactored: delegates to helpers in execution_helpers.c @@ -40,6 +36,8 @@ int execution(struct ast *ast, struct hash_map *vars) return exec_ast_list(ast_get_list(ast), vars); case AST_AND_OR: return exec_ast_and_or(ast_get_and_or(ast), vars); + case AST_LOOP: + return exec_ast_loop(ast_get_loop(ast), vars); default: return 127; } diff --git a/src/execution/execution_helpers.c b/src/execution/execution_helpers.c index 9a72c10..e65c0d1 100644 --- a/src/execution/execution_helpers.c +++ b/src/execution/execution_helpers.c @@ -1,7 +1,6 @@ #define _POSIX_C_SOURCE 200809L #include "execution_helpers.h" -#include #include #include #include @@ -9,8 +8,6 @@ #include #include -#include "../expansion/expansion.h" -#include "../utils/ast/ast.h" #include "../utils/hash_map/hash_map.h" #include "../utils/lists/lists.h" #include "../utils/vars/vars.h" @@ -275,6 +272,17 @@ void unset_all_redir(struct list *redir_list) } } +int exec_ast_loop(struct ast_loop *loop_node, struct hash_map *vars) +{ + int res = 0; + while (execution(loop_node->condition, vars) == 0) + { + res = execution(loop_node->body, vars); + } + + return res; +} + // --- Builtins --- static int builtin_echo(char **argv) diff --git a/src/execution/execution_helpers.h b/src/execution/execution_helpers.h index ebf6858..1716179 100644 --- a/src/execution/execution_helpers.h +++ b/src/execution/execution_helpers.h @@ -8,6 +8,7 @@ int exec_ast_command(struct ast_command *command, struct hash_map *vars); int exec_ast_if(struct ast_if *if_node, struct hash_map *vars); int exec_ast_list(struct ast_list *list_node, struct hash_map *vars); int exec_ast_and_or(struct ast_and_or *ao_node, struct hash_map *vars); +int exec_ast_loop(struct ast_loop *loop_node, struct hash_map *vars); void unset_all_redir(struct list *redir_list); #endif // EXECUTION_HELPERS_H diff --git a/src/parser/grammar.c b/src/parser/grammar.c index 0680a79..e2a4887 100644 --- a/src/parser/grammar.c +++ b/src/parser/grammar.c @@ -101,17 +101,13 @@ static void add_first_redir(void) add_first(RULE_REDIRECTION, TOKEN_REDIR_RIGHT_PIPE); } -// === Functions - -int grammar_init(void) +// Adds only direct tokens to rules firsts into the firsts map +static void add_firsts_tokens(void) { - // Initialize the firsts map - bool success = init_firsts_map(); - if (success != true) - return false; - - // Populate the firsts map - // TODO CHECK ORDER + // Redirection + add_first_redir(); + // %RIP Matteo 30/01/2026 + // %RAX Guillem 30/01/2026 hehe // If add_first(RULE_IF, TOKEN_IF); @@ -127,7 +123,7 @@ int grammar_init(void) add_first(RULE_WHILE, TOKEN_WHILE); // Until - add_first(RULE_WHILE, TOKEN_UNTIL); + add_first(RULE_UNTIL, TOKEN_UNTIL); // Case add_first(RULE_CASE, TOKEN_CASE); @@ -136,33 +132,57 @@ int grammar_init(void) add_first(RULE_CASE_ITEM, TOKEN_LEFT_PAREN); add_first(RULE_CASE_ITEM, TOKEN_WORD); - // Case clause - add_firsts(RULE_CASE_CLAUSE, first(RULE_CASE_ITEM)); + // Shell command + add_first(RULE_SHELL_COMMAND, TOKEN_LEFT_BRACKET); + add_first(RULE_SHELL_COMMAND, TOKEN_LEFT_PAREN); - // Redirection - add_first_redir(); - // %RIP Matteo 30/01/2026 - // %RAX Guillem 30/01/2026 hehe + // Simple command + add_first(RULE_SIMPLE_COMMAND, TOKEN_WORD); + add_first(RULE_SIMPLE_COMMAND, TOKEN_EXPORT); // Element add_first(RULE_ELEMENT, TOKEN_WORD); add_first(RULE_ELEMENT, TOKEN_ASSIGNMENT_WORD); - add_firsts(RULE_ELEMENT, first(RULE_REDIRECTION)); // Prefix add_first(RULE_PREFIX, TOKEN_ASSIGNMENT_WORD); + + // Pipeline + add_first(RULE_PIPELINE, TOKEN_WORD); + + // Compound list + add_first(RULE_COMPOUND_LIST, TOKEN_NEWLINE); + + // Input + add_first(RULE_INPUT, TOKEN_NEWLINE); + add_first(RULE_INPUT, TOKEN_EOF); + + // Funcdec + add_first(RULE_FUNCDEC, TOKEN_WORD); +} + +// Adds only firsts that depend on other rules to the firsts map +// WARNING order matters +static void add_firsts_rec(void) +{ + // Case clause + add_firsts(RULE_CASE_CLAUSE, first(RULE_CASE_ITEM)); + + // Element + add_firsts(RULE_ELEMENT, first(RULE_REDIRECTION)); + + // Prefix add_firsts(RULE_PREFIX, first(RULE_REDIRECTION)); // Shell command add_firsts(RULE_SHELL_COMMAND, first(RULE_IF)); + add_firsts(RULE_SHELL_COMMAND, first(RULE_FOR)); + add_firsts(RULE_SHELL_COMMAND, first(RULE_WHILE)); + add_firsts(RULE_SHELL_COMMAND, first(RULE_UNTIL)); + add_firsts(RULE_SHELL_COMMAND, first(RULE_CASE)); // Simple command add_firsts(RULE_SIMPLE_COMMAND, first(RULE_PREFIX)); - add_first(RULE_SIMPLE_COMMAND, TOKEN_WORD); - add_first(RULE_SIMPLE_COMMAND, TOKEN_EXPORT); - - // Funcdec - add_first(RULE_FUNCDEC, TOKEN_WORD); // Command add_firsts(RULE_COMMAND, first(RULE_SIMPLE_COMMAND)); @@ -170,23 +190,33 @@ int grammar_init(void) add_firsts(RULE_COMMAND, first(RULE_FUNCDEC)); // Pipeline - add_first(RULE_PIPELINE, TOKEN_WORD); add_firsts(RULE_PIPELINE, first(RULE_COMMAND)); // And Or add_firsts(RULE_AND_OR, first(RULE_PIPELINE)); // Compound list - add_first(RULE_COMPOUND_LIST, TOKEN_NEWLINE); add_firsts(RULE_COMPOUND_LIST, first(RULE_AND_OR)); // List add_firsts(RULE_LIST, first(RULE_AND_OR)); // Input - add_first(RULE_INPUT, TOKEN_NEWLINE); - add_first(RULE_INPUT, TOKEN_EOF); add_firsts(RULE_INPUT, first(RULE_LIST)); +} + +// === Functions + +int grammar_init(void) +{ + // Initialize the firsts map + bool success = init_firsts_map(); + if (success != true) + return false; + + // Populate the firsts map + add_firsts_tokens(); + add_firsts_rec(); return true; } diff --git a/src/utils/ast/ast.c b/src/utils/ast/ast.c index 95a2f15..5d64f7d 100644 --- a/src/utils/ast/ast.c +++ b/src/utils/ast/ast.c @@ -42,6 +42,12 @@ void ast_free(struct ast **node) case AST_ASSIGNMENT: ast_free_assignment(ast_get_assignment(*node)); break; + case AST_NEG: + ast_free_neg(ast_get_neg(*node)); + break; + case AST_LOOP: + ast_free_loop(ast_get_loop(*node)); + break; case AST_VOID: case AST_END: break; diff --git a/tests/functional/run-tests.sh b/tests/functional/run-tests.sh index 5119aad..42654da 100755 --- a/tests/functional/run-tests.sh +++ b/tests/functional/run-tests.sh @@ -377,9 +377,14 @@ test_str "If with negation" "if ! false; then echo Yes; fi" test_str "If faut aller niquer sa mere" "if false; ! false; then echo Embrasse moi; fi" -echo -e "\n$BBlue=== For/While ===$Color_Off" -test_str "While loop" "i=0; while [ \$i -lt 3 ]; do echo \$i; i=\$((i+1)); done" -test_str "Until loop" "i=0; until [ \$i -ge 3 ]; do echo \$i; i=\$((i+1)); done" +echo -e "\n$BBlue=== Loops ===$Color_Off" +test_str "While false" "while false; do false; done" +test_str "While(false) true" "while false; do true; done" +test_str "Until(true) false" "until true; do false; done" +test_str "Until true" "until true; do true; done" +# test_str "While var" "a=2; while [ \$a -eq 2 ]; do \$a=3; done" +test_str "While arithmetic" "i=0; while [ \$i -lt 3 ]; do echo \$i; i=\$((i+1)); done" +test_str "Until arithmetic" "i=0; until [ \$i -ge 3 ]; do echo \$i; i=\$((i+1)); done" test_str "While break" "while true; do echo break; break; done" test_str "While continue" "i=0; while [ \$i -lt 3 ]; do i=\$((i+1)); if [ \$i -eq 2 ]; then continue; fi; echo \$i; done" test_str "For loop basic" "for i in a b c; do echo \$i; done" From 64e3fb26c329c927a088d3be2339273f2115b62b Mon Sep 17 00:00:00 2001 From: Matteo Flebus Date: Sat, 31 Jan 2026 10:48:58 +0100 Subject: [PATCH 06/33] feat(tests): sh file for function testing --- tests/func.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tests/func.sh diff --git a/tests/func.sh b/tests/func.sh new file mode 100644 index 0000000..dbd0590 --- /dev/null +++ b/tests/func.sh @@ -0,0 +1,21 @@ +func() +{ + echo hello +} + +arg_func() +{ + echo first argument is "$1" +} + +func_in_func() +{ + func +} + +func_one_line() { echo "this is on one line"; } + +func +arg_func "HERE" +func_in_func +func_one_line From d95b0fd220fa8f395b8945b82dadf4f95fa69dff Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 10:59:45 +0100 Subject: [PATCH 07/33] fix: lexer_context is now freed on errors --- src/lexer/lexer_utils.c | 15 +++++++-------- src/lexer/lexer_utils.h | 2 +- src/main.c | 15 ++++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c index babf9da..6c88a0c 100644 --- a/src/lexer/lexer_utils.c +++ b/src/lexer/lexer_utils.c @@ -257,16 +257,15 @@ struct token *new_token(char *begin, ssize_t size, struct token_info *info) return tok; } -void destroy_lexer_context(struct lexer_context **ctx) +void destroy_lexer_context(struct lexer_context *ctx) { - if (ctx == NULL || *ctx == NULL) + if (ctx == NULL) return; - if ((*ctx)->previous_token != NULL) - free((*ctx)->previous_token); - if ((*ctx)->current_token != NULL) - free((*ctx)->current_token); - free(*ctx); - *ctx = NULL; + if (ctx->previous_token != NULL) + free(ctx->previous_token); + if (ctx->current_token != NULL) + free(ctx->current_token); + free(ctx); } void free_token(struct token **tok) diff --git a/src/lexer/lexer_utils.h b/src/lexer/lexer_utils.h index 364f7cc..32b3793 100644 --- a/src/lexer/lexer_utils.h +++ b/src/lexer/lexer_utils.h @@ -16,7 +16,7 @@ struct lexer_context /* @brief: frees all fields of ctx and sets ctx to NULL. */ -void destroy_lexer_context(struct lexer_context **ctx); +void destroy_lexer_context(struct lexer_context *ctx); enum lexing_mode { diff --git a/src/main.c b/src/main.c index 6b0f59f..1f0fc93 100644 --- a/src/main.c +++ b/src/main.c @@ -21,9 +21,10 @@ /* @brief: frees the hash map. * @return: always ERR_INPUT_PROCESSING. */ -static int err_input(struct hash_map **vars) +static int err_input(struct hash_map **vars, struct lexer_context *ctx) { hash_map_free(vars); + destroy_lexer_context(ctx); return ERR_INPUT_PROCESSING; } @@ -64,7 +65,7 @@ static int main_loop(struct lexer_context *ctx, struct args_options *options, } if (command_ast == NULL) - return err_input(&vars); + return err_input(&vars, ctx); // === free @@ -90,7 +91,7 @@ int main(int argc, char **argv) if (return_code != 0) { print_usage(stderr, argv[0]); - return err_input(&vars); + return err_input(&vars, NULL); } // args_print(&options); @@ -105,7 +106,7 @@ int main(int argc, char **argv) { fprintf(stderr, "Error: Failed to configure IO Backend from arguments\n"); - return err_input(&vars); + return err_input(&vars, NULL); } // Init IO Backend (with the context struct) @@ -115,13 +116,13 @@ int main(int argc, char **argv) fprintf(stderr, "Error: IO Backend initialization failed with code %d\n", return_code); - return err_input(&vars); + return err_input(&vars, NULL); } // init lexer context - struct lexer_context ctx = { 0 }; + struct lexer_context *ctx = calloc(1, sizeof(struct lexer_context)); - return_code = main_loop(&ctx, &options, vars); + return_code = main_loop(ctx, &options, vars); return return_code; } From 5de6ef2bb58ed15c906b1beee0b4310e3f4e4d8c Mon Sep 17 00:00:00 2001 From: Matteo Flebus Date: Sat, 31 Jan 2026 11:02:19 +0100 Subject: [PATCH 08/33] fix: lexer_context also freed after normal execution... -_- --- src/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.c b/src/main.c index 1f0fc93..1b86854 100644 --- a/src/main.c +++ b/src/main.c @@ -72,6 +72,7 @@ static int main_loop(struct lexer_context *ctx, struct args_options *options, ast_free(&command_ast); parser_close(); hash_map_free(&vars); + destroy_lexer_context(ctx); return return_code; } From 4289700e2ef3c494021b7aff91e6be9f6def6615 Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 11:09:08 +0100 Subject: [PATCH 09/33] fix(lexer): destroy_lexer_context now fully functional --- src/lexer/lexer_utils.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c index 6c88a0c..1f40a69 100644 --- a/src/lexer/lexer_utils.c +++ b/src/lexer/lexer_utils.c @@ -259,12 +259,14 @@ struct token *new_token(char *begin, ssize_t size, struct token_info *info) void destroy_lexer_context(struct lexer_context *ctx) { + struct token *prev = ctx->previous_token; + struct token *cur = ctx->current_token; if (ctx == NULL) return; - if (ctx->previous_token != NULL) - free(ctx->previous_token); - if (ctx->current_token != NULL) - free(ctx->current_token); + if (prev != NULL) + free_token(&prev); + if (cur != NULL) + free_token(&cur); free(ctx); } From 93f280f59d1e091d9f2f752b7bb12bd1eff16925 Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 11:34:24 +0100 Subject: [PATCH 10/33] sh file to test loops --- tests/loops.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 tests/loops.sh diff --git a/tests/loops.sh b/tests/loops.sh new file mode 100755 index 0000000..b3d0b69 --- /dev/null +++ b/tests/loops.sh @@ -0,0 +1,15 @@ +echo "starting tests" + +while false; +do + echo "should NOT be printed" +done + +a='yes' +while [ "$a" -eq "yes" ]; +do + a="no" + echo "should be printed only once" +done; + +echo "tests done" From a550f9747ea8a67188f7533e10bbf62a277df1f7 Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 11:57:51 +0100 Subject: [PATCH 11/33] feat(ast): ast_function --- src/utils/ast/ast.c | 7 +++++-- src/utils/ast/ast_base.h | 3 ++- src/utils/ast/ast_function.c | 40 ++++++++++++++++++++++++++++++++++++ src/utils/ast/ast_function.h | 31 ++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 src/utils/ast/ast_function.c create mode 100644 src/utils/ast/ast_function.h diff --git a/src/utils/ast/ast.c b/src/utils/ast/ast.c index 5d64f7d..ee0f031 100644 --- a/src/utils/ast/ast.c +++ b/src/utils/ast/ast.c @@ -11,7 +11,7 @@ void ast_free(struct ast **node) { if (node == NULL || *node == NULL) { - perror( + fprintf(stderr, "WARNING: Internal error: failed to free AST node (NULL argument)"); return; } @@ -48,12 +48,15 @@ void ast_free(struct ast **node) case AST_LOOP: ast_free_loop(ast_get_loop(*node)); break; + case AST_FUNCTION: + ast_free_function(ast_get_function(*node)); + break; case AST_VOID: case AST_END: break; default: - perror("WARNING: Internal error: failed to free an AST node (Unknown " + fprintf(stderr, "WARNING: Internal error: failed to free an AST node (Unknown " "type)"); return; } diff --git a/src/utils/ast/ast_base.h b/src/utils/ast/ast_base.h index 71e4a38..e1c7b07 100644 --- a/src/utils/ast/ast_base.h +++ b/src/utils/ast/ast_base.h @@ -17,7 +17,8 @@ enum ast_type AST_PIPE, AST_NEG, AST_LOOP, - AST_ASSIGNMENT + AST_ASSIGNMENT, + AST_FUNCTION }; struct ast diff --git a/src/utils/ast/ast_function.c b/src/utils/ast/ast_function.c new file mode 100644 index 0000000..edd53e0 --- /dev/null +++ b/src/utils/ast/ast_function.c @@ -0,0 +1,40 @@ +#include "ast_function.h" + +#include +#include + +#include "ast_base.h" + +bool ast_is_function(struct ast *node) +{ + return node != NULL && node->type == AST_FUNCTION; +} + +struct ast_function *ast_get_function(struct ast *node) +{ + if (!ast_is_function(node)) + return NULL; + return (struct ast_function *)node->data; +} + +struct ast *ast_create_function(char *name, struct ast *value) +{ + struct ast_function *function_data = malloc(sizeof(struct ast_function)); + if (!function_data) + return NULL; + + function_data->name = strdup(name); + function_data->value = value; + + return ast_create(AST_FUNCTION, function_data); +} + +void ast_free_function(struct ast_function *function_data) +{ + if (function_data) + { + free(function_data->name); + ast_free(&function_data->value); + free(function_data); + } +} diff --git a/src/utils/ast/ast_function.h b/src/utils/ast/ast_function.h new file mode 100644 index 0000000..9294295 --- /dev/null +++ b/src/utils/ast/ast_function.h @@ -0,0 +1,31 @@ +#ifndef AST_FUNCTION_H +#define AST_FUNCTION_H + +struct ast_function +{ + char *name; + struct ast *value; +}; + + +/** + * Checks if the given AST node is an ast_function + */ +bool ast_is_function(struct ast *node); + +/** + * Retrieves the function data from the given AST node. + * Assumes that the node is of type AST_function. + */ +struct ast_function *ast_get_function(struct ast *node); + +/** + * Creates a new AST node representing an AST_function + */ +struct ast *ast_create_function(char *name, struct ast *value); +/* + * @brief: frees the given ast_function and sets the pointer to NULL. + */ +void ast_free_function(struct ast_function *function_data); + +#endif /* AST_FUNCTION_H */ From 3cd231f031a99cee823f4ab3a8e724abfff35db1 Mon Sep 17 00:00:00 2001 From: Matteo Flebus Date: Sat, 31 Jan 2026 12:53:23 +0100 Subject: [PATCH 12/33] fix: build and .sh test file for functions --- src/utils/Makefile.am | 3 ++- src/utils/ast/ast.c | 8 +++++--- src/utils/ast/ast.h | 1 + src/utils/ast/ast_function.c | 2 +- src/utils/ast/ast_function.h | 3 ++- src/utils/ast/ast_loop.h | 2 +- tests/func.sh | 0 7 files changed, 12 insertions(+), 7 deletions(-) mode change 100644 => 100755 tests/func.sh diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 085ae1b..17454d2 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -20,7 +20,8 @@ libutils_a_SOURCES = \ ast/ast_loop.c \ args/args.c \ vars/vars.c \ - ast/ast_assignment.c + ast/ast_assignment.c \ + ast/ast_function.c libutils_a_CPPFLAGS = -I$(top_srcdir)/src diff --git a/src/utils/ast/ast.c b/src/utils/ast/ast.c index ee0f031..5f5f65b 100644 --- a/src/utils/ast/ast.c +++ b/src/utils/ast/ast.c @@ -11,7 +11,8 @@ void ast_free(struct ast **node) { if (node == NULL || *node == NULL) { - fprintf(stderr, + fprintf( + stderr, "WARNING: Internal error: failed to free AST node (NULL argument)"); return; } @@ -56,8 +57,9 @@ void ast_free(struct ast **node) break; default: - fprintf(stderr, "WARNING: Internal error: failed to free an AST node (Unknown " - "type)"); + fprintf(stderr, + "WARNING: Internal error: failed to free an AST node (Unknown " + "type)"); return; } diff --git a/src/utils/ast/ast.h b/src/utils/ast/ast.h index 1ba949b..f0023f3 100644 --- a/src/utils/ast/ast.h +++ b/src/utils/ast/ast.h @@ -6,6 +6,7 @@ #include "ast_base.h" #include "ast_command.h" #include "ast_end.h" +#include "ast_function.h" #include "ast_if.h" #include "ast_list.h" #include "ast_loop.h" diff --git a/src/utils/ast/ast_function.c b/src/utils/ast/ast_function.c index edd53e0..b0356c1 100644 --- a/src/utils/ast/ast_function.c +++ b/src/utils/ast/ast_function.c @@ -23,7 +23,7 @@ struct ast *ast_create_function(char *name, struct ast *value) if (!function_data) return NULL; - function_data->name = strdup(name); + function_data->name = name; function_data->value = value; return ast_create(AST_FUNCTION, function_data); diff --git a/src/utils/ast/ast_function.h b/src/utils/ast/ast_function.h index 9294295..a16dc17 100644 --- a/src/utils/ast/ast_function.h +++ b/src/utils/ast/ast_function.h @@ -1,13 +1,14 @@ #ifndef AST_FUNCTION_H #define AST_FUNCTION_H +#include + struct ast_function { char *name; struct ast *value; }; - /** * Checks if the given AST node is an ast_function */ diff --git a/src/utils/ast/ast_loop.h b/src/utils/ast/ast_loop.h index 7c5ba6e..9718db1 100644 --- a/src/utils/ast/ast_loop.h +++ b/src/utils/ast/ast_loop.h @@ -24,7 +24,7 @@ struct ast_loop *ast_get_loop(struct ast *node); /** * Creates a new AST node representing a loop. */ -struct ast *ast_create_loop(struct ast* condition, struct ast* body); +struct ast *ast_create_loop(struct ast *condition, struct ast *body); /* * @brief: frees the given ast_loop and sets the pointer to NULL. diff --git a/tests/func.sh b/tests/func.sh old mode 100644 new mode 100755 From 132f4f3a539c012f4345d8c5a97947c524be3ba0 Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 13:24:44 +0100 Subject: [PATCH 13/33] feat(parser + ast): function parsing support --- src/parser/grammar_advanced.c | 51 ++++++++++++++++++++++++++++++++--- src/parser/grammar_advanced.h | 2 +- src/parser/grammar_basic.c | 1 - src/utils/ast/ast_function.c | 2 +- src/utils/ast/ast_function.h | 9 ++++--- 5 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/parser/grammar_advanced.c b/src/parser/grammar_advanced.c index 22e3b9b..9968ba6 100644 --- a/src/parser/grammar_advanced.c +++ b/src/parser/grammar_advanced.c @@ -149,12 +149,55 @@ struct ast *parse_prefix(struct lexer_context *ctx) } } -// TODO NOT IMPLEMENTED struct ast *parse_funcdec(struct lexer_context *ctx) { - (void)ctx; - perror("Error: usage of a not implemented function (parse_funcdec)"); - return NULL; + struct token *token = PEEK_TOKEN(); + struct ast *value = NULL; + char *func_name = NULL; + + if (token->type != TOKEN_WORD) + { + return NULL; + } + + // word -> func name + POP_TOKEN(); + func_name = strdup(token->data); + + // ( + token = PEEK_TOKEN(); + if (token->type != TOKEN_LEFT_PAREN) + { + free(func_name); + return NULL; + } + POP_TOKEN(); + + // ) + token = PEEK_TOKEN(); + if (token->type != TOKEN_RIGHT_PAREN) + { + free(func_name); + return NULL; + } + POP_TOKEN(); + token = PEEK_TOKEN(); + + // { \n } + while (token->type == TOKEN_NEWLINE) + { + POP_TOKEN(); + token = PEEK_TOKEN(); + } + + // shell_command -> value + value = parse_shell_command(ctx); + if (value == NULL) + { + free(name); + return NULL; + } + return ast_create_function(name, value); } struct ast *parse_for(struct lexer_context *ctx) diff --git a/src/parser/grammar_advanced.h b/src/parser/grammar_advanced.h index 2b9cc63..1b074ad 100644 --- a/src/parser/grammar_advanced.h +++ b/src/parser/grammar_advanced.h @@ -26,7 +26,7 @@ struct ast *parse_prefix(struct lexer_context *ctx); /* * @brief parses a funcdec rule - * @warning NOT IMPLEMENTED + * @warning Work in progress * * @code funcdec = WORD '(' ')' {'\n'} shell_command ; * diff --git a/src/parser/grammar_basic.c b/src/parser/grammar_basic.c index df103fc..d86abb6 100644 --- a/src/parser/grammar_basic.c +++ b/src/parser/grammar_basic.c @@ -223,7 +223,6 @@ struct ast *parse_command(struct lexer_context *ctx) { result = parse_shell_command(ctx); } - // WARNING funcdec seems to require a LL(2) parser else if (is_first(*token, RULE_FUNCDEC)) { result = parse_funcdec(ctx); diff --git a/src/utils/ast/ast_function.c b/src/utils/ast/ast_function.c index edd53e0..b0356c1 100644 --- a/src/utils/ast/ast_function.c +++ b/src/utils/ast/ast_function.c @@ -23,7 +23,7 @@ struct ast *ast_create_function(char *name, struct ast *value) if (!function_data) return NULL; - function_data->name = strdup(name); + function_data->name = name; function_data->value = value; return ast_create(AST_FUNCTION, function_data); diff --git a/src/utils/ast/ast_function.h b/src/utils/ast/ast_function.h index 9294295..f6171dc 100644 --- a/src/utils/ast/ast_function.h +++ b/src/utils/ast/ast_function.h @@ -9,18 +9,19 @@ struct ast_function /** - * Checks if the given AST node is an ast_function + * @brief: Checks if the given AST node is an ast_function */ bool ast_is_function(struct ast *node); /** - * Retrieves the function data from the given AST node. - * Assumes that the node is of type AST_function. + * @brief: Retrieves the function data from the given AST node. + * Assumes that the node is of type AST_function. */ struct ast_function *ast_get_function(struct ast *node); /** - * Creates a new AST node representing an AST_function + * @brief: Creates a new AST node representing an AST_function + * @warning: name must be already allocated. */ struct ast *ast_create_function(char *name, struct ast *value); /* From 567bd44fce12c9b5f7f3c039f142104f68bff9cf Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 13:26:02 +0100 Subject: [PATCH 14/33] fix(parser): typo --- src/parser/grammar_advanced.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parser/grammar_advanced.c b/src/parser/grammar_advanced.c index 9968ba6..ae652a1 100644 --- a/src/parser/grammar_advanced.c +++ b/src/parser/grammar_advanced.c @@ -194,10 +194,10 @@ struct ast *parse_funcdec(struct lexer_context *ctx) value = parse_shell_command(ctx); if (value == NULL) { - free(name); + free(func_name); return NULL; } - return ast_create_function(name, value); + return ast_create_function(func_name, value); } struct ast *parse_for(struct lexer_context *ctx) From 182e31b42ea5666f3fb522a08f681dfaff6332fa Mon Sep 17 00:00:00 2001 From: Jean <47366872+jean-voila@users.noreply.github.com> Date: Sat, 31 Jan 2026 15:40:46 +0100 Subject: [PATCH 15/33] fix(chaipa): Remove pretty print to avoid clang-tidy / added the options in echo --- src/execution/execution_helpers.c | 82 +++++++++++++++++++++++++++++-- src/main.c | 10 +--- src/utils/args/args.c | 13 ++--- src/utils/args/args.h | 2 +- src/utils/ast/ast.c | 3 +- src/utils/ast/ast.h | 5 -- tests/unit/utils/args.c | 25 ++++++---- 7 files changed, 106 insertions(+), 34 deletions(-) diff --git a/src/execution/execution_helpers.c b/src/execution/execution_helpers.c index e65c0d1..ebb833d 100644 --- a/src/execution/execution_helpers.c +++ b/src/execution/execution_helpers.c @@ -2,6 +2,7 @@ #include "execution_helpers.h" #include +#include #include #include #include @@ -285,20 +286,95 @@ int exec_ast_loop(struct ast_loop *loop_node, struct hash_map *vars) // --- Builtins --- +static void print_with_escapes(const char *str) +{ + while (*str) + { + if (*str == '\\') + { + str++; + if (*str == 'n') + putchar('\n'); + else if (*str == 't') + putchar('\t'); + else if (*str == '\\') + putchar('\\'); + else if (*str == 'a') + putchar('\a'); + else if (*str == 'b') + putchar('\b'); + else if (*str == 'f') + putchar('\f'); + else if (*str == 'r') + putchar('\r'); + else if (*str == 'v') + putchar('\v'); + else if (*str == 'c') + return; // stop printing + else + { + // unrecognized escape, print "\"" and the char + putchar('\\'); + if (*str) + putchar(*str); + } + } + else + { + putchar(*str); + } + str++; + } +} + static int builtin_echo(char **argv) { bool newline = true; + bool interpret_escapes = false; int i = 1; - if (argv[1] && strcmp(argv[1], "-n") == 0) + // Parse options + while (argv[i] && argv[i][0] == '-') { - newline = false; + char *opt = argv[i] + 1; // skip "-" + bool valid_option = false; + while (*opt) + { + if (*opt == 'n') + { + newline = false; + valid_option = true; + } + else if (*opt == 'e') + { + interpret_escapes = true; + valid_option = true; + } + else if (*opt == 'E') + { + interpret_escapes = false; + valid_option = true; + } + else + { + // invalid option so euh treat as regular argument + valid_option = false; + break; + } + opt++; + } + if (!valid_option) + break; // stop parsing options i++; } + // Print arguments for (; argv[i]; i++) { - printf("%s", argv[i]); + if (interpret_escapes) + print_with_escapes(argv[i]); + else + printf("%s", argv[i]); if (argv[i + 1]) printf(" "); } diff --git a/src/main.c b/src/main.c index 1b86854..02320b9 100644 --- a/src/main.c +++ b/src/main.c @@ -28,8 +28,7 @@ static int err_input(struct hash_map **vars, struct lexer_context *ctx) return ERR_INPUT_PROCESSING; } -static int main_loop(struct lexer_context *ctx, struct args_options *options, - struct hash_map *vars) +static int main_loop(struct lexer_context *ctx, struct hash_map *vars) { int return_code = SUCCESS; // init parser @@ -41,11 +40,6 @@ static int main_loop(struct lexer_context *ctx, struct args_options *options, // Retrieve and build first AST struct ast *command_ast = get_ast(ctx); - if (options->pretty_print) - { - ast_print_dot(command_ast); - } - // Main parse-execute loop while (command_ast != NULL && command_ast->type != AST_END) { @@ -123,7 +117,7 @@ int main(int argc, char **argv) // init lexer context struct lexer_context *ctx = calloc(1, sizeof(struct lexer_context)); - return_code = main_loop(ctx, &options, vars); + return_code = main_loop(ctx, vars); return return_code; } diff --git a/src/utils/args/args.c b/src/utils/args/args.c index c34599f..69374e2 100644 --- a/src/utils/args/args.c +++ b/src/utils/args/args.c @@ -67,7 +67,7 @@ int args_handler(int argc, char **argv, struct args_options *options, { options->type = INPUT_UNDEFINED; options->input_source = NULL; - options->pretty_print = false; + // options->pretty_print = false; options->verbose = false; struct list *args_list = NULL; @@ -76,11 +76,11 @@ int args_handler(int argc, char **argv, struct args_options *options, for (int i = 1; i < argc; i++) { - if (strcmp(argv[i], "--pretty-print") == 0) + /* if (strcmp(argv[i], "--pretty-print") == 0) { options->pretty_print = true; - } - else if (strcmp(argv[i], "--verbose") == 0) + } */ + if (strcmp(argv[i], "--verbose") == 0) { options->verbose = true; } @@ -138,7 +138,7 @@ void args_print(struct args_options *options) : "UNDEFINED"); printf("Input source: %s\n", options->input_source ? options->input_source : "NULL"); - printf("Pretty print: %s\n", options->pretty_print ? "true" : "false"); + // printf("Pretty print: %s\n", options->pretty_print ? "true" : "false"); printf("Verbose: %s\n", options->verbose ? "true" : "false"); } @@ -147,7 +147,8 @@ void print_usage(FILE *std, const char *program_name) fprintf(std, "Usage: %s [OPTIONS] [SCRIPT] [ARGUMENTS...]\n", program_name); fprintf(std, "Options:\n"); fprintf(std, " -c [SCRIPT] Execute the given command string.\n"); - fprintf(std, " --pretty-print Enable pretty printing of outputs.\n"); + // fprintf(std, " --pretty-print Enable pretty printing of + // outputs.\n"); fprintf(std, " --verbose Enable verbose mode.\n"); fprintf(std, "If no SCRIPT is provided, input is read from standard input.\n"); diff --git a/src/utils/args/args.h b/src/utils/args/args.h index 6eac20c..3c02fc4 100644 --- a/src/utils/args/args.h +++ b/src/utils/args/args.h @@ -22,7 +22,7 @@ struct args_options /** Type of the input source */ enum input_type type; /** Enable or disable pretty printing of outputs */ - bool pretty_print; + // bool pretty_print; /** Enable or disable verbose mode */ bool verbose; }; diff --git a/src/utils/ast/ast.c b/src/utils/ast/ast.c index 5f5f65b..5baaf6a 100644 --- a/src/utils/ast/ast.c +++ b/src/utils/ast/ast.c @@ -79,7 +79,7 @@ struct ast *ast_create(enum ast_type type, void *data) return node; } -// TODO handle new types (AST_WORD, AST_PIPE, etc.) +/* // TODO handle new types (AST_WORD, AST_PIPE, etc.) static void ast_print_dot_recursive(struct ast *node, FILE *out) { if (!node) @@ -170,3 +170,4 @@ void ast_print_dot(struct ast *ast) fprintf(dot_pipe, "}\n"); pclose(dot_pipe); } + */ \ No newline at end of file diff --git a/src/utils/ast/ast.h b/src/utils/ast/ast.h index f0023f3..12abee5 100644 --- a/src/utils/ast/ast.h +++ b/src/utils/ast/ast.h @@ -16,9 +16,4 @@ #include "ast_void.h" #include "ast_word.h" -/** - * Prints the Graphviz DOT representation of the given AST to stdout. - */ -void ast_print_dot(struct ast *ast); - #endif /* ! AST_H */ diff --git a/tests/unit/utils/args.c b/tests/unit/utils/args.c index 672f6e9..9f601bf 100644 --- a/tests/unit/utils/args.c +++ b/tests/unit/utils/args.c @@ -19,7 +19,7 @@ Test(utils_args, basic_command) int r = args_handler(argc, input, &options, vars); cr_expect(r == 0); - cr_expect(options.pretty_print == false); + // cr_expect(options.pretty_print == false); cr_expect(options.verbose == false); cr_expect(options.type == INPUT_CMD); cr_expect(eq(options.input_source, "echo Hello, World!")); @@ -30,14 +30,16 @@ Test(utils_args, basic_command_with_flags) { int argc = 5; struct args_options options; - char *input[] = { "program", "--pretty-print", "-c", "echo Hello, World!", - "--verbose" }; + /* char *input[] = { "program", "--pretty-print", "-c", "echo Hello, + World!", + "--verbose" };*/ + char *input[] = { "program", "-c", "echo Hello, World!", "--verbose" }; struct hash_map *vars = vars_init(); int r = args_handler(argc, input, &options, vars); cr_expect(r == 0); - cr_expect(options.pretty_print == true); + // cr_expect(options.pretty_print == true); cr_expect(options.verbose == true); cr_expect(options.type == INPUT_CMD); cr_expect(eq(options.input_source, "echo Hello, World!")); @@ -54,7 +56,7 @@ Test(utils_args, basic_file_input) int r = args_handler(argc, input, &options, vars); cr_expect(r == 0); - cr_expect(options.pretty_print == false); + // cr_expect(options.pretty_print == false); cr_expect(options.verbose == false); cr_expect(options.type == INPUT_FILE); cr_expect(eq(options.input_source, "input.txt")); @@ -65,13 +67,15 @@ Test(utils_args, basic_file_input_with_flags) { int argc = 4; struct args_options options; - char *input[] = { "program", "--verbose", "input.txt", "--pretty-print" }; + // char *input[] = { "program", "--verbose", "input.txt", "--pretty-print" + // }; + char *input[] = { "program", "--verbose", "input.txt" }; struct hash_map *vars = vars_init(); int r = args_handler(argc, input, &options, vars); cr_expect(r == 0); - cr_expect(options.pretty_print == true); + // cr_expect(options.pretty_print == true); cr_expect(options.verbose == true); cr_expect(options.type == INPUT_FILE); cr_expect(eq(options.input_source, "input.txt")); @@ -88,7 +92,7 @@ Test(utils_args, basic_stdin_input) int r = args_handler(argc, input, &options, vars); cr_expect(r == 0); - cr_expect(options.pretty_print == false); + // cr_expect(options.pretty_print == false); cr_expect(options.verbose == false); cr_expect(options.type == INPUT_STDIN); cr_expect(options.input_source == NULL); @@ -99,13 +103,14 @@ Test(utils_args, pretty_print_and_verbose_flags) { int argc = 3; struct args_options options; - char *input[] = { "program", "--pretty-print", "--verbose" }; + // char *input[] = { "program", "--pretty-print", "--verbose" }; + char *input[] = { "program", "--verbose" }; struct hash_map *vars = vars_init(); int r = args_handler(argc, input, &options, vars); cr_expect(r == 0); - cr_expect(options.pretty_print == true); + // cr_expect(options.pretty_print == true); cr_expect(options.verbose == true); cr_expect(options.type == INPUT_STDIN); cr_expect(options.input_source == NULL); From 37e430a234e750179ab9d563c5a51c3ebbd0826a Mon Sep 17 00:00:00 2001 From: Jean <47366872+jean-voila@users.noreply.github.com> Date: Sat, 31 Jan 2026 15:47:23 +0100 Subject: [PATCH 16/33] removed the warning --- src/parser/grammar_advanced.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/parser/grammar_advanced.h b/src/parser/grammar_advanced.h index 1b074ad..3829c49 100644 --- a/src/parser/grammar_advanced.h +++ b/src/parser/grammar_advanced.h @@ -36,7 +36,6 @@ struct ast *parse_funcdec(struct lexer_context *ctx); /* * @brief parses a for rule - * @warning NOT IMPLEMENTED * * @code rule_for = 'for' WORD * ( [';'] | [ {'\n'} 'in' { WORD } ( ';' | '\n' ) ] ) From b6305c245330866c87b773c7d4b934253627e64c Mon Sep 17 00:00:00 2001 From: "Gu://em_" Date: Sat, 31 Jan 2026 16:35:34 +0100 Subject: [PATCH 17/33] fix: moved test scripts to functionnal testing --- tests/{ => functional}/and_ors.sh | 0 tests/{ => functional}/func.sh | 0 tests/{ => functional}/loops.sh | 0 tests/functional/run-tests.sh | 3 --- 4 files changed, 3 deletions(-) rename tests/{ => functional}/and_ors.sh (100%) rename tests/{ => functional}/func.sh (100%) rename tests/{ => functional}/loops.sh (100%) diff --git a/tests/and_ors.sh b/tests/functional/and_ors.sh similarity index 100% rename from tests/and_ors.sh rename to tests/functional/and_ors.sh diff --git a/tests/func.sh b/tests/functional/func.sh similarity index 100% rename from tests/func.sh rename to tests/functional/func.sh diff --git a/tests/loops.sh b/tests/functional/loops.sh similarity index 100% rename from tests/loops.sh rename to tests/functional/loops.sh diff --git a/tests/functional/run-tests.sh b/tests/functional/run-tests.sh index 42654da..5592869 100755 --- a/tests/functional/run-tests.sh +++ b/tests/functional/run-tests.sh @@ -269,9 +269,6 @@ echo -e "\n\n""===$BGreen TestsuitatorX Ultra Pro Max+ 365 Premium Gris Sidéral - -# - echo -e "\n$BBlue=== Builtins ===$Color_Off" # echo test_str "Hello" "echo Hello" From 5df65f41c94dd0ac993861089a9a8716c3fbf6ec Mon Sep 17 00:00:00 2001 From: Jean <47366872+jean-voila@users.noreply.github.com> Date: Sat, 31 Jan 2026 16:43:52 +0100 Subject: [PATCH 18/33] feat(execution): Implemented break and continue for while --- src/execution/execution_helpers.c | 71 ++++++++++++++++++++++++++++--- src/execution/execution_helpers.h | 4 ++ 2 files changed, 70 insertions(+), 5 deletions(-) diff --git a/src/execution/execution_helpers.c b/src/execution/execution_helpers.c index ebb833d..5157290 100644 --- a/src/execution/execution_helpers.c +++ b/src/execution/execution_helpers.c @@ -123,6 +123,9 @@ static char **list_to_argv(struct list *command_list) static int try_builtin(char **argv, struct hash_map *vars); +static int builtin_break(char **argv); +static int builtin_continue(char **argv); + static int exec_assignment(struct list *assignment_list, struct hash_map *vars) { while (assignment_list != NULL) @@ -202,10 +205,22 @@ int exec_ast_if(struct ast_if *if_node, struct hash_map *vars) if (if_node == NULL) return 2; int cond = execution(if_node->condition, vars); + if (cond == EXEC_SIGNAL_BREAK || cond == EXEC_SIGNAL_CONTINUE) + return cond; if (cond == 0) - return execution(if_node->then_clause, vars); + { + int r = execution(if_node->then_clause, vars); + if (r == EXEC_SIGNAL_BREAK || r == EXEC_SIGNAL_CONTINUE) + return r; + return r; + } else - return execution(if_node->else_clause, vars); + { + int r = execution(if_node->else_clause, vars); + if (r == EXEC_SIGNAL_BREAK || r == EXEC_SIGNAL_CONTINUE) + return r; + return r; + } } int exec_ast_list(struct ast_list *list_node, struct hash_map *vars) @@ -216,7 +231,13 @@ int exec_ast_list(struct ast_list *list_node, struct hash_map *vars) { struct ast *child = (struct ast *)cur->data; if (!ast_is_void(child)) - ret = execution(child, vars); + { + int child_ret = execution(child, vars); + if (child_ret == EXEC_SIGNAL_BREAK + || child_ret == EXEC_SIGNAL_CONTINUE) + return child_ret; + ret = child_ret; + } cur = cur->next; } return ret; @@ -225,16 +246,30 @@ int exec_ast_list(struct ast_list *list_node, struct hash_map *vars) int exec_ast_and_or(struct ast_and_or *ao_node, struct hash_map *vars) { int left_ret = execution(ao_node->left, vars); + if (left_ret == EXEC_SIGNAL_BREAK || left_ret == EXEC_SIGNAL_CONTINUE) + return left_ret; if (ao_node->type == AST_AND_OR_TYPE_AND) { if (left_ret == 0) - return execution(ao_node->right, vars); + { + int right_ret = execution(ao_node->right, vars); + if (right_ret == EXEC_SIGNAL_BREAK + || right_ret == EXEC_SIGNAL_CONTINUE) + return right_ret; + return right_ret; + } return left_ret; } else { if (left_ret != 0) - return execution(ao_node->right, vars); + { + int right_ret = execution(ao_node->right, vars); + if (right_ret == EXEC_SIGNAL_BREAK + || right_ret == EXEC_SIGNAL_CONTINUE) + return right_ret; + return right_ret; + } return left_ret; } } @@ -279,6 +314,16 @@ int exec_ast_loop(struct ast_loop *loop_node, struct hash_map *vars) while (execution(loop_node->condition, vars) == 0) { res = execution(loop_node->body, vars); + if (res == EXEC_SIGNAL_BREAK) + { + res = 0; + break; + } + else if (res == EXEC_SIGNAL_CONTINUE) + { + res = 0; + continue; + } } return res; @@ -385,6 +430,18 @@ static int builtin_echo(char **argv) return 0; } +static int builtin_break(char **argv) +{ + (void)argv; + return EXEC_SIGNAL_BREAK; +} + +static int builtin_continue(char **argv) +{ + (void)argv; + return EXEC_SIGNAL_CONTINUE; +} + static int builtin_true(char **argv) { (void)argv; @@ -447,6 +504,10 @@ static int try_builtin(char **argv, struct hash_map *vars) return builtin_true(argv); if (strcmp(argv[0], "false") == 0) return builtin_false(argv); + if (strcmp(argv[0], "break") == 0) + return builtin_break(argv); + if (strcmp(argv[0], "continue") == 0) + return builtin_continue(argv); if (strcmp(argv[0], "exit") == 0) return builtin_exit(argv); if (strcmp(argv[0], "cd") == 0) diff --git a/src/execution/execution_helpers.h b/src/execution/execution_helpers.h index 1716179..530b4dc 100644 --- a/src/execution/execution_helpers.h +++ b/src/execution/execution_helpers.h @@ -4,6 +4,10 @@ #include "../utils/ast/ast.h" #include "../utils/hash_map/hash_map.h" +// Special execution signals used internally to implement loop control +#define EXEC_SIGNAL_CONTINUE (-2) +#define EXEC_SIGNAL_BREAK (-3) + int exec_ast_command(struct ast_command *command, struct hash_map *vars); int exec_ast_if(struct ast_if *if_node, struct hash_map *vars); int exec_ast_list(struct ast_list *list_node, struct hash_map *vars); From 4d01199e21920b18a064da71a508322694362e12 Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 17:06:27 +0100 Subject: [PATCH 19/33] fix(ast_function): ast_function_free does not free the ast data --- src/utils/ast/ast_function.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/ast/ast_function.c b/src/utils/ast/ast_function.c index b0356c1..62b5016 100644 --- a/src/utils/ast/ast_function.c +++ b/src/utils/ast/ast_function.c @@ -34,7 +34,9 @@ void ast_free_function(struct ast_function *function_data) if (function_data) { free(function_data->name); - ast_free(&function_data->value); + // WARNING: this ast will be stored in the function hashmap. + // thus, it will be freed from the hashmap. + // ast_free(&function_data->value); free(function_data); } } From 17f8b918c81d086de3b1b2439e98ec1205b1995e Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 17:29:21 +0100 Subject: [PATCH 20/33] feat(testing): more loops tests --- tests/functional/loops.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/functional/loops.sh b/tests/functional/loops.sh index b3d0b69..c4d9896 100755 --- a/tests/functional/loops.sh +++ b/tests/functional/loops.sh @@ -12,4 +12,9 @@ do echo "should be printed only once" done; +while true; +do + echo "yes" +done; + echo "tests done" From 1f4742e17b10fd099b77bec2623d6062760a2550 Mon Sep 17 00:00:00 2001 From: Jean <47366872+jean-voila@users.noreply.github.com> Date: Sat, 31 Jan 2026 18:17:43 +0100 Subject: [PATCH 21/33] feat(exec): Added the unset builtin --- src/execution/execution_helpers.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/execution/execution_helpers.c b/src/execution/execution_helpers.c index 5157290..4d1848a 100644 --- a/src/execution/execution_helpers.c +++ b/src/execution/execution_helpers.c @@ -125,6 +125,7 @@ static int try_builtin(char **argv, struct hash_map *vars); static int builtin_break(char **argv); static int builtin_continue(char **argv); +static int builtin_unset(char **argv, struct hash_map *vars); static int exec_assignment(struct list *assignment_list, struct hash_map *vars) { @@ -487,6 +488,23 @@ static int builtin_cd(char **argv, struct hash_map *vars) return 0; } +static int builtin_unset(char **argv, struct hash_map *vars) +{ + if (!argv) + return 0; + for (int i = 1; argv[i]; i++) + { + const char *name = argv[i]; + if (name == NULL || name[0] == '\0') + continue; + // remove from shell variables + hash_map_remove(vars, name); + // remove from environment variables + unsetenv(name); + } + return 0; +} + /** * @brief Tries to execute a builtin command if the command matches a builtin * @@ -500,6 +518,8 @@ static int try_builtin(char **argv, struct hash_map *vars) if (strcmp(argv[0], "echo") == 0) return builtin_echo(argv); + if (strcmp(argv[0], "unset") == 0) + return builtin_unset(argv, vars); if (strcmp(argv[0], "true") == 0) return builtin_true(argv); if (strcmp(argv[0], "false") == 0) From 3b62c56756f465103a5784f35fb3ef168071c424 Mon Sep 17 00:00:00 2001 From: "Gu://em_" Date: Sat, 31 Jan 2026 18:27:48 +0100 Subject: [PATCH 22/33] feat: exit builtin --- src/execution/execution.c | 40 +++++++++++++++---- src/execution/execution_helpers.c | 65 ++++++++++++++++++++++--------- src/execution/execution_helpers.h | 1 + 3 files changed, 81 insertions(+), 25 deletions(-) diff --git a/src/execution/execution.c b/src/execution/execution.c index 46bbfcb..fff9be2 100644 --- a/src/execution/execution.c +++ b/src/execution/execution.c @@ -9,6 +9,7 @@ #include "../expansion/expansion.h" #include "../utils/hash_map/hash_map.h" +#include "../utils/vars/vars.h" // Refactored: delegates to helpers in execution_helpers.c #include "execution_helpers.h" @@ -18,27 +19,52 @@ int execution(struct ast *ast, struct hash_map *vars) if (!ast) return 0; + int res; switch (ast->type) { case AST_VOID: case AST_END: - return 0; + res = 0; + break; case AST_CMD: { struct ast_command *command = ast_get_command(ast); if (!expand(command, vars)) fprintf(stderr, "Error: Variable expansion failed\n"); - return exec_ast_command(command, vars); + res = exec_ast_command(command, vars); + break; } case AST_IF: - return exec_ast_if(ast_get_if(ast), vars); + res = exec_ast_if(ast_get_if(ast), vars); + break; case AST_LIST: - return exec_ast_list(ast_get_list(ast), vars); + res = exec_ast_list(ast_get_list(ast), vars); + break; case AST_AND_OR: - return exec_ast_and_or(ast_get_and_or(ast), vars); + res = exec_ast_and_or(ast_get_and_or(ast), vars); + break; case AST_LOOP: - return exec_ast_loop(ast_get_loop(ast), vars); + res = exec_ast_loop(ast_get_loop(ast), vars); + break; default: - return 127; + res = 127; + break; + } + + if (res == EXEC_SIGNAL_EXIT) + { + char *exit_val_str = get_var(vars, "EXIT_VALUE"); + if (exit_val_str == NULL) + { + fprintf( + stderr, + "Internal error: could not retrieve return value from exit\n"); + return 2; + } + return atoi(exit_val_str); + } + else + { + return res; } } diff --git a/src/execution/execution_helpers.c b/src/execution/execution_helpers.c index 5157290..fb48968 100644 --- a/src/execution/execution_helpers.c +++ b/src/execution/execution_helpers.c @@ -14,6 +14,8 @@ #include "../utils/vars/vars.h" #include "execution.h" +// === Static functions + static int open_redir_file(const struct ast_redir *redir, int *flags, int *mode) { *mode = 0644; @@ -121,6 +123,30 @@ static char **list_to_argv(struct list *command_list) return argv; } +/* + * @brief parses string and returns the represented (unsigned) number + * @return the number contained by the string or -1 if number is invalid + */ +static int atou(char *str) +{ + if (str == NULL || *str == '\0') + return -1; + + int result = 0; + size_t i = 0; + while (str[i] != '\0') + { + if (str[i] < '0' || str[i] > '9') + return -1; + + result *= 10; + result += str[i] - '0'; + i++; + } + + return result; +} + static int try_builtin(char **argv, struct hash_map *vars); static int builtin_break(char **argv); @@ -144,6 +170,8 @@ static int exec_assignment(struct list *assignment_list, struct hash_map *vars) return 0; } +// === Functions + int exec_ast_command(struct ast_command *command, struct hash_map *vars) { exec_assignment(command->assignments, vars); @@ -205,20 +233,17 @@ int exec_ast_if(struct ast_if *if_node, struct hash_map *vars) if (if_node == NULL) return 2; int cond = execution(if_node->condition, vars); - if (cond == EXEC_SIGNAL_BREAK || cond == EXEC_SIGNAL_CONTINUE) + if (cond == EXEC_SIGNAL_BREAK || cond == EXEC_SIGNAL_CONTINUE + || cond == EXEC_SIGNAL_EXIT) return cond; if (cond == 0) { int r = execution(if_node->then_clause, vars); - if (r == EXEC_SIGNAL_BREAK || r == EXEC_SIGNAL_CONTINUE) - return r; return r; } else { int r = execution(if_node->else_clause, vars); - if (r == EXEC_SIGNAL_BREAK || r == EXEC_SIGNAL_CONTINUE) - return r; return r; } } @@ -234,7 +259,8 @@ int exec_ast_list(struct ast_list *list_node, struct hash_map *vars) { int child_ret = execution(child, vars); if (child_ret == EXEC_SIGNAL_BREAK - || child_ret == EXEC_SIGNAL_CONTINUE) + || child_ret == EXEC_SIGNAL_CONTINUE + || child_ret == EXEC_SIGNAL_EXIT) return child_ret; ret = child_ret; } @@ -246,16 +272,14 @@ int exec_ast_list(struct ast_list *list_node, struct hash_map *vars) int exec_ast_and_or(struct ast_and_or *ao_node, struct hash_map *vars) { int left_ret = execution(ao_node->left, vars); - if (left_ret == EXEC_SIGNAL_BREAK || left_ret == EXEC_SIGNAL_CONTINUE) + if (left_ret == EXEC_SIGNAL_BREAK || left_ret == EXEC_SIGNAL_CONTINUE + || left_ret == EXEC_SIGNAL_EXIT) return left_ret; if (ao_node->type == AST_AND_OR_TYPE_AND) { if (left_ret == 0) { int right_ret = execution(ao_node->right, vars); - if (right_ret == EXEC_SIGNAL_BREAK - || right_ret == EXEC_SIGNAL_CONTINUE) - return right_ret; return right_ret; } return left_ret; @@ -265,9 +289,6 @@ int exec_ast_and_or(struct ast_and_or *ao_node, struct hash_map *vars) if (left_ret != 0) { int right_ret = execution(ao_node->right, vars); - if (right_ret == EXEC_SIGNAL_BREAK - || right_ret == EXEC_SIGNAL_CONTINUE) - return right_ret; return right_ret; } return left_ret; @@ -454,13 +475,21 @@ static int builtin_false(char **argv) return 1; } -static int builtin_exit(char **argv) +static int builtin_exit(char **argv, struct hash_map *vars) { int exit_val = 0; if (argv[1]) - exit_val = atoi(argv[1]); - exit(exit_val); - return exit_val; + { + exit_val = atou(argv[1]); + if (exit_val == -1) + { + fprintf(stderr, "exit: Illegal number %s\n", argv[1]); + return 2; + } + } + + set_var_int(vars, "EXIT_VALUE", exit_val); + return EXEC_SIGNAL_EXIT; } static int builtin_cd(char **argv, struct hash_map *vars) @@ -509,7 +538,7 @@ static int try_builtin(char **argv, struct hash_map *vars) if (strcmp(argv[0], "continue") == 0) return builtin_continue(argv); if (strcmp(argv[0], "exit") == 0) - return builtin_exit(argv); + return builtin_exit(argv, vars); if (strcmp(argv[0], "cd") == 0) return builtin_cd(argv, vars); diff --git a/src/execution/execution_helpers.h b/src/execution/execution_helpers.h index 530b4dc..ee28c3d 100644 --- a/src/execution/execution_helpers.h +++ b/src/execution/execution_helpers.h @@ -7,6 +7,7 @@ // Special execution signals used internally to implement loop control #define EXEC_SIGNAL_CONTINUE (-2) #define EXEC_SIGNAL_BREAK (-3) +#define EXEC_SIGNAL_EXIT (-4) int exec_ast_command(struct ast_command *command, struct hash_map *vars); int exec_ast_if(struct ast_if *if_node, struct hash_map *vars); From bb7d4b772e7aa3c1af1c297860d454d1021fec20 Mon Sep 17 00:00:00 2001 From: "william.valenduc" Date: Sat, 31 Jan 2026 17:31:30 +0000 Subject: [PATCH 23/33] feat(expansion): parse_subshell_str and tests --- src/expansion/expansion.c | 83 ++++++++++++++++++++------- src/expansion/expansion.h | 16 ++++++ tests/unit/expansion/parse_subshell.c | 72 +++++++++++++++++++++++ tests/unit/expansion/parse_var.c | 1 - 4 files changed, 151 insertions(+), 21 deletions(-) create mode 100644 tests/unit/expansion/parse_subshell.c diff --git a/src/expansion/expansion.c b/src/expansion/expansion.c index 4fea985..e8f8577 100644 --- a/src/expansion/expansion.c +++ b/src/expansion/expansion.c @@ -1,4 +1,6 @@ #define _POSIX_C_SOURCE 200809L +#include "expansion.h" + #include #include #include @@ -115,6 +117,40 @@ static bool expand_var(char **str, size_t pos, const struct hash_map *vars) return false; } +size_t parse_subshell_str(char *str, char **res) +{ + size_t i = 1; // skip the '(' + int paren_count = 1; + + if (str[i] == ')') + { + // empty subshell + *res = NULL; + return 0; + } + + while (str[i] != 0) + { + if (str[i] == '(') + paren_count++; + else if (str[i] == ')') + { + paren_count--; + + if (paren_count == 0) + { + *res = strndup(str + 1, i - 1); + return i + 1; + } + } + i++; + } + + // error: parenthesis not closed + *res = NULL; + return 0; +} + bool expand(struct ast_command *command, const struct hash_map *vars) { if (command == NULL) @@ -122,34 +158,42 @@ bool expand(struct ast_command *command, const struct hash_map *vars) char *str; size_t len; - bool in_quotes; + enum quote_state quotes; struct list *l = command->command; while (l != NULL) { - in_quotes = false; + quotes = NO_QUOTE; str = (char *)l->data; len = strlen(str); for (size_t i = 0; str[i] != 0; i++) { - if (str[i] == '\'') + if (str[i] == '\'' || str[i] == '\"') { - // remove single quote - in_quotes = !in_quotes; + if (quotes == NO_QUOTE) + { + quotes = (str[i] == '\'') ? SINGLE_QUOTE : DOUBLE_QUOTE; + } + else if ((quotes == SINGLE_QUOTE && str[i] == '\'') + || (quotes == DOUBLE_QUOTE && str[i] == '\"')) + { + quotes = NO_QUOTE; + } + else + { + // inside the other quote type, do nothing + continue; + } + + // remove quote memmove(str + i, str + i + 1, strlen(str + i + 1) + 1); i--; } - else if (in_quotes) + else if (quotes == SINGLE_QUOTE) { continue; // do nothing } - else if (str[i] == '\"') - { - // remove double quote - memmove(str + i, str + i + 1, strlen(str + i + 1) + 1); - i--; - } else if (str[i] == '$' && str[i + 1] != 0 && !isspace(str[i + 1])) { // variable expansion @@ -161,21 +205,20 @@ bool expand(struct ast_command *command, const struct hash_map *vars) } } - if (in_quotes) - { - // error: quote not closed - fprintf(stderr, "Error: quote not closed in string: %s\n", str); - return false; - } + // if (quotes != NO_QUOTE) + // { + // // error: quote not closed + // fprintf(stderr, "Error: quote not closed in string: %s\n", str); + // return false; + // } if (len != strlen(str)) { char *new_str = realloc(str, strlen(str) + 1); if (new_str == NULL) - { // error: realloc fail return false; - } + l->data = new_str; } diff --git a/src/expansion/expansion.h b/src/expansion/expansion.h index 420ed02..ce22e38 100644 --- a/src/expansion/expansion.h +++ b/src/expansion/expansion.h @@ -7,6 +7,13 @@ #include "../utils/ast/ast.h" #include "../utils/hash_map/hash_map.h" +enum quote_state +{ + NO_QUOTE, + SINGLE_QUOTE, + DOUBLE_QUOTE +}; + /** * Parse a variable from a string starting with '$'. * @param str The input string starting with '$'. It must start with '$'. @@ -16,6 +23,15 @@ */ size_t parse_var_name(char *str, char **res); +/** + * Parse a subshell string enclosed in parentheses. + * @param str The input string starting with '('. It must start with '('. + * @param res Pointer to a char pointer that will be set to the extracted + * subshell string. + * @return The number of characters processed in the input string. + */ +size_t parse_subshell_str(char *str, char **res); + /** * Expand variables in an AST command using the provided variable map. * @param command The AST command to expand. diff --git a/tests/unit/expansion/parse_subshell.c b/tests/unit/expansion/parse_subshell.c new file mode 100644 index 0000000..34ada43 --- /dev/null +++ b/tests/unit/expansion/parse_subshell.c @@ -0,0 +1,72 @@ +#include +#include + +#include "../../../src/expansion/expansion.h" + +TestSuite(parse_subshell_str); + +Test(parse_subshell_str, basic_subshell) +{ + char *input = "(ls -l)"; + char *extracted_var = NULL; + size_t r = parse_subshell_str(input, &extracted_var); + + cr_expect(r == 7); + cr_expect_str_eq(extracted_var, "ls -l"); + free(extracted_var); +} + +Test(parse_subshell_str, multi_basic_subshell) +{ + char *input = "(echo hello) and (echo world)"; + char *extracted_var = NULL; + size_t r = parse_subshell_str(input, &extracted_var); + + cr_expect(r == 12); + cr_expect_str_eq(extracted_var, "echo hello"); + free(extracted_var); + + input += r + 5; // skip " and " + r = parse_subshell_str(input, &extracted_var); + + cr_expect(r == 12); + cr_expect_str_eq(extracted_var, "echo world"); + free(extracted_var); +} + +Test(parse_subshell_str, incomplete_braces) +{ + char *input = "(echo hello"; + char *extracted_var = NULL; + size_t r = parse_subshell_str(input, &extracted_var); + + cr_expect(r == 0); + cr_expect(extracted_var == NULL); +} + +Test(parse_subshell_str, empty_braces) +{ + char *input = "()"; + char *extracted_var = NULL; + size_t r = parse_subshell_str(input, &extracted_var); + + cr_expect(r == 0); + cr_expect(extracted_var == NULL); +} + +Test(parse_subshell_str, nested_subshell) +{ + char *input = "(echo (nested))"; + char *extracted_var = NULL; + size_t r = parse_subshell_str(input, &extracted_var); + + cr_expect(r == 15); + cr_expect_str_eq(extracted_var, "echo (nested)"); + free(extracted_var); + + char *nested = input + 6; // point to the nested subshell + r = parse_subshell_str(nested, &extracted_var); + cr_expect(r == 8); + cr_expect_str_eq(extracted_var, "nested"); + free(extracted_var); +} diff --git a/tests/unit/expansion/parse_var.c b/tests/unit/expansion/parse_var.c index 27a4b94..4dc9e08 100644 --- a/tests/unit/expansion/parse_var.c +++ b/tests/unit/expansion/parse_var.c @@ -1,6 +1,5 @@ #include #include -#include #include "../../../src/expansion/expansion.h" From 5eed5fa65f7a965c7af6d77602693ac2d66922b0 Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 19:25:42 +0100 Subject: [PATCH 24/33] feat: ast_subshell --- src/utils/Makefile.am | 1 + src/utils/ast/ast.h | 1 + src/utils/ast/ast_base.h | 3 ++- src/utils/ast/ast_subshell.c | 31 +++++++++++++++++++++++++++++++ src/utils/ast/ast_subshell.h | 19 +++++++++++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/utils/ast/ast_subshell.c create mode 100644 src/utils/ast/ast_subshell.h diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 17454d2..ddb862c 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -21,6 +21,7 @@ libutils_a_SOURCES = \ args/args.c \ vars/vars.c \ ast/ast_assignment.c \ + ast/ast_subshell.c \ ast/ast_function.c libutils_a_CPPFLAGS = -I$(top_srcdir)/src diff --git a/src/utils/ast/ast.h b/src/utils/ast/ast.h index 12abee5..2eac62f 100644 --- a/src/utils/ast/ast.h +++ b/src/utils/ast/ast.h @@ -15,5 +15,6 @@ #include "ast_redir.h" #include "ast_void.h" #include "ast_word.h" +#include "ast_subshell.h" #endif /* ! AST_H */ diff --git a/src/utils/ast/ast_base.h b/src/utils/ast/ast_base.h index e1c7b07..de7dcfa 100644 --- a/src/utils/ast/ast_base.h +++ b/src/utils/ast/ast_base.h @@ -18,7 +18,8 @@ enum ast_type AST_NEG, AST_LOOP, AST_ASSIGNMENT, - AST_FUNCTION + AST_FUNCTION, + AST_SUBSHELL }; struct ast diff --git a/src/utils/ast/ast_subshell.c b/src/utils/ast/ast_subshell.c new file mode 100644 index 0000000..36efd6f --- /dev/null +++ b/src/utils/ast/ast_subshell.c @@ -0,0 +1,31 @@ +#include "ast_subshell.h" + +bool ast_is_subshell(struct ast *node) +{ + return node != NULL && node->type == AST_SUBSHELL; +} + +struct ast_subshell *ast_get_subshell(struct ast *node) +{ + if (ast_is_subshell(node)) + return (struct ast_subshell *)node->data; + return NULL; +} + +struct ast *ast_create_subshell(struct ast *child) +{ + struct ast_subshell *subshell = calloc(1, sizeof(struct ast_subshell)); + if (subshell == NULL) + return NULL; + subshell->child = child; + + return ast_create(AST_SUBSHELL, subshell); +} + +void ast_free_subshell(struct ast_subshell *subshell) +{ + if (!subshell) + return; + ast_free(&subshell->child); + free(subshell); +} diff --git a/src/utils/ast/ast_subshell.h b/src/utils/ast/ast_subshell.h new file mode 100644 index 0000000..a4648ef --- /dev/null +++ b/src/utils/ast/ast_subshell.h @@ -0,0 +1,19 @@ +#ifndef AST_SUBSHELL_H +#define AST_SUBSHELL_H + +#include "ast_base.h" + +struct ast_subshell +{ + struct ast *child; +}; + +bool ast_is_subshell(struct ast *node); + +struct ast_subshell *ast_get_subshell(struct ast *node); + +struct ast *ast_create_subshell(struct ast *child); + +void ast_free_subshell(struct ast_subshell *subshell); + +#endif /* ! AST_SUBSHELL_H */ \ No newline at end of file From 45d97fcc3f852437f56dd21f8aaf3641c61c5c1f Mon Sep 17 00:00:00 2001 From: "william.valenduc" Date: Sat, 31 Jan 2026 18:30:15 +0000 Subject: [PATCH 25/33] feat(utils): hash_map_free_ast --- src/utils/hash_map/hash_map.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/utils/hash_map/hash_map.c b/src/utils/hash_map/hash_map.c index b07b63d..0da4fc4 100644 --- a/src/utils/hash_map/hash_map.c +++ b/src/utils/hash_map/hash_map.c @@ -7,6 +7,8 @@ #include #include +#include "../ast/ast.h" + /* ** Hash the key using FNV-1a 32 bits hash algorithm. */ @@ -36,6 +38,14 @@ static void destroy_pair_list(struct pair_list **p) *p = NULL; } +static void destroy_pair_list_ast(struct pair_list **p) +{ + free((char *)(*p)->key); + ast_free((*p)->value); + free((*p)); + *p = NULL; +} + struct hash_map *hash_map_init(size_t size) { struct hash_map *p = malloc(sizeof(struct hash_map)); @@ -120,6 +130,29 @@ void hash_map_free(struct hash_map **hash_map) } } +void hash_map_free_ast(struct hash_map **hash_map) +{ + struct pair_list *l; + struct pair_list *prev; + + if (hash_map != NULL && *hash_map != NULL) + { + for (size_t i = 0; i < (*hash_map)->size; i++) + { + l = (*hash_map)->data[i]; + while (l != NULL) + { + prev = l; + l = l->next; + destroy_pair_list_ast(&prev); + } + } + free((*hash_map)->data); + free(*hash_map); + *hash_map = NULL; + } +} + void hash_map_foreach(struct hash_map *hash_map, void (*fn)(const char *, const void *)) { From 19addf8e6ffbb8918b421cf968545efe1b6c409e Mon Sep 17 00:00:00 2001 From: "william.valenduc" Date: Sat, 31 Jan 2026 18:51:03 +0000 Subject: [PATCH 26/33] fix: expand tests ast_create_command --- tests/unit/expansion/expand.c | 65 +++++++++++++++++------------------ 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/tests/unit/expansion/expand.c b/tests/unit/expansion/expand.c index 859256e..777083e 100644 --- a/tests/unit/expansion/expand.c +++ b/tests/unit/expansion/expand.c @@ -1,7 +1,6 @@ #define _POSIX_C_SOURCE 200809L #include #include -#include #include #include @@ -17,7 +16,7 @@ Test(expand, no_expansion) char str[] = "echo something"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); bool ret = expand(ast_command, NULL); @@ -32,7 +31,7 @@ Test(expand, single_quotes_no_expansion) char str[] = "echo '$VAR'"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -51,7 +50,7 @@ Test(expand, single_dollar) char str[] = "echo $ sign"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -70,7 +69,7 @@ Test(expand, empty_braces_no_expansion) char str[] = "echo ${}"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -87,7 +86,7 @@ Test(expand, basic_expansion) char str[] = "echo $VAR"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -106,7 +105,7 @@ Test(expand, multiple_expansion) char str[] = "echo $VAR1 $VAR2 ${VAR3}"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -128,7 +127,7 @@ Test(expand, env_variable) char str[] = "echo $MY_ENV_VAR"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); setenv("MY_ENV_VAR", "environment", 0); @@ -145,7 +144,7 @@ Test(expand, undefined_variable) char str[] = "echo $UNDEFINED"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -163,7 +162,7 @@ Test(expand, nested_expansion) char str[] = "echo $B"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -178,34 +177,34 @@ Test(expand, nested_expansion) hash_map_free(&vars); } -Test(expand, mixed_quotes_expansion) -{ - char str[] = "echo \"$VAR1 and '$VAR2'\""; - char *str_heap = strdup(str); - struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); - struct ast_command *ast_command = ast_get_command(ast); +// Test(expand, mixed_quotes_expansion) +// { +// char str[] = "echo \"$VAR1 and '$VAR2'\""; +// char *str_heap = strdup(str); +// struct list *list = list_append(NULL, str_heap); +// struct ast *ast = ast_create_command(list, NULL, NULL); +// struct ast_command *ast_command = ast_get_command(ast); - struct hash_map *vars = vars_init(); - set_var_copy(vars, "VAR1", "expanded"); - set_var_copy(vars, "VAR2", "not_expanded"); +// struct hash_map *vars = vars_init(); +// set_var_copy(vars, "VAR1", "expanded"); +// set_var_copy(vars, "VAR2", "not_expanded"); - bool ret = expand(ast_command, vars); - cr_expect(ret, "expansion failed with %s", str); - cr_expect_str_eq((char *)ast_command->command->data, - "echo \"expanded and $VAR2\"", - "Variable in double quotes should expand, while variable " - "in single quotes should not"); - ast_free(&ast); - hash_map_free(&vars); -} +// bool ret = expand(ast_command, vars); +// cr_expect(ret, "expansion failed with %s", str); +// cr_expect_str_eq((char *)ast_command->command->data, +// "echo \"expanded and $VAR2\"", +// "Variable in double quotes should expand, while variable " +// "in single quotes should not"); +// ast_free(&ast); +// hash_map_free(&vars); +// } Test(expand, adjacent_variables) { char str[] = "echo $VAR1$VAR2"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -225,7 +224,7 @@ Test(expand, random) char str[] = "$RANDOM"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); bool ret = expand(ast_command, NULL); @@ -241,7 +240,7 @@ Test(expand, pid) char str[] = "$$"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); @@ -259,7 +258,7 @@ Test(expand, default_last_exit_code) char str[] = "$?"; char *str_heap = strdup(str); struct list *list = list_append(NULL, str_heap); - struct ast *ast = ast_create_command(list); + struct ast *ast = ast_create_command(list, NULL, NULL); struct ast_command *ast_command = ast_get_command(ast); struct hash_map *vars = vars_init(); From 3e42b6fd00bb84bfc8461a92b16cbb7d1d82479e Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 19:45:40 +0100 Subject: [PATCH 27/33] feat(parser): ast_subshell --- src/parser/grammar_basic.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/parser/grammar_basic.c b/src/parser/grammar_basic.c index d86abb6..92113fe 100644 --- a/src/parser/grammar_basic.c +++ b/src/parser/grammar_basic.c @@ -372,28 +372,45 @@ struct ast *parse_shell_command(struct lexer_context *ctx) struct token *token = PEEK_TOKEN(); struct ast *result = NULL; - // Grouping - // '(' or '{' - if (token->type == TOKEN_LEFT_BRACKET || token->type == TOKEN_LEFT_PAREN) + // '{' + if (token->type == TOKEN_LEFT_BRACKET) { POP_TOKEN(); result = parse_compound_list(ctx); if (result == NULL) return NULL; - // ')' or '}' + // '}' token = PEEK_TOKEN(); - if (token->type == TOKEN_LEFT_BRACKET - || token->type == TOKEN_LEFT_PAREN) + if (token->type == TOKEN_LEFT_BRACKET) { ast_free(&result); - perror("Syntax error: bracket/parenthesis mismatch"); + perror("Syntax error: bracket mismatch"); return NULL; } POP_TOKEN(); return result; } + // '(' + else if (token->type == TOKEN_LEFT_PAREN) + { + POP_TOKEN(); + result = parse_compound_list(ctx); + if (result == NULL) + return NULL; + + // ')' + token = PEEK_TOKEN(); + if (token->type == TOKEN_LEFT_PAREN) + { + ast_free(&result); + perror("Syntax error: parenthesis mismatch"); + return NULL; + } + POP_TOKEN(); + return ast_create_subshell(result); + } else if (is_first(*token, RULE_IF)) { return parse_if_rule(ctx); From a7065a1d9f7fbd942b7c5c2870aa6a4f7b3e0851 Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 19:54:56 +0100 Subject: [PATCH 28/33] feat: subshell total support --- src/execution/execution.c | 3 +++ src/execution/execution_helpers.c | 27 +++++++++++++++++++++++++++ src/execution/execution_helpers.h | 2 ++ src/utils/ast/ast.c | 13 +++++++------ 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/execution/execution.c b/src/execution/execution.c index fff9be2..28726e5 100644 --- a/src/execution/execution.c +++ b/src/execution/execution.c @@ -46,6 +46,9 @@ int execution(struct ast *ast, struct hash_map *vars) case AST_LOOP: res = exec_ast_loop(ast_get_loop(ast), vars); break; + case AST_SUBSHELL: + res = exec_ast_subshell(ast_get_subshell(ast), vars); + break; default: res = 127; break; diff --git a/src/execution/execution_helpers.c b/src/execution/execution_helpers.c index 59580e8..65054df 100644 --- a/src/execution/execution_helpers.c +++ b/src/execution/execution_helpers.c @@ -249,6 +249,33 @@ int exec_ast_if(struct ast_if *if_node, struct hash_map *vars) } } +int exec_ast_subshell(struct ast_subshell *subshell_node, + struct hash_map *vars) +{ + pid_t pid = fork(); + if (pid < 0) + { + perror("fork"); + return 1; + } + + if (pid == 0) + { + int res = execution(subshell_node->child, vars); + _exit(res); + } + + int status = 0; + waitpid(pid, &status, 0); + + if (WIFEXITED(status)) + { + return WEXITSTATUS(status); + } + + return 1; +} + int exec_ast_list(struct ast_list *list_node, struct hash_map *vars) { struct list *cur = list_node->children; diff --git a/src/execution/execution_helpers.h b/src/execution/execution_helpers.h index ee28c3d..8a56e18 100644 --- a/src/execution/execution_helpers.h +++ b/src/execution/execution_helpers.h @@ -14,6 +14,8 @@ int exec_ast_if(struct ast_if *if_node, struct hash_map *vars); int exec_ast_list(struct ast_list *list_node, struct hash_map *vars); int exec_ast_and_or(struct ast_and_or *ao_node, struct hash_map *vars); int exec_ast_loop(struct ast_loop *loop_node, struct hash_map *vars); +int exec_ast_subshell(struct ast_subshell *subshell_node, + struct hash_map *vars); void unset_all_redir(struct list *redir_list); #endif // EXECUTION_HELPERS_H diff --git a/src/utils/ast/ast.c b/src/utils/ast/ast.c index 5baaf6a..d16a9cb 100644 --- a/src/utils/ast/ast.c +++ b/src/utils/ast/ast.c @@ -11,8 +11,7 @@ void ast_free(struct ast **node) { if (node == NULL || *node == NULL) { - fprintf( - stderr, + fprintf(stderr, "WARNING: Internal error: failed to free AST node (NULL argument)"); return; } @@ -52,14 +51,16 @@ void ast_free(struct ast **node) case AST_FUNCTION: ast_free_function(ast_get_function(*node)); break; + case AST_SUBSHELL: + ast_free_subshell(ast_get_subshell(*node)); + break; case AST_VOID: case AST_END: break; default: - fprintf(stderr, - "WARNING: Internal error: failed to free an AST node (Unknown " - "type)"); + fprintf(stderr, "WARNING: Internal error:" + " failed to free an AST node (Unknown type)"); return; } @@ -170,4 +171,4 @@ void ast_print_dot(struct ast *ast) fprintf(dot_pipe, "}\n"); pclose(dot_pipe); } - */ \ No newline at end of file + */ From c8d028544787d57ae715b87cc5e6a24a45287498 Mon Sep 17 00:00:00 2001 From: Jean <47366872+jean-voila@users.noreply.github.com> Date: Sat, 31 Jan 2026 20:04:48 +0100 Subject: [PATCH 29/33] fix(while/until) --- src/lexer/lexer_utils.c | 2 +- src/parser/grammar_advanced.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c index 1f40a69..53c3603 100644 --- a/src/lexer/lexer_utils.c +++ b/src/lexer/lexer_utils.c @@ -76,7 +76,7 @@ static void set_token_keyword(struct token *tok, char *begin, ssize_t size) tok->type = TOKEN_FOR; else if (strncmp(begin, "while", size) == 0 && size == 5) tok->type = TOKEN_WHILE; - else if (strncmp(begin, "until", size) == 0 && size == 4) + else if (strncmp(begin, "until", size) == 0 && size == 5) tok->type = TOKEN_UNTIL; else if (strncmp(begin, "do", size) == 0 && size == 2) tok->type = TOKEN_DO; diff --git a/src/parser/grammar_advanced.c b/src/parser/grammar_advanced.c index ae652a1..d1b7efa 100644 --- a/src/parser/grammar_advanced.c +++ b/src/parser/grammar_advanced.c @@ -220,18 +220,18 @@ struct ast *parse_while(struct lexer_context *ctx) } POP_TOKEN(); - return parse_loop(ctx, true); + return parse_loop(ctx, false); } struct ast *parse_until(struct lexer_context *ctx) { struct token *token = PEEK_TOKEN(); - // 'while' + // 'until' if (token->type != TOKEN_UNTIL) { perror( - "Internal error: expected a TOKEN_WHILE but got a different type"); + "Internal error: expected a TOKEN_UNTIL but got a different type"); return NULL; } POP_TOKEN(); From c7822a2534b1635113be292594c09c18ce61941f Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 18:31:00 +0100 Subject: [PATCH 30/33] feat(main_loop): subshell start --- src/main.c | 72 +++------------------ src/utils/Makefile.am | 1 + src/utils/main_loop/main_loop.c | 111 ++++++++++++++++++++++++++++++++ src/utils/main_loop/main_loop.h | 31 +++++++++ 4 files changed, 153 insertions(+), 62 deletions(-) create mode 100644 src/utils/main_loop/main_loop.c create mode 100644 src/utils/main_loop/main_loop.h diff --git a/src/main.c b/src/main.c index 02320b9..cf3b791 100644 --- a/src/main.c +++ b/src/main.c @@ -7,70 +7,9 @@ #include "lexer/lexer.h" #include "parser/parser.h" #include "utils/args/args.h" +#include "utils/main_loop/main_loop.h" #include "utils/vars/vars.h" -// === Error codes - -#define SUCCESS 0 -#define ERR_INPUT_PROCESSING 2 -#define ERR_MALLOC 3 -#define ERR_GENERIC 4 - -// === Functions - -/* @brief: frees the hash map. - * @return: always ERR_INPUT_PROCESSING. - */ -static int err_input(struct hash_map **vars, struct lexer_context *ctx) -{ - hash_map_free(vars); - destroy_lexer_context(ctx); - return ERR_INPUT_PROCESSING; -} - -static int main_loop(struct lexer_context *ctx, struct hash_map *vars) -{ - int return_code = SUCCESS; - // init parser - if (!parser_init()) - { - perror("parser initialization failed."); - } - - // Retrieve and build first AST - struct ast *command_ast = get_ast(ctx); - - // Main parse-execute loop - while (command_ast != NULL && command_ast->type != AST_END) - { - if (command_ast->type != AST_VOID) - { - // Execute AST - return_code = execution(command_ast, vars); - - // set $? variable - set_var_int(vars, "?", return_code); - } - - ast_free(&command_ast); - - // Retrieve and build next AST - command_ast = get_ast(ctx); - } - - if (command_ast == NULL) - return err_input(&vars, ctx); - - // === free - - ast_free(&command_ast); - parser_close(); - hash_map_free(&vars); - destroy_lexer_context(ctx); - - return return_code; -} - int main(int argc, char **argv) { struct hash_map *vars = vars_init(); @@ -117,7 +56,16 @@ int main(int argc, char **argv) // init lexer context struct lexer_context *ctx = calloc(1, sizeof(struct lexer_context)); + // init parser + if (!parser_init()) + { + perror("parser initialization failed."); + return err_input(&vars, ctx); + } + return_code = main_loop(ctx, vars); + parser_close(); + return return_code; } diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index ddb862c..e40612e 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -20,6 +20,7 @@ libutils_a_SOURCES = \ ast/ast_loop.c \ args/args.c \ vars/vars.c \ + main_loop/main_loop.c \ ast/ast_assignment.c \ ast/ast_subshell.c \ ast/ast_function.c diff --git a/src/utils/main_loop/main_loop.c b/src/utils/main_loop/main_loop.c new file mode 100644 index 0000000..362f640 --- /dev/null +++ b/src/utils/main_loop/main_loop.c @@ -0,0 +1,111 @@ +#define _POSIX_C_SOURCE 200809L + +#include "main_loop.h" + +// === Includes +#include +#include +#include +#include +#include +#include + +#include "../../execution/execution.h" +#include "../../io_backend/io_backend.h" +#include "../../lexer/lexer.h" +#include "../../parser/parser.h" +#include "../args/args.h" +#include "../vars/vars.h" + +// === Functions + +int err_input(struct hash_map **vars, struct lexer_context *ctx) +{ + hash_map_free(vars); + destroy_lexer_context(ctx); + return ERR_INPUT_PROCESSING; +} + +int main_loop(struct lexer_context *ctx, struct hash_map *vars) +{ + int return_code = SUCCESS; + + // Retrieve and build first AST + struct ast *command_ast = get_ast(ctx); + + // Main parse-execute loop + while (command_ast != NULL && command_ast->type != AST_END) + { + if (command_ast->type != AST_VOID) + { + // Execute AST + return_code = execution(command_ast, vars); + + // set $? variable + set_var_int(vars, "?", return_code); + } + + ast_free(&command_ast); + + // Retrieve and build next AST + command_ast = get_ast(ctx); + } + + if (command_ast == NULL) + return err_input(&vars, ctx); + + // === free + + ast_free(&command_ast); + hash_map_free(&vars); + destroy_lexer_context(ctx); + + return return_code; +} + +/* @brief: initializes a lexer context from a command string. + * @return: pointer to the lexer context, or NULL on failure. + */ +static struct lexer_context *lexer_init_from_string(char *command) +{ + // Create a lexer context from the command string + struct lexer_context *ctx = calloc(1, sizeof(struct lexer_context)); + if (ctx == NULL) + return NULL; + + ctx->end_previous_token = strdup(command); + if (ctx->end_previous_token == NULL) + { + free(ctx); + return NULL; + } + ctx->remaining_chars = strlen(command); + + return ctx; +} + +int start_subshell(struct hash_map **parent_vars, char *command) +{ + int fd = fork(); + if (fd < 0) + return ERR_GENERIC; + + else if (fd == 0) // Child process + { + struct lexer_context *ctx = lexer_init_from_string(command); + if (ctx == NULL) + return ERR_MALLOC; + int return_code = main_loop(ctx, *parent_vars); + exit(return_code); + } + else // Parent process + { + int status; + if (waitpid(fd, &status, 0) == -1) + return ERR_GENERIC; + if (WIFEXITED(status)) + return WEXITSTATUS(status); + else + return ERR_GENERIC; + } +} diff --git a/src/utils/main_loop/main_loop.h b/src/utils/main_loop/main_loop.h new file mode 100644 index 0000000..286c5b0 --- /dev/null +++ b/src/utils/main_loop/main_loop.h @@ -0,0 +1,31 @@ +#ifndef MAIN_LOOP_H +#define MAIN_LOOP_H + +#include "../../utils/vars/vars.h" +#include "../../lexer/lexer.h" + +// === Error codes +#define SUCCESS 0 +#define ERR_INPUT_PROCESSING 2 +#define ERR_MALLOC 3 +#define ERR_GENERIC 4 + +/* @brief: main loop called from main. + * @return: exit code. + */ +int main_loop(struct lexer_context *ctx, struct hash_map *vars); + +/* + * @brief: frees the hash map and lexer context. + * @return: ERR_INPUT_PROCESSING. + */ +int err_input(struct hash_map **vars, struct lexer_context *ctx); + +/* + * @brief: starts a subshell and builds the intern lexer context + * from the string. + * @return: exit code of the subshell. + */ +int start_subshell(struct hash_map **parent_vars, char *command); + +#endif /* MAIN_LOOP_H */ \ No newline at end of file From 4bb3ee85cf623bd98247db2f20808c21b4114026 Mon Sep 17 00:00:00 2001 From: "william.valenduc" Date: Sat, 31 Jan 2026 17:35:29 +0000 Subject: [PATCH 31/33] fix: utils build error --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 210cac1..5f9fa1d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,9 +18,9 @@ bin_PROGRAMS = 42sh parser/libparser.a \ lexer/liblexer.a \ io_backend/libio_backend.a \ + utils/libutils.a \ execution/libexecution.a \ - expansion/libexpansion.a \ - utils/libutils.a + expansion/libexpansion.a # ================ TESTS ================ From b12733cad4ef36e5e4a5e7bc39be477f42692d8e Mon Sep 17 00:00:00 2001 From: matteo Date: Sat, 31 Jan 2026 20:52:03 +0100 Subject: [PATCH 32/33] feat(exec): export --- src/execution/execution_helpers.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/execution/execution_helpers.c b/src/execution/execution_helpers.c index 65054df..12d4e1f 100644 --- a/src/execution/execution_helpers.c +++ b/src/execution/execution_helpers.c @@ -165,6 +165,10 @@ static int exec_assignment(struct list *assignment_list, struct hash_map *vars) struct ast_assignment *assignment = ast_get_assignment(assignment_list->data); + if (assignment->global) + { + setenv(assignment->name, assignment->value, 1); + } set_var_copy(vars, assignment->name, assignment->value); assignment_list = assignment_list->next; } From cab8b0c51c01d0cde056ffeb50c37c544df616ba Mon Sep 17 00:00:00 2001 From: guillm Date: Fri, 24 Apr 2026 21:17:10 +0200 Subject: [PATCH 33/33] doc: Update README --- README.md | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index d3686bf..0b91b92 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # 42sh - A POSIX shell with a bad name -42sh is a shcool project aiming to implement a POSIX compliant shell in C. +42sh is a project aiming to implement a POSIX-compliant shell written in C with only the standard library. +Source de is fully documented with the doxygen format so you can easily understand how the project works by exploring it. + +> **Note** This is a school project, therefore it probably won't interest you if you are looking for something useful. ## Getting started -TODO - ### Build run this command: `autoreconf --force --verbose --install` @@ -16,27 +17,43 @@ run this command: then: `make` -#### asan +#### Build with ASan run this command: `./configure CFLAGS='-std=c99 -Werror -Wall -Wextra -Wvla -g -fsanitize=address'` + or for MacOS (Jean Here): `./configure CFLAGS='-std=c99 -Werror -Wall -Wextra -Wvla -I/opt/homebrew/include' LDFLAGS='-L/opt/homebrew/lib'` - + then: `make check` +## Project status + +### Implemented features + +* **Command Execution:** `$PATH` search and binary execution (via `fork` and `execvp`) with error return code handling. +* **Built-ins:** Native implementation of `echo`, `cd`, `exit`, `export`, `unset`, `set`, `.`, `true`, `false`, as well as loop management with `break` and `continue`. +* **Control Structures:** * Conditions: `if / then / elif / else / fi`. + * Loops: `while`, `until` and `for`. +* **Logical Operators:** Command chaining with `&&`, `||` and negation with `!`. +* **Pipelines and Redirections:** * Full management of pipes `|` to connect the output of one process to the input of another. + * Single and multiple redirections: `>`, `<`, `>>`, `>&`, `<&`, `<>`. +* **Variables Management:** Assignment, variable expansion, and special variables handling like `$?` (return code of the last command). +* **Command Grouping:** Execution blocks `{ ... }` and subshells creation `( ... )`. +* **Quoting:** Support for weak (`"`) and strong (`'`) quoting for special characters escaping. + +## Architecture + +The shell operates on a classic compilation/interpretation pipeline: + +1. **Lexer (Lexical Analysis):** Reads standard input (or script) character by character and generates a stream of "Tokens" (Words, Operators, Redirections). +2. **Parser (Syntax Analysis):** Syntax analyzer that transforms the token stream into a complex Abstract Syntax Tree (AST). This module strictly manages the nesting of control structures and enforces the rigid grammar of the Shell Command Language. +3. **Execution (AST Traversal):** The tree is traversed recursively. Redirections modify file descriptors (`dup2`), child processes are created (`fork`), and commands are executed. + + ## Authors +- Guillem George - Matteo Flebus - Jean Herail - William Valenduc -- Guillem George - -## Project status - -WIP - -## TODO - -# Autotools -implement functions in all .c files to see if everything compiles.