more cleanup

removing test maps & test files

Makefile

@@ -6,7 +6,7 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/03/27 16:51:02 by tmaze             #+#    #+#              #
-#    Updated: 2019/04/29 12:01:17 by mndhlovu         ###   ########.fr        #
+#    Updated: 2019/05/09 18:39:33 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -27,7 +27,7 @@ endif
 
 #	Compilator
 CC		=	gcc
-FLAGS	=	-Wall -Wextra -Werror -g
+FLAGS	=	-Wall -Wextra -Werror
 
 #	Folders
 LIBDIR	=	libft

includes/lem_in.h

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/23 17:31:19 by tmaze             #+#    #+#             */
-/*   Updated: 2019/05/02 14:26:31 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/05/09 17:39:33 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -49,24 +49,6 @@ typedef struct		s_ants
 	struct s_ants	*next;
 }					t_ants;
 
-typedef struct		s_syntax
-{
-	int				nb_state;
-	int				s_cmd;
-	int				s_pos;
-	int				error;
-	int				s_error;
-	int				e_error;
-	int				v_error;
-	int				l_error;
-	int				gr_status;
-	int				s_vert;
-	int				e_vert;
-	int				e_cmd;
-	int				e_pos;
-	int				v_flag;
-}					t_syntax;
-
 typedef struct		s_temp
 {
 	int				src_ind;
@@ -77,8 +59,22 @@ typedef struct		s_temp
 typedef struct		s_holder
 {
 	int				count;
+	int				nb_state;
+	int				s_cmd;
+	int				s_pos;
+	int				error;
+	int				s_error;
+	int				state;
+	int				e_error;
+	int				v_error;
+	int				l_error;
+	int				gr_status;
+	int				s_vert;
+	int				e_vert;
+	int				e_cmd;
+	int				e_pos;
+	int				v_flag;
 	t_temp			*data;
-	t_syntax		*syntax;
 }					t_holder;
 
 typedef struct		s_rdata
@@ -97,36 +93,34 @@ typedef	struct		s_lmdata
 	t_rdata			*map;
 }					t_lmdata;
 
-int					lm_validate(t_syntax *synt, t_lmdata *lmdata);
-int					lm_parser(t_syntax *synt, t_lmdata *ldata
+int					lm_parser(t_lmdata *ldata
 							, t_holder *holder);
-int					lm_check_room_before(char **tab, t_syntax *synt);
-void				lm_clear_unv(t_holder *holder, t_lmdata *ldata);
+int					lm_check_room_before(char **tab, t_holder *holder
+							, char **name);
+void				lm_clear_unv(t_holder *holder);
 int					lm_add_vertex(t_lmdata *ldata, char *raw, char flag
-							, t_syntax *synt);
+							, t_holder *holder);
 int					lm_ext_conn(t_holder *holder, t_lmdata *data
 							, char *raw);
+void				lm_ext_conn_sub(t_holder *holder, t_temp *new_data);
 int					lm_init_src_dest(int *src, int *dest, t_lmdata *data
 							, char *raw);
 int					lm_find_index(t_lmdata *data, char *str);
-void				lm_get_cmd_vertices(int count, t_syntax *synt
+void				lm_get_cmd_vertices(int count, t_holder *holder
 							, t_lmdata *ldata, char *line);
 int					lm_get_value(char *line);
-void				lm_get_cmd_vert(int count, t_syntax *synt
+void				lm_check_start_vert(int count, t_holder *hol
 							, t_lmdata *ldata, char *line);
-void				lm_check_start_vert(int count, t_syntax *synt
-							, t_lmdata *ldata, char *line);
-void				lm_check_end_vert(int count, t_syntax *synt
+void				lm_check_end_vert(int count, t_holder *hol
 							, t_lmdata *ldata, char *line);
 void				lm_get_vert_link(int count, t_lmdata *ldata
-							, t_syntax *synt, t_holder *holder, char *line);
+							, t_holder *holder, char *line);
 int					lm_validate_rooms(char *name, char *x, char *y);
 int					lm_adj_parser(t_lmdata *lmdata, t_holder *holder);
-void				lm_init_data(t_syntax *synt, t_holder *holder
-							, t_lmdata *ldata);
-int             	lm_verify_cmd(t_syntax *synt, t_holder *holder
-							, t_lmdata *data);
+void				lm_init_data(t_holder *holder, t_lmdata *ldata);
+int					lm_verify_cmd(t_holder *holder, t_lmdata *data);
 void				lm_initdata(t_lmdata *data);
+int					lm_error_nbr(char *raw);
 int					lm_getparams(t_lmdata *data);
 void				lm_clean_data(t_lmdata *data);
 int					lm_check_forbiden_chars(char *line, int flag);

libft/Makefile

@@ -6,12 +6,12 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/04/07 12:47:06 by tmaze             #+#    #+#              #
-#    Updated: 2019/04/26 11:54:46 by mndhlovu         ###   ########.fr        #
+#    Updated: 2019/05/09 18:39:42 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
 CC = gcc
-CCFLAGS = -Wall -Werror -Wextra -g
+CCFLAGS = -Wall -Werror -Wextra
 CCSTD =
 
 NAME = libft.a

libft/ft_strcmp.c

@@ -1,28 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_strcmp.c                                        :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: tmaze <marvin@42.fr>                       +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2018/04/03 15:38:27 by tmaze             #+#    #+#             */
-/*   Updated: 2019/04/22 10:46:05 by mndhlovu         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-int	ft_strcmp(const char *s1, const char *s2)
-{
-	int i;
-	int diff;
-
-	i = 1;
-	diff = (unsigned char)s1[0] - (unsigned char)s2[0];
-	while (diff == 0 && s1[i - 1] && s2[i - 1])
-	{
-		diff = (unsigned char)s1[i] - (unsigned char)s2[i];
-		i++;
-	}
-	return (diff);
-}

maps/comments

@@ -1,11 +0,0 @@
-3
-#you
-##start
-start 0 0
-#lost
-##end
-end 1 1
-#the
-#game
-start-end
-#!!

maps/duplicatepipe

@@ -1,7 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 0 0
-start-end
-end-start

maps/duplicatepipe1

@@ -1,7 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 0 0
-start-end
-start-end

maps/illegalname

@@ -1,7 +0,0 @@
-3
-Lillegalname 2 2
-##start
-start 0 0
-##end
-end 1 1
-start-end

maps/illegalname1

@@ -1,7 +0,0 @@
-3
-ill-egalname 2 2
-##start
-start 0 0
-##end
-end 1 1
-start-end

maps/in0

@@ -1,25 +0,0 @@
-3
-##start
-1 23 3
-2 16 7
-#commentaire
-3 16 3
-4 16 5
-5 9 3
-6 1 5
-7 4 8
-##end
-0 9 5
-0-4
-0-6
-1-3
-4-3
-5-2
-3-5
-#autre commentaire
-4-2
-2-1
-7-6
-7-2
-7-4
-6-5

maps/invalidcommand

@@ -1,8 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 1 1
-##invalidcommand
-room 2 2
-start-end

maps/invalidcommand1

@@ -1,6 +0,0 @@
-3
-start 0 0
-##end
-end 1 1
-##start
-start-end

maps/loop

@@ -1,11 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 1 1
-mid0 2 2
-mid1 3 3
-start-mid0
-mid0-mid1
-mid1-start
-start-end

maps/loop1

@@ -1,10 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 1 1
-mid0 2 2
-mid1 3 3
-start-mid0
-mid0-mid1
-mid1-start

maps/noants

@@ -1,5 +0,0 @@
-##start
-start 0 0
-##end
-end 1 1
-start-end

maps/noend

@@ -1,5 +0,0 @@
-3
-##start
-start 0 0
-end 1 1
-start-end

maps/nopath

@@ -1,5 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 1 1

maps/nostart

@@ -1,5 +0,0 @@
-3
-start 0 0
-##end
-end 1 1
-start-end

maps/overflow

@@ -1,6 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 999999999999999999999 9999999999999999999999999999
-start-end

maps/shortest

@@ -1,20 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 1 1
-long0 2 2
-long1 3 3
-short 4 4
-longer0 5 5
-longer1 6 6
-longer2 7 7
-start-long0
-long0-long1
-long1-end
-start-short
-short-end
-start-longer0
-longer0-longer1
-longer1-longer2
-longer2-end

maps/simple

@@ -1,6 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 1 1
-start-end

maps/simple1

@@ -1,10 +0,0 @@
-23
-##start
-start 0 0
-##end
-end 1 1
-dead0 2 2
-dead1 3 3
-start-dead0
-start-dead1
-start-end

maps/simple2

@@ -1,16 +0,0 @@
-4
-##start
-start 0 0
-##end
-end 1 1
-dead0 2 2
-dead1 3 3
-mid0   4 4
-mid1   5 5
-mid2   6 6
-start-dead0
-start-mid0
-mid0-dead0
-start-mid1
-mid1-mid2
-mid2-end

maps/startisend

@@ -1,4 +0,0 @@
-3
-##start
-##end
-startend 0 0

maps/subject22.map

@@ -1,63 +0,0 @@
-3
-1 0 2
-##start
-#dd
-#ddddd
-##sjdjdjssjds
-##djsjddjs
-#sddsds
-##start
-#dsdsdsdsd
-0 2 0
-##end
-##sjsjsjjds
-#sjdsjdsjs
-#sjsjdsjsaj
-#sjsjss
-##start
-##end
-#sjsjdsjsdh
-#sksksdksdsk
-#skdkskdsjds
-4 2 6
-2 4 2
-#comment
-#comment
-#comment
-#comment
-#comment
-3 4 4
-#comment
-#comment
-##nothing
-#comming
-#asazii
-0-1
-#hellow
-##42 ecole
-##good
-0-2
-#comment
-#comment
-#comment
-#comment
-#comment
-#comment
-#comment
-#comment
-2-3
-##kkkk
-#kkklkk
-#sdedfdds
-#cdkskvkfdkndfvnds
-#cbdjvbdj
-#wofokdkfsdsd
-3-4
-#cooment
-#comment
-#comment
-##starrtt
-4-1
-
-1-2
-0-2

maps/underflow

@@ -1,6 +0,0 @@
-3
-##start
-start 0 0
-##end
-end 1 -9999999999999999999999999
-start-end

maps/whitespaces

@@ -1,7 +0,0 @@
- 3 
-#	#end
-##start
-	start	 0	0   
-##end
-end 	1   1
-start-end

srcs/lem_in.c

@@ -6,27 +6,12 @@
 /*   By: mndhlovu <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/25 06:31:05 by mndhlovu          #+#    #+#             */
