This commit is contained in:
Loic Deridder
2025-01-31 13:45:16 +01:00
parent 304eeb73eb
commit 17361832c1
8 changed files with 83 additions and 59 deletions

View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* cutll.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/31 09:56:34 by nalebrun #+# #+# */
/* Updated: 2025/01/31 10:32:03 by nalebrun ### ########.fr */
/* Created: 2025/01/31 09:56:34 by lderidde #+# #+# */
/* Updated: 2025/01/31 13:38:45 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -14,22 +14,31 @@
void add_nodell(t_nodell **nodell, t_node *node)
{
while (*nodell)
*nodell = (*nodell)->next;
(*nodell) = malloc(sizeof(t_nodell));
(*nodell)->node = node;
(*nodell)->next = NULL;
t_nodell *tmp;
if (!nodell || !(*nodell))
{
*nodell = malloc(sizeof(t_nodell));
(*nodell)->node = node;
(*nodell)->next = NULL;
}
tmp = *nodell;
while (tmp->next)
tmp = tmp->next;
tmp->next = malloc(sizeof(t_nodell));
tmp->next->node = node;
tmp->next->next = NULL;
}
t_node *get_node(t_node *lst, char *expected)
t_node *get_node(t_node **lst, char *expected)
{
t_node *node;
node = NULL;
while (lst && ft_strncmp(lst->val, expected, ft_strlen(expected)))
while ((*lst) && ft_strncmp((*lst)->val, expected, ft_strlen(expected)))
{
add_node_back(&node, lst->val, lst->token, lst->pressision);
lst = lst->next;
add_node_back(&node, (*lst)->val, (*lst)->token, (*lst)->pressision);
(*lst) = (*lst)->next;
}
return (node);
}
@@ -44,10 +53,12 @@ t_nodell *cutll(t_node *lst, char *expected, size_t limiter)
out = NULL;
while (i <= limiter)
{
node = get_node(lst, expected);
node = get_node(&lst, expected);
if (!node)
break;
add_nodell(&out, node);
if(lst && lst->next)
lst = lst->next;
i++;
}
return (out);

View File

@@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* parse.c :+: :+: :+: */
/* test.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/15 08:23:41 by nalebrun #+# #+# */
/* Updated: 2025/01/20 13:15:47 by nalebrun ### ########.fr */
/* Created: 2025/01/15 08:23:41 by lderidde #+# #+# */
/* Updated: 2025/01/31 13:40:10 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -60,19 +60,20 @@ int main(int ac, char **av, char **envp)
// ast = get_ast(envp, lst);
// if (!ast)
// return (1);
// tmp
t_nodell *lls = cutll(lst, "||", -1);
while (lls)
{
gen_dio_linked_list(lls->node, dio);
lls = lls->next;
}
if (DEBUG)
{
// gen_dio_ast(ast, dio);
drawio_end_file(dio);
ft_debug(" draw.io file generated !\n");
}
// tmp
t_nodell *lls = cutll(lst, "||", 1);
while (lls)
{
gen_dio_linked_list(lls->node, dio);
lls = lls->next;
}
free_linked_list(lst);
}

View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* linked_list.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/15 13:38:49 by nalebrun #+# #+# */
/* Updated: 2025/01/20 13:15:03 by nalebrun ### ########.fr */
/* Created: 2025/01/15 13:38:49 by lderidde #+# #+# */
/* Updated: 2025/01/31 13:20:13 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -30,19 +30,22 @@ t_node *create_node(char *val, t_token token)
int add_node_back(t_node **head, char *val, t_token token, t_pres pres)
{
t_node *tmp;
tmp = *head;
if (!val)
return (0);
if (!(*head))
if (!head || !(*head))
{
(*head) = create_node(val, token);
(*head)->pressision = pres;
return (1);
}
while ((*head)->next != NULL)
(*head) = (*head)->next;
(*head)->next = create_node(val, token);
(*head)->next->pressision = pres;
if ((*head)->next == NULL)
while (tmp->next != NULL)
tmp = tmp->next;
tmp->next = create_node(val, token);
tmp->next->pressision = pres;
if (tmp->next == NULL)
return (0);
return (1);
}

View File

@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* tokenizer.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: nalebrun <nalebrun@student.s19.be> +#+ +:+ +#+ */
/* By: lderidde <lderidde@student.s19.be> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/15 13:27:57 by nalebrun #+# #+# */
/* Updated: 2025/01/20 13:15:25 by nalebrun ### ########.fr */
/* Created: 2025/01/15 13:27:57 by lderidde #+# #+# */
/* Updated: 2025/01/31 13:24:28 by lderidde ### ########.fr */
/* */
/* ************************************************************************** */
@@ -21,10 +21,8 @@ static t_node *tokenize_base(char *str)
tab = ft_split_keep(str, " \t\n");
if (!tab)
return (NULL);
head = create_node(tab[0], 0);
if (!head)
return (free(tab), NULL);
i = 1;
head = NULL;
i = 0;
while (tab[i])
{
if (!add_node_back(&head, tab[i], 0, 0))