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

normé - sauf read_stack et putast

Browse source
This commit is contained in:
gwojda 2017-03-27 21:45:18 +02:00
parent 44a6a71770
commit 4aae2cd86d
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/26 00:07:05 by ariard #+# #+# */
/* Updated: 2017/03/27 19:49:31 by ariard ### ########.fr */
/* Updated: 2017/03/27 21:44:14 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -80,10 +80,7 @@ int get_reserved_words(t_list *temp)
if (recognization_rvwords(pv_tk, ante_token))
match_words(token);
if (token && token->type == TK_BANG && is_bang(pv_tk))
{
DG("token type is %s", read_state(token->type));
token->type = TK_WORD;
}
if (ante_token && (ante_token->type == TK_CASE
|| ante_token->type == TK_FOR)
&& ft_strncmp(token->data, "in", 2) == 0)

4
42sh/src/parser/do_parser_routine.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/19 14:24:14 by wescande #+# #+# */
/* Updated: 2017/03/27 21:02:08 by ariard ### ########.fr */
/* Updated: 2017/03/27 21:43:44 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,7 +24,7 @@ int do_parser_routine(t_list **token, t_btree **ast)
token_print(*token);
if (ft_parse(ast, token, &data->parser))
exit(1);
if (data->parser.state != ERROR &&
if (data->parser.state != ERROR &&
(data->lexer.state = data->parser.heredoc_queue ? HEREDOC : DEFAULT))
return (0);
if (data->parser.state == ERROR)

0
42sh/test/fifi
View file