42/42_INT_07_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring parsing (wip)

Browse Source
This commit is contained in:
LuckyLaszlo
2021-12-11 04:27:57 +01:00
parent 9322ec9ec9
commit d3d55386d9
4 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headers/minishell_prototypes.h
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */ /* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/08 02:59:58 by lperrey #+# #+# */ /* Created: 2021/10/08 02:59:58 by lperrey #+# #+# */
/* Updated: 2021/12/05 17:36:01 by lperrey ### ########.fr */ /* Updated: 2021/12/10 18:46:48 by lperrey ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -40,8 +40,8 @@ int valid_command_separator(const t_token *token_list);
size_t count_pipes(t_token *token_list); size_t count_pipes(t_token *token_list);
t_cmd **pipeline_alloc(size_t cmd_nbr); t_cmd **pipeline_alloc(size_t cmd_nbr);
int pipeline_fill_argv(t_token *token_list, t_cmd **pipeline); int pipeline_fill_argv(t_token *token_list, t_cmd **pipeline);
int words_expansions(t_token *token_list); int expansions(t_token *token_list, t_cmd **pipeline);
int token_expansions(t_token **t); int token_expansions(t_token *t);
int redirections(t_token *token_list, t_cmd **pipeline); int redirections(t_token *token_list, t_cmd **pipeline);
// Exec // Exec

14
srcs/parsing/expansions/new_token_for_each_field.c
View File

@@ -6,15 +6,15 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */ /* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */ /* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */
/* Updated: 2021/11/30 18:51:13 by lperrey ### ########.fr */ /* Updated: 2021/12/10 19:11:52 by lperrey ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
static t_token *insert_tokens(t_token *t, t_token *insert_lst); static void insert_tokens(t_token *t, t_token *insert_lst);
int new_token_for_each_field(char **fields, t_token **t) int new_token_for_each_field(char **fields, t_token *t)
{ {
t_token head; t_token head;
t_token *insert_lst; t_token *insert_lst;
@@ -38,11 +38,11 @@ int new_token_for_each_field(char **fields, t_token **t)
i++; i++;
} }
free(fields); free(fields);
*t = insert_tokens(*t, head.next); insert_tokens(t, head.next);
return (1); return (1);
} }
static t_token *insert_tokens(t_token *t, t_token *insert_lst) static void insert_tokens(t_token *t, t_token *insert_lst)
{ {
t_token *tmp; t_token *tmp;
t_token *insert_lst_last; t_token *insert_lst_last;
@@ -50,12 +50,12 @@ static t_token *insert_tokens(t_token *t, t_token *insert_lst)
t->id = 0; t->id = 0;
ft_free_null(&t->content); ft_free_null(&t->content);
if (!insert_lst) if (!insert_lst)
return (t); return ;
tmp = t->next; tmp = t->next;
t->next = insert_lst; t->next = insert_lst;
insert_lst_last = (t_token *)ft_lstlast((t_list *)insert_lst); insert_lst_last = (t_token *)ft_lstlast((t_list *)insert_lst);
insert_lst_last->next = tmp; insert_lst_last->next = tmp;
return (insert_lst_last); //return (insert_lst_last); // return inutile pour reusinage
} }

37
srcs/parsing/expansions/words_expansions.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */ /* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */ /* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */
/* Updated: 2021/11/30 18:35:59 by lperrey ### ########.fr */ /* Updated: 2021/12/10 19:51:33 by lperrey ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,7 +14,7 @@
t_list *expand_token(char *content); t_list *expand_token(char *content);
char *rejoin_after_expand(t_list *expand_lst); char *rejoin_after_expand(t_list *expand_lst);
int new_token_for_each_field(char **fields, t_token **t); int new_token_for_each_field(char **fields, t_token *t);
// 1 - chaque bout dans un element d'une t_list // 1 - chaque bout dans un element d'une t_list
// (telle quelle si non expand, ou VARIABLE de env) // (telle quelle si non expand, ou VARIABLE de env)
@@ -25,28 +25,43 @@ int new_token_for_each_field(char **fields, t_token **t);
// (ft_lstadd_front() sur le token original, puis set le token orignal à : // (ft_lstadd_front() sur le token original, puis set le token orignal à :
// t->id = 0 ; free(t->content) ; t->content = NULL ; pour qu'il soit ignoré sur la suite du parsing) // t->id = 0 ; free(t->content) ; t->content = NULL ; pour qu'il soit ignoré sur la suite du parsing)
int words_expansions(t_token *token_list) int expansions(t_token *t, t_cmd **pipeline)
{ {
while (token_list) int i;
t_token *next_token;
i = 0;
while (t)
{ {
if (token_list->id == T_WORD) if (t->id == '|')
token_expansions(&token_list); i++;
token_list = token_list->next; if (!pipeline[i]->error && t->id == T_WORD)
{
next_token = t->next;
if (!token_expansions(t))
{
pipeline[i]->error = EXIT_EXPANSION;
}
while (t != next_token)
t = t->next;
}
else
t = t->next;
} }
return (1); return (1);
} }
int token_expansions(t_token **t) int token_expansions(t_token *t)
{ {
void *tmp; void *tmp;
char **tmp_split; char **tmp_split;
// 1 // 1
tmp = expand_token((*t)->content); tmp = (t_list*)expand_token(t->content);
if (!tmp) if (!tmp)
return (0); return (0);
// 2 // 2
tmp = rejoin_after_expand(tmp); tmp = (char*)rejoin_after_expand(tmp);
if (!tmp) if (!tmp)
return (0); return (0);
// 3 // 3
@@ -55,7 +70,7 @@ int token_expansions(t_token **t)
if (!tmp_split) if (!tmp_split)
return (0); return (0);
// 4 // 4
tmp = ft_dup_2d_arr(tmp_split, (t_dup_f)ft_strdup_quotes); tmp = (char**)ft_dup_2d_arr(tmp_split, (t_dup_f)ft_strdup_quotes);
ft_free_2d_arr(tmp_split); ft_free_2d_arr(tmp_split);
tmp_split = tmp; tmp_split = tmp;
if (!tmp_split) if (!tmp_split)

27
srcs/parsing/parsing.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */ /* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/24 10:52:40 by lperrey #+# #+# */ /* Created: 2021/10/24 10:52:40 by lperrey #+# #+# */
/* Updated: 2021/12/06 01:08:11 by lperrey ### ########.fr */ /* Updated: 2021/12/10 19:58:17 by lperrey ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -52,25 +52,22 @@ t_cmd **parsing(t_token *token_list)
// 2.9.1 - 1) Save Words // 2.9.1 - 1) Save Words
save_redirections_words(token_list); save_redirections_words(token_list);
// 2.9.1 - 2) Expansion
// TEST TOKENS PRINT
//ft_putstr_fd("TOKENS LIST :\n-----------\n", 1);
//ft_lstprint((t_list *)token_list, 1);
//
// getenv() ne va pas fonctionner avec le changement d'environnement prévu jusqu'ici.
// TODO : Revoir le changement d'environnement (avec extern char **environ ?)
// OU Integrer un equivalent perso comme dans pipex
if (!words_expansions(token_list))
return (NULL);
//
//ft_putstr_fd("TOKENS LIST EXPANDED :\n-----------\n", 1);
//ft_lstprint((t_list *)token_list, 1);
// Struct CMD alloc // Struct CMD alloc
pipeline = pipeline_alloc(1 + count_pipes(token_list)); pipeline = pipeline_alloc(1 + count_pipes(token_list));
if (!pipeline) if (!pipeline)
return (NULL); return (NULL);
// 2.9.1 - 2) Expansion
// TEST TOKENS PRINT
/* ft_putstr_fd("TOKENS LIST :\n-----------\n", STDERR_FILENO);
ft_lstprint((t_list *)token_list, STDERR_FILENO); */
//
if (!expansions(token_list, pipeline))
return (ft_retp_free(NULL, &pipeline, (t_free_f)free_pipeline));
//
/* ft_putstr_fd("TOKENS LIST EXPANDED :\n-----------\n", STDERR_FILENO);
ft_lstprint((t_list *)token_list, STDERR_FILENO); */
// 2.9.1 - 3) Redirection // 2.9.1 - 3) Redirection
if (!redirections(token_list, pipeline)) if (!redirections(token_list, pipeline))
return (ft_retp_free(NULL, &pipeline, (t_free_f)free_pipeline)); return (ft_retp_free(NULL, &pipeline, (t_free_f)free_pipeline));