Merge branch 'solo' into feature/executor-gl
# Conflicts: # src/parser/parser.c
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* By: sede-san <sede-san@student.42madrid.com +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/10/22 19:10:13 by sede-san #+# #+# */
|
||||
/* Updated: 2026/02/09 18:45:41 by sede-san ### ########.fr */
|
||||
/* Updated: 2026/02/10 23:21:35 by sede-san ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -19,9 +19,37 @@
|
||||
/* Structures & Data Types */
|
||||
/******************************************************************************/
|
||||
|
||||
typedef struct s_minishell t_minishell;
|
||||
typedef struct s_variables t_variables;
|
||||
typedef struct s_command t_command;
|
||||
# define TOKENS_COUNT 5
|
||||
|
||||
typedef enum e_token_type
|
||||
{
|
||||
TOKEN_WORD,
|
||||
TOKEN_PIPE,
|
||||
TOKEN_REDIRECT_IN,
|
||||
TOKEN_REDIRECT_OUT,
|
||||
TOKEN_APPEND,
|
||||
TOKEN_HEREDOC
|
||||
} t_token_type;
|
||||
|
||||
typedef struct s_token
|
||||
{
|
||||
t_token_type type;
|
||||
char *value;
|
||||
} t_token;
|
||||
|
||||
typedef enum e_redirection_type
|
||||
{
|
||||
REDIRECT_IN,
|
||||
REDIRECT_OUT,
|
||||
APPEND,
|
||||
HEREDOC
|
||||
} t_redirection_type;
|
||||
|
||||
typedef struct s_redirection
|
||||
{
|
||||
t_token_type type;
|
||||
char *target;
|
||||
} t_redirection;
|
||||
|
||||
/**
|
||||
* @brief Structure that holds both environment and internal variables
|
||||
@@ -70,6 +98,7 @@ typedef struct s_command
|
||||
char **argv;
|
||||
char *path;
|
||||
t_list *redirections;
|
||||
t_list *heredocs;
|
||||
} t_command;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user