From f7d0f0408a6444bb36be18b10b66148472430b99 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Fri, 17 Mar 2017 19:27:22 +0100 Subject: [PATCH] petite lecon des familles --- 42sh/src/lexer/get_reserved_words.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/42sh/src/lexer/get_reserved_words.c b/42sh/src/lexer/get_reserved_words.c index 7e95db6f..c4a7deab 100644 --- a/42sh/src/lexer/get_reserved_words.c +++ b/42sh/src/lexer/get_reserved_words.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/26 00:07:05 by ariard #+# #+# */ -/* Updated: 2017/03/17 17:21:23 by ariard ### ########.fr */ +/* Updated: 2017/03/17 19:27:08 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,7 +31,7 @@ t_rvwords g_rvwords[] = static int recognization_rvwords(t_token *pv_tk, t_token *at_tk) { - if (!pv_tk || (pv_tk->type == TK_NEWLINE || pv_tk->type == TK_AMP + return (!pv_tk || (pv_tk->type == TK_NEWLINE || pv_tk->type == TK_AMP || pv_tk->type == TK_SEMI || pv_tk->type == TK_PIPE || pv_tk->type == TK_WHILE || pv_tk->type == TK_DONE || pv_tk->type == TK_DO || pv_tk->type == TK_IF @@ -39,8 +39,6 @@ static int recognization_rvwords(t_token *pv_tk, t_token *at_tk) || pv_tk->type == TK_ELIF || pv_tk->type == TK_ELSE || pv_tk->type == TK_DSEMI) || (pv_tk->type == TK_PAREN_CLOSE && at_tk->type == TK_PAREN_OPEN)) - return (1); - return (0); } static int match_words(t_token *token) @@ -60,14 +58,12 @@ static int match_words(t_token *token) return (0); } -int get_reserved_words(t_list **alst) +int get_reserved_words(t_list *temp) { t_token *token; t_token *pv_tk; t_token *ante_token; - t_list *temp; - temp = *alst; pv_tk = NULL; ante_token = NULL; while (temp)