Change function names to prevent naming colision

diff --git a/ft_parse/actions.c b/ft_parse/actions.c
index a84b040af5402012f6009367f49c7839001609f0..accc57cb687325ae365fe3f5c6f80682a78085ce 100644 (file)
--- a/ft_parse/actions.c
+++ b/ft_parse/actions.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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 083f8c27cb4e167f3b2a7977c96fac6bada3cfdc..3fbcdcc0b7d09a55be8def8e165c73c9e0ae97e9 100644 (file)
--- a/ft_parse/ft_parse.c
+++ b/ft_parse/ft_parse.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <ljiriste@student.42prague.com>   +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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 8c70ea2a36200926f8d6220b26867f3f282d63bf..7ec06e0853dc761b7193b5b1abcc1161f48ad598 100644 (file)
--- a/ft_parse/ft_parse_inner.h
+++ b/ft_parse/ft_parse_inner.h
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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 287507a5c43961b32a530adbcfbe036f637a36ff..d8b3b678d995c4e01650c8c14ce8fee42e95c74d 100644 (file)
--- a/ft_parse/ft_parse_tree_free.c
+++ b/ft_parse/ft_parse_tree_free.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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 e391be844df23c031f56b494b71eda518443d0ae..bf1633445ed1277bc66c03f0382253957b8cd926 100644 (file)
--- a/ft_parse/ft_parsing_table_free.c
+++ b/ft_parse/ft_parsing_table_free.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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 <stdlib.h>
 
-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 adb9867c50f1b18cfe6f712240dd9974a6f48e56..14b1719244d7a181784ef08569e0e0b4edcebcb5 100644 (file)
--- a/ft_parse/helpers.c
+++ b/ft_parse/helpers.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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 d5d259e4e11387a2d4b5bbf30a4c5d679f9cafa0..857e2653fd78ba8682c90bb67504f88e227a3dbd 100644 (file)
--- a/ft_parse/load_rules.c
+++ b/ft_parse/load_rules.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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);