invalid maps

This commit is contained in:
Mthandazo Ndhlovu
2019-04-02 15:09:43 +02:00
parent 4e2fc9f19e
commit 1abb3fc566
127 changed files with 4946 additions and 131 deletions

View File

@@ -14,18 +14,12 @@
static void lm_locate_cmd(int count, char *raw, t_syntax *synt)
{
int s_state;
int e_state;
char *tmp;
int index;
index = 0;
s_state = synt->s_cmd;
e_state = synt->e_cmd;
tmp = ft_strchr(raw, '#');
if ((!s_state || !e_state) && (tmp != NULL && raw[index + 1] == '#'))
if ((!synt->s_cmd || !synt->e_cmd) && (tmp != NULL && raw[1] == '#'))
{
if (!s_state)
if (!synt->s_cmd)
{
if (ft_strcmp(tmp, "##start"))
{
@@ -33,7 +27,7 @@ static void lm_locate_cmd(int count, char *raw, t_syntax *synt)
synt->e_pos = count;
}
}
if (!e_state)
if (!synt->e_cmd)
{
if (ft_strcmp(tmp, "##end"))
{
@@ -44,8 +38,8 @@ static void lm_locate_cmd(int count, char *raw, t_syntax *synt)
}
}
static void lm_get_vertices(int count, char *raw, t_syntax *synt,
t_lmdata *data, t_graph *graph)
static int lm_get_vertices(int count, char *raw, t_syntax *synt,
t_lmdata *data, t_holder *holder)
{
int index;
char *tmp;
@@ -54,16 +48,15 @@ static void lm_get_vertices(int count, char *raw, t_syntax *synt,
index = 0;
value = 0;
graph = NULL;
if (synt->s_cmd > 0 && (synt->e_pos == count - 1))
{
synt->s_vert = count;
lm_add_vertex(data, raw, 's');
return (lm_add_vertex(data, raw, 'e', synt));
}
if (synt->e_cmd > 0 && (synt->s_pos == count - 1))
{
synt->e_vert = count;
lm_add_vertex(data, raw, 'e');
return (lm_add_vertex(data, raw, 's', synt));
}
if (count > 0 && (count != synt->s_vert && count != synt->e_vert)
&& (count != synt->s_pos && count != synt->e_pos))
@@ -71,12 +64,11 @@ static void lm_get_vertices(int count, char *raw, t_syntax *synt,
tmp = ft_strchr(raw, '-');
tmp2 = ft_strchr(raw, '#');
if (tmp == NULL && tmp2 == NULL)
lm_add_vertex(data, raw, 'v');
return (lm_add_vertex(data, raw, 'v', synt));
else if (tmp2 == NULL && tmp != NULL)
{
lm_ext_conn(graph, data, raw, synt);
}
return (lm_ext_conn(holder, data, raw));
}
return (1);
}
static void lm_get_ant_num(int count, char *raw, t_lmdata *ldata, t_syntax *synt)
@@ -101,26 +93,37 @@ static void lm_get_ant_num(int count, char *raw, t_lmdata *ldata, t_synt
}
}
int lm_validate(t_syntax *synt, t_lmdata *lmdata)
{
if (!synt->nb_state || !synt->s_cmd || !synt->e_cmd || synt->error)
return (0);
if (lmdata->nbants == 0 || lmdata->nb_nodes == 0)
return (0);
return (1);
}
int lm_parser(int fd, t_syntax *synt, t_lmdata *ldata,
t_graph *graph)
void lm_parser(int fd, t_syntax *synt, t_lmdata *ldata,
t_holder *tmp_data)
{
char *raw;
int ret;
int index;
index = 0;
ft_printf("debug flags %d \n", index);
while ((ret = get_next_line(fd, &raw)))
{
if (ret == -1)
return (0);
{
synt->error = 1;
return ;
}
lm_get_ant_num(index, raw, ldata, synt);
lm_locate_cmd(index, raw, synt);
lm_get_vertices(index, raw, synt, ldata, graph);
if (!lm_get_vertices(index, raw, synt, ldata, tmp_data))
{
synt->error = 1;
return ;
}
index++;
}
if (index > 1)
return (1);
return (0);
}