diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-06-19 13:31:08 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-06-19 13:31:08 +0200 |
| commit | 35434a76eaab34e4d639f5bd0a3b7ba610001c5e (patch) | |
| tree | cf30a93445da19b38392c0c5e8303038164de906 /include | |
| parent | a2ebd4ad078d7056a4c28ea697cfd3ebbf09d0f6 (diff) | |
| parent | c8091831c4ce1c4cf8703b18de22441aff191f44 (diff) | |
| download | minishell-35434a76eaab34e4d639f5bd0a3b7ba610001c5e.tar.gz minishell-35434a76eaab34e4d639f5bd0a3b7ba610001c5e.tar.bz2 minishell-35434a76eaab34e4d639f5bd0a3b7ba610001c5e.zip | |
Merge branch 'parse_cmd'
Diffstat (limited to 'include')
| -rw-r--r-- | include/ast.h | 9 | ||||
| -rw-r--r-- | include/lexer.h | 12 | ||||
| -rw-r--r-- | include/parser.h | 6 |
3 files changed, 22 insertions, 5 deletions
diff --git a/include/ast.h b/include/ast.h index 18f1d93..597c444 100644 --- a/include/ast.h +++ b/include/ast.h @@ -6,7 +6,7 @@ /* By: charles <charles@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:05:38 by charles #+# #+# */ -/* Updated: 2020/06/19 10:40:34 by charles ### ########.fr */ +/* Updated: 2020/06/19 13:29:27 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -48,9 +48,9 @@ typedef struct s_op enum e_ast_tag { - AST_CMD = 1 << 0, - AST_OP = 1 << 1, - AST_PARENT = 1 << 2, + AST_CMD, + AST_OP, + AST_PARENT, }; /* @@ -70,6 +70,7 @@ typedef struct s_ast { t_op op; t_ftlst *cmd_argv; + struct s_ast *parent_ast; }; t_ftlst *redirs; } t_ast; diff --git a/include/lexer.h b/include/lexer.h index 43c3821..df05c20 100644 --- a/include/lexer.h +++ b/include/lexer.h @@ -1,3 +1,15 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* lexer.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/06/19 10:51:26 by nahaddac #+# #+# */ +/* Updated: 2020/06/19 10:51:30 by nahaddac ### ########.fr */ +/* */ +/* ************************************************************************** */ + #ifndef LEXER_H # define LEXER_H diff --git a/include/parser.h b/include/parser.h index 302c45f..0bdc679 100644 --- a/include/parser.h +++ b/include/parser.h @@ -6,7 +6,7 @@ /* By: cacharle <cacharle@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 09:00:00 by cacharle #+# #+# */ -/* Updated: 2020/06/18 13:18:13 by charles ### ########.fr */ +/* Updated: 2020/06/18 16:34:18 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,7 @@ # define PARSE_H # include "minishell.h" +#include "libft_str.h" # include "ast.h" /* @@ -54,4 +55,7 @@ t_ast *push_redir(t_ast *ast, t_ftlst *rest); int parse_cmd_str_true_false(enum e_token_tag tag); int parse_redir_true_false(enum e_token_tag tag); +// error +t_token *error_syntax_simple(t_ftlst *in); + #endif |