-/*   Updated: 2019/05/02 14:26:13 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/05/09 17:38:50 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "lem_in.h"
 
-void		lm_test_print(t_lmdata *data)
-{
-	t_node		*node;
-
-	if (data != NULL)
-	{
-		node = data->nodes_data;
-		while (node)
-		{
-			ft_printf("name: %s | x: %d | y: %d | role: %c \n", node->name, node->x, node->y, node->role);
-			node = node->next;
-		}
-	}
-}
-
 static int		start_end_link(t_lmdata *data, int s_ind, int e_ind)
 {
 	t_ind	*it;
@@ -41,32 +26,40 @@ static int		start_end_link(t_lmdata *data, int s_ind, int e_ind)
 	return (0);
 }
 
-static int		lem_in(t_syntax *synt, t_holder *holder,
-						t_lmdata *lmdata, t_ind ***ret)
+static int		do_algorithm(t_lmdata *lmdata, t_ind ***ret)
 {
-	lm_parser(synt, lmdata, holder);
-	if (!lm_verify_cmd(synt, holder, lmdata))
+	get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
+					, get_node_role(lmdata, 'e')->ind);
+	if ((*ret = edmonds_karp(lmdata, get_node_role(lmdata, 's')->ind
+							, get_node_role(lmdata, 'e')->ind)) == NULL)
+		return (0);
+	print_map(lmdata);
+	if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
+		return (0);
+	tablst_inddel(*ret);
+	return (1);
+}
+
+static int		lem_in(t_holder *holder,
+					t_lmdata *lmdata, t_ind ***ret)
+{
+	lm_parser(lmdata, holder);
+	if (!lm_verify_cmd(holder, lmdata))
 		return (0);
 	if (!lst_indinit(lmdata))
 		return (0);
 	if ((lm_adj_parser(lmdata, holder) == 0))
 		return (0);
-	print_map(lmdata);
-	lm_clear_unv(holder, lmdata);
+	lm_clear_unv(holder);
 	if (start_end_link(lmdata, get_node_role(lmdata, 's')->ind
-					   , get_node_role(lmdata, 'e')->ind))
-		push_ants_end(lmdata, get_node_role(lmdata, 'e')->name);
-	else
+						, get_node_role(lmdata, 'e')->ind))
 	{
-		get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
-						 , get_node_role(lmdata, 'e')->ind);
-		if ((*ret = edmonds_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);
+		print_map(lmdata);
+		push_ants_end(lmdata, get_node_role(lmdata, 'e')->name);
 	}
+	else if (!do_algorithm(lmdata, ret))
+		return (0);
+	del_map(lmdata);
 	return (1);
 }
 
@@ -78,7 +71,6 @@ static int		lm_error_exit(void)
 
 int				main(int ac, char **av)
 {
-	t_syntax	synt;
 	t_lmdata	ldata;
 	t_holder	holder;
 	t_ind		**ret;
@@ -86,8 +78,8 @@ int				main(int ac, char **av)
 	(void)av;
 	if (ac == 1)
 	{
-		lm_init_data(&synt, &holder, &ldata);
-		if (!(lem_in(&synt, &holder, &ldata, &ret)))
+		lm_init_data(&holder, &ldata);
+		if (!(lem_in(&holder, &ldata, &ret)))
 		{
 			lm_clean_data(&ldata);
 			del_map(&ldata);

srcs/lm_check_errors.c

@@ -6,20 +6,25 @@
 /*   By: mndhlovu <mndhlovu@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/22 08:55:30 by mndhlovu          #+#    #+#             */
