From 5316c9880416b77b4b97b07fd6ae47f171a0ba23 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Mon, 8 Jul 2024 16:15:32 +0200
Subject: Move assign into cmd node

---
 src/free_node.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/free_node.c')

diff --git a/src/free_node.c b/src/free_node.c
index 8f32c12..8664a07 100644
--- a/src/free_node.c
+++ b/src/free_node.c
@@ -6,21 +6,19 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/27 11:41:46 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/06/28 14:55:50 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/08 16:15:21 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "ast.h"
 
-static void	free_assign_node(t_node *node);
 static void	free_pipe_node(t_node *node);
 static void	free_cmd_node(t_node *node);
+static void	free_assigns(t_assign **assigns);
 
 void	free_node(t_node *node)
 {
-	if (node->type == ASSIGN_NODE)
-		free_assign_node(node);
-	else if (node->type == PIPE_NODE)
+	if (node->type == PIPE_NODE)
 		free_pipe_node(node);
 	else if (node->type == CMD_NODE)
 		free_cmd_node(node);
@@ -54,6 +52,22 @@ static void	free_cmd_node(t_node *node)
 		i++;
 	}
 	free(node->content.cmd.args);
+	free_assigns(node->content.cmd.assigns);
 	free(node->content.cmd.redirs[0].specifier);
 	free(node->content.cmd.redirs[1].specifier);
 }
+
+static void	free_assigns(t_assign **assigns)
+{
+	int	i;
+
+	i = 0;
+	while (assigns[i] != NULL)
+	{
+		free(assigns[i]->var);
+		free(assigns[i]->value);
+		free(assigns[i]);
+		i++;
+	}
+	free(assigns);
+}
-- 
cgit v1.2.3


From 16ca09f57525cd9a4e7eb82ce70e4c1e0cb85a31 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Tue, 9 Jul 2024 12:56:09 +0200
Subject: Remove redundant funcs and add parse funcs to header and Makefile

---
 Makefile            |  2 +-
 include/minishell.h |  6 +++++-
 src/free_node.c     |  8 +-------
 src/parser.c        | 15 +--------------
 4 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'src/free_node.c')

diff --git a/Makefile b/Makefile
index 41551ec..8896ded 100644
--- 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 a528e4a..2411cc5 100644
--- 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 8664a07..2dfeb7d 100644
--- 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 5bf82f6..66c6785 100644
--- 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;
-- 
cgit v1.2.3


From 47a68b82e0463f5dfd4bd8a9c4b32b4c5fbcb610 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Mon, 22 Jul 2024 15:07:59 +0200
Subject: Fix errors and make the parser work

---
 include/ast.h   |  9 ++++++---
 src/free_node.c | 13 ++++++++-----
 src/new_node.c  |  3 ++-
 src/parse_cmd.c | 29 ++++++++++++++++-------------
 4 files changed, 32 insertions(+), 22 deletions(-)

(limited to 'src/free_node.c')

diff --git a/include/ast.h b/include/ast.h
index b0ed996..bf19083 100644
--- a/include/ast.h
+++ b/include/ast.h
@@ -6,12 +6,12 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/27 11:48:27 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/09 16:54:29 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/10 12:31:39 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "stdlib.h"
 #include "debug_tools.h"
