From 990077c402979055f017047749309b2063586e3e Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Fri, 21 Jun 2024 16:47:58 +0200 Subject: [PATCH] Change function names to prevent naming colision --- ft_parse/actions.c | 6 +++--- ft_parse/ft_parse.c | 6 +++--- ft_parse/ft_parse_inner.h | 12 ++++++------ ft_parse/ft_parse_tree_free.c | 4 ++-- ft_parse/ft_parsing_table_free.c | 18 +++++++++--------- ft_parse/helpers.c | 6 +++--- ft_parse/load_rules.c | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ft_parse/actions.c b/ft_parse/actions.c index a84b040..accc57c 100644 --- a/ft_parse/actions.c +++ b/ft_parse/actions.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/21 15:34:14 by ljiriste #+# #+# */ -/* Updated: 2024/06/21 15:36:12 by ljiriste ### ########.fr */ +/* Updated: 2024/06/21 16:46:28 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,7 +23,7 @@ int push_state(t_stack *stack, size_t state_num, t_token token) if (!element.node) return (1); ft_vec_init(&element.node->children, sizeof(t_parse_tree_node)); - element.node->token = dup_token(token); + element.node->token = ft_token_dup(token); if (!element.node->token.type) return (1); element.state_num = state_num; @@ -70,7 +70,7 @@ int follow_rule(t_stack *stack, size_t rule_num, const t_parsing_table *table) return (1); ft_vec_init(&element.node->children, sizeof(t_parse_tree_node)); rule = ft_vec_caccess(&table->rules, rule_num); - element.node->token = dup_token(rule->result); + element.node->token = ft_token_dup(rule->result); i = rule->constituents.size; while (i > 0) { diff --git a/ft_parse/ft_parse.c b/ft_parse/ft_parse.c index 083f8c2..3fbcdcc 100644 --- a/ft_parse/ft_parse.c +++ b/ft_parse/ft_parse.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/20 20:51:36 by ljiriste #+# #+# */ -/* Updated: 2024/06/21 15:36:40 by ljiriste ### ########.fr */ +/* Updated: 2024/06/21 16:45:13 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,7 +37,7 @@ static const t_parser_action *get_action(t_stack *stack, t_token token, column = find_token_index(token, &table->tokens); if (column < 0 || (size_t)column > table->terminal_tokens_num) { - ft_stack_free(stack, free_stack_element); + ft_stack_free(stack, ft_free_stack_element); return (NULL); } return (ft_vec_caccess(&state->lookahead, column)); @@ -81,7 +81,7 @@ t_parse_tree_node *ft_parse(const t_vec *tokens, const t_parsing_table *table) || (action->type == parser_shift && push_state(&stack, action->number, token))) { - ft_stack_free(&stack, free_stack_element); + ft_stack_free(&stack, ft_free_stack_element); return (NULL); } else if (action->type == parser_accept) diff --git a/ft_parse/ft_parse_inner.h b/ft_parse/ft_parse_inner.h index 8c70ea2..7ec06e0 100644 --- a/ft_parse/ft_parse_inner.h +++ b/ft_parse/ft_parse_inner.h @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/20 13:23:20 by ljiriste #+# #+# */ -/* Updated: 2024/06/21 15:37:09 by ljiriste ### ########.fr */ +/* Updated: 2024/06/21 16:57:14 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,12 +15,12 @@ # include "libft.h" -void free_token(void *v_token); -void free_rule(void *v_rule); -void free_state(void *v_state); -void free_stack_element(void *v_el); +void ft_free_token(void *v_token); +void ft_free_rule(void *v_rule); +void ft_free_state(void *v_state); +void ft_free_stack_element(void *v_el); -t_token dup_token(t_token token); +t_token ft_token_dup(t_token token); ssize_t find_token_index(t_token token, const t_vec *tokens); t_ft_stat load_rules(t_vec *rules, const char *rules_filename); diff --git a/ft_parse/ft_parse_tree_free.c b/ft_parse/ft_parse_tree_free.c index 287507a..d8b3b67 100644 --- a/ft_parse/ft_parse_tree_free.c +++ b/ft_parse/ft_parse_tree_free.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/21 15:26:34 by ljiriste #+# #+# */ -/* Updated: 2024/06/21 15:28:52 by ljiriste ### ########.fr */ +/* Updated: 2024/06/21 16:45:20 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,7 +22,7 @@ static void parse_tree_free_children(void *v_node) if (!node) return ; ft_vec_free(&node->children, parse_tree_free_children); - free_token(&node->token); + ft_free_token(&node->token); } void ft_parse_tree_free(void *node) diff --git a/ft_parse/ft_parsing_table_free.c b/ft_parse/ft_parsing_table_free.c index e391be8..bf16334 100644 --- a/ft_parse/ft_parsing_table_free.c +++ b/ft_parse/ft_parsing_table_free.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/20 13:21:26 by ljiriste #+# #+# */ -/* Updated: 2024/06/20 13:49:40 by ljiriste ### ########.fr */ +/* Updated: 2024/06/21 16:56:50 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ #include "ft_parse.h" #include -void free_token(void *v_token) +void ft_free_token(void *v_token) { t_token *token; @@ -24,17 +24,17 @@ void free_token(void *v_token) return ; } -void free_rule(void *v_rule) +void ft_free_rule(void *v_rule) { t_grammar_rule *rule; rule = v_rule; - free_token(&rule->result); - ft_vec_free(&rule->constituents, free_token); + ft_free_token(&rule->result); + ft_vec_free(&rule->constituents, ft_free_token); return ; } -void free_state(void *v_state) +void ft_free_state(void *v_state) { t_parser_state *state; @@ -46,8 +46,8 @@ void free_state(void *v_state) void ft_parsing_table_free(t_parsing_table *table) { - ft_vec_free(&table->rules, free_rule); - ft_vec_free(&table->states, free_state); - ft_vec_free(&table->tokens, free_token); + ft_vec_free(&table->rules, ft_free_rule); + ft_vec_free(&table->states, ft_free_state); + ft_vec_free(&table->tokens, ft_free_token); return ; } diff --git a/ft_parse/helpers.c b/ft_parse/helpers.c index adb9867..14b1719 100644 --- a/ft_parse/helpers.c +++ b/ft_parse/helpers.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/21 15:30:29 by ljiriste #+# #+# */ -/* Updated: 2024/06/21 15:33:39 by ljiriste ### ########.fr */ +/* Updated: 2024/06/21 16:52:09 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ #include "ft_parse.h" #include "libft.h" -void free_stack_element(void *v_el) +void ft_free_stack_element(void *v_el) { t_parser_stack_element *el; @@ -25,7 +25,7 @@ void free_stack_element(void *v_el) return ; } -t_token dup_token(t_token token) +t_token ft_token_dup(t_token token) { t_token res; diff --git a/ft_parse/load_rules.c b/ft_parse/load_rules.c index d5d259e..857e265 100644 --- a/ft_parse/load_rules.c +++ b/ft_parse/load_rules.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/20 13:29:48 by ljiriste #+# #+# */ -/* Updated: 2024/06/20 13:50:16 by ljiriste ### ########.fr */ +/* Updated: 2024/06/21 16:45:29 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -94,7 +94,7 @@ t_ft_stat load_rules(t_vec *rules, const char *rules_filename) rule = parse_rule(line); if (!is_valid_rule(&rule) || ft_vec_append(rules, &rule) != success) { - ft_vec_free(rules, free_rule); + ft_vec_free(rules, ft_free_rule); return (non_specific_failure); } free(line); -- 2.30.2