Merge branch 'Lexex_Parser' into Dev

Makefile

@@ -57,6 +57,9 @@ SRCS	=	$(PATH_SRC)/check_args.c \
 		$(PATH_SRC)/shell_loop/prompt/display_bonus_prompt.c \
 		$(PATH_SRC)/shell_loop/prompt/display_prompt.c \
 		$(PATH_SRC)/shell_loop/parsing/get_command_line.c \
+		$(PATH_SRC)/shell_loop/parsing/parsing/get_word.c \
+		$(PATH_SRC)/shell_loop/parsing/parsing/my_str_to_words.c \
+		$(PATH_SRC)/shell_loop/parsing/parsing/my_strcpy_words.c \
 		$(PATH_SRC)/shell_loop/parsing/get_number_instruction.c \
 		$(PATH_SRC)/shell_loop/parsing/get_pipe_number.c \
 		$(PATH_SRC)/shell_loop/parsing/fill_up_instruction.c \

lib/my/my_str_to_words_array.c

@@ -49,10 +49,8 @@ char **cut_line(char *line)
 	tab_arg = malloc(sizeof(*tab_arg) * (nb_arg + 1));
 	if (tab_arg == NULL)
 		return (NULL);
-	for (int i = 0; i < nb_arg; i += 1) {
+	for (int i = 0; i < nb_arg; i += 1)
 		tab_arg[i] = copy_args(line, &j);
-		printf("%s\n", tab_arg[i]);
-	}
 	tab_arg[nb_arg] = NULL;
 	return (tab_arg);
-}
+}

src/shell_loop/parsing/get_pipe.c

@@ -18,7 +18,7 @@ static unsigned int get_args_pipe(pipe_t **pipe, char **env, char **local)
 	int a = 0;
 
 	for (unsigned int i = 0; pipe[i]; i++) {
-		pipe[i]->args = cut_line(pipe[i]->full_instruction);
+		pipe[i]->args = my_str_to_words(pipe[i]->full_instruction);
 		if (pipe[i]->args == NULL)
 			return (FAILURE);
 		check_env_variable(pipe[i]->args, env);

src/shell_loop/parsing/parsing/get_word.c

@@ -6,9 +6,10 @@
 */
 
 #include "shell.h"
+
 static void check_reset(int *i, int *j, int reset)
 {
-	if (reset == 1) {
+	if (reset == 0) {
 		*i = 0;
 		*j = 0;
 	}
@@ -41,14 +42,3 @@ char *get_word(char *str, int reset)
 	}
 	return (my_strcpy_words_parse(str, j, i++));
 }
-
-int main(void)
-{
-	//gcc get_word.c my_strcpy_words.c -I../../../../include -g3 && ./a.out
-	char *str = "\"lol c un test \"mdr 'xd sa march lol'     ptdr";
-	char **st = malloc(sizeof(char*) * 4);
-	for (int i = 0; i < 4; i++) {
-		printf("LE MOT : '%s'\n", get_word(str, 0));
-	}
-	return (0);
-}

src/shell_loop/parsing/parsing/my_str_to_words.c

@@ -9,17 +9,19 @@
 
 char **my_str_to_words(char *str)
 {
-	int words = count_words(str);
-	char **word = malloc(sizeof(char *) * (words + 1));
+	//gcc get_word.c my_strcpy_words.c -I../../../../include -g3 && ./a.out
+	//char *str = "\"lol c un test \"mdr 'xd sa march lol'     ptdr";
+	char **words = malloc(sizeof(char*) * 1);
+	char *temp = NULL;
 
-	if (words == 0)
-		return (NULL);
-	for (int i = 0; i < words; i++) {
-		if (i == 0)
-			word[i] = get_word(str, 1);
-		else
-			word[i] = get_word(str, 0);
+	words[0] = NULL;
+	for (int i = 0; (temp = get_word(str, i)) != NULL; i++) {
+		words = realloc(words, sizeof(char*) * (i+2));
+		words[i] = temp;
+		//printf("LE MOT : '%s'\n", words[i]);
+		words[i+1] = NULL;
 	}
-	word[words] = NULL;
-	return (word);
+	if (words[0] == NULL)
+		words = NULL;
+	return (words);
 }

src/shell_loop/parsing/parsing/my_strcpy_words.c

@@ -13,6 +13,8 @@ char *my_strcpy_words_parse(char *str, int start, int end)
 	int j = 0;
 	char *new_str = malloc(sizeof(char) * ((end - start) + 2));
 
+	if (start == end)
+		return (NULL);
 	while (i < end && str[i] != '\0') {
 		new_str[j] = str[i];
 		i++;