diff options
| author | nass1pro <nass1pro@gmail.com> | 2020-06-18 13:19:21 +0200 |
|---|---|---|
| committer | nass1pro <nass1pro@gmail.com> | 2020-06-18 13:19:21 +0200 |
| commit | 70459a3ab97b13df9bf829e29ed91becfba1ea03 (patch) | |
| tree | 4f5a47bb60027e35227565e22a3e330b9c6c9c20 | |
| parent | 1f0fde016765d33dc43c3c37d654be28f11c758e (diff) | |
| download | minishell-70459a3ab97b13df9bf829e29ed91becfba1ea03.tar.gz minishell-70459a3ab97b13df9bf829e29ed91becfba1ea03.tar.bz2 minishell-70459a3ab97b13df9bf829e29ed91becfba1ea03.zip | |
Change parse
| -rw-r--r-- | include/parser.h | 15 | ||||
| m--------- | minishell_test | 0 | ||||
| -rw-r--r-- | src/eval/eval.c | 4 | ||||
| -rw-r--r-- | src/lexer/lexer.c | 6 | ||||
| -rwxr-xr-x | src/parse/parse.c | 4 |
5 files changed, 18 insertions, 11 deletions
diff --git a/include/parser.h b/include/parser.h index bc1e549..0dfeb18 100644 --- a/include/parser.h +++ b/include/parser.h @@ -6,7 +6,7 @@ /* By: cacharle <cacharle@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/28 09:00:00 by cacharle #+# #+# */ -/* Updated: 2020/06/17 18:03:33 by nahaddac ### ########.fr */ +/* Updated: 2020/06/18 12:40:22 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,11 +37,20 @@ ** parse.c */ + t_ret *parse(t_ftlst *input); -t_ret *parse_c(t_ftlst *input); +t_ret *parse_op(t_ftlst *input) +t_ret *parse_expr(t_ftlst *input); +t_ret *parse_cmd(t_ftlst *input); + +// utils +t_ret *ret_wrap_ast(t_ast *ast, t_ftlst *rest); +t_ftlst *push_token(t_ftlst **tokens, t_token *pushed); + + + t_ast *push_cmd(t_ast *ast, t_ftlst *ret); t_ast *push_redir(t_ast *ast, t_ftlst *rest); - int parse_cmd_str_true_false(enum e_token_tag tag); int parse_redir_true_false(enum e_token_tag tag); diff --git a/minishell_test b/minishell_test -Subproject d845a683e67a89c699109dab660f6ec0eb74a2c +Subproject f36a8ccb91cb71c1e4f15dc12cdecf3167eb142 diff --git a/src/eval/eval.c b/src/eval/eval.c index c1b580f..a831237 100644 --- a/src/eval/eval.c +++ b/src/eval/eval.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* eval.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ +/* By: charles <charles@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:05:21 by charles #+# #+# */ -/* Updated: 2020/06/14 10:42:37 by charles ### ########.fr */ +/* Updated: 2020/06/18 13:16:34 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c index 2b1bdce..9b43616 100644 --- a/src/lexer/lexer.c +++ b/src/lexer/lexer.c @@ -9,9 +9,9 @@ int len_is_not_sep(char *input) { if (lexer_sep(input[i])) { - if (input[i + 1] == ' ') - while(input[++i] == ' ') - ; + //if (input[i + 1] == ' ') + // while(input[++i] == ' ') + // ; return(i); } if (input[i] == '\'' || input[i] == '"') diff --git a/src/parse/parse.c b/src/parse/parse.c index a46de84..198ac65 100755 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 18:09:04 by nahaddac #+# #+# */ -/* Updated: 2020/06/18 12:40:23 by nahaddac ### ########.fr */ +/* Updated: 2020/06/18 12:48:20 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ @@ -79,8 +79,6 @@ t_ret *parse_cmd(t_ftlst *input) // <op> ::= <expr> <sep> <op> | <expr> // <expr> ::= '(' <op> ')' | <cmd> -t_ret *parse_expr(t_ftlst *input); - t_ret *parse_op(t_ftlst *input) { t_ast *ast; |