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

Merge branch 'master' into rendu

Browse source
This commit is contained in:
Jack Halford 2017-03-27 19:52:01 +02:00
commit 98593a4f71
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
42sh/src/lexer/get_state_global.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 20:39:06 by jhalford #+# #+# */ /* Created: 2017/02/09 20:39:06 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:39:55 by ariard ### ########.fr */ /* Updated: 2017/03/27 19:48:41 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -33,8 +33,7 @@ t_lexstate get_state_global(t_lexer *lexer)
|| ((c == '`') && (ret = BQUOTE)) || ((c == '`') && (ret = BQUOTE))
|| ((c == '(' || c == ')') && (ret = PAREN)) || ((c == '(' || c == ')') && (ret = PAREN))
|| (((c == '{' && (cn == ' ' || cn == 0)) || (((c == '{' && (cn == ' ' || cn == 0))
|| (c == '}' && (cl == ' ' || cl == 0))) || (c == '}' && (cl == ' ' || cl == 0))) && (ret = CURLY_BRACKETS))
&& (ret = CURLY_BRACKETS))
|| ((c == 0) && (ret = END))) || ((c == 0) && (ret = END)))
{ {
; ;