+#include "stdlib.h"
 
 enum						e_node_type
 {
@@ -68,5 +68,8 @@ typedef struct s_node
 
 t_node						*new_node(int type);
 t_node						*new_pipe_node(t_node *left, t_node *right);
-t_node						*new_cmd_node(char **args, t_assign  **assigns, t_redirection redirs[2]);
+t_node						*new_cmd_node(char **args, t_assign **assigns,
+								t_redirection redirs[2]);
 t_node						*new_string_node(char *string);
+
+void						free_node(t_node *node);
diff --git a/src/free_node.c b/src/free_node.c
index 2dfeb7d..f8677d5 100644
--- 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/09 11:37:11 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/22 14:30:14 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -40,15 +40,17 @@ static void	free_cmd_node(t_node *node)
 	int	i;
 
 	i = 0;
-	while (node->content.cmd.args[i] != NULL)
+	while (node->content.cmd.args != NULL && node->content.cmd.args[i] != NULL)
 	{
 		free(node->content.cmd.args[i]);
 		i++;
 	}
 	free(node->content.cmd.args);
 	free_assigns(node->content.cmd.assigns);
-	free(node->content.cmd.redirs[0].specifier);
-	free(node->content.cmd.redirs[1].specifier);
+	if (node->content.cmd.redirs[0].type != 0 && node->content.cmd.redirs[0].specifier != NULL)
+		free(node->content.cmd.redirs[0].specifier);
+	if (node->content.cmd.redirs[1].type != 0 && node->content.cmd.redirs[0].specifier != NULL)
+		free(node->content.cmd.redirs[1].specifier);
 }
 
 static void	free_assigns(t_assign **assigns)
@@ -56,10 +58,11 @@ static void	free_assigns(t_assign **assigns)
 	int	i;
 
 	i = 0;
+	if (assigns == 0)
+		return ;
 	while (assigns[i] != NULL)
 	{
 		free(assigns[i]->var);
-		free(assigns[i]->value);
 		free(assigns[i]);
 		i++;
 	}
diff --git a/src/new_node.c b/src/new_node.c
index c334eb6..c2458d0 100644
--- a/src/new_node.c
+++ b/src/new_node.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/27 11:21:03 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/08 16:10:44 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/22 14:25:03 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -46,6 +46,7 @@ t_node	*new_cmd_node(char **args, t_assign **assigns, t_redirection redirs[2])
 	node->content.cmd.assigns = assigns;
 	node->content.cmd.redirs[0] = redirs[0];
 	node->content.cmd.redirs[1] = redirs[1];
+	free(redirs);
 	return (node);
 }
 
diff --git a/src/parse_cmd.c b/src/parse_cmd.c
index 4fa2bc2..0173caa 100644
--- a/src/parse_cmd.c
+++ b/src/parse_cmd.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/08 15:06:25 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/09 19:22:51 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/07/10 13:26:17 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,8 @@ static t_redirection	*collect_redirs(t_token **tokens);
 static t_assign			**collect_assigns(t_token **tokens);
 static char				**collect_args(t_token **tokens);
 static t_assign			*to_assign(char *str);
