nalebrun/mmoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

norm

Browse Source
This commit is contained in:
gazhonsepaskwa
2025-02-07 18:08:37 +01:00
parent cc57905fa9
commit d3849d196f
18 changed files with 178 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/parsing/ast/and_or.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* and_or.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 07:57:33 by nalebrun #+# #+# */
/* Updated: 2025/02/05 07:57:33 by nalebrun ### ########.fr */
/* Updated: 2025/02/07 17:57:01 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
@@ -14,7 +14,7 @@
void create_and_or(t_ast_n *self, t_node *lst, t_node *token, t_msh *msh)
{
t_nodell *nodell;
t_nodell *nodell;
nodell = cutll(lst, token, 1);
self->left = create_ast_n(nodell->node, self, msh, self->sh);

10
srcs/parsing/ast/ast.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* ast.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/24 08:22:16 by lderidde #+# #+# */
/* Updated: 2025/02/05 14:04:12 by lderidde ### ########.fr */
/* Updated: 2025/02/07 17:57:10 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
@@ -15,7 +15,7 @@
t_ast_n *create_ast_n(t_node *lst, t_ast_n *parent, t_msh *msh, bool subsh)
{
t_ast_n *node;
t_ast_n *node;
t_node *token;
node = malloc(sizeof(t_ast_n));
@@ -29,7 +29,7 @@ t_ast_n *create_ast_n(t_node *lst, t_ast_n *parent, t_msh *msh, bool subsh)
node->_stdin = 0;
node->save_stdo = 1;
node->save_stdi = 0;
node->sh = subsh;
node->sh = subsh;
if (node->state == _AND || node->state == _OR)
create_and_or(node, lst, token, msh);
else if (node->state == _SUBSH)
@@ -43,7 +43,7 @@ t_ast_n *create_ast_n(t_node *lst, t_ast_n *parent, t_msh *msh, bool subsh)
t_ast_n *get_ast(t_msh *msh, t_node *lst)
{
t_ast_n *head;
t_ast_n *head;
head = create_ast_n(lst, NULL, msh, false);
return (head);

37
srcs/parsing/ast/commands.c
View File

@@ -3,16 +3,16 @@
/* ::: :::::::: */
/* commands.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 07:48:37 by nalebrun #+# #+# */
/* Updated: 2025/02/05 07:48:37 by nalebrun ### ########.fr */
/* Updated: 2025/02/07 18:00:41 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
# include "../../../includes/minishell.h"
#include "../../../includes/minishell.h"
char **lltotab(t_node *lst, t_node *limiter)
char **lltotab(t_node *lst, t_node *limiter)
{
char **out;
int count;
@@ -40,11 +40,11 @@ char **lltotab(t_node *lst, t_node *limiter)
return (out);
}
char **get_args(t_node *start)
char **get_args(t_node *start)
{
t_node *cpy;
char **out;
cpy = NULL;
while (start)
{
@@ -64,23 +64,26 @@ char **get_args(t_node *start)
void create_cmd(t_ast_n *self, t_node *lst)
{
char **cmd_args;
int i;
self->state = _CMD;
self->files = NULL;
self->redir = ft_calloc(1, sizeof(t_redir));
self->redir[0] = _NR;
self->redir[0] = _NR;
cmd_args = get_args(lst);
self->args = cmd_args;
self->cmd = ft_strdup(cmd_args[0]);
create_redir(lst, self);
// debug
int i = -1;
ft_debug("==== CMD REDIR\n");
while (self->files && self->files[++i])
ft_debug("redi : [%d]%s\n",self->redir[i], self->files[i]);
ft_debug("==== CMD ARGS\n");
i = -1;
while (self->args && self->args[++i])
ft_debug("args : %s\n",self->args[i], self->args[i]);
ft_debug("==== CMD DONE\n\n");
if (DEBUG)
{
i = -1;
ft_debug("==== CMD REDIR\n");
while (self->files && self->files[++i])
ft_debug("redi : [%d]%s\n", self->redir[i], self->files[i]);
ft_debug("==== CMD ARGS\n");
i = -1;
while (self->args && self->args[++i])
ft_debug("args : %s\n", self->args[i], self->args[i]);
ft_debug("==== CMD DONE\n\n");
}
}

36
srcs/parsing/ast/cutll.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* cutll.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/31 09:56:34 by lderidde #+# #+# */
/* Updated: 2025/01/31 14:05:12 by lderidde ### ########.fr */
/* Updated: 2025/02/07 17:56:37 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
@@ -31,7 +31,7 @@ static void add_nodell(t_nodell **nodell, t_node *node)
tmp->next->next = NULL;
}
static t_node *get_node(t_node **lst, t_node *expected, int limiter)
static t_node *get_node(t_node **lst, t_node *expected, int limiter)
{
t_node *node;
@@ -41,7 +41,8 @@ static t_node *get_node(t_node **lst, t_node *expected, int limiter)
add_node_back(&node, (*lst)->val, (*lst)->token, (*lst)->pressision);
(*lst) = (*lst)->next;
}
while (limiter == -1 && (*lst) && ft_strncmp((*lst)->val, expected->val, ft_strlen((*lst)->val)))
while (limiter == -1 && (*lst) && ft_strncmp((*lst)->val, expected->val,
ft_strlen((*lst)->val)))
{
add_node_back(&node, (*lst)->val, (*lst)->token, (*lst)->pressision);
(*lst) = (*lst)->next;
@@ -54,34 +55,35 @@ t_nodell *cutll(t_node *lst, t_node *expected, size_t limiter)
t_nodell *out;
t_node *node;
size_t i;
t_nodell *tmp;
i = 0;
out = NULL;
while (i <= limiter)
{
node = get_node(&lst, expected, limiter);
if (!node)
break;
break ;
add_nodell(&out, node);
t_nodell *tmp = out;
tmp = out;
while (tmp)
tmp = tmp->next;
if(lst && lst->next)
if (lst && lst->next)
lst = lst->next;
i++;
}
return (out);
}
void free_lltab(t_nodell *nodell)
void free_lltab(t_nodell *nodell)
{
t_nodell *tmp;
t_nodell *tmp;
while (nodell)
{
free_linked_list(nodell->node);
tmp = nodell->next;
free(nodell);
nodell = tmp;
}
while (nodell)
{
free_linked_list(nodell->node);
tmp = nodell->next;
free(nodell);
nodell = tmp;
}
}

22
srcs/parsing/ast/free_ast.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* free_ast.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 14:39:28 by lderidde #+# #+# */
/* Updated: 2025/02/07 09:20:16 by lderidde ### ########.fr */
/* Updated: 2025/02/07 17:57:21 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
@@ -19,20 +19,20 @@ static void free_redirs(t_ast_n *node)
free_tab(node->files);
}
static void free_cmd(t_ast_n *node)
static void free_cmd(t_ast_n *node)
{
free(node->cmd);
free_redirs(node);
free_tab(node->args);
free_tab(node->args);
}
static void free_pline(t_ast_n *node)
static void free_pline(t_ast_n *node)
{
int i;
int i;
i = -1;
while (node->pline[++i])
free_ast(node->pline[i]);
i = -1;
while (node->pline[++i])
free_ast(node->pline[i]);
}
void free_ast(t_ast_n *node)
@@ -48,9 +48,9 @@ void free_ast(t_ast_n *node)
free_redirs(node);
}
else if (node->state == _PLINE)
free_pline(node);
free_pline(node);
else
free_cmd(node);
free_cmd(node);
free(node);
}

42
srcs/parsing/ast/redirections.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* redirections.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 07:38:26 by nalebrun #+# #+# */
/* Updated: 2025/02/05 11:41:23 by nalebrun ### ########.fr */
/* Updated: 2025/02/07 17:57:42 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
@@ -29,33 +29,33 @@ t_redir get_redir(t_node *node)
static void add_redir(t_redir redir, t_redir **redir_list)
{
int i;
int j;
t_redir *tmp;
int i;
int j;
t_redir *tmp;
i = 0;
while ((*redir_list)[i] != _NR)
i++;
tmp = ft_calloc(i + 2, sizeof(t_redir));
j = -1;
while ((*redir_list)[++j] != _NR)
tmp[j] = (*redir_list)[j];
tmp[j++] = redir;
tmp[j] = _NR;
free(*redir_list);
*redir_list = tmp;
i = 0;
while ((*redir_list)[i] != _NR)
i++;
tmp = ft_calloc(i + 2, sizeof(t_redir));
j = -1;
while ((*redir_list)[++j] != _NR)
tmp[j] = (*redir_list)[j];
tmp[j++] = redir;
tmp[j] = _NR;
free(*redir_list);
*redir_list = tmp;
}
void create_redir(t_node *head, t_ast_n *self)
{
t_redir redir;
t_redir redir;
while (head)
{
while (head && get_redir(head) == _NR)
head = head->next;
if (!head)
break;
break ;
redir = get_redir(head);
add_redir(redir, &self->redir);
add_to_tab(&self->files, head->next->val);
@@ -65,7 +65,7 @@ void create_redir(t_node *head, t_ast_n *self)
}
}
int in_parenthesis(t_node *head)
int in_parenthesis(t_node *head)
{
int count;
@@ -85,14 +85,14 @@ int in_parenthesis(t_node *head)
void create_redir_subsh(t_node *head, t_ast_n *self)
{
t_redir redir;
t_redir redir;
while (head)
{
while (head && (get_redir(head) == _NR || in_parenthesis(head)))
head = head->next;
if (!head)
break;
break ;
redir = get_redir(head);
add_redir(redir, &self->redir);
add_to_tab(&self->files, head->next->val);

30
srcs/parsing/ast/subsh.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* subsh.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 07:51:27 by lderidde #+# #+# */
/* Updated: 2025/02/07 09:12:41 by lderidde ### ########.fr */
/* Updated: 2025/02/07 18:01:31 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
@@ -31,7 +31,7 @@ t_node *remove_parentheses(t_node *lst)
if (it->pressision == SUBSH_E)
deepness -= 1;
if (deepness == 0)
break;
break ;
add_node_back(&out, str, it->token, it->pressision);
free(str);
it = it->next;
@@ -40,23 +40,25 @@ t_node *remove_parentheses(t_node *lst)
return (out);
}
void create_subsh(t_ast_n *self, t_node *lst, t_msh *msh)
void create_subsh(t_ast_n *self, t_node *lst, t_msh *msh)
{
t_node *cutted;
int i;
self->sh = true;
self->sh = true;
cutted = remove_parentheses(lst);
self->left = create_ast_n(cutted, self, msh, self->sh);
self->files = NULL;
self->redir = ft_calloc(1, sizeof(t_redir));
self->redir[0] = _NR;
self->redir[0] = _NR;
create_redir_subsh(lst, self);
// debug
int i = -1;
ft_debug("==== SUBSH REDIR\n");
while (self->redir[++i])
ft_debug("subsh_redir : [%d]%s\n", self->redir[i], self->files[i]);
ft_debug("==== SUBSH DONE\n\n");
free_linked_list(cutted);
if (DEBUG)
{
i = -1;
ft_debug("==== SUBSH REDIR\n");
while (self->redir[++i])
ft_debug("subsh_redir : [%d]%s\n", self->redir[i], self->files[i]);
ft_debug("==== SUBSH DONE\n\n");
free_linked_list(cutted);
}
}

15
srcs/parsing/ast/top_token.c
View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* top_token.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/31 17:14:26 by nalebrun #+# #+# */
/* Updated: 2025/01/31 17:14:26 by nalebrun ### ########.fr */
/* Updated: 2025/02/07 17:56:02 by nalebrun ### ########.fr */
/* */
/* ************************************************************************** */
@@ -27,10 +27,9 @@ static int last_tok_redir(t_node *lst)
{
while (lst)
{
if ((lst->next == NULL
|| lst->next->pressision == D_RED_R
|| lst->next->pressision == RED_R)
&& !ft_strncmp(lst->val, ")", 1))
if ((lst->next == NULL || lst->next->pressision == D_RED_R
|| lst->next->pressision == RED_R) && !ft_strncmp(lst->val, ")",
1))
return (1);
lst = lst->next;
}
@@ -62,7 +61,7 @@ static t_node *find_token(char *tok, t_node *lst)
return (NULL);
}
t_node *get_top_token(t_node *lst, t_state *state)
t_node *get_top_token(t_node *lst, t_state *state)
{
*state = _SUBSH;
if (!ft_strncmp(lst->val, "(", 1) && last_tok_subsh(lst))
@@ -82,7 +81,7 @@ t_node *get_top_token(t_node *lst, t_state *state)
*state = _PLINE;
return (find_token("|", lst));
}
else if (!ft_strncmp(lst->val, "(", 1) && last_tok_redir(lst))
else if (!ft_strncmp(lst->val, "(", 1) && last_tok_redir(lst))
return (lst);
else
{