-/*   Updated: 2019/05/02 13:20:38 by mndhlovu         ###   ########.fr       */
+/*   Updated: 2019/05/09 17:37:23 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "lem_in.h"
 
-int					lm_check_room_before(char **tab, t_syntax *synt)
+int					lm_check_room_before(char **tab, t_holder *holder
+					, char **name)
 {
 	if (tab[0] != NULL && tab[1] != NULL && tab[2] != NULL)
 	{
-		if (lm_validate_rooms(tab[0], tab[1], tab[2]))
+		if (lm_validate_rooms(tab[0], tab[1], tab[2]) && !holder->state)
+		{
+			if (!(*name = ft_strdup(tab[0])))
+				return (0);
 			return (1);
+		}
 	}
-	synt->v_error = 1;
+	holder->v_error = 1;
 	return (0);
 }
 
@@ -45,7 +50,7 @@ int					lm_check_forbiden_chars(char *line, int flag)
 	return (0);
 }
 
-void				lm_clear_unv(t_holder *holder, t_lmdata *ldata)
+void				lm_clear_unv(t_holder *holder)
 {
 	t_temp			*data;
 	t_temp			*flush;
@@ -59,28 +64,29 @@ void				lm_clear_unv(t_holder *holder, t_lmdata *ldata)
 		flush = NULL;
 	}
 	holder->data = NULL;
-	del_map(ldata);
 }
 
-int					lm_verify_links(t_holder *data, t_syntax *synt)
+int					lm_verify_links(t_holder *data, t_holder *hold)
 {
-	if (!synt->l_error || (synt->l_error && data->count > 0))
+	if (!hold->l_error
+	|| (hold->l_error
+	&& data->count > 0))
 		return (1);
 	return (0);
 }
 
-int					lm_verify_cmd(t_syntax *synt, t_holder *holder
+int					lm_verify_cmd(t_holder *holder
 						, t_lmdata *data)
 {
-	if (synt->s_cmd && synt->e_cmd
-			&& !synt->e_error && !synt->s_error
-			&& !synt->v_error
-			&& synt->s_vert
-			&& synt->e_vert
-			&& synt->nb_state
-			&& lm_verify_links(holder, synt)
+	if (holder->s_cmd && holder->e_cmd
+			&& !holder->e_error && !holder->s_error
+			&& !holder->v_error
+			&& holder->s_vert
+			&& holder->e_vert
+			&& holder->nb_state
+			&& lm_verify_links(holder, holder)
 			&& (data->nb_nodes > 0))
 		return (1);
-	lm_clear_unv(holder, data);
+	lm_clear_unv(holder);
 	return (0);
 }

srcs/lm_data_utils.c

@@ -6,7 +6,7 @@
 /*   By: mndhlovu <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/05 06:35:40 by mndhlovu          #+#    #+#             */
