Merge pull request #27 from cuajarsaki/fix_smallerror

norm and unnesserary group file

Author: cuajarsaki

Makefile

@@ -22,7 +22,6 @@ SRC = $(SRC_DIR)/$(CMD_DIR)/shell_cd.c \
 	  $(SRC_DIR)/parser/parser_ast.c \
 	  $(SRC_DIR)/parser/parser_cmd.c \
 	  $(SRC_DIR)/parser/parser_env.c \
-	  $(SRC_DIR)/parser/parser_group.c \
 	  $(SRC_DIR)/parser/parser_redir.c \
 	  $(SRC_DIR)/parser/parser_token_utils.c \
 	  $(SRC_DIR)/parser/parser_token.c \

src/parser/parser.h

@@ -6,7 +6,7 @@
 /*   By: jidler <[email protected]>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/04 16:00:00 by jidler            #+#    #+#             */
-/*   Updated: 2025/03/04 16:10:23 by jidler           ###   ########.fr       */
+/*   Updated: 2025/03/04 19:24:30 by jidler           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,6 +19,9 @@
 # include <ctype.h>
 # include <stdio.h>
 
+
+
+
 /* ************************************************************************** */
 /*                           UTILITY FUNCTIONS                                */
 /* ************************************************************************** */

src/parser/parser_ast.c

@@ -6,7 +6,7 @@
 /*   By: jidler <[email protected]>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/04 16:09:23 by jidler            #+#    #+#             */
-/*   Updated: 2025/03/04 16:10:44 by jidler           ###   ########.fr       */
+/*   Updated: 2025/03/04 19:08:10 by jidler           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,6 +17,7 @@ t_ast	*get_ast(const char *input, t_env *env_list, int *exit_status)
 	t_ast	*ast;
 	t_list	*command_group;
 	int		curr_pos;
+	void	*cmd_grp;
 
 	ast = (t_ast *)malloc(sizeof(t_ast));
 	if (!ast)
@@ -26,7 +27,9 @@ t_ast	*get_ast(const char *input, t_env *env_list, int *exit_status)
 	while (input[curr_pos])
 	{
 		ft_skip_spaces(input, &curr_pos);
-		command_group = ft_lstnew((void *)get_command_group(input, &curr_pos, env_list, exit_status));
+		cmd_grp = (void *)get_command_group(input,
+				&curr_pos, env_list, exit_status);
+		command_group = ft_lstnew(cmd_grp);
 		if (!command_group)
 		{
 			free(ast);
@@ -35,4 +38,4 @@ t_ast	*get_ast(const char *input, t_env *env_list, int *exit_status)
 		ft_lstadd_back(&ast->command_groups, command_group);
 	}
 	return (ast);
-}
+}

src/parser/parser_cmd.c

@@ -6,27 +6,28 @@
 /*   By: jidler <[email protected]>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/04 16:09:28 by jidler            #+#    #+#             */
-/*   Updated: 2025/03/04 16:09:29 by jidler           ###   ########.fr       */
+/*   Updated: 2025/03/04 19:25:32 by jidler           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "parser.h"
 
-t_cmd	*get_cmd(const char *input, int *curr_pos, t_env *env_list, int *exit_status)
+t_cmd	*get_cmd(const char *input, int *curr_pos, 
+		t_env *env_list, int *exit_status)
 {
 	t_cmd	*cmd;
 	t_list	*new_node;
+	t_token	*token_struct;
+	char	*final_token;
 
 	cmd = (t_cmd *)malloc(sizeof(t_cmd));
 	if (!cmd)
 		return (NULL);
 	cmd->tokens = NULL;
 	cmd->redirs = NULL;
-
 	while (input[*curr_pos] && input[*curr_pos] != '|')
 	{
 		ft_skip_spaces(input, curr_pos);
-
 		if (input[*curr_pos] == '>' || input[*curr_pos] == '<')
 		{
 			new_node = ft_lstnew((void *)get_redir(input, curr_pos));
@@ -36,15 +37,15 @@ t_cmd	*get_cmd(const char *input, int *curr_pos, t_env *env_list, int *exit_stat
 		}
 		else
 		{
-			t_token *token_struct = get_token(input, curr_pos);
+			token_struct = get_token(input, curr_pos);
 			if (token_struct)
 			{
-				char *final_token = token_struct->is_single_quoted ? ft_strdup(token_struct->value) :
-					expand_env_token(token_struct->value, env_list, exit_status);
-
+				final_token = token_struct->is_single_quoted 
+					? ft_strdup(token_struct->value) 
+					: expand_env_token(token_struct->value, 
+						env_list, exit_status);
 				free(token_struct->value);
 				free(token_struct);
-
 				new_node = ft_lstnew((void *)final_token);
 				if (!new_node)
 				{
@@ -58,35 +59,33 @@ t_cmd	*get_cmd(const char *input, int *curr_pos, t_env *env_list, int *exit_stat
 	return (cmd);
 }
 
-t_command_group	*get_command_group(const char *input, int *curr_pos, t_env *env_list, int *exit_status)
+t_command_group	*get_command_group(const char *input, int *curr_pos, 
+		t_env *env_list, int *exit_status)
 {
 	t_command_group	*command_group;
-	t_list		*cmd;
+	t_list			*cmd;
 
 	command_group = (t_command_group *)malloc(sizeof(t_command_group));
 	if (!command_group)
 		return (NULL);
 	command_group->cmds = NULL;
-
 	while (input[*curr_pos])
 	{
 		ft_skip_spaces(input, curr_pos);
-
-		// Parse commands inside this table
-		cmd = ft_lstnew((void *)get_cmd(input, curr_pos, env_list, exit_status));
+		cmd = ft_lstnew((void *)get_cmd(input, curr_pos, 
+					env_list, exit_status));
 		if (!cmd)
 		{
-			ft_lstclear(&command_group->cmds, (void (*)(void *))free_cmd);
+			ft_lstclear(&command_group->cmds, 
+				(void (*)(void *))free_cmd);
 			return (NULL);
 		}
 		ft_lstadd_back(&command_group->cmds, cmd);
-
-		// Handle pipes within the same command table
 		if (input[*curr_pos] == '|' && input[*curr_pos + 1] != '|')
 		{
-			(*curr_pos)++; // Skip the `|`
-			continue; // Stay inside the same `t_command_group`
+			(*curr_pos)++;
+			continue;
 		}
 	}
 	return (command_group);
-}
+}