Cleaned the seg faults and normed the code, only
lm_mem_utils has a norm error.
This commit is contained in:
@@ -6,42 +6,42 @@
|
||||
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2019/04/20 15:24:51 by mndhlovu #+# #+# */
|
||||
/* Updated: 2019/05/02 13:11:43 by mndhlovu ### ########.fr */
|
||||
/* Updated: 2019/05/02 13:35:43 by mndhlovu ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "lem_in.h"
|
||||
|
||||
static void lm_locate_cd(int index, t_syntax *synt, char *line)
|
||||
static void lm_locate_cd(int index, t_holder *holder, char *line)
|
||||
{
|
||||
char *tmp;
|
||||
|
||||
tmp = ft_strchr(line, '#');
|
||||
if ((!synt->s_cmd || !synt->e_cmd)
|
||||
if ((!holder->s_cmd || !holder->e_cmd)
|
||||
&& (tmp != NULL && line[1] == '#'
|
||||
&& lm_check_forbiden_chars(line, 1)))
|
||||
{
|
||||
if (!synt->s_cmd)
|
||||
if (!holder->s_cmd)
|
||||
{
|
||||
if (ft_strcmp(line, "##start") == 0)
|
||||
{
|
||||
synt->s_cmd = 1;
|
||||
synt->s_pos = index;
|
||||
holder->s_cmd = 1;
|
||||
holder->s_pos = index;
|
||||
}
|
||||
}
|
||||
if (!synt->e_cmd)
|
||||
if (!holder->e_cmd)
|
||||
{
|
||||
if (ft_strcmp(line, "##end") == 0)
|
||||
{
|
||||
synt->e_cmd = 1;
|
||||
synt->e_pos = index;
|
||||
holder->e_cmd = 1;
|
||||
holder->e_pos = index;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int lm_get_ant_(int counter, t_lmdata *ldata
|
||||
, t_syntax *synt, char *line)
|
||||
, t_holder *holder, char *line)
|
||||
{
|
||||
int value;
|
||||
|
||||
@@ -51,7 +51,7 @@ static int lm_get_ant_(int counter, t_lmdata *ldata
|
||||
if (value > 0)
|
||||
{
|
||||
ldata->nbants = value;
|
||||
synt->nb_state = 1;
|
||||
holder->nb_state = 1;
|
||||
return (1);
|
||||
}
|
||||
free(line);
|
||||
@@ -60,20 +60,19 @@ static int lm_get_ant_(int counter, t_lmdata *ldata
|
||||
}
|
||||
|
||||
static int lm_get_vertices(int count, t_lmdata *data
|
||||
, t_syntax *syntax, t_holder *holder, char *line)
|
||||
, t_holder *holder, char *line)
|
||||
{
|
||||
lm_get_cmd_vertices(count, syntax, data, line);
|
||||
if (!syntax->s_error && !syntax->e_error)
|
||||
lm_get_cmd_vertices(count, holder, data, line);
|
||||
if (!holder->s_error && !holder->e_error)
|
||||
{
|
||||
lm_get_vert_link(count, data, syntax, holder, line);
|
||||
if (!syntax->v_error && !syntax->l_error)
|
||||
lm_get_vert_link(count, data, holder, line);
|
||||
if (!holder->v_error && !holder->l_error)
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
int lm_parser(t_syntax *synt
|
||||
, t_lmdata *ldata, t_holder *holder)
|
||||
int lm_parser(t_lmdata *ldata, t_holder *holder)
|
||||
{
|
||||
char *raw;
|
||||
int index;
|
||||
@@ -83,10 +82,10 @@ int lm_parser(t_syntax *synt
|
||||
{
|
||||
if ((add_line_map(ldata, raw)))
|
||||
return (0);
|
||||
if (!(lm_get_ant_(index, ldata, synt, raw)) && index == 0)
|
||||
if (!(lm_get_ant_(index, ldata, holder, raw)) && index == 0)
|
||||
return (0);
|
||||
lm_locate_cd(index, synt, raw);
|
||||
if (!(lm_get_vertices(index, ldata, synt, holder, raw)))
|
||||
lm_locate_cd(index, holder, raw);
|
||||
if (!(lm_get_vertices(index, ldata, holder, raw)))
|
||||
return (0);
|
||||
index++;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user