willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expansion

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-19 15:24:06 +01:00
parent ce028b7b6f
commit 9f6f48c0ef
9 changed files with 213 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/expander.h
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/18 19:00:51 by qmennen #+# #+# */ /* Created: 2025/02/18 19:00:51 by qmennen #+# #+# */
/* Updated: 2025/02/18 20:40:04 by qmennen ### ########.fr */ /* Updated: 2025/02/19 15:19:50 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -15,8 +15,11 @@
#include "minishell.h" #include "minishell.h"
t_environment *expander_get_var(const char *s, int idx, t_minishell *minishell);
size_t expander_count_vars(const char *s); t_list *expander_parse_variables(const char *s, t_minishell *minishell);
char *expander_allocate_memory(const char *s, t_list *variables);
char *expander_parse_string(char *s, t_minishell *minishell); char *expander_parse_string(char *s, t_minishell *minishell);
int expander_character_valid(const char c);
int expander_expand_dollar(char *src, char *dest, int *j, t_list *variables);
#endif #endif

40
src/expander/expander_allocate_memory.c Normal file
View File

@ -0,0 +1,40 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* expander_allocate_memory.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/19 13:57:19 by qmennen #+# #+# */
/* Updated: 2025/02/19 13:57:36 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
char *expander_allocate_memory(const char *s, t_list *variables)
{
int size;
t_list *current;
t_environment *env;
char *string;
size = 0;
current = variables;
while (current)
{
if (current->content == NULL)
{
current = current->next;
continue;
}
env = (t_environment *)current->content;
size += (ft_strlen(env->value) - ft_strlen(env->name));
current = current->next;
}
size += ft_strlen(s);
string = malloc(size);
if (!string)
perror("expander malloc");
return (string);
}

45
src/expander/expander_expand_dollar.c Normal file
View File

@ -0,0 +1,45 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* expander_expand_dollar.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/19 15:05:58 by qmennen #+# #+# */
/* Updated: 2025/02/19 15:22:40 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
static int get_var_len(const char *source, int idx)
{
int i;
i = 0;
while (expander_character_valid(source[idx + i]))
i++;
return (i);
}
int expander_expand_dollar(char *src, char *dest, int *j, t_list *variables)
{
int i;
int v_len;
t_environment *env;
i = 0;
v_len = 0;
if (variables && variables->content)
{
env = (t_environment *)variables->content;
v_len = ft_strlen(env->name);
while (env->value[i])
{
dest[(*j)++] = env->value[i++];
}
}
else
v_len = get_var_len(src, (*j) + 1);
return (v_len);
}

47
src/expander/expander.c → src/expander/expander_get_variable.c
View File

@ -1,63 +1,30 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* expander.c :+: :+: :+: */ /* expander_get_variable.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/18 19:00:35 by qmennen #+# #+# */ /* Created: 2025/02/19 13:59:03 by qmennen #+# #+# */
/* Updated: 2025/02/18 21:04:00 by qmennen ### ########.fr */ /* Updated: 2025/02/19 13:59:14 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "environment.h"
#include "libft.h"
#include "minishell.h" #include "minishell.h"
#include "typedef.h"
static size_t len_var_name(const char *s, int idx) t_environment *expander_get_var(const char *s, int idx, t_minishell *minishell)
{
size_t i;
i = 0;
while (s[idx + i] && ft_isalpha(s[idx + i]))
i++;
return (i);
}
t_environment *get_var(const char *s, int idx, t_minishell *minishell)
{ {
int i; int i;
t_environment *env; t_environment *env;
char *name; char *name;
i = 0; i = 0;
while (s[idx + i] && ft_isalpha(s[idx + i])) while (expander_character_valid(s[idx + i]))
i++; i++;
name = ft_substr(s, idx, i); name = ft_substr(s, idx, i);
if (!name) if (!name || !*name)
perror("name"); return (NULL);
env = environment_get(minishell->environment, name); env = environment_get(minishell->environment, name);
free(name); free(name);
return (env); return (env);
} }
char *expander_parse_string(char *s, t_minishell *minishell)
{
int i;
t_environment *env;
t_list *var_list;
i = 0;
while (s[i])
{
if (s[i] == '$')
{
env = get_var(s, i, minishell);
if (env)
ft_lstadd_back(&var_list, ft_lstnew(env->value));
}
i++;
}
return ft_strdup("");
}

21
src/expander/expander_count_vars.c → src/expander/expander_is_character.c
View File

@ -1,29 +1,18 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* expander_count_vars.c :+: :+: :+: */ /* expander_is_character.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/18 20:38:17 by qmennen #+# #+# */ /* Created: 2025/02/19 13:15:11 by qmennen #+# #+# */
/* Updated: 2025/02/18 20:39:53 by qmennen ### ########.fr */ /* Updated: 2025/02/19 13:15:55 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
size_t expander_count_vars(const char *s) int expander_character_valid(const char c)
{ {
size_t vars; return (ft_isalnum(c) || c == '_');
size_t i;
i = 0;
vars = 0;
while (s[i])
{
if (s[i] == '$' && ft_isalpha(s[i + 1]))
vars++;
i++;
}
return (vars);
} }

58
src/expander/expander_parse_string.c Normal file
View File

@ -0,0 +1,58 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* expander_parse_string.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/18 19:00:35 by qmennen #+# #+# */
/* Updated: 2025/02/19 15:20:04 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
static void free_variables(t_list *variables)
{
t_list *current;
t_list *last;
current = variables;
while (current)
{
last = current;
current = current->next;
free(last);
}
}
char *expander_parse_string(char *s, t_minishell *minishell)
{
t_list *variables;
t_list *current;
char *string;
int i;
int j;
variables = expander_parse_variables(s, minishell);
string = expander_allocate_memory(s, variables);
i = 0;
j = 0;
current = variables;
while (s[i])
{
if (s[i] == '$' && s[i + 1])
{
i++;
i += expander_expand_dollar(s, string, &j, current);
if (current)
current = current->next;
}
else
string[j++] = s[i++];
}
string[j] = 0;
free_variables(variables);
return (string);
}

37
src/expander/expander_parse_variables.c Normal file
View File

@ -0,0 +1,37 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* expander_parse_variables.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/19 13:58:13 by qmennen #+# #+# */
/* Updated: 2025/02/19 15:07:23 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
t_list *expander_parse_variables(const char *s, t_minishell *minishell)
{
int i;
t_list *var_list;
t_environment *env;
i = 0;
var_list = NULL;
while (s[i])
{
if (s[i] == '$')
{
env = expander_get_var(s, i + 1, minishell);
if (env)
ft_lstadd_back(&var_list, ft_lstnew(env));
else
ft_lstadd_back(&var_list, ft_lstnew(NULL));
}
i++;
}
return (var_list);
}

2
src/lexer/lexer_read_word.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 19:03:47 by qmennen #+# #+# */ /* Created: 2025/02/05 19:03:47 by qmennen #+# #+# */
/* Updated: 2025/02/18 17:02:17 by qmennen ### ########.fr */ /* Updated: 2025/02/19 14:12:19 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

15
src/parser/parser_get_arguments.c
View File

@ -31,6 +31,17 @@ static int count_cmds(t_list *list)
return (cmds); return (cmds);
} }
static int parser_should_expand(t_list *value)
{
t_token *token;
token = (t_token *)value->content;
if (!token)
return (0);
return (token->type == T_DQWORD || (token->type == T_WORD &&
token->value[0] == '$' && token->value[1]));
}
char **parser_get_arguments(t_list *list, t_minishell *minishell) char **parser_get_arguments(t_list *list, t_minishell *minishell)
{ {
t_list *current; t_list *current;
@ -49,11 +60,11 @@ char **parser_get_arguments(t_list *list, t_minishell *minishell)
i = -1; i = -1;
while ((++i) < cmds && current) while ((++i) < cmds && current)
{ {
if (((t_token *)current->content)->type == T_DQWORD) if (parser_should_expand(current))
{ {
args[i] = expander_parse_string(((t_token *)current->content)->value, minishell); args[i] = expander_parse_string(((t_token *)current->content)->value, minishell);
} }
if (((t_token *)current->content)->type == T_WORD || else if (((t_token *)current->content)->type == T_WORD ||
((t_token *)current->content)->type == T_SQWORD) ((t_token *)current->content)->type == T_SQWORD)
args[i] = ft_strdup(((t_token *)current->content)->value); args[i] = ft_strdup(((t_token *)current->content)->value);
current = current->next; current = current->next;