From ea2199c8805b5db5b31c46d0c5feb37f607a8394 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 9 Sep 2020 14:21:13 +0200 Subject: Fixing parenthesis redirection, Added better prompt --- src/parser/parser.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/parser/parser.c') diff --git a/src/parser/parser.c b/src/parser/parser.c index a0c76d2..c486c1e 100644 --- a/src/parser/parser.c +++ b/src/parser/parser.c @@ -6,7 +6,7 @@ /* By: nahaddac +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 18:09:04 by nahaddac #+# #+# */ -/* Updated: 2020/08/28 10:40:03 by charles ### ########.fr */ +/* Updated: 2020/09/09 13:40:49 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -108,24 +108,30 @@ t_parsed *parse_op(t_tok_lst *input) t_parsed *parse_expr(t_tok_lst *input) { + t_parsed *parsed; t_parsed *tmp; t_ast *ast; if (input->tag & TAG_PARENT_OPEN) { - if (!(tmp = parse_op(input->next)) || tmp->syntax_error) - return (tmp); - input = tmp->rest; + if (!(parsed = parse_op(input->next)) || parsed->syntax_error) + return (parsed); + input = parsed->rest; if (input == NULL || !(input->tag & TAG_PARENT_CLOSE)) return (parsed_error("syntax error expected token\n")); input = input->next; ast = ast_new(AST_PARENT); - ast->parent_ast = tmp->ast; - tmp->ast = ast; + ast->parent_ast = parsed->ast; + parsed->ast = ast; while (input != NULL && input->tag & TAG_IS_REDIR) - parse_redir(input, &tmp->ast->redirs); - tmp->rest = input; - return (tmp); + { + tmp = parse_redir(input, &parsed->ast->redirs); + if (tmp == NULL || tmp->syntax_error) + return (tmp); + input = tmp->rest; + } + parsed->rest = input; + return (parsed); } return (parse_cmd(input)); } -- cgit