42/42_old_fillit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check_tetri_error WORKING + Parser

Browse Source
This commit is contained in:
Manzovince
2019-04-14 23:02:29 +02:00
parent 9d8940e6a5
commit 1e42ba9fbe
7 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -6,26 +6,20 @@
# By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ # # By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2019/03/01 13:24:35 by vmanzoni #+# #+# # # Created: 2019/03/01 13:24:35 by vmanzoni #+# #+# #
# Updated: 2019/04/14 14:21:26 by vmanzoni ### ########.fr # # Updated: 2019/04/14 22:01:39 by vmanzoni ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME = fillit NAME = fillit
SRC_DIR = srcs/
SRCS = *.c
OBJ_DIR = objs/ OBJ_DIR = objs/
OBJS = $(SRCS:.c=.o)
HEADER = includes/ HEADER = includes/
SRCS = *.c
OBJS = $(SRCS:.c=.o)
LIB = fillit.h LIB = fillit.h
CC = gcc CC = gcc
CFLAGS = -Wall -Werror -Wextra CFLAGS = -Wall -Werror -Wextra
RM = rm -rf RM = rm -rf
@@ -33,15 +27,20 @@ RM = rm -rf
all: $(NAME) all: $(NAME)
$(NAME): $(NAME):
$(CC) $(CFLAGS) -I$(HEADER) -c $(addprefix $(SRC_DIR), $(SRCS)) make -C libft/
$(CC) $(OBJS) -o $(NAME) $(CC) $(CFLAGS) -I$(HEADER) -c $(SRCS)
$(CC) -o $(NAME) $(OBJS) -L libft/ -lft
#$(CC) $(CFLAGS) -I$(HEADER) -c $(addprefix $(SRC_DIR), $(SRCS))
#$(CC) $(OBJS) -o $(NAME)
mkdir $(OBJ_DIR) mkdir $(OBJ_DIR)
mv $(OBJS) $(OBJ_DIR) mv $(OBJS) $(OBJ_DIR)
clean: clean:
make -C libft/ clean
$(RM) $(OBJ_DIR) $(RM) $(OBJ_DIR)
fclean: clean fclean: clean
make -C libft/ fclean
$(RM) $(NAME) $(RM) $(NAME)
re: fclean all re: fclean all

4
fillit.h
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 17:43:41 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 22:32:32 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -35,5 +35,7 @@ void print_test(char *test);
char *read_file(char *file); char *read_file(char *file);
void print_error(char *s); void print_error(char *s);
int check_file_errors(char *file); int check_file_errors(char *file);
int check_tetri_errors(char *tetri);
int check_tetri_errors2(char *tetri);
#endif #endif

28
handle_errors.c
View File

@@ -6,19 +6,20 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 21:37:23 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 22:57:14 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "fillit.h" #include "fillit.h"
/* /*
** Function that display error message *s on fd ** Function that display error message *s on fd and exit program
*/ */
void print_error(char *s) void print_error(char *s)
{ {
write(2, s, strlen(s)); write(2, s, strlen(s));
exit(1);
} }
/* /*
@@ -41,8 +42,8 @@ int check_file_errors(char *file)
return (1); return (1);
if (file[i] == '\n') if (file[i] == '\n')
line_nbr++; line_nbr++;
if (file[i] == '\n' && file[i+1] == '\n') // if (file[i] == '\n' && file[i+2] != '.' && file[i+2] != '#')
return (1); // return (1);
i++; i++;
} }
if (line_nbr < 4 || line_nbr > 129) if (line_nbr < 4 || line_nbr > 129)
@@ -61,17 +62,18 @@ int check_tetri_errors(char *tetri)
dot = 0; dot = 0;
while (tetri[i]) while (tetri[i])
{ {
if (tetri[i] = '#') if (tetri[i] == '#')
htg++; htg++;
else if (tetri[i] = '.') else if (tetri[i] == '.')
dot++; dot++;
i++;
} }
if (htg != 4 || dot != 12 || check_tetri_errors2(tetri)) if (htg != 4 || dot != 12 || check_tetri_errors2(tetri))
return (1); return (1);
return (0); return (0);
} }
/*
int check_tetri_errors2(char *tetri) int check_tetri_errors2(char *tetri)
{ {
int i; int i;
@@ -79,11 +81,13 @@ int check_tetri_errors2(char *tetri)
i = 0; i = 0;
while (tetri[i]) while (tetri[i])
{ {
if (tetri[i] == '#') if (tetri[i] == '.' || tetri[i] == '\n')
{ i++;
else if (tetri[i] == '#' && (tetri[i + 1] == '#' || tetri[i - 1] == '#'
} || tetri[i + 5] == '#' || tetri[i - 5] == '#'))
i++;
else
return (1);
} }
return (0); return (0);
} }
*/

1
libft Submodule

Submodule libft added at dad20d5d96

7
main.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 21:37:27 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 22:58:47 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -22,6 +22,8 @@ int main(int argc, char **argv)
print_error("Error: Could not read file.\n"); print_error("Error: Could not read file.\n");
if (check_file_errors(input)) if (check_file_errors(input))
print_error("Error: Invalid file.\n"); print_error("Error: Invalid file.\n");
if (check_tetri_errors(input))
print_error("Error: Tetrimino not valid.\n");
/* /*
Check if every tetrimino is valid Check if every tetrimino is valid
Transform input to tetriminos Transform input to tetriminos
@@ -31,7 +33,6 @@ int main(int argc, char **argv)
*/ */
} }
else else
print_error("Error: Please submit a file.\n"); print_error("Usage: Please submit a file.\n");
return (0); return (0);
print_test(input);
} }

8
read_file.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */ /* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 21:37:37 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 23:01:31 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -46,7 +46,7 @@ char *read_file(char *file)
int parse_input(char *input) int parse_input(char *input)
{ {
char /*NOM DE LA VARIABLE*/; char tetri;
int c; int c;
int i; int i;
int j; int j;
@@ -60,9 +60,11 @@ int parse_input(char *input)
j = 0; j = 0;
while (j < 4) while (j < 4)
{ {
/*NOM DE LA VARIABLE[j]*/ = input[c++]; tetri[j] = input[c++];
j++; j++;
} }
if (check_tetri_errors(tetri))
print_error("Error: Tetrimino not valid.\n");
c++; c++;
i++; i++;
} }

4
samples/test Normal file
View File

@@ -0,0 +1,4 @@
..#.
..#.
..#.
..