From 944a7e97d40a77e969cb84f7f1b8a334c3681583 Mon Sep 17 00:00:00 2001 From: Antoine Riard Date: Mon, 13 Mar 2017 19:30:58 +0100 Subject: [PATCH 1/4] before pull --- 42sh/src/parser/add_bang.c | 2 +- 42sh/src/parser/add_func.c | 2 +- 42sh/src/parser/add_redir.c | 2 +- 42sh/src/parser/add_subshell.c | 2 +- 42sh/src/parser/aggregate_sym.c | 2 +- 42sh/src/parser/build_tree.c | 2 +- 42sh/src/parser/heredoc_parser.c | 2 +- 42sh/test.sh | 4 ++++ 8 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 42sh/test.sh diff --git a/42sh/src/parser/add_bang.c b/42sh/src/parser/add_bang.c index 910e7be8..46f09634 100644 --- a/42sh/src/parser/add_bang.c +++ b/42sh/src/parser/add_bang.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/10 14:57:45 by ariard #+# #+# */ -/* Updated: 2017/03/13 16:25:38 by ariard ### ########.fr */ +/* Updated: 2017/03/13 18:01:53 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/add_func.c b/42sh/src/parser/add_func.c index ca30af45..c2419d00 100644 --- a/42sh/src/parser/add_func.c +++ b/42sh/src/parser/add_func.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/24 23:43:07 by ariard #+# #+# */ -/* Updated: 2017/03/13 16:24:17 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:27:58 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/add_redir.c b/42sh/src/parser/add_redir.c index 259e189e..69e3a9cc 100644 --- a/42sh/src/parser/add_redir.c +++ b/42sh/src/parser/add_redir.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 16:39:05 by ariard #+# #+# */ -/* Updated: 2017/03/13 16:59:01 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:27:04 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/add_subshell.c b/42sh/src/parser/add_subshell.c index 5b64d400..18e6af51 100644 --- a/42sh/src/parser/add_subshell.c +++ b/42sh/src/parser/add_subshell.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/24 18:41:50 by ariard #+# #+# */ -/* Updated: 2017/03/13 16:09:23 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:04:55 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/aggregate_sym.c b/42sh/src/parser/aggregate_sym.c index c8234ba0..3017a02f 100644 --- a/42sh/src/parser/aggregate_sym.c +++ b/42sh/src/parser/aggregate_sym.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/11 15:58:38 by ariard #+# #+# */ -/* Updated: 2017/03/13 17:29:05 by ariard ### ########.fr */ +/* Updated: 2017/03/13 18:01:57 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/build_tree.c b/42sh/src/parser/build_tree.c index a96605c5..5e3598eb 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/03/13 17:45:41 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:28:58 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/heredoc_parser.c b/42sh/src/parser/heredoc_parser.c index 542c270b..54a837c7 100644 --- a/42sh/src/parser/heredoc_parser.c +++ b/42sh/src/parser/heredoc_parser.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/08 16:21:05 by ariard #+# #+# */ -/* Updated: 2017/03/13 16:57:08 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:28:21 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/test.sh b/42sh/test.sh new file mode 100644 index 00000000..d21ccdca --- /dev/null +++ b/42sh/test.sh @@ -0,0 +1,4 @@ +while [ 1 ] ; +do + ls +done ; done From 2584111886a6df998f56423cabfb337399980301 Mon Sep 17 00:00:00 2001 From: Antoine Riard Date: Mon, 13 Mar 2017 19:31:07 +0100 Subject: [PATCH 2/4] before pull --- 42sh/test.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 42sh/test.sh diff --git a/42sh/test.sh b/42sh/test.sh deleted file mode 100644 index d21ccdca..00000000 --- a/42sh/test.sh +++ /dev/null @@ -1,4 +0,0 @@ -while [ 1 ] ; -do - ls -done ; done From 79c940eaf60d517e5d9a6c60c166403320b4d3de Mon Sep 17 00:00:00 2001 From: Antoine Riard Date: Mon, 13 Mar 2017 19:42:49 +0100 Subject: [PATCH 3/4] modifs redirection sur pipe --- 42sh/file | 0 42sh/libft | 2 +- 42sh/src/parser/add_bang.c | 2 +- 42sh/src/parser/aggregate_sym.c | 4 +++- 42sh/src/parser/eval_sym.c | 3 +-- 5 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 42sh/file diff --git a/42sh/file b/42sh/file new file mode 100644 index 00000000..e69de29b diff --git a/42sh/libft b/42sh/libft index 9382dc10..b209bb1f 160000 --- a/42sh/libft +++ b/42sh/libft @@ -1 +1 @@ -Subproject commit 9382dc10fdb91892ab26604a5776e5301ab88b71 +Subproject commit b209bb1fb718a68256253d5ab5ff69a46a90d5d6 diff --git a/42sh/src/parser/add_bang.c b/42sh/src/parser/add_bang.c index 46f09634..78c9df57 100644 --- a/42sh/src/parser/add_bang.c +++ b/42sh/src/parser/add_bang.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/10 14:57:45 by ariard #+# #+# */ -/* Updated: 2017/03/13 18:01:53 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:32:08 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/aggregate_sym.c b/42sh/src/parser/aggregate_sym.c index 3017a02f..d3371fc0 100644 --- a/42sh/src/parser/aggregate_sym.c +++ b/42sh/src/parser/aggregate_sym.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/11 15:58:38 by ariard #+# #+# */ -/* Updated: 2017/03/13 18:01:57 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:40:56 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -138,6 +138,7 @@ t_aggrematch g_aggrematch[] = {IO_REDIRECT, CMD_WORD, CMD_SUFFIX, 0}, {IO_REDIRECT, CMD_PREFIX, CMD_PREFIX, CMD_PREFIX}, {IO_REDIRECT, LINEBREAK, CMD_PREFIX, 0}, + {IO_REDIRECT, SEQUENCE, CMD_PREFIX, 0}, {IO_REDIRECT, TK_PAREN_OPEN, CMD_PREFIX, 0}, {IO_REDIRECT, TK_LBRACE, CMD_PREFIX, 0}, {IO_REDIRECT, COMPLETE_COMMANDS, CMD_PREFIX, 0}, @@ -159,6 +160,7 @@ t_aggrematch g_aggrematch[] = {CMD_SUFFIX, PIPE_SEMI_SEQUENCE, PIPE_SEMI_SEQUENCE, PIPE_SEMI_SEQUENCE}, {CMD_SUFFIX, PIPE_CLOSE_SEQUENCE, PIPE_CLOSE_SEQUENCE, PIPE_CLOSE_SEQUENCE}, {CMD_PREFIX, LINEBREAK, SIMPLE_COMMAND, 0}, + {CMD_PREFIX, SEQUENCE, SIMPLE_COMMAND, 0}, {CMD_PREFIX, TK_PAREN_OPEN, SIMPLE_COMMAND, 0}, {CMD_PREFIX, TK_LBRACE, SIMPLE_COMMAND, 0}, {CMD_PREFIX, COMPLETE_COMMANDS, SIMPLE_COMMAND, 0}, diff --git a/42sh/src/parser/eval_sym.c b/42sh/src/parser/eval_sym.c index 4fd71e7b..15628a30 100644 --- a/42sh/src/parser/eval_sym.c +++ b/42sh/src/parser/eval_sym.c @@ -6,7 +6,7 @@ /* By: ariard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/11 16:11:21 by ariard #+# #+# */ -/* Updated: 2017/03/13 17:28:13 by ariard ### ########.fr */ +/* Updated: 2017/03/13 19:39:30 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -70,7 +70,6 @@ t_stackmatch g_stackmatch[] = {TK_DSEMI, CMD_SUPERIOR}, {TK_DSEMI, PIPE_SEMI_SEQUENCE}, {TK_DSEMI, PIPE_CLOSE_SEQUENCE}, - {TK_DSEMI, SEQUENCE}, {TK_LESS, TK_IO_NUMBER}, {TK_LESS, REDIRECT_LIST}, {TK_LESS, CMD_SUFFIX}, From 30645abeb0e4287af63cdd26a9ce23edad19166c Mon Sep 17 00:00:00 2001 From: Antoine Riard Date: Mon, 13 Mar 2017 19:42:56 +0100 Subject: [PATCH 4/4] modifs redirection sur pipe --- 42sh/file | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 42sh/file diff --git a/42sh/file b/42sh/file deleted file mode 100644 index e69de29b..00000000