Remove redundant funcs and add parse funcs to header and Makefile

diff --git a/Makefile b/Makefile
index 41551ec68379b360ebbae7ec5aa48851d42c6fba..8896dedf9895bb6149016d899001e4e4cf5941ca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ HEADERS =  -I include -I $(LIB_DIR)/libft
 
 VPATH   := src
 SRC     := main.c debug_tools.c init.c signal_handling.c repl.c new_token.c \
-           free_token.c new_node.c free_node.c
+           free_token.c new_node.c free_node.c parser.c parse_cmd.c
 
 OBJ_DIR := _obj
 OBJ     := $(addprefix $(OBJ_DIR)/, $(SRC:%.c=%.o))

diff --git a/include/minishell.h b/include/minishell.h
index a528e4a533120a3e31fcb8003d22d96501f5d8fe..2411cc5f824c5272a009845493bf918bef2d2b77 100644 (file)
--- a/include/minishell.h
+++ b/include/minishell.h
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 17:14:49 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/06/27 18:47:31 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/09 11:36:09 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -30,4 +30,8 @@ int           init_signal_handling(void);
 
 void   repl(const char *prompt);
 
+
+t_list *parse(t_token *tokens);
+t_node *parse_cmd(t_token *tokens);
+
 #endif

diff --git a/src/free_node.c b/src/free_node.c
index 8664a073056a75ba470246a61daee21a97e8d9b3..2dfeb7d7f1f2a2a94ffd664ae68ed0820616dece 100644 (file)
--- a/src/free_node.c
+++ b/src/free_node.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/27 11:41:46 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/08 16:15:21 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/09 11:37:11 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,12 +29,6 @@ void free_node(t_node *node)
        free(node);
 }
 
-static void    free_assign_node(t_node *node)
-{
-       free(node->content.assign.var);
-       free(node->content.assign.value);
-}
-
 static void    free_pipe_node(t_node *node)
 {
        free_node(node->content.pipe.left);

diff --git a/src/parser.c b/src/parser.c
index 5bf82f6fb48c6f1401b0b805cf927abcc913ff86..66c67855d11af4ef28d4993d0e0ec5a9c17d86cd 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/29 15:53:29 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/08 16:11:07 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/09 11:38:12 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,7 +16,6 @@ static t_token        *find_token_by_type(t_token *tokens, int type);
 t_token                        *split_at_first(t_token **tokens, int type);
 
 static t_node  *parse_statement(t_token *tokens);
-static t_node  *parse_cmd(t_token *tokens);
 
 t_list *parse(t_token *tokens)
 {
@@ -64,18 +63,6 @@ static t_node        *parse_statement(t_token *tokens)
        }
 }
 
-static t_node  *parse_cmd(t_token *tokens)
-{
-       char                    **args;
-       t_assign                **assigns;
-       t_redirection   **redirs;
-
-       redirs = collect_redirs(&tokens);
-       assigns = collect_assigns(&tokens);
-       args = collect_args(&tokens);
-       return (new_cmd_node(args, assigns, redirs));
-}
-
 t_token        *split_at_first(t_token **tokens, int type)
 {
        t_token *split;