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-24 16:59:01 +01:00
commit e3c06e5978
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* lexer_dquote.c :+: :+: :+: */ /* lexer_dquote.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* 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/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] == '\\') else if (lexer->str[lexer->pos] == '\\')
{ {
if (lexer->str[lexer->pos + 1] == 0) lexer->pos++;
return (lexer_backslash(alst, lexer)); if (lexer->str[lexer->pos] == 0)
token_append(token, lexer, 1, 1); return (push(&lexer->stack, BACKSLASH) ? 0 : 0);
} }
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));