From c4190fe0ac30381401da8b79e2792d008fb71089 Mon Sep 17 00:00:00 2001 From: wescande Date: Thu, 23 Mar 2017 03:43:06 +0100 Subject: [PATCH] possible d'assigner des variables avec des bquote genre 'echo a b c ' --- 42sh/src/lexer/lexer_bquote.c | 4 ++-- 42sh/src/lexer/lexer_word.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/42sh/src/lexer/lexer_bquote.c b/42sh/src/lexer/lexer_bquote.c index e16cba63..88f5af97 100644 --- a/42sh/src/lexer/lexer_bquote.c +++ b/42sh/src/lexer/lexer_bquote.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/09 22:03:48 by jhalford #+# #+# */ -/* Updated: 2017/03/22 23:59:05 by jhalford ### ########.fr */ +/* Updated: 2017/03/23 03:41:34 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,7 +36,7 @@ int lexer_bquote(t_list **alst, t_lexer *lexer) if (lexer->str[lexer->pos] == 0) return (push(&lexer->stack, BACKSLASH) ? 0 : 0); } - token_append(token, lexer, back, back); + token_append(token, lexer, back || token->type == TK_ASSIGNMENT_WORD, back); lexer->pos++; return (lexer_lex(alst, lexer)); } diff --git a/42sh/src/lexer/lexer_word.c b/42sh/src/lexer/lexer_word.c index 77296e3e..6468005b 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/03/17 20:17:23 by jhalford ### ########.fr */ +/* Updated: 2017/03/23 03:39:38 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ @@ -27,7 +27,7 @@ int lexer_word(t_list **alst, t_lexer *lexer) && word_is_assignment((char *[]){token->data, (char *)token->esc})) { token->type = TK_ASSIGNMENT_WORD; - token_append(token, lexer, 0, 0); + token_append(token, lexer, 1, 0); lexer->pos++; } else