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

correciton heredoc + error syntax

Browse source
This commit is contained in:
Antoine Riard 2017-03-27 21:03:49 +02:00
parent 73d186071b
commit ddee711b43
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
42sh/file Normal file
View file

@ -0,0 +1,17 @@
42ShellTester
42sh
Makefile
README.md
STDBUG
auteur
donovan_segaults_06-02
file
includes
libft
objs
pdf
sample
scriptheader.sh
src
test
update_makefile.sh

3
42sh/src/main/main.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/20 14:45:40 by gwojda #+# #+# */ /* Created: 2017/03/20 14:45:40 by gwojda #+# #+# */
/* Updated: 2017/03/27 18:28:37 by ariard ### ########.fr */ /* Updated: 2017/03/27 20:57:57 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -46,7 +46,6 @@ static int handle_instruction(t_list **token, t_btree **ast)
return (ret); return (ret);
if (do_lexer_routine(token, stream) > 0) if (do_lexer_routine(token, stream) > 0)
continue ; continue ;
token_print(*token);
if ((ret = do_parser_routine(token, ast)) == 1 if ((ret = do_parser_routine(token, ast)) == 1
&& SH_NO_INTERACTIVE(data->opts)) && SH_NO_INTERACTIVE(data->opts))
return (ret); return (ret);

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

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

2
42sh/src/parser/eval_sym.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/11 16:11:21 by ariard #+# #+# */ /* Created: 2017/03/11 16:11:21 by ariard #+# #+# */
/* Updated: 2017/03/27 17:29:01 by ariard ### ########.fr */ /* Updated: 2017/03/27 21:03:04 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */