diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-10-10 10:34:20 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-10-10 10:34:20 +0200 |
| commit | 5b681182824ae45b5a27d1503de32fa2760c5800 (patch) | |
| tree | fcbe26572ed46649c9931750c284a0573414bef1 /src/parser | |
| parent | 0e3db10c626f54a6c6aa94aa59648782e8602c02 (diff) | |
| download | minishell-5b681182824ae45b5a27d1503de32fa2760c5800.tar.gz minishell-5b681182824ae45b5a27d1503de32fa2760c5800.tar.bz2 minishell-5b681182824ae45b5a27d1503de32fa2760c5800.zip | |
Norming interpolation
Diffstat (limited to 'src/parser')
| -rw-r--r-- | src/parser/expr.c | 8 | ||||
| -rw-r--r-- | src/parser/parsed_error.c | 4 | ||||
| -rw-r--r-- | src/parser/parser.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/parser/expr.c b/src/parser/expr.c index 04aa685..f4c82ce 100644 --- a/src/parser/expr.c +++ b/src/parser/expr.c @@ -6,7 +6,7 @@ /* By: cacharle <me@cacharle.xyz> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/10/10 08:42:24 by cacharle #+# #+# */ -/* Updated: 2020/10/10 09:11:10 by cacharle ### ########.fr */ +/* Updated: 2020/10/10 09:24:33 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -53,7 +53,7 @@ static t_parsed *st_parse_cmd_body(t_tok_lst *input) else if (input->tag & TAG_IS_REDIR) { tmp = parse_redir(input, &ast->redirs); - if (parsed_err(tmp)) + if (parsed_check(tmp)) { tok_lst_destroy(&tmp->rest, free); ast_destroy(ast); @@ -86,7 +86,7 @@ static t_parsed *st_parse_parenthesis(t_tok_lst *input) t_parsed *tmp; t_ast *ast; - if (parsed_err(parsed = parse_op(input))) + if (parsed_check(parsed = parse_op(input))) return (parsed); if ((input = parsed->rest) == NULL || !(input->tag & TAG_PARENT_CLOSE)) { @@ -100,7 +100,7 @@ static t_parsed *st_parse_parenthesis(t_tok_lst *input) parsed->ast = ast; while (input != NULL && input->tag & TAG_IS_REDIR) { - if (parsed_err(tmp = parse_redir(input, &parsed->ast->redirs))) + if (parsed_check(tmp = parse_redir(input, &parsed->ast->redirs))) return (tmp); input = tmp->rest; free(tmp); diff --git a/src/parser/parsed_error.c b/src/parser/parsed_error.c index a38a85c..3486235 100644 --- a/src/parser/parsed_error.c +++ b/src/parser/parsed_error.c @@ -6,7 +6,7 @@ /* By: cacharle <me@cacharle.xyz> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/10/10 09:20:17 by cacharle #+# #+# */ -/* Updated: 2020/10/10 09:20:30 by cacharle ### ########.fr */ +/* Updated: 2020/10/10 09:24:59 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,7 +37,7 @@ t_parsed *parsed_unexpected(char *content) return (parsed_error("syntax error near unexpected token `%s'", content)); } -bool parsed_err(t_parsed *parsed) +bool parsed_check(t_parsed *parsed) { return (parsed == NULL || parsed->syntax_error); } diff --git a/src/parser/parser.c b/src/parser/parser.c index a75ad03..85e2214 100644 --- a/src/parser/parser.c +++ b/src/parser/parser.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/17 18:09:04 by nahaddac #+# #+# */ -/* Updated: 2020/10/10 09:19:32 by cacharle ### ########.fr */ +/* Updated: 2020/10/10 09:24:28 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -44,12 +44,12 @@ t_parsed *parse_pipeline(t_tok_lst *input) t_ast *pipeline_ast; expr = parse_expr(input); - if (parsed_err(expr) || expr->rest == NULL || expr->rest->tag != TAG_PIPE) + if (parsed_check(expr) || expr->rest == NULL || expr->rest->tag != TAG_PIPE) return (expr); tok_lst_pop_front(&expr->rest, free); if (expr->rest == NULL) return (destroy_ret(expr, parsed_expected())); - if (parsed_err(tail = parse_pipeline(expr->rest))) + if (parsed_check(tail = parse_pipeline(expr->rest))) return (destroy_ret(expr, tail)); expr_ast = expr->ast; free(expr); @@ -91,7 +91,7 @@ t_parsed *parse_op(t_tok_lst *input) if (input == NULL) return (NULL); - if (parsed_err(left = parse_pipeline(input))) + if (parsed_check(left = parse_pipeline(input))) return (left); if ((input = left->rest) == NULL || input->tag & TAG_PARENT_CLOSE) return (left); @@ -107,7 +107,7 @@ t_parsed *parse_op(t_tok_lst *input) if (input == NULL) return (destroy_ret(left, parsed_expected())); right = parse_op(input); - if (parsed_err(right)) + if (parsed_check(right)) return (destroy_ret(left, right)); return (parse_op_build(left, right, sep_tag)); } @@ -120,7 +120,7 @@ t_parsed *parse(t_tok_lst *input) if (input == NULL) return (NULL); parsed = parse_op(input); - if (parsed_err(parsed)) + if (parsed_check(parsed)) return (parsed); if (parsed->rest != NULL) { |