diff --git a/Makefile b/Makefile index 1fe1bed..eec6698 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: marde-vr +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/07/28 00:35:01 by tomoron #+# #+# # -# Updated: 2024/03/27 17:26:09 by tomoron ### ########.fr # +# Updated: 2024/03/27 18:29:50 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -34,7 +34,9 @@ SRCS_RAW = main.c\ pipe.c\ utils.c\ utils2.c\ - signal_handler.c + signal_handler.c\ + parsing_bonus.c + OBJS_DIR = objs/ SRCS_DIR = srcs/ diff --git a/srcs/minishell.h b/srcs/minishell.h index a51cef7..2b73651 100755 --- a/srcs/minishell.h +++ b/srcs/minishell.h @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */ -/* Updated: 2024/03/27 18:28:48 by tomoron ### ########.fr */ +/* Updated: 2024/03/27 19:50:37 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,16 +25,32 @@ # include # include +typedef enum e_cmd_type +{ + PIPE, + CMD, + PAREN, + AND, + OR +} + +typedef struct s_cmd +{ + t_cmd_type cmd_type; + char *value; + stuct s_cmd *next; +} t_cmd; + typedef enum e_token_type { ARG, - PIPE, RED_O, RED_O_APP, RED_I, - HERE_DOC, + HERE_DOC } t_token_type; + typedef struct s_token { t_token_type type; diff --git a/srcs/parsing_bonus.c b/srcs/parsing_bonus.c index 98ca660..317f0ac 100644 --- a/srcs/parsing_bonus.c +++ b/srcs/parsing_bonus.c @@ -6,8 +6,9 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/27 14:40:44 by tomoron #+# #+# */ -/* Updated: 2024/03/27 17:20:51 by tomoron ### ########.fr */ +/* Updated: 2024/03/27 20:08:38 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" +