Fixed variable expansion errors

docs/mstest_m_removed_extra_tests.txt

@@ -0,0 +1,26 @@
+Tests eliminados del reporte por ser extras (\ y/o ~):
+
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:52 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:54 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:56 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:58 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:60 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:62 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:64 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:7 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:59 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:61 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:63 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:65 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:67 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:69 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:71 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:314 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:328 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:337 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:606 | motivo: \, ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_redirs.sh:208 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_path_check.sh:30 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/8_syntax_errors.sh:19 | motivo: ~
+
+Total casos eliminados (extras): 22

docs/mstest_m_removed_extra_tests_mandatory_only.txt

@@ -0,0 +1,59 @@
+Tests eliminados del reporte por estar fuera del obligatorio:
+- \ (barra invertida no especificada)
+- ~ (tilde expansion no obligatoria)
+- $"..." (extension bash, no requerida)
+- ; (separador no obligatorio segun subject)
+- && / || (bonus)
+
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:26 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:28 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:32 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:34 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:52 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:54 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:56 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:58 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:60 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:62 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/0_compare_parsing.sh:64 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/10_parsing_hell.sh:301 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:7 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:31 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:33 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:37 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:39 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:59 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:61 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:63 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:65 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:67 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:69 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:71 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:314 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:328 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:337 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:536 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:538 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:552 | motivo: ; (no obligatorio)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_builtins.sh:606 | motivo: \, ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_redirs.sh:208 | motivo: \
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_variables.sh:40 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_variables.sh:42 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_variables.sh:44 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_variables.sh:48 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_variables.sh:60 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/1_variables.sh:62 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_correction.sh:129 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_correction.sh:139 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_correction.sh:141 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_correction.sh:143 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_correction.sh:147 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_correction.sh:159 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_correction.sh:161 | motivo: $"..." (bash extension)
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/2_path_check.sh:30 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/8_syntax_errors.sh:19 | motivo: ~
+- /home/marcos/programming/minishell_sergio/tests/42_minishell_tester/cmds/mand/8_syntax_errors.sh:68 | motivo: &&/|| (bonus)
+
+Total casos evaluados en reporte original: 195
+Total casos eliminados (extras): 48
+Total casos restantes (mandatory): 147

src/minishell.c

@@ -6,7 +6,7 @@
 /*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/10/20 20:51:33 by sede-san          #+#    #+#             */
-/*   Updated: 2026/02/14 01:58:39 by sede-san         ###   ########.fr       */
+/*   Updated: 2026/02/14 02:23:17 by sede-san         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,7 +29,8 @@ void	minishell_init(
 
 void	minishell_run(
 	t_minishell	*minishell
-){
+)
+{
 	char	*line;
 	t_list	*commands;
 
@@ -39,7 +40,7 @@ void	minishell_run(
 	while (!minishell->exit)
 	{
 		if (isatty(STDIN_FILENO))
-			line = readline(DEFAULT_PS1);
+			line = readline(get_var("PS1", minishell));
 		else
 			line = get_next_line(STDIN_FILENO);
 		handle_sigint_status(minishell);

src/parser/parser_expand.c

@@ -6,94 +6,110 @@
 /*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/02/13 21:24:45 by sede-san          #+#    #+#             */
