jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:jzck/42sh

Browse source
This commit is contained in:
wescande 2017-03-28 16:02:27 +02:00
commit f7c6983754
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
42sh/src/lexer/lexer_dquote.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 18:36:58 by jhalford #+# #+# */ /* Created: 2016/11/28 18:36:58 by jhalford #+# #+# */
/* Updated: 2017/03/27 21:27:35 by gwojda ### ########.fr */ /* Updated: 2017/03/28 15:46:22 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,17 +19,16 @@ int lexer_dquote(t_list **alst, t_lexer *lexer)
token = (*alst)->content; token = (*alst)->content;
token->type = token->type ? token->type : TK_WORD; token->type = token->type ? token->type : TK_WORD;
if (lexer->str[lexer->pos] == '"') if (lexer->str[lexer->pos] == '"')
get_lexer_stack(*lexer) == DQUOTE && (lexer->state = WORD) ?
pop(&lexer->stack) : push(&lexer->stack, DQUOTE) && 0;
else if (lexer->str[lexer->pos] == '\\')
{ {
if (get_lexer_stack(*lexer) == DQUOTE && (lexer->state = WORD)) if (lexer->str[++lexer->pos] == 0)
pop(&lexer->stack);
else
push(&lexer->stack, DQUOTE);
}
else if (lexer->str[lexer->pos] == '\\' && lexer->str[lexer->pos + 1] == 0)
{
lexer->pos++;
if (lexer->str[lexer->pos] == 0)
return (push(&lexer->stack, BACKSLASH) ? 0 : 0); return (push(&lexer->stack, BACKSLASH) ? 0 : 0);
else if (lexer->str[lexer->pos] == '"')
token_append(token, lexer, 1, 1);
else
--lexer->pos;
} }
else if (lexer->str[lexer->pos] == '`' && (lexer->state = BQUOTE)) else if (lexer->str[lexer->pos] == '`' && (lexer->state = BQUOTE))
return (lexer_lex(alst, lexer)); return (lexer_lex(alst, lexer));