-/*   Updated: 2019/04/30 07:14:50 by mndhlovu         ###   ########.fr       */
+/*   Updated: 2019/05/09 17:35:34 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

srcs/lm_graph_utils.c

@@ -6,7 +6,7 @@
 /*   By: mndhlovu <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/29 07:17:06 by mndhlovu          #+#    #+#             */
-/*   Updated: 2019/04/30 07:15:04 by mndhlovu         ###   ########.fr       */
+/*   Updated: 2019/05/09 17:26:36 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,6 +29,16 @@ static int			is_link_in(t_lmdata *data, int src, int dest)
 	return (0);
 }
 
+void				lm_ext_conn_sub(t_holder *holder, t_temp *new_data)
+{
+	t_temp			*temp;
+
+	temp = holder->data;
+	while (temp->next)
+		temp = temp->next;
+	temp->next = new_data;
+}
+
 int					lm_adj_parser(t_lmdata *lmdata, t_holder *holder)
 {
 	t_temp			*data;

srcs/lm_initdata.c

@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/23 17:43:34 by tmaze             #+#    #+#             */
-/*   Updated: 2019/05/02 12:52:26 by mndhlovu         ###   ########.fr       */
+/*   Updated: 2019/05/09 17:35:50 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,52 +19,58 @@ void			lm_initdata(t_lmdata *data)
 	data->adj = NULL;
 }
 
-void			lm_check_start_vert(int count, t_syntax *synt, t_lmdata *ldata, char *line)
+void			lm_check_start_vert(int count, t_holder *hol
+				, t_lmdata *ldata, char *line)
 {
-	if ((synt->s_pos < synt->e_pos) && lm_check_forbiden_chars(line, 0))
+	if ((hol->s_pos < hol->e_pos)
+			&& lm_check_forbiden_chars(line, 0))
 	{
-		if ((count > synt->s_pos && count < synt->e_pos)
-				&& (!synt->s_vert))
+		if ((count > hol->s_pos && count < hol->e_pos)
+				&& (!hol->s_vert))
 		{
-			if ((lm_add_vertex(ldata, line, 's', synt)))
-				synt->s_vert = count;
+			if ((lm_add_vertex(ldata, line, 's', hol)))
+				hol->s_vert = count;
 			else
-				synt->s_error = 1;
-		}	
+				hol->s_error = 1;
+		}
 	}
-	if ((synt->s_pos > synt->e_pos) && lm_check_forbiden_chars(line, 0))
+	if ((hol->s_pos > hol->e_pos)
+			&& lm_check_forbiden_chars(line, 0))
 	{
-		if (!synt->s_vert)
+		if (!hol->s_vert)
 		{
-			if ((lm_add_vertex(ldata, line, 's', synt)))
-				synt->s_vert = count;
+			if ((lm_add_vertex(ldata, line, 's', hol)))
+				hol->s_vert = count;
 			else
-				synt->s_error = 1;
+				hol->s_error = 1;
 		}
 	}
 }
 
-void				lm_check_end_vert(int count, t_syntax *synt, t_lmdata *ldata, char *line)
+void			lm_check_end_vert(int count, t_holder *hol
+				, t_lmdata *ldata, char *line)
 {
-	if((synt->e_pos < synt->s_pos) && lm_check_forbiden_chars(line, 0))
+	if ((hol->e_pos < hol->s_pos)
+			&& lm_check_forbiden_chars(line, 0))
 	{
-		if ((count > synt->e_pos && count < synt->s_pos)
-				&& (!synt->e_vert))
+		if ((count > hol->e_pos && count < hol->s_pos)
+				&& (!hol->e_vert))
 		{
-			if ((lm_add_vertex(ldata, line, 'e', synt)))
-				synt->e_vert = count;
+			if ((lm_add_vertex(ldata, line, 'e', hol)))
+				hol->e_vert = count;
 			else
-				synt->e_error = 1;
+				hol->e_error = 1;
 		}
 	}
-	if ((synt->e_pos > synt->s_pos) && lm_check_forbiden_chars(line, 0))
+	if ((hol->e_pos > hol->s_pos)
+			&& lm_check_forbiden_chars(line, 0))
 	{
-		if (!synt->e_vert)
+		if (!hol->e_vert)
 		{
-			if ((lm_add_vertex(ldata, line, 'e', synt)))
-				synt->e_vert = count;
+			if ((lm_add_vertex(ldata, line, 'e', hol)))
+				hol->e_vert = count;
 			else
-				synt->e_error = 1;
+				hol->e_error = 1;
 		}
 	}
 }

srcs/lm_mem_utils.c

@@ -6,27 +6,27 @@
 /*   By: mndhlovu <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/25 06:31:37 by mndhlovu          #+#    #+#             */