+static void				set_redir(t_redirection *redir, int type,
+							char *specifier);
 
 t_node	*parse_cmd(t_token *tokens)
 {
@@ -33,6 +35,7 @@ static t_redirection	*collect_redirs(t_token **tokens)
 {
 	t_redirection	*result;
 	t_token			*cur;
+	int				idx;
 
 	cur = *tokens;
 	result = malloc(sizeof(t_redirection) * 2);
@@ -41,24 +44,18 @@ static t_redirection	*collect_redirs(t_token **tokens)
 		// free all tokens
 		return (NULL);
 	}
-	result[0].specifier = NULL;
-	result[0].type = 0;
-	result[1].specifier = NULL;
-	result[1].type = 0;
+	set_redir(&result[0], 0, NULL);
+	set_redir(&result[1], 0, NULL);
 	while (cur != NULL && cur->next != NULL)
 	{
 		if (cur->type == REDIR_TOKEN && cur->next->type == STRING_TOKEN)
 		{
 			if (cur->content.redir_type & (INPUT_FILE | INPUT_LIMITER))
-			{
-				result[0].type = cur->content.redir_type;
-				result[0].specifier = cur->next->content.string;
-			}
+				idx = 0;
 			else if (cur->content.redir_type & (OUTPUT_APPEND | OUTPUT_OVERRIDE))
-			{
-				result[1].type = cur->content.redir_type;
-				result[1].specifier = cur->next->content.string;
-			}
+				idx = 1;
+			set_redir(&result[idx], cur->content.redir_type,
+				cur->next->content.string);
 			cur = cur->next;
 			free_token_and_connect(cur->previous);
 			if (cur->next != NULL)
@@ -170,3 +167,9 @@ static char	**collect_args(t_token **tokens)
 	result[i] = NULL;
 	return (result);
 }
+
+static void	set_redir(t_redirection *redir, int type, char *specifier)
+{
+	redir->type = type;
+	redir->specifier = specifier;
+}
-- 
cgit v1.2.3


From c7a4494fd97b7e80665cbd47ed96bc37bf5800e5 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Fri, 2 Aug 2024 15:29:00 +0200
Subject: Refactor parser

* Fix norme for free_node.c

* Uglify parser.c

* Merge parser updates into refactor-parser

* Outsource collect_assigns and collect_redirs

* Make parse_cmd.c norme conform

* Make free_tokens() norme conform

* Make collect_assigns.c norme conform

* Some refactoring of collect_redirs

* Refactor collect_redirs---
 include/minishell.h   |  16 +++---
 src/collect_assigns.c |  84 ++++++++++++++++++++++++++++++
 src/collect_redirs.c  |  80 +++++++++++++++++++++++++++++
 src/free_node.c       |   8 +--
 src/free_token.c      |   4 +-
 src/parse_cmd.c       | 138 ++------------------------------------------------
 src/parser.c          |  14 ++---
 7 files changed, 193 insertions(+), 151 deletions(-)
 create mode 100644 src/collect_assigns.c
 create mode 100644 src/collect_redirs.c

(limited to 'src/free_node.c')

diff --git a/include/minishell.h b/include/minishell.h
index d980d42..b21acbc 100644
--- 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/07/22 15:49:34 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/02 13:55:48 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,13 +25,15 @@
 # include <termios.h>
 # include <unistd.h>
 
-int		init(void);
-int		init_signal_handling(void);
+int				init(void);
+int				init_signal_handling(void);
 
-void	repl(const char *prompt);
+void			repl(const char *prompt);
 
-t_list	*parse(t_token *tokens);
-t_node	*parse_cmd(t_token *tokens);
+t_list			*parse(t_token *tokens);
+t_node			*parse_cmd(t_token *tokens);
+t_redirection	*collect_redirs(t_token **tokens);
+t_assign	**collect_assigns(t_token **tokens);
 
-void	print_ast(t_node *ast);
+void			print_ast(t_node *ast);
 #endif
diff --git a/src/collect_assigns.c b/src/collect_assigns.c
new file mode 100644
index 0000000..da43503
--- /dev/null
+++ b/src/collect_assigns.c
@@ -0,0 +1,84 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   collect_assigns.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/08/02 13:54:36 by dkaiser           #+#    #+#             */
+/*   Updated: 2024/08/02 14:37:41 by dkaiser          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+#include "token.h"
+
+static t_assign	*to_assign(char *str);
+static int		count_tokens(t_token *tokens);
+static int		is_quote(char c);
+
+t_assign	**collect_assigns(t_token **tokens)
+{
+	t_token		*cur;
+	t_assign	**result;
+	int			i;
+
+	result = malloc(sizeof(t_assign *) * (count_tokens(*tokens) + 1));
+	if (result == NULL)
+		return (free_tokens(*tokens), NULL);
+	cur = *tokens;
+	i = 0;
+	while (cur != NULL && cur->type == STRING_TOKEN
+		&& !is_quote(cur->content.string[0]) && ft_strchr(cur->content.string,
+			'=') != NULL)
+	{
+		result[i++] = to_assign(cur->content.string);
+		if (cur->next != NULL)
+		{
+			cur = cur->next;
+			free_token(cur->previous);
+		}
+		else
+			free_token(cur);
+	}
+	*tokens = cur;
+	result[i] = NULL;
+	return (result);
+}
+
+static t_assign	*to_assign(char *str)
+{
+	t_assign	*result;
+	char		*split_pos;
+
+	split_pos = ft_strchr(str, '=');
+	*split_pos = '\0';
+	result = malloc(sizeof(t_assign));
+	if (result == NULL)
+	{
+		return (NULL);
+	}
+	result->var = str;
+	result->value = split_pos + 1;
+	return (result);
+}
+
+static int	count_tokens(t_token *tokens)
+{
+	int	len;
+
+	len = 0;
+	while (tokens != NULL && tokens->type == STRING_TOKEN
+		&& !is_quote(tokens->content.string[0])
+		&& ft_strchr(tokens->content.string, '=') != NULL)
+	{
+		len++;
+		tokens = tokens->next;
+	}
+	return (len);
+}
+
+static int	is_quote(char c)
+{
+	return (c == '"' || c == '\'');
+}
diff --git a/src/collect_redirs.c b/src/collect_redirs.c
new file mode 100644
index 0000000..76b08da
--- /dev/null
+++ b/src/collect_redirs.c
@@ -0,0 +1,80 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   collect_redirs.c                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/08/02 13:49:31 by dkaiser           #+#    #+#             */
+/*   Updated: 2024/08/02 15:21:04 by dkaiser          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+static void		collect_redir(t_token **tokens, t_redirection *result,
+					t_token *cur);
+static void		set_redir(t_redirection *redir, int type, char *specifier);
+static int		is_output_redir(int i);
+
+t_redirection	*collect_redirs(t_token **tokens)
+{
+	t_redirection	*result;
+	t_token			*cur;
+
+	cur = *tokens;
+	result = malloc(sizeof(t_redirection) * 2);
+	if (result == NULL)
+		return (free_tokens(*tokens), NULL);
+	set_redir(&result[0], 0, NULL);
+	set_redir(&result[1], 0, NULL);
+	while (cur != NULL && cur->next != NULL)
+	{
+		if (cur->type == REDIR_TOKEN && cur->next->type == STRING_TOKEN)
+			collect_redir(tokens, result, cur);
+		else if (cur->type == REDIR_TOKEN)
+		{
+			dbg("TODO: Add parsing errmsg");
+			return (free(result), NULL);
+		}
+		else
+			cur = cur->next;
+	}
+	return (result);
+}
+
+static void	collect_redir(t_token **tokens, t_redirection *result, t_token *cur)
+{
+	set_redir(&result[is_output_redir(cur->content.redir_type)],
+		cur->content.redir_type, cur->next->content.string);
+	cur = cur->next;
+	free_token_and_connect(cur->previous);
+	if (cur->next != NULL)
+	{
+		if (cur->previous == NULL)
+			*tokens = cur->next;
+		cur = cur->next;
+		free_token_and_connect(cur->previous);
+	}
+	else
+		free_token(cur);
+}
+
+static void	set_redir(t_redirection *redir, int type, char *specifier)
+{
+	redir->type = type;
+	redir->specifier = specifier;
+}
+
+static int	is_output_redir(int i)
+{
+	if (i & (INPUT_FILE | INPUT_LIMITER))
+		return (0);
+	else if (i & (OUTPUT_APPEND | OUTPUT_OVERRIDE))
+		return (1);
+	else
+	{
+		panic(UNREACHABLE);
+		return (-1);
+	}
+}
diff --git a/src/free_node.c b/src/free_node.c
index f8677d5..f387c0a 100644
--- 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/22 14:30:14 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/02 13:28:47 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -47,9 +47,11 @@ static void	free_cmd_node(t_node *node)
 	}
 	free(node->content.cmd.args);
 	free_assigns(node->content.cmd.assigns);
-	if (node->content.cmd.redirs[0].type != 0 && node->content.cmd.redirs[0].specifier != NULL)
+	if (node->content.cmd.redirs[0].type != 0
+		&& node->content.cmd.redirs[0].specifier != NULL)
 		free(node->content.cmd.redirs[0].specifier);
-	if (node->content.cmd.redirs[1].type != 0 && node->content.cmd.redirs[0].specifier != NULL)
+	if (node->content.cmd.redirs[1].type != 0
+		&& node->content.cmd.redirs[0].specifier != NULL)
 		free(node->content.cmd.redirs[1].specifier);
 }
 
diff --git a/src/free_token.c b/src/free_token.c
index 3c8ce1a..9b035ac 100644
--- a/src/free_token.c
+++ b/src/free_token.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/27 14:38:57 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/08/02 14:14:30 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/02 14:23:56 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -30,7 +30,7 @@ void	free_token_and_connect(t_token *token)
 	free(token);
 }
 
-void free_tokens(t_token *tokens)
+void	free_tokens(t_token *tokens)
 {
 	while (tokens->next != NULL)
 	{
diff --git a/src/parse_cmd.c b/src/parse_cmd.c
index 8ed9785..068a4c1 100644
--- a/src/parse_cmd.c
+++ b/src/parse_cmd.c
@@ -6,18 +6,13 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/08 15:06:25 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/08/02 13:22:18 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/02 14:22:32 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-static t_redirection	*collect_redirs(t_token **tokens);
-static t_assign			**collect_assigns(t_token **tokens);
-static char				**collect_args(t_token **tokens);
-static t_assign			*to_assign(char *str);
-static void				set_redir(t_redirection *redir, int type,
-							char *specifier);
+static char	**collect_args(t_token **tokens);
 
 t_node	*parse_cmd(t_token *tokens)
 {
@@ -31,120 +26,6 @@ t_node	*parse_cmd(t_token *tokens)
 	return (new_cmd_node(args, assigns, redirs));
 }
 
-static t_redirection	*collect_redirs(t_token **tokens)
-{
-	t_redirection	*result;
-	t_token			*cur;
-	int				idx;
-
-	cur = *tokens;
-	result = malloc(sizeof(t_redirection) * 2);
-	if (result == NULL)
-	{
-		// free all tokens
-		return (NULL);
-	}
-	set_redir(&result[0], 0, NULL);
-	set_redir(&result[1], 0, NULL);
-	while (cur != NULL && cur->next != NULL)
-	{
-		if (cur->type == REDIR_TOKEN && cur->next->type == STRING_TOKEN)
-		{
-			if (cur->content.redir_type & (INPUT_FILE | INPUT_LIMITER))
-				idx = 0;
-			else if (cur->content.redir_type & (OUTPUT_APPEND | OUTPUT_OVERRIDE))
-				idx = 1;
-			set_redir(&result[idx], cur->content.redir_type,
-				cur->next->content.string);
-			cur = cur->next;
-			free_token_and_connect(cur->previous);
-			if (cur->next != NULL)
-			{
-				if (cur->previous == NULL)
-					*tokens = cur->next;
-				cur = cur->next;
-				free_token_and_connect(cur->previous);
-			}
-			else
-			{
-				free_token(cur);
-			}
-		}
-		else if (cur->type == REDIR_TOKEN)
-		{
-			// err Parsing error
-			free(result);
-			return (NULL);
-		}
-		else
-		{
-			cur = cur->next;
-		}
-	}
-	return (result);
-}
-
-static t_assign	**collect_assigns(t_token **tokens)
-{
-	t_token		*cur;
-	t_assign	**result;
-	int			i;
-
-	cur = *tokens;
-	i = 0;
-	while (cur != NULL && cur->type == STRING_TOKEN
-		&& cur->content.string[0] != '"' && cur->content.string[0] != '\''
-		&& ft_strchr(cur->content.string, '=') != NULL)
-	{
-		i++;
-		cur = cur->next;
-	}
-	result = malloc(sizeof(t_assign *) * (i + 1));
-	if (!result)
-	{
-		// free all tokens
-		return (NULL);
-	}
-	cur = *tokens;
-	i = 0;
-	while (cur != NULL && cur->type == STRING_TOKEN
-		&& cur->content.string[0] != '"' && cur->content.string[0] != '\''
-		&& ft_strchr(cur->content.string, '=') != NULL)
-	{
-		result[i] = to_assign(cur->content.string);
-		i++;
-		if (cur->next != NULL)
-		{
-			cur = cur->next;
-			free_token(cur->previous);
-		}
-		else
-		{
-			free_token(cur);
-		}
-	}
-	*tokens = cur;
-	result[i] = NULL;
-	return (result);
-}
-
-static t_assign	*to_assign(char *str)
-{
-	t_assign	*result;
-	char		*split_pos;
-
-	split_pos = ft_strchr(str, '=');
-	*split_pos = '\0';
-	result = malloc(sizeof(t_assign));
-	if (result == NULL)
-	{
-		return (NULL);
-	}
-	result->var = str;
-	result->value = split_pos + 1;
-	return (result);
-}
-
 static char	**collect_args(t_token **tokens)
 {
 	t_token	*cur;
@@ -159,26 +40,17 @@ static char	**collect_args(t_token **tokens)
 		cur = cur->next;
 	}
 	result = malloc(sizeof(char *) * (i + 1));
-	if (!result)
-	{
-		// free all tokens;
-		return (NULL);
-	}
+	if (result == NULL)
+		return (free_tokens(*tokens), NULL);
 	cur = *tokens;
 	i = 0;
 	while (cur != NULL && cur->type == STRING_TOKEN)
 	{
 		result[i] = cur->content.string;
-		// free token
 		i++;
 		cur = cur->next;
+		free_token(cur->previous);
 	}
 	result[i] = NULL;
 	return (result);
 }
-
-static void	set_redir(t_redirection *redir, int type, char *specifier)
-{
-	redir->type = type;
-	redir->specifier = specifier;
-}
diff --git a/src/parser.c b/src/parser.c
index 66c6785..f9484c9 100644
--- 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/09 11:38:12 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/02 13:48:09 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,8 +14,8 @@
 
 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 void		free_node_wrapper(void *node);
 
 t_list	*parse(t_token *tokens)
 {
@@ -38,10 +38,7 @@ t_list	*parse(t_token *tokens)
 			current = current->next;
 		}
 		if (current == NULL)
-		{
-			// Free: ft_lstclear(&result, free_node);
-			return (NULL);
-		}
+			return (ft_lstclear(&result, free_node_wrapper), NULL);
 		current_tokens = split_at_first(&tokens, NEWLINE_TOKEN);
 	}
 	return (result);
@@ -91,3 +88,8 @@ static t_token	*find_token_by_type(t_token *tokens, int type)
 	}
 	return (NULL);
 }
+
+static void	free_node_wrapper(void *node)
+{
+	free_node((t_node *)node);
+}
-- 
cgit v1.2.3


From 99e8655aaf9827c7d5248c7f3d0913fcb1377cfb Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Sun, 11 Aug 2024 12:27:02 +0200
Subject: Remove assigns

I found out that there's a difference between shell variables and env
variables.
We don't have to implement shell variables, so I removed all code that
handles them.
---
 Makefile              |  2 +-
 include/ast.h         | 12 ++------
 include/minishell.h   |  3 +-
 src/collect_assigns.c | 84 ---------------------------------------------------
 src/free_node.c       | 20 +-----------
 src/new_node.c        |  5 ++-
 src/parse_cmd.c       |  6 ++--
 src/print_ast.c       | 10 +-----
 8 files changed, 10 insertions(+), 132 deletions(-)
 delete mode 100644 src/collect_assigns.c

(limited to 'src/free_node.c')

diff --git a/Makefile b/Makefile
index d4778bf..827c317 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,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 tokenizer.c parser.c \
-           parse_cmd.c collect_assigns.c collect_redirs.c print_ast.c
+           parse_cmd.c collect_redirs.c print_ast.c
 
 OBJ_DIR := _obj
 OBJ     := $(addprefix $(OBJ_DIR)/, $(SRC:%.c=%.o))
diff --git a/include/ast.h b/include/ast.h
index bf19083..cd2f9c9 100644
--- a/include/ast.h
+++ b/include/ast.h
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/27 11:48:27 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/10 12:31:39 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/11 12:20:56 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,12 +20,6 @@ enum						e_node_type
 	STRING_NODE
 };
 
-typedef struct s_assign
-{
-	char					*var;
-	char					*value;
-}							t_assign;
-
 typedef struct s_pipe
 {
 	struct s_node			*left;
@@ -49,7 +43,6 @@ typedef struct s_redirection
 typedef struct s_cmd
 {
 	char					**args;
-	struct s_assign			**assigns;
 	struct s_redirection	redirs[2];
 }							t_cmd;
 
@@ -68,8 +61,7 @@ typedef struct s_node
 
 t_node						*new_node(int type);
 t_node						*new_pipe_node(t_node *left, t_node *right);
-t_node						*new_cmd_node(char **args, t_assign **assigns,
-								t_redirection redirs[2]);
+t_node						*new_cmd_node(char **args, t_redirection redirs[2]);
 t_node						*new_string_node(char *string);
 
 void						free_node(t_node *node);
diff --git a/include/minishell.h b/include/minishell.h
index 4f04682..6997b15 100644
--- 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/08/11 10:59:16 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/11 12:22:07 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,7 +34,6 @@ void			repl(const char *prompt);
 t_list			*parse(t_token *tokens);
 t_node			*parse_cmd(t_token *tokens);
 t_redirection	*collect_redirs(t_token **tokens);
-t_assign	**collect_assigns(t_token **tokens);
 
 void			print_ast(t_node *ast);
 #endif
diff --git a/src/collect_assigns.c b/src/collect_assigns.c
deleted file mode 100644
index da43503..0000000
--- a/src/collect_assigns.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   collect_assigns.c                                  :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/08/02 13:54:36 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/08/02 14:37:41 by dkaiser          ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "minishell.h"
-#include "token.h"
-
-static t_assign	*to_assign(char *str);
-static int		count_tokens(t_token *tokens);
-static int		is_quote(char c);
-
-t_assign	**collect_assigns(t_token **tokens)
-{
-	t_token		*cur;
-	t_assign	**result;
-	int			i;
-
-	result = malloc(sizeof(t_assign *) * (count_tokens(*tokens) + 1));
-	if (result == NULL)
-		return (free_tokens(*tokens), NULL);
-	cur = *tokens;
-	i = 0;
-	while (cur != NULL && cur->type == STRING_TOKEN
-		&& !is_quote(cur->content.string[0]) && ft_strchr(cur->content.string,
-			'=') != NULL)
-	{
-		result[i++] = to_assign(cur->content.string);
-		if (cur->next != NULL)
-		{
-			cur = cur->next;
-			free_token(cur->previous);
-		}
-		else
-			free_token(cur);
-	}
-	*tokens = cur;
-	result[i] = NULL;
-	return (result);
-}
-
-static t_assign	*to_assign(char *str)
-{
-	t_assign	*result;
-	char		*split_pos;
-
-	split_pos = ft_strchr(str, '=');
-	*split_pos = '\0';
-	result = malloc(sizeof(t_assign));
-	if (result == NULL)
-	{
-		return (NULL);
-	}
-	result->var = str;
-	result->value = split_pos + 1;
-	return (result);
-}
-
-static int	count_tokens(t_token *tokens)
-{
-	int	len;
-
-	len = 0;
-	while (tokens != NULL && tokens->type == STRING_TOKEN
-		&& !is_quote(tokens->content.string[0])
-		&& ft_strchr(tokens->content.string, '=') != NULL)
-	{
-		len++;
-		tokens = tokens->next;
-	}
-	return (len);
-}
-
-static int	is_quote(char c)
-{
-	return (c == '"' || c == '\'');
-}
diff --git a/src/free_node.c b/src/free_node.c
index f387c0a..6eae059 100644
--- 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/08/02 13:28:47 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/11 12:26:20 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,6 @@
 
 static void	free_pipe_node(t_node *node);
 static void	free_cmd_node(t_node *node);
-static void	free_assigns(t_assign **assigns);
 
 void	free_node(t_node *node)
 {
@@ -46,7 +45,6 @@ static void	free_cmd_node(t_node *node)
 		i++;
 	}
 	free(node->content.cmd.args);
-	free_assigns(node->content.cmd.assigns);
 	if (node->content.cmd.redirs[0].type != 0
 		&& node->content.cmd.redirs[0].specifier != NULL)
 		free(node->content.cmd.redirs[0].specifier);
@@ -54,19 +52,3 @@ static void	free_cmd_node(t_node *node)
 		&& node->content.cmd.redirs[0].specifier != NULL)
 		free(node->content.cmd.redirs[1].specifier);
 }
-
-static void	free_assigns(t_assign **assigns)
-{
-	int	i;
-
-	i = 0;
-	if (assigns == 0)
-		return ;
-	while (assigns[i] != NULL)
-	{
-		free(assigns[i]->var);
-		free(assigns[i]);
-		i++;
-	}
-	free(assigns);
-}
diff --git a/src/new_node.c b/src/new_node.c
index c2458d0..6da9f9e 100644
--- a/src/new_node.c
+++ b/src/new_node.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/27 11:21:03 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/07/22 14:25:03 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/11 12:22:45 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -35,7 +35,7 @@ t_node	*new_pipe_node(t_node *left, t_node *right)
 	return (node);
 }
 
-t_node	*new_cmd_node(char **args, t_assign **assigns, t_redirection redirs[2])
+t_node	*new_cmd_node(char **args, t_redirection redirs[2])
 {
 	t_node	*node;
 
@@ -43,7 +43,6 @@ t_node	*new_cmd_node(char **args, t_assign **assigns, t_redirection redirs[2])
 	if (node == NULL)
 		return (NULL);
 	node->content.cmd.args = args;
-	node->content.cmd.assigns = assigns;
 	node->content.cmd.redirs[0] = redirs[0];
 	node->content.cmd.redirs[1] = redirs[1];
 	free(redirs);
diff --git a/src/parse_cmd.c b/src/parse_cmd.c
index eb70f0d..2755cae 100644
--- a/src/parse_cmd.c
+++ b/src/parse_cmd.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/08 15:06:25 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/08/11 12:14:11 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/11 12:20:06 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,13 +17,11 @@ static char	**collect_args(t_token **tokens);
 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));
+	return (new_cmd_node(args, redirs));
 }
 
 static char	**collect_args(t_token **tokens)
diff --git a/src/print_ast.c b/src/print_ast.c
index 94f813f..a511246 100644
--- a/src/print_ast.c
+++ b/src/print_ast.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/22 15:16:53 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/08/02 13:18:48 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/08/11 12:26:00 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -49,14 +49,6 @@ static void	print_cmd_node(t_node *ast, int indent)
 		printf(" '%s'", ast->content.cmd.args[i]);
 		i++;
 	}
-	i = 0;
-	printf("\n%*sASSIGNS:", indent + 2, "");
-	while (ast->content.cmd.assigns[i] != NULL)
-	{
-		printf(" %s=%s", ast->content.cmd.assigns[i]->var,
-			ast->content.cmd.assigns[i]->value);
-		i++;
-	}
 	printf("\n%*sREDIRS:", indent + 2, "");
 	printf("\n%*sIN: %d %s", indent + 4, "", ast->content.cmd.redirs[0].type,
 		ast->content.cmd.redirs[0].specifier);
-- 
cgit v1.2.3