Executor merge

.gitignore

@@ -13,3 +13,4 @@
 !includes/*
 !libft/*
 !readline/*
+!.heredoc

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "libft"]
 	path = libft
 	url = git@github.com:lithiumox-codam/libft.git
+	branch = minishell
 [submodule "builtins"]
 	path = src/builtins
 	url = git@github.com:lithiumox-codam/built-ins.git

.vscode/c_cpp_properties.json

@@ -2,10 +2,10 @@
     "configurations": [
         {
             "name": "Mac",
+            "os": "mac",
             "includePath": [
-                "${workspaceFolder}/includes",
-                "${workspaceFolder}/../libft",
-                "../libft"
+                "${workspaceFolder}/includes/**",
+                "${workspaceFolder}/libft/includes/**"
             ],
             "macFrameworkPath": [
                 "/Library/Frameworks"
@@ -15,7 +15,20 @@
             "cStandard": "c17",
             "cppStandard": "c++17",
             "configurationProvider": "ms-vscode.makefile-tools"
+        },
+        {
+            "name": "Ubuntu",
+            "os": "linux",
+            "includePath": [
+                "${workspaceFolder}/includes/**",
+                "${workspaceFolder}//libft/includes/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "configurationProvider": "ms-vscode.makefile-tools"
         }
     ],
     "version": 4
-}
+}

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "lldb",
+			"request": "launch",
+			"name": "Debug",
+			"program": "${workspaceFolder}/./minishell",
+			"preLaunchTask": "build",
+			"args": [
+				"\"(city \"test\" 'test' > < >> << || | && () )\""
+			],
+			"cwd": "${workspaceFolder}"
+		}
+	]
+}

.vscode/settings.json

@@ -11,5 +11,17 @@
 			"comments": false,
 			"strings": false
 		},
+	},
+	"files.associations": {
+		"sstream": "c",
+		"__locale": "c",
+		"__string": "c",
+		"array": "c",
+		"iterator": "c",
+		"string": "c",
+		"string_view": "c",
+		"vector": "c",
+		"minishell.h": "c",
+		"random": "c"
 	}
-}
+}

.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "build",
+			"type": "shell",
+			"command": "make re DEBUG=1",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"problemMatcher": [
+				"$tsc"
+			]
+		},
+	]
+}

Makefile

@@ -1,16 +1,17 @@
 NAME = minishell
-SRC = main \
-	check_input
+SRC = main check_input utils/error structs/token structs/group parser/index parser/token_vec2 parser/quotes parser/token_vec debug/print_vector lexer/index lexer/string lexer/token lexer/op_split structs/env structs/shell group/group group/heredoc parser/verify_token exec/exec exec/create_processes exec/redirect exec/exec_process utils/miscellaneous exec/utils
 SRCS = $(addsuffix .c, $(addprefix src/, $(SRC)))
 OBJS = $(patsubst src/%.c, build/%.o, $(SRCS))
 LIBFT = libft/libft.a
 READLINE = readline/libreadline.a
 
+DEBUG ?= 0
+DEBUG_FLAGS = -g
 G_FLAGS = -DREADLINE_LIBRARY
 CODAM_FLAGS = -Wall -Wextra -Werror
 LIBS = libft/libft.a readline/libreadline.a readline/libhistory.a
 LINKER = -lncurses
-INCLUDES = -I $(CURDIR)/includes -I $(CURDIR)/libft -I $(CURDER)/readline
+INCLUDES = -I $(CURDIR)/includes -I $(CURDIR)/libft/includes -I $(CURDER)/readline
 
 COLOR_INFO = \033[1;36m
 COLOR_SUCCESS = \033[1;32m
@@ -23,19 +24,19 @@ EMOJI_RUN = 🚀
 
 all: $(NAME)
 
-$(NAME): $(LIBFT) $(READLINE) $(OBJS)
+$(NAME): $(LIBFT) $(OBJS)
 	@printf "$(COLOR_INFO)$(EMOJI_INFO)  Compiling $(NAME)...$(COLOR_RESET)\t"
-	@cc $(OBJS) $(CODAM_FLAGS) $(LINKER) $(INCLUDES) $(LIBS) -o $@
+	@cc $(OBJS) $(CODAM_FLAGS) $(if DEBUG, $(DEBUG_FLAGS)) -DDEBUG=$(DEBUG) $(LINKER) $(INCLUDES) $(LIBS) -o $@
 	@sleep 0.25
 	@printf "✅\n"
 
-build/%.o: src/%.c includes/minishell.h
+build/%.o: src/%.c includes/minishell.h includes/structs.h includes/enum.h
 	@mkdir -p $(@D)
-	@cc $(INCLUDES) $(CODAM_FLAGS) -c $< -o $@
+	@cc $(INCLUDES) $(CODAM_FLAGS) $(if DEBUG, $(DEBUG_FLAGS)) -DDEBUG=$(DEBUG) -c $< -o $@
 
 $(LIBFT):
 	@printf "$(COLOR_INFO)$(EMOJI_INFO)  Initializing submodules...$(COLOR_RESET)\t"
-	@git submodule update --init --recursive > /dev/null
+# @git submodule update --init --recursive > /dev/null
 	@sleep 0.25
 	@printf "✅\n"
 	@printf "$(COLOR_INFO)$(EMOJI_INFO)  Building Libft...$(COLOR_RESET)\t\t"
@@ -61,7 +62,7 @@ clean:
 fclean: clean
 	@printf "$(COLOR_INFO)$(EMOJI_CLEAN)  Removing executable...$(COLOR_RESET)\t"
 	@$(MAKE) -C libft fclean > /dev/null
-	@rm -f $(LIBS)
+	@rm -f libft/libft.a
 	@rm -f $(NAME)
 	@sleep 0.25
 	@printf "✅\n"
@@ -77,6 +78,8 @@ re: fclean $(NAME)
 
 bonus: all
 
+readline: $(READLINE)
+
 module-update:
 	@printf "$(COLOR_INFO)$(EMOJI_INFO)  Updating submodules...$(COLOR_RESET)\t"
 	@git submodule update --remote --merge

includes/enum.h

@@ -0,0 +1,87 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        ::::::::            */
+/*   enum.h                                             :+:    :+:            */
+/*                                                     +:+                    */
+/*   By: mdekker/jde-baai <team@codam.nl>             +#+                     */
+/*                                                   +#+                      */
+/*   Created: 2023/07/13 17:41:00 by mdekker/jde   #+#    #+#                 */
+/*   Updated: 2023/09/07 03:46:17 by mdekker/jde   ########   odam.nl         */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef ENUM_H
+# define ENUM_H
+
+/**
+ * @brief The enum for the different types of token_vec
+ *
+ * @param DOUBLE_QUOTE (")
+ * @param SINGLE_QUOTE (')
+ * @param PIPE (|)
+ * @param PARENTHESES (())
+ * @param OR (||)
+ * @param AND (&&)
+ * @param ENV ($)
+ * @param DQ_ENV An environment variable in double quotes ("$")
+ * @param ENV_QUESTION An environment variable with a question mark ("$?")
+ * @param STRING A string
+ * @param O_REDIRECT (>)
+ * @param I_REDIRECT (<)
+ * @param A_REDIRECT (>>)
+ * @param HEREDOC (<<)
+ */
+typedef enum e_types
+{
+	UNKNOWN,
+	STRING,
+	DOUBLE_QUOTE,
+	SINGLE_QUOTE,
+	PARENTHESES,
+	PIPE,
+	OR,
+	AND,
+	ENV,
+	DQ_ENV,
+	ENV_QUESTION,
+	O_REDIRECT,
+	I_REDIRECT,
+	A_REDIRECT,
+	HEREDOC
+}	t_types;
+
+/**
+ * @brief The enum for the different types of errors
+ *
+ * @param PERROR A perror
+ * @param NOT_FOUND A not found error
+ * @param PERMISSION A permission error
+ * @param SYNTAX A syntax error
+ * @param SYNTAX_MINI A syntax error for the minishell
+ * @param SIGNAL_C A signal interrupt
+ *
+ */
+typedef enum e_exit
+{
+	GOOD,
+	PERROR,
+	MALLOC,
+	NOT_FOUND,
+	PERMISSION,
+	SYNTAX,
+	SYNTAX_MINI,
+	SIGNAL_C
+}	t_exit;
+
+/**
+ * @brief defines which process is being executed
+ */
+typedef enum e_process
+{
+	SINGLE,
+	LEFT,
+	RIGHT,
+	MIDDLE,
+}	t_process;
+
+#endif