-/*   Updated: 2026/02/14 01:51:57 by sede-san         ###   ########.fr       */
+/*   Updated: 2026/02/14 06:56:00 by sede-san         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "parser.h"
+#include "parser_expand_internal.h"
-#include "errors.h"
-#include "variables.h"
 
-static char	*replace_value(char *original, char *value, int start, int end);
+static void	command_clear_argv_expand(
-static void	expand_variable(char **argument, int *i, t_minishell *minishell);
+	t_command *command
-static void	expand_argument(char **argument, t_minishell *minishell);
-
-static char	*replace_value(
-	char *original,
-	char *value,
-	int start,
-	int end
 )
 {
-	const char	*before = ft_substr(original, 0, start);
+	int	i;
-	const char	*after = ft_substr(original, end, ft_strlen(original) - end);
-	const char	*expanded = ft_strnjoin(3, before, value, after);
 
-	free((char *)before);
+	i = 0;
-	free((char *)after);
+	while (i < command->argc)
-	return ((char *)expanded);
+	{
+		free(command->argv[i]);
+		i++;
+	}
+	free(command->argv);
 }
 
-static void	expand_variable(
+static bool	command_set_expanded_argv(
-	char **argument,
+	t_command *command,
-	int *i,
+	t_list *expanded_args,
 	t_minishell *minishell
 )
 {
-	char		*expanded;
+	char	**argv;
-	char		*variable_name;
+	t_list	*current;
-	char		*variable_value;
+	int		argc;
-	const int	start = *i + 1;
-	int			end;
-
-	end = start;
-	while (ft_isalnum((*argument)[end]) || (*argument)[end] == '_'
-		|| (*argument)[end] == '?')
-		end++;
-	variable_name = ft_substr(*argument, start, end - start);
-	if (variable_name == NULL)
-		return (minishell->exit = true, malloc_error());
-	variable_value = get_var(variable_name, minishell);
-	free(variable_name);
-	if (variable_value == NULL)
-		variable_value = "";
-	expanded = replace_value(*argument, variable_value, start - 1, end);
-	if (expanded == NULL)
-		return (minishell->exit = true, malloc_error());
-	*i += ft_strlen(variable_value);
-	free(*argument);
-	*argument = expanded;
-}
-
-static void	expand_argument(
-	char **argument,
-	t_minishell *minishell
-)
-{
-	bool	in_single_quote;
-	bool	in_double_quote;
 	int		i;
 
-	in_single_quote = false;
+	argc = ft_lstsize(expanded_args);
-	in_double_quote = false;
+	argv = (char **)malloc(sizeof(char *) * (argc + 1));
+	if (argv == NULL)
+		return (ft_lstclear(&expanded_args, free),
+			parser_expand_malloc_error(minishell), false);
 	i = 0;
-	while ((*argument)[i] != '\0')
+	current = expanded_args;
+	while (current != NULL)
 	{
-		if ((*argument)[i] == '$' && !in_single_quote)
+		argv[i++] = (char *)current->content;
-		{
+		current = current->next;
-			expand_variable(argument, &i, minishell);
+	}
-			if (*argument == NULL)
+	argv[i] = NULL;
-				return (minishell->exit = true, malloc_error());
+	ft_lstclear_nodes(&expanded_args);
-		}
+	command_clear_argv_expand(command);
+	command->argc = argc;
+	command->argv = argv;
+	return (true);
+}
+
+static bool	expand_argv(
+	t_command *command,
+	t_minishell *minishell
+)
+{
+	int		i;
+	t_list	*expanded_args;
+	t_list	*fields;
+	t_list	*last;
+
+	i = 0;
+	expanded_args = NULL;
+	while (i < command->argc)
+	{
+		fields = NULL;
+		if (!parser_expand_word_fields(command->argv[i], minishell,
+				true, &fields))
+			return (ft_lstclear(&expanded_args, free), false);
+		if (expanded_args == NULL)
+			expanded_args = fields;
 		else
 		{
-			if ((*argument)[i] == '\'' && !in_double_quote)
+			last = ft_lstlast(expanded_args);
-				in_single_quote = !in_single_quote;
+			if (last != NULL)
-			else if ((*argument)[i] == '"' && !in_single_quote)
+				last->next = fields;
-				in_double_quote = !in_double_quote;
-			i++;
 		}
+		i++;
 	}
+	return (command_set_expanded_argv(command, expanded_args, minishell));
+}
+
+static bool	expand_redirections(
+	t_list *redirections,
+	t_minishell *minishell,
+	bool expand_vars
+)
+{
+	t_redirection	*redirection;
+	char			*expanded;
+
+	while (redirections != NULL)
+	{
+		redirection = (t_redirection *)redirections->content;
+		expanded = parser_expand_word(redirection->target, minishell,
+				expand_vars);
+		if (expanded == NULL)
+			return (false);
+		free(redirection->target);
+		redirection->target = expanded;
+		redirections = redirections->next;
+	}
+	return (true);
 }
 
 void	expand(
@@ -101,24 +117,23 @@ void	expand(
 	t_minishell *minishell
 )
 {
-	t_list		*current_command;
+	t_list		*current;
 	t_command	*command;
-	int			i;
 
-	current_command = *commands;
+	if (commands == NULL || *commands == NULL)
-	while (current_command != NULL)
+		return ;
+	current = *commands;
+	while (current != NULL)
 	{
-		command = (t_command *)current_command->content;
+		command = (t_command *)current->content;
-		i = 0;
+		if (!expand_argv(command, minishell)
-		while (i < command->argc)
+			|| !expand_redirections(command->redirections, minishell, true)
+			|| !expand_redirections(command->heredocs, minishell, false))
 		{
-			expand_argument(&command->argv[i], minishell);
+			ft_lstclear(commands, (void (*)(void *))command_clear);
-			if (command->argv[i] == NULL)
+			*commands = NULL;
-				ft_lstclear(commands, (void (*)(void *))command_clear);
+			return ;
-			i++;
 		}
-		if (command == NULL)
+		current = current->next;
-			return (ft_lstclear(commands, (void (*)(void *))command_clear));
-		current_command = current_command->next;
 	}
 }

src/parser/parser_expand_fields.c

@@ -0,0 +1,90 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   parser_expand_fields.c                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/02/14 13:15:00 by sede-san          #+#    #+#             */
+/*   Updated: 2026/02/14 13:15:00 by sede-san         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "parser_expand_internal.h"
+
+static t_fields_ctx	init_fields_ctx(
+	t_list **fields,
+	char **current,
+	t_field_state *state
+)
+{
+	t_fields_ctx	ctx;
+
+	ctx.fields = fields;
+	ctx.current = current;
+	ctx.touched = &state->touched;
+	ctx.in_single_quote = &state->in_single_quote;
+	ctx.in_double_quote = &state->in_double_quote;
+	return (ctx);
+}
+
+static bool	finish_word_fields(
+	t_fields_ctx ctx
+)
+{
+	if (*ctx.in_single_quote || *ctx.in_double_quote)
+	{
+		ft_lstclear(ctx.fields, free);
+		free(*ctx.current);
+		syntax_error_unexpected_token(NULL);
+		ctx.minishell->exit_status = 2;
+		return (false);
+	}
+	if ((*ctx.touched || (*ctx.current)[0] != '\0')
+		&& !parser_fields_push_field(ctx))
+		return (false);
+	free(*ctx.current);
+	return (true);
+}
+
+static bool	process_word_fields(
+	const char *word,
+	t_fields_ctx ctx
+)
+{
+	size_t	i;
+
+	i = 0;
+	while (word[i] != '\0')
+	{
+		if (!parser_fields_step(word, &i, ctx))
+			return (false);
+	}
+	return (true);
+}
+
+bool	parser_expand_word_fields(
+	const char *word,
+	t_minishell *minishell,
+	bool expand_vars,
+	t_list **fields
+)
+{
+	char			*current;
+	t_field_state	state;
+	t_fields_ctx	ctx;
+
+	*fields = NULL;
+	current = ft_strdup("");
+	if (current == NULL)
+		return (parser_expand_malloc_error(minishell), false);
+	state.touched = false;
+	state.in_single_quote = false;
+	state.in_double_quote = false;
+	ctx = init_fields_ctx(fields, &current, &state);
+	ctx.minishell = minishell;
+	ctx.expand_vars = expand_vars;
+	if (!process_word_fields(word, ctx))
+		return (ft_lstclear(fields, free), free(current), false);
+	return (finish_word_fields(ctx));
+}

src/parser/parser_expand_fields_step.c

@@ -0,0 +1,105 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   parser_expand_fields_step.c                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/02/14 14:12:00 by sede-san          #+#    #+#             */
+/*   Updated: 2026/02/14 14:12:00 by sede-san         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "parser_expand_internal.h"
+
+static bool	handle_quote_char(
+	const char *word,
+	size_t *i,
+	t_fields_ctx ctx
+)
+{
+	if (word[*i] == '\'' && !*ctx.in_double_quote)
+	{
+		*ctx.in_single_quote = !*ctx.in_single_quote;
+		*ctx.touched = true;
+		(*i)++;
+		return (true);
+	}
+	if (word[*i] == '\"' && !*ctx.in_single_quote)
+	{
+		*ctx.in_double_quote = !*ctx.in_double_quote;
+		*ctx.touched = true;
+		(*i)++;
+		return (true);
+	}
+	return (false);
+}
+
+static bool	skip_dollar_quote_prefix(
+	const char *word,
+	size_t *i,
+	t_fields_ctx ctx
+)
+{
+	if (word[*i] == '$' && !*ctx.in_single_quote && !*ctx.in_double_quote
+		&& word[*i + 1] != '\0'
+		&& (word[*i + 1] == '\'' || word[*i + 1] == '\"'))
+	{
+		(*i)++;
+		return (true);
+	}
+	return (false);
+}
+
+static bool	expand_dollar_token(
+	const char *word,
+	size_t *i,
+	t_fields_ctx ctx,
+	bool *handled
+)
+{
+	char	*expanded;
+
+	*handled = false;
+	if (word[*i] != '$' || *ctx.in_single_quote || !ctx.expand_vars)
+		return (true);
+	*handled = true;
+	expanded = parser_expand_variable(word, i, ctx.minishell);
+	if (expanded == NULL)
+		return (false);
+	if (!*ctx.in_double_quote
+		&& !parser_fields_expand_unquoted_value(ctx, expanded))
+		return (free(expanded), false);
+	if (*ctx.in_double_quote && !parser_fields_append_text(ctx.current,
+			expanded, ctx.minishell))
+		return (free(expanded), false);
+	if (*ctx.in_double_quote && expanded[0] != '\0')
+		*ctx.touched = true;
+	free(expanded);
+	return (true);
+}
+
+bool	parser_fields_step(
+	const char *word,
+	size_t *i,
+	t_fields_ctx ctx
+)
+{
+	char	value[2];
+	bool	handled;
+
+	if (handle_quote_char(word, i, ctx))
+		return (true);
+	if (skip_dollar_quote_prefix(word, i, ctx))
+		return (true);
+	if (!expand_dollar_token(word, i, ctx, &handled))
+		return (false);
+	if (handled)
+		return (true);
+	value[0] = word[(*i)++];
+	value[1] = '\0';
+	if (!parser_fields_append_text(ctx.current, value, ctx.minishell))
+		return (false);
+	*ctx.touched = true;
+	return (true);
+}

src/parser/parser_expand_fields_utils.c

@@ -0,0 +1,100 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   parser_expand_fields_utils.c                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/02/14 14:12:00 by sede-san          #+#    #+#             */
+/*   Updated: 2026/02/14 14:12:00 by sede-san         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "parser_expand_internal.h"
+
+bool	parser_fields_append_text(
+	char **current,
+	const char *value,
+	t_minishell *minishell
+)
+{
+	char	*joined;
+
+	joined = ft_strnjoin(2, *current, (char *)value);
+	if (joined == NULL)
+	{
+		free(*current);
+		*current = NULL;
+		return (parser_expand_malloc_error(minishell), false);
+	}
+	free(*current);
+	*current = joined;
+	return (true);
+}
+
+static bool	is_ifs_char(
+	char c
+)
+{
+	return (c == ' ' || c == '\t' || c == '\n');
+}
+
+bool	parser_fields_push_field(
+	t_fields_ctx ctx
+)
+{
+	t_list	*node;
+
+	node = ft_lstnew(*ctx.current);
+	if (node == NULL)
+	{
+		free(*ctx.current);
+		*ctx.current = NULL;
+		return (parser_expand_malloc_error(ctx.minishell), false);
+	}
+	ft_lstadd_back(ctx.fields, node);
+	*ctx.current = ft_strdup("");
+	if (*ctx.current == NULL)
+		return (ft_lstclear(ctx.fields, free),
+			parser_expand_malloc_error(ctx.minishell), false);
+	*ctx.touched = false;
+	return (true);
+}
+
+static void	skip_ifs(
+	const char *expanded,
+	size_t *i
+)
+{
+	while (expanded[*i] != '\0' && is_ifs_char(expanded[*i]))
+		(*i)++;
+}
+
+bool	parser_fields_expand_unquoted_value(
+	t_fields_ctx ctx,
+	const char *expanded
+)
+{
+	size_t	i;
+	char	value[2];
+
+	i = 0;
+	while (expanded[i] != '\0')
+	{
+		if (is_ifs_char(expanded[i]))
+		{
+			if ((*ctx.touched || (*ctx.current)[0] != '\0')
+				&& !parser_fields_push_field(ctx))
+				return (false);
+			skip_ifs(expanded, &i);
+			continue ;
+		}
+		value[0] = expanded[i];
+		value[1] = '\0';
+		if (!parser_fields_append_text(ctx.current, value, ctx.minishell))
+			return (false);
+		*ctx.touched = true;
+		i++;
+	}
+	return (true);
+}

src/parser/parser_expand_internal.h

@@ -0,0 +1,63 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   parser_expand_internal.h                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/02/14 06:56:00 by sede-san          #+#    #+#             */
+/*   Updated: 2026/02/14 06:56:00 by sede-san         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef PARSER_EXPAND_INTERNAL_H
+# define PARSER_EXPAND_INTERNAL_H
+
+# include "parser.h"
+# include "errors.h"
+# include "variables.h"
+
+typedef struct s_fields_ctx	t_fields_ctx;
+
+void	parser_expand_malloc_error(t_minishell *minishell);
+char	*parser_expand_variable(const char *word, size_t *i,
+			t_minishell *minishell);
+char	*parser_expand_word(const char *word, t_minishell *minishell,
+			bool expand_vars);
+bool	parser_expand_word_fields(const char *word, t_minishell *minishell,
+			bool expand_vars, t_list **fields);
+bool	parser_fields_append_text(char **current, const char *value,
+			t_minishell *minishell);
+bool	parser_fields_push_field(t_fields_ctx ctx);
+bool	parser_fields_expand_unquoted_value(t_fields_ctx ctx,
+			const char *expanded);
+bool	parser_fields_step(const char *word, size_t *i, t_fields_ctx ctx);
+
+typedef struct s_word_ctx
+{
+	char		**result;
+	bool		*in_single_quote;
+	bool		*in_double_quote;
+	t_minishell	*minishell;
+	bool		expand_vars;
+}	t_word_ctx;
+
+typedef struct s_fields_ctx
+{
+	t_list		**fields;
+	char		**current;
+	bool		*touched;
+	bool		*in_single_quote;
+	bool		*in_double_quote;
+	t_minishell	*minishell;
+	bool		expand_vars;
+}	t_fields_ctx;
+
+typedef struct s_field_state
+{
+	bool	touched;
+	bool	in_single_quote;
+	bool	in_double_quote;
+}	t_field_state;
+
+#endif

src/parser/parser_expand_variable.c

@@ -0,0 +1,82 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   parser_expand_variable.c                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/02/14 06:56:00 by sede-san          #+#    #+#             */
+/*   Updated: 2026/02/14 06:56:00 by sede-san         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "parser_expand_internal.h"
+
+void	parser_expand_malloc_error(
+	t_minishell *minishell
+)
+{
+	minishell->exit = true;
+	malloc_error();
+}
+
+static bool	is_var_char(
+	char c
+)
+{
+	return (ft_isalnum(c) || c == '_');
+}
+
+static char	*dup_or_error(
+	const char *value,
+	t_minishell *minishell
+)
+{
+	char	*dup;
+
+	dup = ft_strdup(value);
+	if (dup == NULL)
+		return (parser_expand_malloc_error(minishell), NULL);
+	return (dup);
+}
+
+static char	*expand_named_variable(
+	const char *word,
+	size_t *i,
+	t_minishell *minishell
+)
+{
+	char	*name;
+	char	*value;
+	size_t	start;
+
+	start = *i;
+	while (word[*i] != '\0' && is_var_char(word[*i]))
+		(*i)++;
+	name = ft_substr(word, start, *i - start);
+	if (name == NULL)
+		return (parser_expand_malloc_error(minishell), NULL);
+	value = get_var(name, minishell);
+	free(name);
+	if (value == NULL)
+		value = "";
+	return (dup_or_error(value, minishell));
+}
+
+char	*parser_expand_variable(const char *word, size_t *i,
+		t_minishell *minishell)
+{
+	char	*expanded;
+
+	(*i)++;
+	if (word[*i] == '?')
+	{
+		expanded = ft_itoa(minishell->exit_status);
+		if (expanded == NULL)
+			return (parser_expand_malloc_error(minishell), NULL);
+		return ((*i)++, expanded);
+	}
+	if (word[*i] == '\0' || !is_var_char(word[*i]))
+		return (dup_or_error("$", minishell));
+	return (expand_named_variable(word, i, minishell));
+}

src/parser/parser_expand_word.c

@@ -0,0 +1,104 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   parser_expand_word.c                               :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/02/14 06:56:00 by sede-san          #+#    #+#             */
+/*   Updated: 2026/02/14 06:56:00 by sede-san         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "parser_expand_internal.h"
+
+static bool	word_toggle_quotes(
+	char c,
+	bool *in_single_quote,
+	bool *in_double_quote
+)
+{
+	if (c == '\'' && !*in_double_quote)
+		return (*in_single_quote = !*in_single_quote, true);
+	if (c == '\"' && !*in_single_quote)
+		return (*in_double_quote = !*in_double_quote, true);
+	return (false);
+}
+
+static bool	word_append(
+	char **result,
+	const char *value,
+	t_minishell *minishell
+)
+{
+	char	*joined;
+
+	joined = ft_strnjoin(2, *result, (char *)value);
+	if (joined == NULL)
+	{
+		free(*result);
+		*result = NULL;
+		return (parser_expand_malloc_error(minishell), false);
+	}
+	free(*result);
+	*result = joined;
+	return (true);
+}
+
+static bool	word_step(
+	const char *word,
+	size_t *i,
+	t_word_ctx ctx
+)
+{
+	char	*expanded;
+	char	value[2];
+
+	if (word_toggle_quotes(word[*i], ctx.in_single_quote, ctx.in_double_quote))
+		return ((*i)++, true);
+	if (word[*i] == '$' && word[*i + 1] != '\0'
+		&& !*ctx.in_single_quote && !*ctx.in_double_quote
+		&& (word[*i + 1] == '\'' || word[*i + 1] == '\"'))
+		return ((*i)++, true);
+	if (word[*i] == '$' && !*ctx.in_single_quote && ctx.expand_vars)
+	{
+		expanded = parser_expand_variable(word, i, ctx.minishell);
+		if (expanded == NULL || !word_append(ctx.result, expanded,
+				ctx.minishell))
+			return (free(expanded), false);
+		return (free(expanded), true);
+	}
+	value[0] = word[*i];
+	value[1] = '\0';
+	(*i)++;
+	return (word_append(ctx.result, value, ctx.minishell));
+}
+
+char	*parser_expand_word(
+	const char *word,
+	t_minishell *minishell,
+	bool expand_vars
+)
+{
+	char	*result;
+	size_t	i;
+	bool	in_single_quote;
+	bool	in_double_quote;
+
+	result = ft_strdup("");
+	if (result == NULL)
+		return (parser_expand_malloc_error(minishell), NULL);
+	i = 0;
+	in_single_quote = false;
+	in_double_quote = false;
+	while (word[i] != '\0')
+	{
+		if (!word_step(word, &i, (t_word_ctx){&result, &in_single_quote,
+				&in_double_quote, minishell, expand_vars}))
+			return (NULL);
+	}
+	if (in_single_quote || in_double_quote)
+		return (free(result), syntax_error_unexpected_token(NULL),
+			minishell->exit_status = 2, NULL);
+	return (result);
+}

src/parser/parser_words.c

@@ -6,7 +6,7 @@
 /*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/02/13 21:29:44 by sede-san          #+#    #+#             */
-/*   Updated: 2026/02/13 21:29:44 by sede-san         ###   ########.fr       */
+/*   Updated: 2026/02/14 03:34:38 by sede-san         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

src/variables/environment/environment.c

@@ -71,7 +71,9 @@ void	set_env(
 		}
 	}
 	val = value;
-	if (val != NULL)
+	if (val == NULL)
+		val = ft_strdup("");
+	else
 		val = ft_strdup(value);
 	if (val == NULL)
 	{