clean up still in progress

eliminated most of the leaks of the parser
norming still need to be done
This commit is contained in:
Tanguy MAZE
2019-04-11 11:40:26 +02:00
parent 8c4a6aac25
commit 86b0530bf7
6 changed files with 82 additions and 130 deletions

View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/04/10 15:35:18 by tmaze ### ########.fr */
/* Updated: 2019/04/11 10:50:40 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -26,8 +26,18 @@ static t_node *get_node_role(t_lmdata *data, char role)
return (NULL);
}
static int get_nb_paths(t_ind **ret)
{
int i;
i = 0;
while (ret[i])
i++;
return (i);
}
static int lem_in(t_syntax *synt, t_holder *holder,
t_lmdata *lmdata)
t_lmdata *lmdata, t_ind ***ret)
{
if (!(lm_parser(synt, lmdata, holder)))
return (0);
@@ -35,6 +45,12 @@ static int lem_in(t_syntax *synt, t_holder *holder,
return (0);
if (!(lm_adj_parser(lmdata, holder)))
return (0);
if ((*ret = edmunds_karp(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind)) == NULL)
return (0);
if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
return (0);
tablst_inddel(*ret);
return (1);
}
@@ -50,30 +66,14 @@ int main(int ac, char **av)
t_lmdata ldata;
t_holder holder;
t_ind **ret;
int i;
(void)av;
i = 0;
if (ac == 1)
{
lm_init_data(&synt, &holder, &ldata);
if (!(lem_in(&synt, &holder, &ldata)))
if (!(lem_in(&synt, &holder, &ldata, &ret)))
return (lm_error_exit());
if ((ret = edmunds_karp(&ldata, get_node_role(&ldata, 's')->ind
, get_node_role(&ldata, 'e')->ind)) == NULL)
return (lm_error_exit());
i = 0;
while (ret[i])
i++;
push_ants(&ldata, ret, i);
tablst_inddel(ret);
i = 0;
while (i < ldata.nb_nodes)
{
lst_inddel(&(ldata.adj[i]));
i++;
}
ft_memdel((void**)&(ldata.adj));
lm_clean_data(&ldata);
return (0);
}
return (1);