code cleaning done on 80 percent of the parser functions, whats left is to re structure the syntax struct and do furthure tests to eliminate level 0 errors
This commit is contained in:
@@ -6,15 +6,15 @@
|
||||
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2019/04/04 09:24:45 by mndhlovu #+# #+# */
|
||||
/* Updated: 2019/04/26 13:35:09 by mndhlovu ### ########.fr */
|
||||
/* Updated: 2019/04/29 12:05:40 by mndhlovu ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "lem_in.h"
|
||||
|
||||
int lm_check_ant_no(char *line)
|
||||
static int lm_check_ant_no(char *line)
|
||||
{
|
||||
int len;
|
||||
int len;
|
||||
|
||||
len = ft_strlen(line);
|
||||
if (len > 0)
|
||||
@@ -27,55 +27,56 @@ int lm_check_ant_no(char *line)
|
||||
return (0);
|
||||
}
|
||||
|
||||
int lm_get_value(char *line)
|
||||
int lm_get_value(char *line)
|
||||
{
|
||||
if (line != NULL)
|
||||
if (line != NULL)
|
||||
return (lm_check_ant_no(line));
|
||||
return (0);
|
||||
return (0);
|
||||
}
|
||||
|
||||
void lm_get_cmd_vert(int count, t_syntax *synt
|
||||
, t_lmdata *ldata, char *line)
|
||||
void lm_get_cmd_vert(int count, t_syntax *synt
|
||||
, t_lmdata *ldata, char *line)
|
||||
{
|
||||
char *tmp;
|
||||
char *tmp;
|
||||
|
||||
if (synt->s_pos == count - 1)
|
||||
{
|
||||
tmp = ft_strchr(line, '#');
|
||||
if (tmp == NULL && count != synt->e_vert)
|
||||
{
|
||||
synt->s_vert = count;
|
||||
if (!(lm_add_vertex(ldata, line, 's', synt)))
|
||||
synt->e_error = 1;
|
||||
}
|
||||
}
|
||||
if (synt->e_pos == count - 1)
|
||||
{
|
||||
tmp = ft_strchr(line, '#');
|
||||
if (tmp == NULL && count != synt->s_vert)
|
||||
{
|
||||
synt->e_vert = count;
|
||||
if (!(lm_add_vertex(ldata, line, 'e', synt)))
|
||||
synt->s_error = 1;
|
||||
}
|
||||
}
|
||||
if (synt->s_pos == count - 1)
|
||||
{
|
||||
tmp = ft_strchr(line, '#');
|
||||
if (tmp == NULL && count != synt->e_vert)
|
||||
{
|
||||
synt->s_vert = count;
|
||||
if (!(lm_add_vertex(ldata, line, 's', synt)))
|
||||
synt->s_error = 1;
|
||||
}
|
||||
}
|
||||
if (synt->e_pos == count - 1)
|
||||
{
|
||||
tmp = ft_strchr(line, '#');
|
||||
if (tmp == NULL && count != synt->s_vert)
|
||||
{
|
||||
synt->e_vert = count;
|
||||
if (!(lm_add_vertex(ldata, line, 'e', synt)))
|
||||
synt->e_error = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void lm_get_vert_link(int count, t_syntax *synt, t_lmdata *ldata
|
||||
, t_holder *holder, char *line)
|
||||
void lm_get_vert_link(int count, t_syntax *synt
|
||||
, t_lmdata *ldata, t_holder *holder, char *line)
|
||||
{
|
||||
if (count > 0 && (count != synt->s_vert && count != synt->e_vert)
|
||||
&& (count != synt->s_pos && count != synt->e_pos && line != NULL))
|
||||
{
|
||||
if (lm_check_forbiden_chars(line, 0))
|
||||
{
|
||||
if (!(lm_add_vertex(ldata, line, 'v', synt)))
|
||||
synt->v_error = 1;
|
||||
}
|
||||
if (lm_check_forbiden_chars(line, 3))
|
||||
{
|
||||
if (!(lm_ext_conn(holder, ldata, line)))
|
||||
synt->l_error = 1;
|
||||
}
|
||||
}
|
||||
if (count > 0 && (count != synt->s_vert && count != synt->e_vert)
|
||||
&& (count != synt->s_pos
|
||||
&& count != synt->e_pos && line != NULL))
|
||||
{
|
||||
if (lm_check_forbiden_chars(line, 0))
|
||||
{
|
||||
if (!(lm_add_vertex(ldata, line, 'v', synt)))
|
||||
synt->v_error = 1;
|
||||
}
|
||||
if (lm_check_forbiden_chars(line, 3))
|
||||
{
|
||||
if (!(lm_ext_conn(holder, ldata, line)))
|
||||
synt->l_error = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user