-/*   Updated: 2019/05/02 13:20:36 by mndhlovu         ###   ########.fr       */
+/*   Updated: 2019/05/09 17:33:39 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "lem_in.h"
 
-void			lm_init_data(t_syntax *synt, t_holder *holder, t_lmdata *ldata)
+void			lm_init_data(t_holder *holder, t_lmdata *ldata)
 {
-	synt->nb_state = 0;
-	synt->s_cmd = 0;
-	synt->e_cmd = 0;
-	synt->s_error = 0;
-	synt->e_error = 0;
-	synt->v_error = 0;
-	synt->l_error = 0;
-	synt->s_vert = 0;
-	synt->e_vert = 0;
-	synt->gr_status = 0;
-	synt->s_pos = 0;
-	synt->e_pos = 0;
-	synt->v_flag = 0;
+	holder->nb_state = 0;
+	holder->s_cmd = 0;
+	holder->e_cmd = 0;
+	holder->s_error = 0;
+	holder->e_error = 0;
+	holder->v_error = 0;
+	holder->l_error = 0;
+	holder->s_vert = 0;
+	holder->e_vert = 0;
+	holder->state = 0;
+	holder->s_pos = 0;
+	holder->e_pos = 0;
+	holder->v_flag = 0;
 	holder->count = 0;
 	holder->data = NULL;
 	ldata->nbants = 0;
@@ -53,22 +53,19 @@ static void		lm_add_vertex_sub(t_lmdata *ldata, t_node *new)
 }
 
 int				lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
-				t_syntax *synt)
+				t_holder *holder)
 {
 	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, synt))
+		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);

srcs/lm_parser.c

@@ -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/09 16:55:53 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,29 +51,27 @@ 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);
 	}
 	return (0);
 }
 
 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 +81,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++;
 	}

srcs/lm_parser_error_check.c

@@ -6,7 +6,7 @@
 /*   By: mndhlovu <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/08 06:42:37 by mndhlovu          #+#    #+#             */
