norm errors eliminated and parser modified

This commit is contained in:
Mthandazo Ndhlovu
2019-05-09 17:41:07 +02:00
parent 94145d3d17
commit ea99e7b1fc
10 changed files with 70 additions and 32 deletions

View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:37 by mndhlovu #+# #+# */
/* Updated: 2019/05/06 07:34:54 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 17:33:39 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -23,7 +23,7 @@ void lm_init_data(t_holder *holder, t_lmdata *ldata)
holder->l_error = 0;
holder->s_vert = 0;
holder->e_vert = 0;
holder->gr_status = 0;
holder->state = 0;
holder->s_pos = 0;
holder->e_pos = 0;
holder->v_flag = 0;
@@ -57,18 +57,15 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
{
char **tab;
t_node *new;
char *str;
if (!(new = (t_node *)ft_memalloc(sizeof(t_node))))
return (0);
tab = ft_strsplit(raw, ' ');
if (tab != NULL)
if ((tab = ft_strsplit(raw, ' ')) != NULL)
{
if (lm_check_room_before(tab, holder))
if (lm_check_room_before(tab, holder, &str))
{
if ((new->name = ft_strdup(tab[0])) == NULL)
ft_del_words_tables(&tab);
if (new->name == NULL)
return (0);
new->name = str;
new->x = ft_atoi(tab[1]);
new->y = ft_atoi(tab[2]);
new->role = flag;
@@ -100,7 +97,6 @@ int lm_find_index(t_lmdata *data, char *str)
int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
{
t_temp *temp;
t_temp *new;
int src;
int dest;
@@ -115,13 +111,9 @@ int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
if (holder->data == NULL)
holder->data = new;
else
{
temp = holder->data;
while (temp->next)
temp = temp->next;
temp->next = new;
}
lm_ext_conn_sub(holder, new);
(holder->count)++;
holder->state = 1;
return (1);
}
free(new);