From 21c10a57877812296634c4c33da94b30c5eac4e5 Mon Sep 17 00:00:00 2001
From: Manzovince <manzovince@outlook.fr>
Date: Tue, 23 Apr 2019 16:17:13 +0200
Subject: [PATCH] editing few files for readability

---
 add_to_list.c | 14 ++++-----
 parse_input.c | 78 ++++++++++++++++++++++++---------------------------
 test_mask.c   | 50 ++++++++++++++++-----------------
 3 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/add_to_list.c b/add_to_list.c
index 048db2a..9a0ad48 100644
--- a/add_to_list.c
+++ b/add_to_list.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <hulamy@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/14 15:20:53 by hulamy            #+#    #+#             */
-/*   Updated: 2019/04/22 15:58:39 by vmanzoni         ###   ########.fr       */
+/*   Updated: 2019/04/23 16:15:10 by vmanzoni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,7 +36,6 @@ void	print_bits(short line)
 int		fill_list(char line[], t_fillist *list)
 {
 	short	tmp;
-	int	 	test;
 	int		i;
 
 	i = 0;
@@ -56,10 +55,6 @@ int		fill_list(char line[], t_fillist *list)
 		list->tibirtet <<= 1;
 		tmp >>= 1;
 	}
-	test = list->tibirtet;
-	print_bits(test);
-	while (test <<= 1)
-		print_bits(test);
 	return (0);
 }
 
@@ -99,7 +94,7 @@ void	print_test(int octet)
 }
 
 /*
-** ???
+** Test
 */
 
 void	test(unsigned int map[])
@@ -130,6 +125,11 @@ void	test(unsigned int map[])
 		mask = (mask >> 1) | (((1 << (i % 32)) & map[j]) << (31 - (i % 32)));
 	}
 }
+
+/*
+** MAIN FOR TEST
+*/
+
 /*
 int		main(int ac, char **av)
 {
diff --git a/parse_input.c b/parse_input.c
index 7209657..8852298 100644
--- a/parse_input.c
+++ b/parse_input.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/15 14:48:14 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/04/23 15:24:46 by vmanzoni         ###   ########.fr       */
+/*   Updated: 2019/04/23 16:01:12 by vmanzoni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,43 @@
 
 /*
 ** Function that parse a file and put each tetrimino in a linked list
+*/
+
+void	parse_input(char *input)
+{
+	static t_fillist	*list = NULL;
+	char				tetri[20];
+	int					i;
+	int					j;
+
+	i = 0;
+	printf("%s", input);
+	while (input[i])
+	{
+		j = 0;
+		while (j < 19)
+			tetri[j++] = input[i++];
+		tetri[19] = '\0';
+		if (check_tetri_errors(tetri))
+			print_error("Error: Tetrimino not valid.");
+		add_to_list(tetri, &list);
+		while (input[i] && input[i] != '.' && input[i] != '#')
+			i++;
+	}
+	/*DEBUG PART - Print each tetribit*/
+/*
+	while (list != NULL)
+	{
+		printf("%i\n", list->tetribit);
+		printf("\n");
+		list = list->next;
+	}
+*/
+}
+
+/*
 ** DELETE BEFORE EVAL - NOT USED ANYMORE
+** Function that parse a file and put each tetrimino in a linked list
 */
 
 char	**create_square(char *tetri)
@@ -40,43 +76,3 @@ char	**create_square(char *tetri)
 	}
 	return (square);
 }
-
-/*
-** Function that parse a file and put each tetrimino in a linked list
-*/
-
-void	parse_input(char *input)
-{
-	static t_fillist	*list = NULL;
-	char				tetri[20];
-	int					i;
-	int					j;
-
-	i = 0;
-	while (input[i])
-	{
-		j = 0;
-		while (j < 19)
-			tetri[j++] = input[i++];
-		tetri[19] = '\0';
-		printf("%s\n", tetri);
-		if (check_tetri_errors(tetri))
-			print_error("Error: Tetrimino not valid.");
-		add_to_list(tetri, &list);
-		while (input[i] == '\n')
-			i++;
-	}
-/*
-**	ce qui suit sert juste a afficher le contenu de tous les tetraminos de la liste chainee
-**	pour debug, a effacer au rendu
-*/
-	/*
-	while (list && (i = -1))
-	{
-		while (++i < list->size[1])
-			printf("%s\n", list->tetraminos[i]);
-		printf("\n");
-		list = list->next;
-	}
-	*/
-}
diff --git a/test_mask.c b/test_mask.c
index c8d0d42..940fc6f 100644
--- a/test_mask.c
+++ b/test_mask.c
@@ -40,16 +40,16 @@ void	compare(int initial, int compare)
 	!(initial & compare) ? ft_putendl("&: fit") : ft_putendl("&: not fit");
 
 /*
-//	j = 1 << 12;
-//	while (j >>= 1)
-//		(initial | compare) & j ? ft_putnbr(1) : ft_putnbr(0);
-//	ft_putchar('\n');
-//	(initial | compare) ? ft_putendl("|: fit") : ft_putendl("|: not fit");
-//	j = 1 << 12;
-//	while (j >>= 1)
-//		(initial ^ compare) & j ? ft_putnbr(1) : ft_putnbr(0);
-//	ft_putchar('\n');
-//	(initial ^ compare) ? ft_putendl("^: fit") : ft_putendl("^: not fit");
+	j = 1 << 12;
+	while (j >>= 1)
+		(initial | compare) & j ? ft_putnbr(1) : ft_putnbr(0);
+	ft_putchar('\n');
+	(initial | compare) ? ft_putendl("|: fit") : ft_putendl("|: not fit");
+	j = 1 << 12;
+	while (j >>= 1)
+		(initial ^ compare) & j ? ft_putnbr(1) : ft_putnbr(0);
+	ft_putchar('\n');
+	(initial ^ compare) ? ft_putendl("^: fit") : ft_putendl("^: not fit");
 */
 }
 
@@ -74,19 +74,19 @@ int		main(int ac, char **av)
 }
 
 /*
-**int		main(int ac, char **av)
-**{
-**	int	init;
-**	int	mask;
-**
-**	mask = (1 << 4);
-**	if (ac == 4)
-**	{
-**		ft_putendl(ft_convertbase(av[1], av[2], av[3]));
-**		ft_putnbrendl(init);
-**		init |= mask;
-**		ft_putnbrendl(init);
-**	}
-**	return (0);
-**}
+int		main(int ac, char **av)
+{
+	int	init;
+	int	mask;
+
+	mask = (1 << 4);
+	if (ac == 4)
+	{
+		ft_putendl(ft_convertbase(av[1], av[2], av[3]));
+		ft_putnbrendl(init);
+		init |= mask;
+		ft_putnbrendl(init);
+	}
+	return (0);
+}
 */