includes/minishell.h

@@ -6,22 +6,95 @@
 /*   By: mdekker/jde-baai <team@codam.nl>             +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2023/07/09 21:25:59 by mdekker       #+#    #+#                 */
-/*   Updated: 2023/07/16 14:03:45 by mdekker/jde   ########   odam.nl         */
+/*   Updated: 2023/09/06 20:29:47 by mdekker/jde   ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef MINISHELL_H
 # define MINISHELL_H
 
+# include <errno.h>
+# include <fcntl.h>
 # include <libft.h>
-# include <structs.h>
 # include <readline/history.h>
 # include <readline/readline.h>
+# include <stdbool.h>
 # include <stdio.h>
 # include <stdlib.h>
-# include <stdbool.h>
+# include <structs.h>
+# include <unistd.h>
 
-/* input_check */
+# ifndef DEBUG
+#  define DEBUG 0
+# endif
+
+/* init shell */
+t_shell	*init_shell(char **env, bool first_init);
+void	free_shell(t_shell *data, bool close_shell);
+
+/* lexer */
+void	lexer(char *input, t_shell *data);
 bool	check_quotes_parantheses(char *input);
+bool	create_string(char *str, size_t *i, t_vector *vec);
+bool	create_quote_string(char *str, size_t *i, t_vector *vec);
+bool	create_paran_string(char *str, size_t *i, t_vector *vec);
+void	operator_split(t_shell *data);
+char	**split(t_token *token);
+
+/* parser */
+void	parser(t_shell *data);
+void	parse_one(t_token *token);
+bool	is_encased_dq(char *str);
+bool	is_encased_sq(char *str);
+bool	is_encased_parentheses(char *str);
+bool	is_pipe(char *str);
+bool	is_r_redirect(char *str);
+bool	is_l_redirect(char *str);
+bool	is_a_redirect(char *str);
+bool	is_heredoc(char *str);
+bool	contains_env_var(char *str);
+bool	is_or(char *str);
+bool	is_and(char *str);
+void	verify_token_vec(t_shell *data);
+
+/* group */
+void	group_token_vec(t_shell *data);
+void	heredoc(char *filename, char *stop, t_types type, t_shell *data);
+
+/* executor */
+int		executor(t_shell *data);
+bool	create_processes(t_shell *data);
+void	exec_process(t_group *group, t_process type);
+void	redirect_input(t_group *group, size_t i);
+
+/* exec_utils */
+bool	is_built_in(char *str);
+char	**combine_env(t_vector *env_vec);
+char	**create_cmd(t_vector *input);
+bool	is_redirect(t_token *token);
+bool	is_string_type(t_token *token);
+
+/* structs */
+t_token	*create_token(char *value, t_types type);
+void	clear_token(void *data);
+t_token	*dup_token(t_token *input);
+t_env	*create_env(char *key, char *value);
+void	clear_env(void *data);
+t_group	*create_group(void);
+void	clear_group(void *data);
+void	clear_fname(void *data);
+t_exec	*create_exec(void);
+void	clear_exec(t_exec *exec);
+
+/* general utils */
+void	exit_mini(char *str, int exit_code);
+void	err(t_exit type, char *name, t_shell *data, bool free_struct);
+char	*rm_quotes(t_token *token);
+
+/* debug */
+void	print_vector(t_vector *vec, void (*printer)(void *, size_t));
+void	print_token(void *data, size_t i);
+char	*print_type(t_types type);
+void	print_env(void *data, size_t i);
 
 #endif