From fffb8c74a5acd2c61f4e6032629636339e1c961d Mon Sep 17 00:00:00 2001 From: "ariard@student.42.fr" Date: Tue, 21 Feb 2017 20:29:46 +0100 Subject: [PATCH] before pull main clean --- 42sh/includes/parser.h | 2 +- 42sh/src/exec/ft_exec.c | 2 +- 42sh/src/main/main.c | 6 +++--- 42sh/src/parser/build_tree.c | 2 +- 42sh/src/parser/ft_parse.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/42sh/includes/parser.h b/42sh/includes/parser.h index e87b47b1..7708a4d1 100644 --- a/42sh/includes/parser.h +++ b/42sh/includes/parser.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/01 12:15:54 by jhalford #+# #+# */ -/* Updated: 2017/02/21 18:13:10 by ariard ### ########.fr */ +/* Updated: 2017/02/21 20:28:27 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/exec/ft_exec.c b/42sh/src/exec/ft_exec.c index d2916952..ed9ec0bb 100644 --- a/42sh/src/exec/ft_exec.c +++ b/42sh/src/exec/ft_exec.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/27 20:30:32 by jhalford #+# #+# */ -/* Updated: 2017/02/21 18:15:31 by ariard ### ########.fr */ +/* Updated: 2017/02/21 18:50:05 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c index 785ed302..13178f42 100644 --- a/42sh/src/main/main.c +++ b/42sh/src/main/main.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */ -/* Updated: 2017/02/21 18:33:24 by ariard ### ########.fr */ +/* Updated: 2017/02/21 18:51:41 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -49,8 +49,8 @@ int handle_instruction(int fd) return (error_syntax(&token)); } btree_print(STDBUG, ast, &ft_putast); - if (ft_exec(&ast)) - return (1); +// if (ft_exec(&ast)) +// return (1); ft_add_str_in_history(lexer.str); return (1); } diff --git a/42sh/src/parser/build_tree.c b/42sh/src/parser/build_tree.c index b602bead..fa58745c 100644 --- a/42sh/src/parser/build_tree.c +++ b/42sh/src/parser/build_tree.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/15 18:32:59 by ariard #+# #+# */ -/* Updated: 2017/02/20 22:16:04 by jhalford ### ########.fr */ +/* Updated: 2017/02/21 20:28:38 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/ft_parse.c b/42sh/src/parser/ft_parse.c index a03801f6..8cc4e169 100644 --- a/42sh/src/parser/ft_parse.c +++ b/42sh/src/parser/ft_parse.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/30 17:14:58 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:40:24 by ariard ### ########.fr */ +/* Updated: 2017/02/21 18:52:33 by ariard ### ########.fr */ /* */ /* ************************************************************************** */