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

we're expanding

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-18 20:04:56 +01:00
parent 4005f98b16
commit 6d308b4a67
11 changed files with 152 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -22,7 +22,7 @@ LIBFT = $(LIBFT_PATH)/libft.a
OBJ_PATH = obj
VPATH = src:src/environment:src/prompt:src/lexer:src/token:src/utils:src/executor:src/parser
VPATH = src:src/environment:src/prompt:src/lexer:src/token:src/utils:src/executor:src/parser:src/expander
SOURCES = $(shell basename -a $(shell find $(SRC_PATH) -type f -name "*.c"))
OBJECTS = $(addprefix $(OBJ_PATH)/, $(SOURCES:.c=.o))

20
inc/expander.h Normal file
View File

@ -0,0 +1,20 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* expander.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/18 19:00:51 by qmennen #+# #+# */
/* Updated: 2025/02/18 19:05:14 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef EXPANDER_H
# define EXPANDER_H
#include "minishell.h"
char *expander_parse_string(char *s, t_minishell *minishell);
#endif

1
inc/minishell.h
View File

@ -21,6 +21,7 @@
# include "tokenizer.h"
# include "executor.h"
# include "parser.h"
# include "expander.h"
# include "utils.h"
# define TRUE 1

4
inc/parser.h
View File

@ -16,7 +16,7 @@
# include "minishell.h"
t_command *parser_command_new(char *cmd);
char **parser_get_arguments(t_list *list);
t_list *parser_get_commands(t_list *list);
char **parser_get_arguments(t_list *list, t_minishell *minishell);
t_list *parser_get_commands(t_minishell *minishell);
#endif

2
inc/typedef.h
View File

@ -16,6 +16,8 @@
typedef enum e_token_type
{
T_WORD,
T_DQWORD,
T_SQWORD,
T_PIPE,
T_REDIRECT_IN,
T_REDIRECT_OUT,

86
src/expander/expander.c Normal file
View File

@ -0,0 +1,86 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* expander.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/18 19:00:35 by qmennen #+# #+# */
/* Updated: 2025/02/18 20:00:51 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
#include <stdio.h>
static size_t len_prefix(const char *s)
{
size_t i;
i = 0;
while (s[i] != '$' && s[i])
i++;
return (i);
}
static size_t len_var_name(const char *s)
{
size_t start;
size_t i;
start = len_prefix(s);
if (start == ft_strlen(s))
return (0);
start++;
i = 0;
while (s[start + i])
i++;
return (i);
}
static char *get_env_value(char *s)
{
int start;
start = 0;
while (s[start] != '$' && s[start])
start++;
if (s[start] != '$' || !s[start + 1])
return (NULL);
start++;
return ft_substr(s, start, len_var_name(s));
}
static char *expand_string(char *s, t_environment *env)
{
char *final_str;
final_str = ft_calloc(1, ft_strlen(env->value) + len_prefix(s) + 1);
if (!final_str)
{
perror("malloc");
exit(EXIT_FAILURE);
}
ft_strlcat(final_str, s, len_prefix(s) + 1);
ft_strlcat(final_str, env->value, ft_strlen(env->value));
return (final_str);
}
char *expander_parse_string(char *s, t_minishell *minishell)
{
size_t l1;
char *result;
char *name;
t_environment *env;
l1 = len_prefix(s);
if (l1 == ft_strlen(s))
return (ft_strdup(s));
name = get_env_value(s);
if (!name)
return (ft_strdup(""));
env = environment_get(minishell->environment, name);
result = expand_string(s, env);
free(name);
return (result);
}

2
src/lexer/lexer_parse_input.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 19:09:20 by qmennen #+# #+# */
/* Updated: 2025/02/05 19:09:26 by qmennen ### ########.fr */
/* Updated: 2025/02/18 17:18:10 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */

15
src/lexer/lexer_token_next.c
View File

@ -11,6 +11,17 @@
/* ************************************************************************** */
#include "minishell.h"
#include "typedef.h"
static t_token_type get_word_type(char c)
{
if (c == '\'')
return (T_SQWORD);
else if (c == '"')
return (T_DQWORD);
else
return (T_WORD);
}
/**
* @brief Retrieves the next token from the lexer.
@ -34,6 +45,7 @@
t_token *ft_token_next(t_lexer *lexer)
{
t_token *token;
t_token_type word_type;
char *word;
int current_pos;
@ -48,10 +60,11 @@ t_token *ft_token_next(t_lexer *lexer)
token = token_parse(lexer);
else if (ft_isprint(lexer->current_char))
{
word_type = get_word_type(lexer->current_char);
word = lexer_readword(lexer);
if (!word)
return (token_new(T_ERROR, &lexer->current_char, current_pos));
token = token_new(T_WORD, word, current_pos);
token = token_new(word_type, word, current_pos);
free(word);
}
else

2
src/main.c
View File

@ -38,7 +38,7 @@ int main(int argc, char **argv, char **envp)
minishell->lexer = ft_lexer_new(minishell->line);
minishell->tokens = ft_parse_input(minishell->lexer);
ft_lstiter(minishell->tokens, token_print);
//minishell->commands = parser_get_commands(minishell->tokens);
minishell->commands = parser_get_commands(minishell);
simple_builtins(minishell);
free_minishell_line(minishell);
ft_lstclear(&minishell->commands, free_command_list);

13
src/parser/parser_get_arguments.c
View File

@ -16,12 +16,14 @@ static int count_cmds(t_list *list)
{
int cmds;
t_list *current;
t_token *token;
cmds = 0;
current = list;
while (current)
{
if (((t_token *)current->content)->type != T_WORD)
token = ((t_token *)current->content);
if (token->type >= 3)
break ;
cmds++;
current = current->next;
@ -29,7 +31,7 @@ static int count_cmds(t_list *list)
return (cmds);
}
char **parser_get_arguments(t_list *list)
char **parser_get_arguments(t_list *list, t_minishell *minishell)
{
t_list *current;
char **args;
@ -47,7 +49,12 @@ char **parser_get_arguments(t_list *list)
i = -1;
while ((++i) < cmds && current)
{
if (((t_token *)current->content)->type == T_WORD)
if (((t_token *)current->content)->type == T_DQWORD)
{
args[i] = expander_parse_string(((t_token *)current->content)->value, minishell);
}
if (((t_token *)current->content)->type == T_WORD ||
((t_token *)current->content)->type == T_SQWORD)
args[i] = ft_strdup(((t_token *)current->content)->value);
current = current->next;
}

37
src/parser/parser_get_commands.c
View File

@ -1,35 +1,18 @@
/* ************************************************************************** */
/* */
/* :::::::: */
/* parser_get_commands.c :+: :+: */
/* +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */
/* ::: :::::::: */
/* parser_get_commands.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/11 14:06:02 by qmennen #+# #+# */
/* Updated: 2025/02/12 20:49:00 by willem ######## odam.nl */
/* Updated: 2025/02/18 19:29:38 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
// static void print_cmds(void *content)
// {
// t_command *cmd;
// int i;
// cmd = (t_command *)content;
// printf("cmd: %s\n", cmd->command);
// printf("args: ");
// i = 0;
// while (cmd->args[i])
// {
// printf("%s ", cmd->args[i]);
// i++;
// }
// printf("\n");
// }
t_list *parser_get_commands(t_list *list)
t_list *parser_get_commands(t_minishell *minishell)
{
t_list *command_list;
t_list *current;
@ -37,14 +20,14 @@ t_list *parser_get_commands(t_list *list)
t_token *token;
command_list = NULL;
if (!list)
if (!minishell->tokens)
return (NULL);
current = list;
current = minishell->tokens;
while (current)
{
token = (t_token *) current->content;
command = parser_command_new(ft_strdup(token->value));
command->args = parser_get_arguments(current);
command->args = parser_get_arguments(current, minishell);
ft_lstadd_back(&command_list, ft_lstnew(command));
while (current && ((t_token *)current->content)->type == T_WORD)
current = current->next;