-/*   Updated: 2019/04/29 12:06:08 by mndhlovu         ###   ########.fr       */
+/*   Updated: 2019/05/06 07:24:46 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -71,6 +71,6 @@ int						lm_error_nbr(char *raw)
 			|| lm_check_max(raw) == -1
 			|| (ft_atoi(raw) > 0 && (ft_atoi(raw) == 0))
 			|| ft_strlen(raw) > 19)
-		return (-1);
-	return (0);
+		return (0);
+	return (1);
 }

srcs/lm_utils_parser.c

@@ -6,7 +6,7 @@
 /*   By: mndhlovu <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/04 09:24:45 by mndhlovu          #+#    #+#             */
-/*   Updated: 2019/05/02 13:12:06 by mndhlovu         ###   ########.fr       */
+/*   Updated: 2019/05/09 17:40:24 by mndhlovu         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,7 +21,7 @@ static int			lm_check_ant_no(char *line)
 	{
 		if (len == 1 && ft_isdigit(*line))
 			return (*line - '0');
-		else if (len > 1 && len < 19 && ft_isnumeric(line))
+		else if (len > 1 && lm_error_nbr(line) && ft_isnumeric(line))
 			return (ft_atoi(line));
 	}
 	return (0);
@@ -34,33 +34,33 @@ int					lm_get_value(char *line)
 	return (0);
 }
 
-void				lm_get_cmd_vertices(int count, t_syntax *synt
+void				lm_get_cmd_vertices(int count, t_holder *holder
 					, t_lmdata *ldata, char *line)
 {
 	if (count > 0 && line != NULL)
 	{
-		lm_check_start_vert(count, synt, ldata, line);
-		lm_check_end_vert(count, synt, ldata, line);
+		lm_check_start_vert(count, holder, ldata, line);
+		lm_check_end_vert(count, holder, ldata, line);
 	}
 }
 
 void				lm_get_vert_link(int count, t_lmdata *ldata
-					, t_syntax *syntax, t_holder *holder, char *line)
+					, t_holder *holder, char *line)
 {
-	if (count > 0 && (count != syntax->s_vert
-				&& count != syntax->e_vert)
-			&& (count != syntax->s_pos
-				&& count != syntax->e_pos && line != NULL))
+	if (count > 0 && (count != holder->s_vert
+				&& count != holder->e_vert)
+			&& (count != holder->s_pos
+				&& count != holder->e_pos && line != NULL))
 	{
 		if (lm_check_forbiden_chars(line, 0))
 		{
-			if (!(lm_add_vertex(ldata, line, 'v', syntax)))
-				syntax->v_error = 1;
+			if (!(lm_add_vertex(ldata, line, 'v', holder)))
+				holder->v_error = 1;
 		}
 		if (lm_check_forbiden_chars(line, 3))
 		{
 			if (!(lm_ext_conn(holder, ldata, line)))
-				syntax->l_error = 1;
+				holder->l_error = 1;
 		}
 	}
 }

srcs/print_map.c

@@ -6,23 +6,25 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/24 17:35:29 by tmaze             #+#    #+#             */
-/*   Updated: 2019/05/02 14:34:28 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/05/09 16:35:02 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "lem_in.h"
-#include <stdio.h>
 
 void	del_map(t_lmdata *data)
 {
 	t_rdata *tmp;
 
-	while (data->map)
+	if (data != NULL)
 	{
-		tmp = data->map;
-		data->map = data->map->next;
-		ft_strdel(&(tmp->line));
-		ft_memdel((void**)&tmp);
+		while (data->map)
+		{
+			tmp = data->map;
+			data->map = data->map->next;
+			ft_strdel(&(tmp->line));
+			ft_memdel((void**)&tmp);
+		}
 	}
 }