From f5fafb4c191d0e31e67db5f5b745d79313a9556a Mon Sep 17 00:00:00 2001 From: "ariard@student.42.fr" Date: Wed, 1 Mar 2017 16:25:53 +0100 Subject: [PATCH] before pull --- 42sh/Makefile | 3 +- 42sh/includes/parser.h | 36 +++++++-------- 42sh/includes/types.h | 4 +- 42sh/src/lexer/lexer_word.c | 3 +- 42sh/src/lexer/token_print.c | 2 +- 42sh/src/main/ft_putast.c | 4 +- 42sh/src/main/main.c | 2 +- 42sh/src/parser/add_cmd.c | 10 ++-- 42sh/src/parser/add_condition.c | 2 +- 42sh/src/parser/{add_file.c => add_redir.c} | 51 ++++++++++++--------- 42sh/src/parser/add_sep.c | 2 +- 42sh/src/parser/aggregate_sym.c | 7 +-- 42sh/src/parser/produce_sym.c | 2 +- 42sh/src/parser/read_stack.c | 2 +- 42sh/src/parser/tree_wrapper.c | 5 +- 15 files changed, 71 insertions(+), 64 deletions(-) rename 42sh/src/parser/{add_file.c => add_redir.c} (59%) diff --git a/42sh/Makefile b/42sh/Makefile index e42b63b4..1971ae9d 100644 --- a/42sh/Makefile +++ b/42sh/Makefile @@ -6,7 +6,7 @@ # By: wescande +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2016/08/29 21:32:58 by wescande #+# #+# # -# Updated: 2017/02/25 00:13:39 by ariard ### ########.fr # +# Updated: 2017/03/01 15:37:46 by ariard ### ########.fr # # # # **************************************************************************** # @@ -234,6 +234,7 @@ parser/add_loop.c\ parser/add_sep.c\ parser/add_case.c\ parser/add_func.c\ +parser/add_redir.c\ parser/aggregate_sym.c\ parser/build_tree.c\ parser/error_syntax.c\ diff --git a/42sh/includes/parser.h b/42sh/includes/parser.h index 80ffcebb..c138fcd0 100644 --- a/42sh/includes/parser.h +++ b/42sh/includes/parser.h @@ -6,6 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/01 12:15:54 by jhalford #+# #+# */ +/* Updated: 2017/03/01 16:24:58 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,9 +22,9 @@ enum e_parstate { - ERROR = 0, UNDEFINED, SUCCESS, + ERROR, }; # define TK_REDIR(x) (TK_LESS <= x && x <= TK_GREATAND) @@ -83,7 +84,6 @@ int push_stack(t_sym *stack, t_sym new_sym); int pop_stack(t_sym **stack, t_sym erase_sym); int error_syntax(t_list **token); -int error_EOF(void); int ft_read_stack(t_sym *stack); char *read_state(t_sym current); @@ -107,26 +107,18 @@ int build_tree(t_btree **ast, t_list **lst); int add_sep(t_btree **ast, t_list **lst); int add_cmd(t_btree **ast, t_list **lst); int add_file(t_btree **ast, t_list **lst); -int add_redir(t_btree **ast, t_list **lst); int add_loop_cmd(t_btree **ast, t_list **lst); int add_loop_sep(t_btree **ast, t_list **lst); -int add_loop_condition(t_btree **ast, t_list **lst); int add_condition_cmd(t_btree **ast, t_list **lst); int add_condition_sep(t_btree **ast, t_list **lst); int add_branch(t_btree **ast, t_list **lst); -int add_case_cmd(t_btree **ast, t_list **lst); -int add_case_sep(t_btree **ast, t_list **lst); -int add_pattern(t_btree **ast, t_list **lst); -int add_subshell_cmd(t_btree **ast, t_list **lst); -int add_subshell_sep(t_btree **ast, t_list **lst); -int add_func_cmd(t_btree **ast, t_list **lst); -int add_func_sep(t_btree **ast, t_list **lst); -int isloop(t_btree **ast, t_list **lst); -int isdir(t_btree **ast, t_list **lst); -int iscase(t_btree **ast, t_list **lst); -int iscondition(t_btree **ast, t_list **lst); -int issubshell(t_btree **ast, t_list **lst); -int isfunc(t_btree **ast, t_list **lst); +int add_redir_word(t_btree **ast, t_list **lst) +int add_redir_type(t_btree **ast, t_list **lst) +int isloop(t_btree **ast); +int isdir(t_btree **ast); +int iscondition(t_btree **ast, t_list **list); +int isdir_sep(t_list **list); +int isdir_word(t_btree **ast, t_list **list); int join_ast(t_btree **ast, t_btree **new_node); int gen_node(t_btree **ast); @@ -150,10 +142,15 @@ struct s_redir int close; }; +struct s_cmd +{ + t_list * redir; + t_ld *token; +} + union u_astdata { - t_redir redir; - t_ld *token; + t_cmd *cmd; t_list *wordlist; char **sstr; char *str; @@ -164,7 +161,6 @@ struct s_astnode int nest; int full; - int pattern; t_type type; t_astdata data; }; diff --git a/42sh/includes/types.h b/42sh/includes/types.h index 474b8b7a..b3a417ca 100644 --- a/42sh/includes/types.h +++ b/42sh/includes/types.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/13 17:11:48 by jhalford #+# #+# */ -/* Updated: 2017/02/25 19:37:31 by ariard ### ########.fr */ +/* Updated: 2017/03/01 16:19:09 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,6 +30,7 @@ typedef struct s_token t_token; typedef struct s_ld t_ld; typedef struct s_astnode t_astnode; typedef struct s_redir t_redir; +typedef struct s_cmd t_cmd; typedef union u_astdata t_astdata; typedef union u_word t_word; typedef long long t_type; @@ -156,6 +157,7 @@ enum e_sym PATTERN_CASE, FUNC_NAME, CLOSE_LIST, + REDIR, ALL = 200, }; diff --git a/42sh/src/lexer/lexer_word.c b/42sh/src/lexer/lexer_word.c index 157668ba..25f2e6ef 100644 --- a/42sh/src/lexer/lexer_word.c +++ b/42sh/src/lexer/lexer_word.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/03 12:07:11 by jhalford #+# #+# */ -/* Updated: 2017/02/25 20:10:39 by ariard ### ########.fr */ +/* Updated: 2017/03/01 14:06:03 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,6 @@ int lexer_word(t_list **alst, t_lexer *lexer) token = (*alst)->content; token->type = TK_WORD; - DG("lexer word"); if ((state = get_state_global(lexer))) { lexer->state = state; diff --git a/42sh/src/lexer/token_print.c b/42sh/src/lexer/token_print.c index 0c2ca145..98c29591 100644 --- a/42sh/src/lexer/token_print.c +++ b/42sh/src/lexer/token_print.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 14:39:01 by jhalford #+# #+# */ -/* Updated: 2017/02/24 21:48:47 by ariard ### ########.fr */ +/* Updated: 2017/03/01 16:25:30 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/ft_putast.c b/42sh/src/main/ft_putast.c index 60d40e35..6b35fe87 100644 --- a/42sh/src/main/ft_putast.c +++ b/42sh/src/main/ft_putast.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 18:18:04 by jhalford #+# #+# */ -/* Updated: 2017/02/25 00:17:44 by ariard ### ########.fr */ +/* Updated: 2017/03/01 15:56:54 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,6 +17,8 @@ char *ft_putast(void *nodein) t_astnode *node; node = nodein; + if (node->type == REDIR) + return ("REDIR"); if (node->type == CLOSE_LIST) return ("CLOSE_LIST"); if (node->type == FNAME) diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c index 76e2b3a5..b10509f4 100644 --- a/42sh/src/main/main.c +++ b/42sh/src/main/main.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */ -/* Updated: 2017/02/25 20:34:27 by ariard ### ########.fr */ +/* Updated: 2017/03/01 15:55:23 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/add_cmd.c b/42sh/src/parser/add_cmd.c index d372954d..d4f7542c 100644 --- a/42sh/src/parser/add_cmd.c +++ b/42sh/src/parser/add_cmd.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 20:49:15 by ariard #+# #+# */ -/* Updated: 2017/02/25 18:50:30 by ariard ### ########.fr */ +/* Updated: 2017/03/01 16:25:27 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,13 +18,12 @@ int add_cmd(t_btree **ast, t_list **lst) t_astnode *node; char **my_tab; - DG("add cmd"); if ((token = (*lst)->content)->type == TK_IN || token->type == TK_PAREN_OPEN) return (0); else if (!*ast) gen_node(ast); else if (isdir(ast, lst)) - return (add_file(ast, lst)); + return (add_redir_word(ast, lst)); else if (isloop(ast, lst) == 3) return (add_loop_condition(ast, lst)); else if (isloop(ast, lst)) @@ -44,16 +43,17 @@ int add_cmd(t_btree **ast, t_list **lst) else if (isfunc(ast, lst)) return (add_func_cmd(ast, lst)); else if ((node = (*ast)->item)->type != TK_DO && node->type != TK_THEN - && node->type != TK_PAREN_CLOSE) + && node->type != TK_PAREN_CLOSE && node->type != TK_WORD) return (add_cmd(&(*ast)->right, lst)); my_tab = NULL; node = (*ast)->item; node->type = token->type; if (token->type == TK_WORD) { + DG("add data"); my_tab = ft_sstradd(my_tab, token->data); my_tab = ft_sstradd(my_tab, (char *)token->esc); - ft_ld_pushback(&node->data.token, my_tab); + ft_ld_pushback(&node->data.cmd.token, my_tab); } return (0); } diff --git a/42sh/src/parser/add_condition.c b/42sh/src/parser/add_condition.c index abadea9c..a3987a98 100644 --- a/42sh/src/parser/add_condition.c +++ b/42sh/src/parser/add_condition.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/19 18:12:52 by ariard #+# #+# */ -/* Updated: 2017/02/25 00:11:09 by ariard ### ########.fr */ +/* Updated: 2017/03/01 15:59:58 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/add_file.c b/42sh/src/parser/add_redir.c similarity index 59% rename from 42sh/src/parser/add_file.c rename to 42sh/src/parser/add_redir.c index c056049c..bb750272 100644 --- a/42sh/src/parser/add_file.c +++ b/42sh/src/parser/add_redir.c @@ -6,13 +6,25 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 16:39:05 by ariard #+# #+# */ -/* Updated: 2017/02/25 20:33:12 by ariard ### ########.fr */ +/* Updated: 2017/03/01 16:25:15 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ #include "parser.h" -int isdir(t_btree **ast, t_list **list) +int isdir_sep(t_list **list) +{ + t_token *token; + + token = (*list)->content; + if (token->type == TK_LESS || token->type == TK_GREAT || + || token->type == TK_GREATAND || token->type == TK_LESSAND + || token->type == TK_DLESS || TK_DGREAT) + return (1); + return (0); +} + +int isdir_word(t_btree **ast, t_list **list) { t_astnode *node; t_token *token; @@ -20,25 +32,14 @@ int isdir(t_btree **ast, t_list **list) token = (*list)->content; if (*ast) { - DG("isdir"); node = (*ast)->item; - if ((node->type == TK_LESS || node->type == TK_GREAT - || node->type == TK_LESSAND || node->type == TK_GREATAND - || node->type == TK_DGREAT) - && token->type == TK_WORD) - return (1); - if ((node->type == TK_LESS || node->type == TK_GREAT - || node->type == TK_LESSAND || node->type == TK_GREATAND - || node->type == TK_DGREAT) - && (token->type == TK_LESS || token->type == TK_GREAT - || token->type == TK_LESSAND || token->type == TK_GREATAND - || token->type == TK_DGREAT)) - return (2); + if (token->type == TK_WORD && node->type == REDIR) + return (1); } return (0); } -int add_file(t_btree **ast, t_list **lst) +int add_redir_word(t_btree **ast, t_list **lst) { t_astnode *node; t_token *token; @@ -46,16 +47,21 @@ int add_file(t_btree **ast, t_list **lst) token = (*lst)->content; node = (*ast)->item; - if (node->data.wordlist) + if (node->data.cmd.redir) { DG("add file"); - redir = (ft_lstlast(node->data.wordlist))->content; - redir->word.word = token->data; - } + redir = (ft_lstlast(node->data.cmd.redir))->content; + if (redir->type == TK_DLESS) + redir->word.word = NULL; + else if (ft_stris((char *)token->data, &isdigit)) + redir->word.fd = ft_atoi(token->data); + else + redir->word.word = token->data; + } return (0); } -int add_redir(t_btree **ast, t_list **lst) +int add_redir_type(t_btree **ast, t_list **lst) { t_astnode *node; t_token *token; @@ -66,8 +72,9 @@ int add_redir(t_btree **ast, t_list **lst) gen_node(ast); token = (*lst)->content; node = (*ast)->item; + node->type = REDIR; redir = ft_memalloc(sizeof(redir)); redir->type = token->type; - ft_lsteadd(&node->data.wordlist, ft_lstnew(redir, sizeof(redir))); + ft_lsteadd(&node->data.cmd.redir, ft_lstnew(redir, sizeof(redir))); return (0); } diff --git a/42sh/src/parser/add_sep.c b/42sh/src/parser/add_sep.c index b2954785..54b8e3fa 100644 --- a/42sh/src/parser/add_sep.c +++ b/42sh/src/parser/add_sep.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 19:12:07 by ariard #+# #+# */ -/* Updated: 2017/02/25 20:39:38 by ariard ### ########.fr */ +/* Updated: 2017/03/01 16:25:35 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/aggregate_sym.c b/42sh/src/parser/aggregate_sym.c index 879045ca..3da1846f 100644 --- a/42sh/src/parser/aggregate_sym.c +++ b/42sh/src/parser/aggregate_sym.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 17:39:18 by ariard #+# #+# */ -/* Updated: 2017/02/25 13:53:57 by ariard ### ########.fr */ +/* Updated: 2017/03/01 14:45:19 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -92,8 +92,6 @@ t_aggrematch g_aggrematch[] = {NEWLINE_LIST, FOR_WORDLIST, SEQUENTIAL_SEP, 0}, //to check - {IO_HERE, TK_IO_NUMBER, IO_REDIRECT, TK_IO_NUMBER}, - {IO_HERE, ALL, IO_REDIRECT, 0}, {FILENAME, TK_LESS, IO_FILE, TK_LESS}, {FILENAME, TK_LESSAND, IO_FILE, TK_LESSAND}, {FILENAME, TK_GREAT, IO_FILE, TK_GREAT}, @@ -102,9 +100,12 @@ t_aggrematch g_aggrematch[] = {FILENAME, TK_LESSGREAT, IO_FILE, TK_LESSGREAT}, {FILENAME, TK_CLOBBER, IO_FILE, TK_CLOBBER}, + {HERE_END, TK_DLESS, IO_HERE, TK_DLESS}, //to check {IO_FILE, TK_IO_NUMBER, IO_REDIRECT, TK_IO_NUMBER}, {IO_FILE, ALL, IO_REDIRECT, 0}, + {IO_HERE, TK_IO_NUMBER, IO_REDIRECT, TK_IO_NUMBER}, + {IO_HERE, ALL, IO_REDIRECT, 0}, {IO_REDIRECT, CMD_SUPERIOR, CMD_SUPERIOR, CMD_SUPERIOR}, {IO_REDIRECT, COMPOUND_COMMAND, REDIRECT_LIST, REDIRECT_LIST}, diff --git a/42sh/src/parser/produce_sym.c b/42sh/src/parser/produce_sym.c index 4a2cbad4..26a0448b 100644 --- a/42sh/src/parser/produce_sym.c +++ b/42sh/src/parser/produce_sym.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 17:58:34 by ariard #+# #+# */ -/* Updated: 2017/02/25 13:54:08 by ariard ### ########.fr */ +/* Updated: 2017/03/01 14:40:24 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/read_stack.c b/42sh/src/parser/read_stack.c index ebb6e4d8..a92a8b9d 100644 --- a/42sh/src/parser/read_stack.c +++ b/42sh/src/parser/read_stack.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 15:32:10 by ariard #+# #+# */ -/* Updated: 2017/02/25 00:15:00 by ariard ### ########.fr */ +/* Updated: 2017/03/01 16:25:33 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/tree_wrapper.c b/42sh/src/parser/tree_wrapper.c index ac2d3d5b..0928d24a 100644 --- a/42sh/src/parser/tree_wrapper.c +++ b/42sh/src/parser/tree_wrapper.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 18:57:44 by ariard #+# #+# */ -/* Updated: 2017/02/25 19:10:34 by ariard ### ########.fr */ +/* Updated: 2017/03/01 15:59:32 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,8 +26,7 @@ int gen_node(t_btree **ast) if (!*ast) { *ast = btree_create_node(&item, sizeof(item)); - ((t_astnode *)(*ast)->item)->data.token = NULL; - ((t_astnode *)(*ast)->item)->data.redir.word.word = NULL; + ((t_astnode *)(*ast)->item)->data.cmd = NULL; ((t_astnode *)(*ast)->item)->nest = 0; ((t_astnode *)(*ast)->item)->full = 0; ((t_astnode *)(*ast)->item)->type = 0;