syntax error fix, we still have a problem when creating cmds

vctrubio · Feb 25, 2023 · 0e8e2c0 · 0e8e2c0
1 parent 175c723
commit 0e8e2c0
Show file tree

Hide file tree

Showing 49 changed files with 58 additions and 40 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,7 @@
 		"array": "c",
 		"string_view": "c",
 		"initializer_list": "c",
-		"utility": "c"
+		"utility": "c",
+		"sstream": "c"
 	}
 }
diff --git a/Makefile b/Makefile
@@ -6,6 +6,7 @@ LIBFT		=	lib/libft.a
 
 CC			=	gcc
 
+# CFLAGS		=  -fsanitize=address
 CFLAGS		= -Werror -Wall -Wextra -g -I $(HEADER)  -fsanitize=address
 
 SRCS		=	$(wildcard ./srcs/*.c)

diff --git a/include/minishell.h b/include/minishell.h
@@ -198,10 +198,10 @@ char					**line_to_matrix(char *line);
 
 //parse2.c
 void					ft_do_quote(char **output, char c);
+void					ft_do_pipe(char **output);
 int						readline_check(char **p2line);
 
 //parse_clean.c
-//for late to remove quotes- but we will do this at the very end
 char					*parse_clean(char **p2str);
 
 //parse_envp.c

diff --git a/lib/libft.a b/lib/libft.a
diff --git a/lol.c” b/lol.c”
@@ -0,0 +1 @@
+“cat lol.c
diff --git a/minishell b/minishell
diff --git a/srcs/builtins.o b/srcs/builtins.o
diff --git a/srcs/builtins_background.o b/srcs/builtins_background.o
diff --git a/srcs/builtins_background2.o b/srcs/builtins_background2.o
diff --git a/srcs/builtins_checkers.o b/srcs/builtins_checkers.o
diff --git a/srcs/builtins_runners.o b/srcs/builtins_runners.o
diff --git a/srcs/cmd_build.c b/srcs/cmd_build.c
@@ -77,7 +77,7 @@ bool	add_cmds(char **matrix)
 	validate_rl(matrix);
 	if (_shell()->valid_input == false)
 	{
-		printf("SYNTAX ERROR: unexpected token ...\n");
+		printf("\033[0;31msyntax error near unexpected token `newline'\033[0m\n");
 		return (false);
 	}
 	else

diff --git a/srcs/cmd_build.o b/srcs/cmd_build.o
diff --git a/srcs/cmd_build2.o b/srcs/cmd_build2.o
diff --git a/srcs/concat.o b/srcs/concat.o
diff --git a/srcs/create_files.o b/srcs/create_files.o
diff --git a/srcs/error.o b/srcs/error.o
diff --git a/srcs/exec.o b/srcs/exec.o
diff --git a/srcs/free.o b/srcs/free.o
diff --git a/srcs/heredoc.o b/srcs/heredoc.o
diff --git a/srcs/initializers.o b/srcs/initializers.o
diff --git a/srcs/loop.o b/srcs/loop.o
diff --git a/srcs/loop_new.o b/srcs/loop_new.o
diff --git a/srcs/loop_utils.o b/srcs/loop_utils.o
diff --git a/srcs/main.c b/srcs/main.c
@@ -93,7 +93,7 @@ void	minishell(void)
 		matrix = line_to_matrix(line);
 		if (add_cmds(matrix) && init_remove_qt())
 		{
-			// print_tcmd(_shell()->head);
+			print_tcmd(_shell()->head);
 			pipe_commands(_shell()->head);
 		}
 		else

diff --git a/srcs/main.o b/srcs/main.o
diff --git a/srcs/matrix_fts.o b/srcs/matrix_fts.o
diff --git a/srcs/matrix_utils.o b/srcs/matrix_utils.o
diff --git a/srcs/parse.c b/srcs/parse.c
@@ -1,17 +1,4 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   parse.c                                            :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: vrubio < [email protected] >     +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2022/12/22 15:20:00 by vrubio            #+#    #+#             */
-/*   Updated: 2022/12/22 15:20:01 by vrubio           ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
 #include "../include/minishell.h"
-//parsing of quotes
 
 static char	*buffer_quotes(char **buff, char c, char *str, int i)
 {
@@ -33,7 +20,6 @@ static char	*buffer_scan_for_quotes(char *str)
 	f = 0;
 	k = 0;
 	i = -1;
-	c = 0;
 	while (str[++i])
 	{
 		if ((str[i] == '\'' || str[i] == '"'))
@@ -49,25 +35,19 @@ static char	*buffer_scan_for_quotes(char *str)
 	return (str);
 }
 
-static void	buffer2string_quotes(char **buff, char **str, int *i)
+int		check_last_char_if_its_pipe(char *str)
 {
-	if (ft_strexist("'\"\2", **buff) && *(*buff) != '\0' && *(*buff
-			+ 1) == **buff)
-		(*buff) += 2;
-	if (ft_strexist("'\"\2", **buff) && *(*buff) != '\0' && (**buff
-			+ 1 != **buff))
-		(*str) = buffer_quotes(&(*buff), **buff, (*str), *i);
-	else if (**buff)
-		(*str)[(*i)++] = *(*buff)++;
+	int		i;
+
+	i = ft_strlen(str);
+	if (str[i - 1] == '|')
+		return (1);
+	return (0);
 }
 
-static char	*buffer_to_string(char **buff)
+static char	*buffer_to_string(char **buff, int i, char *str)
 {
-	char	*str;
-	int		i;
-
-	str = ft_calloc(sizeof(char), (ft_strlen(*buff) + 1));
-	i = 0;
+	str = calloc(sizeof(char), (ft_strlen(*buff) + 1));
 	while (**buff)
 	{
 		i = ft_strlen(str);
@@ -82,7 +62,12 @@ static char	*buffer_to_string(char **buff)
 				str[i++] = *(*buff)++;
 			return (str);
 		}
-		buffer2string_quotes(buff, &str, &i);
+		if ((**buff == '\'' || **buff == '"') && *(*buff + 1) == **buff)
+			(*buff) += 2;
+		if ((**buff == '\'' || **buff == '"') && (**buff + 1 != **buff))
+			str = buffer_quotes(&(*buff), **buff, str, i);
+		else if (**buff)
+			str[i++] = *(*buff)++;
 	}
 	return (buffer_scan_for_quotes(str));
 }
@@ -91,17 +76,28 @@ char	**line_to_matrix(char *line)
 {
 	char	**matrix;
 	int		i;
+	char	*buff;
 
-	matrix = malloc(sizeof(char *) * (r_size(line) + 1));
+	buff = NULL;
+	matrix = malloc(sizeof(char *) * (r_size(line) + 4));
 	i = 0;
 	while (*line)
 	{
 		while (ft_isspace(*line))
 			line++;
 		if (!line || ft_strlen(line) == 0)
 			break ;
-		matrix[i++] = buffer_to_string(&line);
+		matrix[i++] = buffer_to_string(&line, 0, NULL);
+	}
+	if (matrix[i - 1] && check_last_char_if_its_pipe(matrix[i - 1]))
+	{
+		while (!buff || ft_strlen(buff) == 0)
+			buff = readline("pipe> ");
+		add_history(buff);
+		matrix[i++] = ft_strdup(buff);
+		free (buff);
 	}
 	matrix[i] = 0;
+	print_arrays(matrix);
 	return (matrix);
 }
diff --git a/srcs/parse.o b/srcs/parse.o
diff --git a/srcs/parse2.c b/srcs/parse2.c
@@ -30,6 +30,25 @@ void	ft_do_quote(char **output, char c)
 		ft_do_quote(output, c);
 }
 
+void	ft_do_pipe(char **output)
+{
+	char	*buff;
+	char	*tmp;
+
+	buff = readline("pipe> ");
+	if (ft_strlen(buff) == 0)
+		ft_do_pipe(output);
+	else
+	{
+		add_history(buff);
+		tmp = ft_strdup(buff);
+		ft_stradd(&(*output), tmp);
+		free(buff);
+		free(tmp);
+	}
+}
+
+
 int	readline_check(char **p2line)
 {
 	char	*line;

diff --git a/srcs/parse2.o b/srcs/parse2.o
diff --git a/srcs/parse_clean.c b/srcs/parse_clean.c
@@ -24,6 +24,7 @@ char	*parse_clean(char **p2str)
 	i = 0;
 	while (*str)
 	{
+		// printf("EVAL----%s\n", str);
 		if (*str == 2 || *str == '\'' || *str == '"')
 		{
 			c = *str++;

diff --git a/srcs/parse_clean.o b/srcs/parse_clean.o
diff --git a/srcs/parse_env.o b/srcs/parse_env.o
diff --git a/srcs/path.o b/srcs/path.o
diff --git a/srcs/piping.o b/srcs/piping.o
diff --git a/srcs/piping2.o b/srcs/piping2.o
diff --git a/srcs/piping_redir.o b/srcs/piping_redir.o
diff --git a/srcs/prompt.o b/srcs/prompt.o
diff --git a/srcs/shell.o b/srcs/shell.o
diff --git a/srcs/tester.o b/srcs/tester.o
diff --git a/srcs/utils2.o b/srcs/utils2.o
diff --git a/srcs/utils_array.o b/srcs/utils_array.o
diff --git a/srcs/utils_fd.o b/srcs/utils_fd.o
diff --git a/srcs/utils_parsing.o b/srcs/utils_parsing.o
diff --git a/srcs/validation.c b/srcs/validation.c
@@ -26,8 +26,6 @@ static void	ft_validate_pipe_matrix(char **line, int i, int j)
 				_shell()->valid_input = false;
 		}
 	}
-	if (line[i + 1] == NULL)
-		_shell()->valid_input = false;
 }
 
 static void	ft_validate_redir_output_matrix(char **line, int i)
@@ -64,9 +62,10 @@ void	validate_rl(char **matrix)
 		j = -1;
 		while (matrix[i][++j])
 		{
-			if (matrix[i][j] == '\"' || matrix[i][j] == '\'')
+
+			if (matrix[i][j] == '"' || matrix[i][j] == '\'')
 			{
-				c = matrix[i][j];
+				c = matrix[i][j++];
 				while (matrix[i][j] && matrix[i][j] != c)
 					j++;
 			}

diff --git a/srcs/validation.o b/srcs/validation.o
diff --git a/srcs/var_expansion.o b/srcs/var_expansion.o