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

This commit is contained in:
wescande 2017-03-24 16:59:01 +01:00
commit e3c06e5978

View file

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* lexer_dquote.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 18:36:58 by jhalford #+# #+# */
/* Updated: 2017/03/22 23:56:49 by jhalford ### ########.fr */
/* Updated: 2017/03/24 16:08:35 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,9 +27,9 @@ int lexer_dquote(t_list **alst, t_lexer *lexer)
}
else if (lexer->str[lexer->pos] == '\\')
{
if (lexer->str[lexer->pos + 1] == 0)
return (lexer_backslash(alst, lexer));
token_append(token, lexer, 1, 1);
lexer->pos++;
if (lexer->str[lexer->pos] == 0)
return (push(&lexer->stack, BACKSLASH) ? 0 : 0);
}
else if (lexer->str[lexer->pos] == '`' && (lexer->state = BQUOTE))
return (lexer_lex(alst, lexer));