refonte de la gestion des cmd dans parsing

srcs/parsing/parsing.c

@@ -11,10 +11,113 @@
 	enum e_token_id			id;
 }				t_binary_tree; */
 
+size_t	count_pipes(t_token *token)
+{
+	size_t	nb;
+
+	nb = 0;
+	while (token)
+	{
+		if (token->id == T_PIPE)
+			nb++;
+		token = token->next;
+	}
+	return (nb + 1);
+}
+
+t_cmd	**create_cmd(t_token *token_list, size_t cmd_nbr)
+{
+	t_cmd	**cmd_arr;
+	size_t	i;
+
+	(void)token_list;
+	cmd_arr = ft_calloc(cmd_nbr + 1, sizeof(t_cmd *));
+	cmd_arr[cmd_nbr] = NULL;
+	i = 0;
+	while (i < cmd_nbr)
+	{
+		cmd_arr[i] = ft_calloc(1, sizeof(t_cmd));
+		ft_bzero(cmd_arr[i], sizeof(t_cmd));
+		i++;
+	}
+	return (cmd_arr);
+}
+
+//	T_TOKEN = 0,
+//	T_LESS = '<',
+//	T_GREAT = '>',
+//	T_PIPE = '|',
+//	T_DLESS, //'<<'
+//	T_DGREAT, //'>>'
+//	T_WORD
+// count nbr word in cmd, minus redirection and heredoc
+int	next_cmd(t_token **token)
+{
+	int	i;
+
+	i = 0;
+	while (*token && (*token)->id != T_PIPE)
+	{
+		if ((*token)->id != T_WORD)
+			i--;
+		else
+			i++;
+		*token = (*token)->next;
+	}
+	if (*token && (*token)->id == T_PIPE)
+		*token = (*token)->next;
+	return (i);
+}
+
+void	handle_argv(t_token *token, t_cmd **cmd_arr, size_t cmd_nbr)
+{
+	int		argc;
+	int		i;
+
+	(void)cmd_arr;
+	(void)token;
+	(void)cmd_nbr;
+	while (cmd_nbr)
+	{
+		argc = next_cmd(&token);
+		cmd->argv = calloc(argc + 1, sizeof(char *));
+		cmd->argv[argc] = NULL;
+//		i = 0;
+//		while (token && token->id != T_PIPE)
+//		{
+//			if (token->id == T_WORD)
+//			{
+//				cmd->argv[i] = ft_strdup(token->content);
+//				i++;
+//			}
+//			token = token->next;
+//		}
+//		cmd_nbr--;
+	}
+
+//	cmd->argv = calloc(argc + 1, sizeof(char *));
+//	cmd->argv[argc] = NULL;
+
+//	i = 0;
+//	while (*token && (*token)->id != T_PIPE)
+//	{
+//		if ((*token)->id == T_WORD)
+//		{
+//			cmd->argv[i] = ft_strdup((*token)->content);
+//			i++;
+//		}
+//		*token = (*token)->next;
+//	}
+//	if (*token && (*token)->id == T_PIPE)
+//		*token = (*token)->next;
+}
+
 t_cmd	**parsing(t_token *token_list, char **envp)
 {
 	t_cmd	**cmd_arr;
+	size_t	cmd_nbr;
 
+	(void)envp;
 /* 	t_binary_tree	*syntax_tree;
 	
 	syntax_tree = ft_calloc(1, sizeof *syntax_tree);
@@ -24,13 +127,21 @@ t_cmd	**parsing(t_token *token_list, char **envp)
 	if (!valid_syntax(token_list))
 		return (NULL);
 	// Pipes count (determine cmd_nbr)
+	cmd_nbr = count_pipes(token_list);
 		
 	// Struct CMD alloc/fill
-	cmd_arr = fill_cmd(token_list, envp);
+	cmd_arr = create_cmd(token_list, cmd_nbr);
+//	cmd_arr = fill_cmd(token_list, envp);
 
 	// 2.9.1 - 2) Expansion
+//	cmd_expansion(cmd_arr, envp);
+
+	handle_argv(token_list, cmd_arr, cmd_nbr);
+//		if (!handle_builtin(token, cmd[i]))
+//			handle_cmd(cmd[i]->argv, envp);
 
 	// 2.9.1 - 3) Redirection
+//		handle_fd(token, cmd + i);
 	
 	return (cmd_arr);
 }