diff --git a/Filelist.sh.mk b/Filelist.sh.mk index 141e9970..91b48ec4 100644 --- a/Filelist.sh.mk +++ b/Filelist.sh.mk @@ -27,19 +27,14 @@ src/vec/pid/pid_functions2 \ src/vec/pid/pid_functions3 \ src/vec/pid/pid_functions4 \ src/vec/pid/pid_sort \ -src/vec/reduce_action/reduce_action \ -src/vec/reduce_action/reduce_action_functions2 \ -src/vec/reduce_action/reduce_action_functions3 \ -src/vec/reduce_action/reduce_action_functions4 \ -src/vec/reduce_action/reduce_action_sort \ src/vec/str/str \ src/vec/str/str_functions2 \ src/vec/str/str_functions3 \ src/vec/str/str_functions4 \ src/vec/str/str_sort \ -src/vec/subtree/subtree \ -src/vec/subtree/subtree_functions2 \ -src/vec/subtree/subtree_functions3 \ -src/vec/subtree/subtree_functions4 \ -src/vec/subtree/subtree_sort \ +src/vec/token/token \ +src/vec/token/token_functions2 \ +src/vec/token/token_functions3 \ +src/vec/token/token_functions4 \ +src/vec/token/token_sort \ diff --git a/Makefile b/Makefile index 899562dc..0690d667 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: rparodi +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/12 11:05:05 by rparodi #+# #+# # -# Updated: 2024/09/19 17:33:04 by maiboyer ### ########.fr # +# Updated: 2024/09/26 18:01:37 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -132,14 +132,13 @@ tokei: build_filelist: - @$(MAKE) --no-print-directory -C ./stdme/ build_filelist - @$(MAKE) --no-print-directory -C ./allocator/ build_filelist - @$(MAKE) --no-print-directory -C ./ast/ build_filelist - @$(MAKE) --no-print-directory -C ./exec/ build_filelist - @$(MAKE) --no-print-directory -C ./line/ build_filelist - @$(MAKE) --no-print-directory -C ./parser/ -f ./Grammar.mk build_filelist - @$(MAKE) --no-print-directory -C ./parser/ -f ./Parser.mk build_filelist - @$(MAKE) --no-print-directory -f ./Minishell.mk build_filelist + @$(MAKE) --no-print-directory -C ./stdme/ build_filelist + @$(MAKE) --no-print-directory -C ./allocator/ build_filelist + @$(MAKE) --no-print-directory -C ./ast/ build_filelist + @$(MAKE) --no-print-directory -C ./exec/ build_filelist + @$(MAKE) --no-print-directory -C ./line/ build_filelist + @$(MAKE) --no-print-directory -C ./parser/ build_filelist + @$(MAKE) --no-print-directory -f ./Minishell.mk build_filelist # phony .PHONY: all bonus clean fclean re header footer build_filelist diff --git a/Minishell.mk b/Minishell.mk index 6df733d6..e31a4944 100644 --- a/Minishell.mk +++ b/Minishell.mk @@ -6,7 +6,7 @@ # By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/04/28 17:28:30 by maiboyer #+# #+# # -# Updated: 2024/08/19 14:31:41 by maiboyer ### ########.fr # +# Updated: 2024/09/26 18:27:18 by maiboyer ### ########.fr # # # # **************************************************************************** # @@ -53,21 +53,20 @@ END = \033[0m .PHONY: all bonus build_filelist re clean fclean -LIBS_NAMES = me gmr aq ast parser line exec sh +LIBS_NAMES = me aq ast parser line exec sh LIBS_FILES = $(addprefix $(BUILD_DIR)/, $(addsuffix .a, $(addprefix lib, $(LIBS_NAMES)))) LIBS_FLAGS = $(addprefix -l, $(LIBS_NAMES)) -all: - @$(MAKE) -C ./stdme/ "LIB_NAME=$(shell realpath ./stdme)/" libme.a - @$(MAKE) -C ./allocator/ "LIB_NAME=$(shell realpath ./allocator)/" libaq.a - @$(MAKE) -C ./ast/ "LIB_NAME=$(shell realpath ./ast)/" libast.a - @$(MAKE) -C ./exec/ "LIB_NAME=$(shell realpath ./exec)/" libexec.a - @$(MAKE) -C ./line/ "LIB_NAME=$(shell realpath ./line)/" libline.a - @$(MAKE) -C ./parser/ -f ./Grammar.mk "LIB_NAME=$(shell realpath ./parser)/" libgmr.a - @$(MAKE) -C ./parser/ -f ./Parser.mk "LIB_NAME=$(shell realpath ./parser)/" libparser.a - @$(MAKE) -f./Minishell.mk lib$(ANAME).a - @$(MAKE) -f./Minishell.mk $(NAME) +all: + @$(MAKE) -C ./stdme/ "LIB_NAME=$(shell realpath ./stdme)/" libme.a + @$(MAKE) -C ./allocator/ "LIB_NAME=$(shell realpath ./allocator)/" libaq.a + #@$(MAKE) -C ./ast/ "LIB_NAME=$(shell realpath ./ast)/" libast.a + @$(MAKE) -C ./exec/ "LIB_NAME=$(shell realpath ./exec)/" libexec.a + @$(MAKE) -C ./line/ "LIB_NAME=$(shell realpath ./line)/" libline.a + @$(MAKE) -C ./parser/ "LIB_NAME=$(shell realpath ./parser)/" libparser.a + @$(MAKE) -f./Minishell.mk lib$(ANAME).a + @$(MAKE) -f./Minishell.mk $(NAME) # Bonus (make bonus) bonus: $(OBJ) $(LIBS_FILES) @@ -77,6 +76,7 @@ bonus: $(OBJ) $(LIBS_FILES) @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' @$(CC) $(CFLAGS) -DDEBUG=1 -o $(NAME) $(OBJ) -L$(BUILD_DIR) $(call link_group,$(LIBS_FLAGS)) + # Dependences for all $(NAME): $(LIBS_FILES) @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' diff --git a/ast/include/ast/_from_node.h b/ast/include/ast/_from_node.h index 66feac95..a64a80b3 100644 --- a/ast/include/ast/_from_node.h +++ b/ast/include/ast/_from_node.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/02 16:54:31 by maiboyer #+# #+# */ -/* Updated: 2024/09/03 15:47:16 by maiboyer ### ########.fr */ +/* Updated: 2024/09/26 18:06:39 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,6 @@ # include "ast/ast.h" # include "me/types.h" -# include "parser/api.h" # include "gmr/symbols.h" void _add_negation(t_ast_node *node); diff --git a/includes/app/state.h b/includes/app/state.h index 4ddd9ddb..8fb2e0ea 100644 --- a/includes/app/state.h +++ b/includes/app/state.h @@ -6,7 +6,7 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/02 15:49:56 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 17:28:52 by maiboyer ### ########.fr */ +/* Updated: 2024/09/26 18:10:23 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,6 @@ # include "me/hashmap/hashmap_env.h" # include "me/os/os.h" # include "me/types.h" -# include "parser/inner/node.h" typedef struct s_state t_state; @@ -27,7 +26,7 @@ struct s_state t_str str_input; t_hashmap_env *env; t_hashmap_env *tmp_var; - t_parser *parser; + void *parser; t_ast_node ast; }; diff --git a/includes/gmr b/includes/gmr deleted file mode 120000 index 7a0b1420..00000000 --- a/includes/gmr +++ /dev/null @@ -1 +0,0 @@ -../parser/static/headers/ \ No newline at end of file diff --git a/includes/parser b/includes/parser index c87daae3..6891663a 120000 --- a/includes/parser +++ b/includes/parser @@ -1 +1 @@ -../parser/includes \ No newline at end of file +../parser/include/parser \ No newline at end of file diff --git a/input.toml b/input.toml index 7dd70454..ed4c198f 100644 --- a/input.toml +++ b/input.toml @@ -86,15 +86,7 @@ replace.C__PREFIXUP__ = "PID" [[create.vec]] sources_output = "src/vec/C__PREFIX__/" headers_output = "include/me/vec/" -replace.C__TYPENAME__ = "t_subtree" -replace.C__TYPEHEADER__ = '#include "parser/inner/subtree_inner.h"' -replace.C__PREFIX__ = "subtree" -replace.C__PREFIXUP__ = "SUBTREE" - -[[create.vec]] -sources_output = "src/vec/C__PREFIX__/" -headers_output = "include/me/vec/" -replace.C__TYPENAME__ = "t_reduce_action" -replace.C__TYPEHEADER__ = '#include "parser/inner/reduce_action_inner.h"' -replace.C__PREFIX__ = "reduce_action" -replace.C__PREFIXUP__ = "REDUCE_ACTION" +replace.C__TYPENAME__ = "t_token" +replace.C__TYPEHEADER__ = '#include "parser/token.h"' +replace.C__PREFIX__ = "token" +replace.C__PREFIXUP__ = "TOKEN" diff --git a/output/include/me/hashmap/hashmap_env.h b/output/include/me/hashmap/hashmap_env.h index c96341af..b36c130e 100644 --- a/output/include/me/hashmap/hashmap_env.h +++ b/output/include/me/hashmap/hashmap_env.h @@ -1,41 +1,44 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* hashmap_env.h :+: :+: :+: */ +/* hashmap_env.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 11:00:22 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 17:44:19 by maiboyer ### ########.fr */ +/* Updated: 2023/12/11 15:24:44 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef HASHMAP_ENV_H -# define HASHMAP_ENV_H +#define HASHMAP_ENV_H -# define DEFAULT_BUCKETS 750 +#define DEFAULT_BUCKETS 750 -# include "me/hash/hasher.h" -# include "me/types.h" -# include -# include -# include -# include -# include + + +#include "me/hash/hasher.h" +#include "me/types.h" +#include +#include +#include +#include +#include /// @struct A key-value pair for the hashmap typedef struct s_kv_env { - t_str key; - t_str val; -} t_kv_env; + t_str key; + t_str val; +} t_kv_env; /// @typedef A function that hashes a key -typedef void (*t_hash_env_fn)(t_hasher *hasher, t_str *key); +typedef void (*t_hash_env_fn)(t_hasher *hasher, t_str *key); /// @typedef A function that drops a key-value pair -typedef void (*t_free_env_fn)(t_kv_env val); -/// @typedef A function that compares two keys & returns true if they are equal -typedef bool (*t_eq_env_fn)(t_str *lhs, t_str *rhs); +typedef void (*t_free_env_fn)(t_kv_env val); +/// @typedef A function that compares two keys and returns true if they are equal +typedef bool (*t_eq_env_fn)(t_str *lhs, t_str *rhs); + /// @struct A single entry in the hashmap /// @var hash_id The hash of the key @@ -43,10 +46,10 @@ typedef bool (*t_eq_env_fn)(t_str *lhs, t_str *rhs); /// @var next The next entry in the bucket typedef struct s_entry_env { - t_usize hash_id; + t_usize hash_id; t_kv_env kv; - struct s_entry_env *next; -} t_entry_env; + struct s_entry_env *next; +} t_entry_env; /// @struct A hashmap of keys t_str and values t_str /// @var buckets The array of buckets @@ -57,59 +60,54 @@ typedef struct s_entry_env /// @var free The free function typedef struct s_hashmap_env { - t_entry_env **buckets; - t_usize num_buckets; - t_hasher hasher; - t_hash_env_fn hfunc; - t_eq_env_fn cfunc; - t_free_env_fn free; -} t_hashmap_env; + t_entry_env **buckets; + t_usize num_buckets; + t_hasher hasher; + t_hash_env_fn hfunc; + t_eq_env_fn cfunc; + t_free_env_fn free; +} t_hashmap_env; -/// @brief Creates a new hashmap with the given hash, -/// comparison, & free functions +/// @brief Creates a new hashmap with the given hash, comparison, and free functions /// @param hash The hash function /// @param cmp The comparison function /// @param free The free function /// @return A new hashmap -t_hashmap_env *hmap_env_new(\ - t_hash_env_fn hash, t_eq_env_fn cmp, t_free_env_fn free); +t_hashmap_env *hmap_env_new(t_hash_env_fn hash, t_eq_env_fn cmp, t_free_env_fn free); -/// @brief Creates a new hashmap with the given hash, -/// comparison, and free functions +/// @brief Creates a new hashmap with the given hash, comparison, and free functions /// @param hash The hash function /// @param cmp The comparison function /// @param free The free function /// @param cap The number of buckets /// @return A new hashmap -t_hashmap_env *hmap_env_new_with_buckets(\ - t_hash_env_fn hash, t_eq_env_fn cmp, t_free_env_fn free, size_t cap); +t_hashmap_env *hmap_env_new_with_buckets(t_hash_env_fn hash, t_eq_env_fn cmp, t_free_env_fn free, size_t cap); /// @brief Free the hashmap and all of its entries /// @param hmap The hashmap to free -void hmap_env_free(t_hashmap_env *hmap); +void hmap_env_free(t_hashmap_env *hmap); /// @brief Clear the hashmap, removing all of its entries /// @param hmap The hashmap to clear -void hmap_env_clear(t_hashmap_env *hmap); +void hmap_env_clear(t_hashmap_env *hmap); /// @brief Inserts a key-value pair into the hashmap /// @param hmap The hashmap /// @param key The key /// @param value The value /// @return true if the key already existed before, false otherwise -bool hmap_env_insert(t_hashmap_env *hmap, t_str key, t_str value); +bool hmap_env_insert(t_hashmap_env *hmap, t_str key, t_str value); /// @brief Gets the value associated with the key /// @param hmap The hashmap /// @param key The key -/// @return The value associated with the key, -/// or NULL if the key is not in the hashmap -t_str *hmap_env_get(t_hashmap_env *hmap, t_str *key); +/// @return The value associated with the key, or NULL if the key is not in the hashmap +t_str *hmap_env_get(t_hashmap_env *hmap, t_str *key); /// @brief Removes the key-value pair from the hashmap /// @param hmap The hashmap /// @param key The key -void hmap_env_remove(t_hashmap_env *hmap, t_str *key); +void hmap_env_remove(t_hashmap_env *hmap, t_str *key); /// @brief Get an entry from the hashmap /// @param hmap The hashmap @@ -118,31 +116,23 @@ void hmap_env_remove(t_hashmap_env *hmap, t_str *key); /// @param prev The previous entry in the bucket /// @return The entry, or NULL if the key is not in the hashmap /// @note this is an internal function -t_entry_env *hmap_env_get_entry(\ - t_hashmap_env *hmap, t_usize hash, t_str *key, t_entry_env **prev); +t_entry_env *hmap_env_get_entry(t_hashmap_env *hmap, t_usize hash, t_str *key, t_entry_env **prev); -/// @brief Iterates over the hashmap & -/// calls the given function for each key-value pair +/// @brief Iterates over the hashmap and calls the given function for each key-value pair /// @param self The hashmap /// @param func The function to call /// @param ctx The context to pass to the function /// @return An error code -/// @note The iteration can be stopped by returning -/// an error code from the function -t_error hmap_env_iter(\ - t_hashmap_env *self, t_error (*func)(\ - t_usize idx, const t_str *key, t_str *val, void *ctx), void *ctx); +/// @note The iteration can be stopped by returning an error code from the function +t_error hmap_env_iter(t_hashmap_env *self, t_error (*func)(t_usize idx, const t_str *key, t_str *val, void *ctx), void *ctx); -/// @brief Clone an entire hashmap, -/// using the given function to duplicate the items + +/// @brief Clone an entire hashmap, using the given function to duplicate the items /// @param self The hashmap /// @param func The function to call /// @param ctx The context to pass to the function /// @param out The cloned hashmap /// @return An error code -t_error hmap_env_clone(\ - t_hashmap_env *self, t_error (*clone)(\ - const t_kv_env *val, void *ctx, t_kv_env *out), \ - void *ctx, t_hashmap_env **out); +t_error hmap_env_clone(t_hashmap_env *self, t_error (*clone)(const t_kv_env *val, void *ctx, t_kv_env *out), void *ctx, t_hashmap_env **out); #endif diff --git a/output/include/me/vec/vec_ast.h b/output/include/me/vec/vec_ast.h index a61ecbd8..6a7dc78c 100644 --- a/output/include/me/vec/vec_ast.h +++ b/output/include/me/vec/vec_ast.h @@ -1,41 +1,43 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_ast.h :+: :+: :+: */ +/* vec_ast.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 17:42:32 by maiboyer ### ########.fr */ +/* Updated: 2023/12/09 17:53:00 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef VEC_AST_H -# define VEC_AST_H +#define VEC_AST_H -# include "ast/_forward_def.h" -# include "me/types.h" +#include "ast/_forward_def.h" +#include "me/types.h" /// @brief A function that takes two t_ast_node and compare them -typedef bool (*t_vec_ast_sort_fn)(t_ast_node *, t_ast_node *); +typedef bool (*t_vec_ast_sort_fn)(t_ast_node *lhs, t_ast_node *rhs); /// @brief A function that free an t_ast_node -typedef void (*t_free_ast_item)(t_ast_node); +typedef void (*t_free_ast_item)(t_ast_node elem); /// @brief A dynamic array of t_ast_node -typedef struct s_vec_ast +typedef struct s_vec_ast t_vec_ast; + +struct s_vec_ast { - t_free_ast_item free_func; - t_usize len; - t_usize capacity; - t_ast_node *buffer; -} t_vec_ast; + t_free_ast_item free_func; + t_usize len; + t_usize capacity; + t_ast_node *buffer; +}; struct s_vec_ast_splice_arguments { - t_usize index; - t_usize old_count; - t_usize new_count; - const t_ast_node *elements; + t_usize index; + t_usize old_count; + t_usize new_count; + const t_ast_node *elements; }; /// @brief Create a new vec_ast with a given capacity @@ -43,28 +45,26 @@ struct s_vec_ast_splice_arguments /// elements) /// @param free_function The function that will be used to free the elements of /// the vec_ast -t_vec_ast vec_ast_new(\ - t_usize capacity, t_free_ast_item free_function); +t_vec_ast vec_ast_new(t_usize capacity, + t_free_ast_item free_function); /// @brief Push an element to the last position of the vec_ast /// @param vec The vec_ast to push the element to /// @param element The element to push -t_error vec_ast_push(\ - t_vec_ast *vec, t_ast_node element); +t_error vec_ast_push(t_vec_ast *vec, t_ast_node element); /// @brief Push an element to the first position of the vec_ast /// @param vec The vec_ast to push the element to /// @param element The element to push /// @note This operation is O(n) -t_error vec_ast_push_front(\ - t_vec_ast *vec, t_ast_node element); +t_error vec_ast_push_front(t_vec_ast *vec, + t_ast_node element); /// @brief Get the last element from the vec_ast, and remove it from the /// vec_ast /// @param vec The vec_ast to get the element from /// @param[out] out The last element of the vec_ast /// @return true if the operation failed, false otherwise -t_error vec_ast_pop(\ - t_vec_ast *vec, t_ast_node *value); +t_error vec_ast_pop(t_vec_ast *vec, t_ast_node *value); /// @brief Get the first element from the vec_ast, and remove it from /// the vec_ast @@ -72,27 +72,26 @@ t_error vec_ast_pop(\ /// @param[out] out The first element of the vec_ast /// @return true if the operation failed, false otherwise /// @note This operation is O(n) -t_error vec_ast_pop_front(\ - t_vec_ast *vec, t_ast_node *value); +t_error vec_ast_pop_front(t_vec_ast *vec, t_ast_node *value); /// @brief Free the vector and all its elements /// @param vec The vec_ast to free -void vec_ast_free(t_vec_ast vec); +void vec_ast_free(t_vec_ast vec); /// @brief Make the vec_ast at least the given capacity /// @param vec The vec_ast to reserve /// @param wanted_capacity The minimum capacity to reserve /// @return true if the operation failed, false otherwise -t_error vec_ast_reserve(\ - t_vec_ast *vec, t_usize wanted_capacity); +t_error vec_ast_reserve(t_vec_ast *vec, + t_usize wanted_capacity); /// @brief Run the function and returns the index of the first element that /// returns true /// @param vec The vec_ast to search in /// @param fn The function to run on each element /// @param[out] index The index of the first element that returns true -t_error vec_ast_find(t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), t_usize *index); +t_error vec_ast_find(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), t_usize *index); /// @brief Run the function and returns the index of the first element that /// returns true, but starting at index starting_index @@ -100,9 +99,9 @@ t_error vec_ast_find(t_vec_ast *vec, bool (*fn)(\ /// @param fn The function to run on each element /// @param starting_index The index to start the search from /// @param[out] index The index of the first element that returns true -t_error vec_ast_find_starting(\ - t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), t_usize starting_index, t_usize *index); +t_error vec_ast_find_starting(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), + t_usize starting_index, t_usize *index); /// @brief Run the function on every element of the vec_ast and returns /// if all elements returned true @@ -111,8 +110,8 @@ t_error vec_ast_find_starting(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_ast is empty, result will be true -t_error vec_ast_all(t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), bool *result); +t_error vec_ast_all(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), bool *result); /// @brief Run the function on every element of the vec_ast and returns /// if any element returned true @@ -121,54 +120,55 @@ t_error vec_ast_all(t_vec_ast *vec, bool (*fn)(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_ast is empty, result will be false -t_error vec_ast_any(t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), bool *result); +t_error vec_ast_any(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), bool *result); /// @brief Run the function on every element of the vec_ast /// @param vec The vec_ast to iterate over /// @param fn The function to run on each element /// @param state The state to pass to the function -void vec_ast_iter(t_vec_ast *vec, void (*fn)(\ - t_usize index, t_ast_node *value, void *state), void *state); +void vec_ast_iter(t_vec_ast *vec, + void (*fn)(t_usize index, t_ast_node *value, + void *state), + void *state); /// @brief Reverse the order of the elements in the vec_ast /// @param vec The vec_ast to reverse -void vec_ast_reverse(t_vec_ast *vec); +void vec_ast_reverse(t_vec_ast *vec); /// @brief Sort the elements of the vec_ast /// @param vec The vec_ast to sort /// @param is_sorted The function to use to compare the elements -void vec_ast_sort(\ - t_vec_ast *vec, t_vec_ast_sort_fn is_sorted); +void vec_ast_sort(t_vec_ast *vec, + t_vec_ast_sort_fn is_sorted); /// @brief Get a pointer to the last element of the vec_ast /// @param vec The vec_ast to get the element from /// @param[out] out A pointer to the last element of the vec_ast /// @return true if the operation failed, false otherwise -t_error vec_ast_back(\ - t_vec_ast *vec, t_ast_node **out); +t_error vec_ast_back(t_vec_ast *vec, t_ast_node **out); /// @brief Get a pointer to the i'th element, or NULL otherwise /// @param vec The vec_ast to get the element from /// @return A pointer to the element or NULL -t_ast_node *vec_ast_get(t_vec_ast *vec, t_usize i); +t_ast_node *vec_ast_get(t_vec_ast *vec, t_usize i); /// @brief Get a pointer to the last element, or NULL otherwise /// @param vec The vec_ast to get the element from /// @return A pointer to the last element or NULL -t_ast_node *vec_ast_last(t_vec_ast *vec); +t_ast_node *vec_ast_last(t_vec_ast *vec); /// @brief Perform a simple bytewise copy into the other vector /// @param vec The vec_ast to be copied from /// @param dest The vec_ast to be copied to -void vec_ast_copy_into(\ - t_vec_ast *vec, t_vec_ast *dest); +void vec_ast_copy_into(t_vec_ast *vec, t_vec_ast *dest); /// read code lol -void vec_ast_splice(t_vec_ast *self, \ - struct s_vec_ast_splice_arguments args); +void vec_ast_splice(t_vec_ast *self, + struct s_vec_ast_splice_arguments args); -struct s_vec_ast_splice_arguments vec_ast_splice_args(t_usize index, \ - t_usize old_count, t_usize new_count, const t_ast_node *elements); +struct s_vec_ast_splice_arguments vec_ast_splice_args( + t_usize index, t_usize old_count, t_usize new_count, + const t_ast_node *elements); #endif diff --git a/output/include/me/vec/vec_estr.h b/output/include/me/vec/vec_estr.h index 1ff1ebd3..ce4fc893 100644 --- a/output/include/me/vec/vec_estr.h +++ b/output/include/me/vec/vec_estr.h @@ -1,41 +1,43 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_estr.h :+: :+: :+: */ +/* vec_estr.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 14:33:29 by rparodi ### ########.fr */ +/* Updated: 2023/12/09 17:53:00 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef VEC_ESTR_H -# define VEC_ESTR_H +#define VEC_ESTR_H -# include "exec/_tuple_expanded_str.h" -# include "me/types.h" +#include "exec/_tuple_expanded_str.h" +#include "me/types.h" /// @brief A function that takes two t_expandable_str and compare them -typedef bool (*t_vec_estr_sort_fn)(t_expandable_str *, t_expandable_str *); +typedef bool (*t_vec_estr_sort_fn)(t_expandable_str *lhs, t_expandable_str *rhs); /// @brief A function that free an t_expandable_str -typedef void (*t_free_estr_item)(t_expandable_str); +typedef void (*t_free_estr_item)(t_expandable_str elem); /// @brief A dynamic array of t_expandable_str -typedef struct s_vec_estr +typedef struct s_vec_estr t_vec_estr; + +struct s_vec_estr { - t_free_estr_item free_func; - t_usize len; - t_usize capacity; - t_expandable_str *buffer; -} t_vec_estr; + t_free_estr_item free_func; + t_usize len; + t_usize capacity; + t_expandable_str *buffer; +}; struct s_vec_estr_splice_arguments { - t_usize index; - t_usize old_count; - t_usize new_count; - const t_expandable_str *elements; + t_usize index; + t_usize old_count; + t_usize new_count; + const t_expandable_str *elements; }; /// @brief Create a new vec_estr with a given capacity @@ -43,29 +45,26 @@ struct s_vec_estr_splice_arguments /// elements) /// @param free_function The function that will be used to free the elements of /// the vec_estr -t_vec_estr vec_estr_new(t_usize capacity, \ - t_free_estr_item free_function); - +t_vec_estr vec_estr_new(t_usize capacity, + t_free_estr_item free_function); /// @brief Push an element to the last position of the vec_estr /// @param vec The vec_estr to push the element to /// @param element The element to push -t_error vec_estr_push(\ - t_vec_estr *vec, t_expandable_str element); +t_error vec_estr_push(t_vec_estr *vec, t_expandable_str element); /// @brief Push an element to the first position of the vec_estr /// @param vec The vec_estr to push the element to /// @param element The element to push /// @note This operation is O(n) -t_error vec_estr_push_front(\ - t_vec_estr *vec, t_expandable_str element); +t_error vec_estr_push_front(t_vec_estr *vec, + t_expandable_str element); /// @brief Get the last element from the vec_estr, and remove it from the /// vec_estr /// @param vec The vec_estr to get the element from /// @param[out] out The last element of the vec_estr /// @return true if the operation failed, false otherwise -t_error vec_estr_pop(\ - t_vec_estr *vec, t_expandable_str *value); +t_error vec_estr_pop(t_vec_estr *vec, t_expandable_str *value); /// @brief Get the first element from the vec_estr, and remove it from /// the vec_estr @@ -73,27 +72,26 @@ t_error vec_estr_pop(\ /// @param[out] out The first element of the vec_estr /// @return true if the operation failed, false otherwise /// @note This operation is O(n) -t_error vec_estr_pop_front(\ - t_vec_estr *vec, t_expandable_str *value); +t_error vec_estr_pop_front(t_vec_estr *vec, t_expandable_str *value); /// @brief Free the vector and all its elements /// @param vec The vec_estr to free -void vec_estr_free(t_vec_estr vec); +void vec_estr_free(t_vec_estr vec); /// @brief Make the vec_estr at least the given capacity /// @param vec The vec_estr to reserve /// @param wanted_capacity The minimum capacity to reserve /// @return true if the operation failed, false otherwise -t_error vec_estr_reserve(\ - t_vec_estr *vec, t_usize wanted_capacity); +t_error vec_estr_reserve(t_vec_estr *vec, + t_usize wanted_capacity); /// @brief Run the function and returns the index of the first element that /// returns true /// @param vec The vec_estr to search in /// @param fn The function to run on each element /// @param[out] index The index of the first element that returns true -t_error vec_estr_find(\ - t_vec_estr *vec, bool (*fn)(const t_expandable_str *), t_usize *index); +t_error vec_estr_find(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), t_usize *index); /// @brief Run the function and returns the index of the first element that /// returns true, but starting at index starting_index @@ -101,9 +99,9 @@ t_error vec_estr_find(\ /// @param fn The function to run on each element /// @param starting_index The index to start the search from /// @param[out] index The index of the first element that returns true -t_error vec_estr_find_starting(\ - t_vec_estr *vec, bool (*fn)(const t_expandable_str *), \ - t_usize starting_index, t_usize *index); +t_error vec_estr_find_starting(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), + t_usize starting_index, t_usize *index); /// @brief Run the function on every element of the vec_estr and returns /// if all elements returned true @@ -112,8 +110,8 @@ t_error vec_estr_find_starting(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_estr is empty, result will be true -t_error vec_estr_all(\ - t_vec_estr *vec, bool (*fn)(const t_expandable_str *), bool *result); +t_error vec_estr_all(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), bool *result); /// @brief Run the function on every element of the vec_estr and returns /// if any element returned true @@ -122,57 +120,55 @@ t_error vec_estr_all(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_estr is empty, result will be false -t_error vec_estr_any(\ - t_vec_estr *vec, bool (*fn)(const t_expandable_str *), bool *result); +t_error vec_estr_any(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), bool *result); /// @brief Run the function on every element of the vec_estr /// @param vec The vec_estr to iterate over /// @param fn The function to run on each element /// @param state The state to pass to the function -void vec_estr_iter(\ - t_vec_estr *vec, void (*fn)(\ - t_usize index, t_expandable_str *value, void *state), void *state); +void vec_estr_iter(t_vec_estr *vec, + void (*fn)(t_usize index, t_expandable_str *value, + void *state), + void *state); /// @brief Reverse the order of the elements in the vec_estr /// @param vec The vec_estr to reverse -void vec_estr_reverse(t_vec_estr *vec); +void vec_estr_reverse(t_vec_estr *vec); /// @brief Sort the elements of the vec_estr /// @param vec The vec_estr to sort /// @param is_sorted The function to use to compare the elements -void vec_estr_sort(\ - t_vec_estr *vec, t_vec_estr_sort_fn is_sorted); +void vec_estr_sort(t_vec_estr *vec, + t_vec_estr_sort_fn is_sorted); /// @brief Get a pointer to the last element of the vec_estr /// @param vec The vec_estr to get the element from /// @param[out] out A pointer to the last element of the vec_estr /// @return true if the operation failed, false otherwise -t_error vec_estr_back(\ - t_vec_estr *vec, t_expandable_str **out); +t_error vec_estr_back(t_vec_estr *vec, t_expandable_str **out); /// @brief Get a pointer to the i'th element, or NULL otherwise /// @param vec The vec_estr to get the element from /// @return A pointer to the element or NULL -t_expandable_str *vec_estr_get(\ - t_vec_estr *vec, t_usize i); +t_expandable_str *vec_estr_get(t_vec_estr *vec, t_usize i); /// @brief Get a pointer to the last element, or NULL otherwise /// @param vec The vec_estr to get the element from /// @return A pointer to the last element or NULL -t_expandable_str *vec_estr_last(t_vec_estr *vec); +t_expandable_str *vec_estr_last(t_vec_estr *vec); /// @brief Perform a simple bytewise copy into the other vector /// @param vec The vec_estr to be copied from /// @param dest The vec_estr to be copied to -void vec_estr_copy_into(\ - t_vec_estr *vec, t_vec_estr *dest); +void vec_estr_copy_into(t_vec_estr *vec, t_vec_estr *dest); /// read code lol -void vec_estr_splice(\ - t_vec_estr *self, struct s_vec_estr_splice_arguments args); +void vec_estr_splice(t_vec_estr *self, + struct s_vec_estr_splice_arguments args); -struct s_vec_estr_splice_arguments vec_estr_splice_args( \ - t_usize index, t_usize old_count, t_usize new_count, \ +struct s_vec_estr_splice_arguments vec_estr_splice_args( + t_usize index, t_usize old_count, t_usize new_count, const t_expandable_str *elements); #endif diff --git a/output/include/me/vec/vec_pid.h b/output/include/me/vec/vec_pid.h index 343144a3..426bd103 100644 --- a/output/include/me/vec/vec_pid.h +++ b/output/include/me/vec/vec_pid.h @@ -1,41 +1,43 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_pid.h :+: :+: :+: */ +/* vec_pid.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 14:33:54 by rparodi ### ########.fr */ +/* Updated: 2023/12/09 17:53:00 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef VEC_PID_H -# define VEC_PID_H +#define VEC_PID_H -# include "me/os/os.h" -# include "me/types.h" +#include "me/os/os.h" +#include "me/types.h" /// @brief A function that takes two t_pid and compare them -typedef bool (*t_vec_pid_sort_fn)(t_pid *, t_pid *); +typedef bool (*t_vec_pid_sort_fn)(t_pid *lhs, t_pid *rhs); /// @brief A function that free an t_pid -typedef void (*t_free_pid_item)(t_pid); +typedef void (*t_free_pid_item)(t_pid elem); /// @brief A dynamic array of t_pid -typedef struct s_vec_pid +typedef struct s_vec_pid t_vec_pid; + +struct s_vec_pid { - t_free_pid_item free_func; - t_usize len; - t_usize capacity; - t_pid *buffer; -} t_vec_pid; + t_free_pid_item free_func; + t_usize len; + t_usize capacity; + t_pid *buffer; +}; struct s_vec_pid_splice_arguments { - t_usize index; - t_usize old_count; - t_usize new_count; - const t_pid *elements; + t_usize index; + t_usize old_count; + t_usize new_count; + const t_pid *elements; }; /// @brief Create a new vec_pid with a given capacity @@ -43,28 +45,26 @@ struct s_vec_pid_splice_arguments /// elements) /// @param free_function The function that will be used to free the elements of /// the vec_pid -t_vec_pid vec_pid_new(\ - t_usize capacity, t_free_pid_item free_function); +t_vec_pid vec_pid_new(t_usize capacity, + t_free_pid_item free_function); /// @brief Push an element to the last position of the vec_pid /// @param vec The vec_pid to push the element to /// @param element The element to push -t_error vec_pid_push(\ - t_vec_pid *vec, t_pid element); +t_error vec_pid_push(t_vec_pid *vec, t_pid element); /// @brief Push an element to the first position of the vec_pid /// @param vec The vec_pid to push the element to /// @param element The element to push /// @note This operation is O(n) -t_error vec_pid_push_front(\ - t_vec_pid *vec, t_pid element); +t_error vec_pid_push_front(t_vec_pid *vec, + t_pid element); /// @brief Get the last element from the vec_pid, and remove it from the /// vec_pid /// @param vec The vec_pid to get the element from /// @param[out] out The last element of the vec_pid /// @return true if the operation failed, false otherwise -t_error vec_pid_pop(\ - t_vec_pid *vec, t_pid *value); +t_error vec_pid_pop(t_vec_pid *vec, t_pid *value); /// @brief Get the first element from the vec_pid, and remove it from /// the vec_pid @@ -72,28 +72,26 @@ t_error vec_pid_pop(\ /// @param[out] out The first element of the vec_pid /// @return true if the operation failed, false otherwise /// @note This operation is O(n) -t_error vec_pid_pop_front(\ - t_vec_pid *vec, t_pid *value); +t_error vec_pid_pop_front(t_vec_pid *vec, t_pid *value); /// @brief Free the vector and all its elements /// @param vec The vec_pid to free -void vec_pid_free(\ - t_vec_pid vec); +void vec_pid_free(t_vec_pid vec); /// @brief Make the vec_pid at least the given capacity /// @param vec The vec_pid to reserve /// @param wanted_capacity The minimum capacity to reserve /// @return true if the operation failed, false otherwise -t_error vec_pid_reserve(\ - t_vec_pid *vec, t_usize wanted_capacity); +t_error vec_pid_reserve(t_vec_pid *vec, + t_usize wanted_capacity); /// @brief Run the function and returns the index of the first element that /// returns true /// @param vec The vec_pid to search in /// @param fn The function to run on each element /// @param[out] index The index of the first element that returns true -t_error vec_pid_find(\ - t_vec_pid *vec, bool (*fn)(const t_pid *), t_usize *index); +t_error vec_pid_find(t_vec_pid *vec, + bool (*fn)(const t_pid *), t_usize *index); /// @brief Run the function and returns the index of the first element that /// returns true, but starting at index starting_index @@ -101,9 +99,9 @@ t_error vec_pid_find(\ /// @param fn The function to run on each element /// @param starting_index The index to start the search from /// @param[out] index The index of the first element that returns true -t_error vec_pid_find_starting(\ - t_vec_pid *vec, bool (*fn)(\ - const t_pid *), t_usize starting_index, t_usize *index); +t_error vec_pid_find_starting(t_vec_pid *vec, + bool (*fn)(const t_pid *), + t_usize starting_index, t_usize *index); /// @brief Run the function on every element of the vec_pid and returns /// if all elements returned true @@ -112,8 +110,8 @@ t_error vec_pid_find_starting(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_pid is empty, result will be true -t_error vec_pid_all(\ - t_vec_pid *vec, bool (*fn)(const t_pid *), bool *result); +t_error vec_pid_all(t_vec_pid *vec, + bool (*fn)(const t_pid *), bool *result); /// @brief Run the function on every element of the vec_pid and returns /// if any element returned true @@ -122,59 +120,55 @@ t_error vec_pid_all(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_pid is empty, result will be false -t_error vec_pid_any(\ - t_vec_pid *vec, bool (*fn)(const t_pid *), bool *result); +t_error vec_pid_any(t_vec_pid *vec, + bool (*fn)(const t_pid *), bool *result); /// @brief Run the function on every element of the vec_pid /// @param vec The vec_pid to iterate over /// @param fn The function to run on each element /// @param state The state to pass to the function -void vec_pid_iter(\ - t_vec_pid *vec, void (*fn)(\ - t_usize index, t_pid *value, void *state), void *state); +void vec_pid_iter(t_vec_pid *vec, + void (*fn)(t_usize index, t_pid *value, + void *state), + void *state); /// @brief Reverse the order of the elements in the vec_pid /// @param vec The vec_pid to reverse -void vec_pid_reverse(\ - t_vec_pid *vec); +void vec_pid_reverse(t_vec_pid *vec); /// @brief Sort the elements of the vec_pid /// @param vec The vec_pid to sort /// @param is_sorted The function to use to compare the elements -void vec_pid_sort(\ - t_vec_pid *vec, t_vec_pid_sort_fn is_sorted); +void vec_pid_sort(t_vec_pid *vec, + t_vec_pid_sort_fn is_sorted); /// @brief Get a pointer to the last element of the vec_pid /// @param vec The vec_pid to get the element from /// @param[out] out A pointer to the last element of the vec_pid /// @return true if the operation failed, false otherwise -t_error vec_pid_back(\ - t_vec_pid *vec, t_pid **out); +t_error vec_pid_back(t_vec_pid *vec, t_pid **out); /// @brief Get a pointer to the i'th element, or NULL otherwise /// @param vec The vec_pid to get the element from /// @return A pointer to the element or NULL -t_pid *vec_pid_get(\ - t_vec_pid *vec, t_usize i); +t_pid *vec_pid_get(t_vec_pid *vec, t_usize i); /// @brief Get a pointer to the last element, or NULL otherwise /// @param vec The vec_pid to get the element from /// @return A pointer to the last element or NULL -t_pid *vec_pid_last(\ - t_vec_pid *vec); +t_pid *vec_pid_last(t_vec_pid *vec); /// @brief Perform a simple bytewise copy into the other vector /// @param vec The vec_pid to be copied from /// @param dest The vec_pid to be copied to -void vec_pid_copy_into(\ - t_vec_pid *vec, t_vec_pid *dest); +void vec_pid_copy_into(t_vec_pid *vec, t_vec_pid *dest); /// read code lol -void vec_pid_splice(\ - t_vec_pid *self, struct s_vec_pid_splice_arguments args); +void vec_pid_splice(t_vec_pid *self, + struct s_vec_pid_splice_arguments args); -struct s_vec_pid_splice_arguments vec_pid_splice_args( \ - t_usize index, t_usize old_count, t_usize new_count, \ +struct s_vec_pid_splice_arguments vec_pid_splice_args( + t_usize index, t_usize old_count, t_usize new_count, const t_pid *elements); #endif diff --git a/output/include/me/vec/vec_reduce_action.h b/output/include/me/vec/vec_reduce_action.h deleted file mode 100644 index 99ba0f62..00000000 --- a/output/include/me/vec/vec_reduce_action.h +++ /dev/null @@ -1,186 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* vec_reduce_action.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2024/09/19 14:09:05 by rparodi #+# #+# */ -/* Updated: 2024/09/19 17:45:30 by maiboyer ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef VEC_REDUCE_ACTION_H -# define VEC_REDUCE_ACTION_H - -# include "parser/inner/reduce_action_inner.h" -# include "me/types.h" - -/// @brief A function that takes two t_reduce_action and compare them -typedef bool (*t_vec_reduce_action_sort_fn)(\ - t_reduce_action *, t_reduce_action *); -/// @brief A function that free an t_reduce_action -typedef void (*t_free_reduce_action_item)(t_reduce_action); - -/// @brief A dynamic array of t_reduce_action -typedef struct s_vec_reduce_action -{ - t_free_reduce_action_item free_func; - t_usize len; - t_usize capacity; - t_reduce_action *buffer; -} t_vec_reduce_action; - -struct s_vec_reduce_action_splice_arguments -{ - t_usize index; - t_usize old_count; - t_usize new_count; - const t_reduce_action *elements; -}; - -/// @brief Create a new vec_reduce_action with a given capacity -/// @param capacity The capacity of the new vec_reduce_action (in terms of -/// elements) -/// @param free_function The function that will be used to free the elements of -/// the vec_reduce_action -t_vec_reduce_action vec_reduce_action_new(\ - t_usize capacity, t_free_reduce_action_item free_function); - -/// @brief Push an element to the last position of the vec_reduce_action -/// @param vec The vec_reduce_action to push the element to -/// @param element The element to push -t_error vec_reduce_action_push(\ - t_vec_reduce_action *vec, t_reduce_action element); - -/// @brief Push an element to the first position of the vec_reduce_action -/// @param vec The vec_reduce_action to push the element to -/// @param element The element to push -/// @note This operation is O(n) -t_error vec_reduce_action_push_front(\ - t_vec_reduce_action *vec, t_reduce_action element); - -/// @brief Get the last element from the vec_reduce_action, -/// and remove it from the vec_reduce_action -/// @param vec The vec_reduce_action to get the element from -/// @param[out] out The last element of the vec_reduce_action -/// @return true if the operation failed, false otherwise -t_error vec_reduce_action_pop(\ - t_vec_reduce_action *vec, t_reduce_action *value); - -/// @brief Get the first element from the vec_reduce_action, and remove it from -/// the vec_reduce_action -/// @param vec The vec_reduce_action to get the element from -/// @param[out] out The first element of the vec_reduce_action -/// @return true if the operation failed, false otherwise -/// @note This operation is O(n) -t_error vec_reduce_action_pop_front(\ - t_vec_reduce_action *vec, t_reduce_action *value); - -/// @brief Free the vector and all its elements -/// @param vec The vec_reduce_action to free -void vec_reduce_action_free(\ - t_vec_reduce_action vec); - -/// @brief Make the vec_reduce_action at least the given capacity -/// @param vec The vec_reduce_action to reserve -/// @param wanted_capacity The minimum capacity to reserve -/// @return true if the operation failed, false otherwise -t_error vec_reduce_action_reserve(\ - t_vec_reduce_action *vec, t_usize wanted_capacity); - -/// @brief Run the function and returns the index of the first element that -/// returns true -/// @param vec The vec_reduce_action to search in -/// @param fn The function to run on each element -/// @param[out] index The index of the first element that returns true -t_error vec_reduce_action_find(\ - t_vec_reduce_action *vec, bool (*fn)(\ - const t_reduce_action *), t_usize *index); - -/// @brief Run the function and returns the index of the first element that -/// returns true, but starting at index starting_index -/// @param vec The vec_reduce_action to search in -/// @param fn The function to run on each element -/// @param starting_index The index to start the search from -/// @param[out] index The index of the first element that returns true -t_error vec_reduce_action_find_starting(\ - t_vec_reduce_action *vec, bool (*fn)(\ - const t_reduce_action *), t_usize starting_index, t_usize *index); - -/// @brief Run the function on every element of the -/// vec_reduce_action and returns if all elements returned true -/// @param vec The vec_reduce_action to search in -/// @param fn The function to run on each element -/// @param[out] result The result of the operation -/// @return true if the operation failed, false otherwise -/// @note If the vec_reduce_action is empty, result will be true -t_error vec_reduce_action_all(\ - t_vec_reduce_action *vec, bool (*fn)(\ - const t_reduce_action *), bool *result); - -/// @brief Run the function on every element -/// of the vec_reduce_action and returns if any element returned true -/// @param vec The vec_reduce_action to search in -/// @param fn The function to run on each element -/// @param[out] result The result of the operation -/// @return true if the operation failed, false otherwise -/// @note If the vec_reduce_action is empty, result will be false -t_error vec_reduce_action_any(\ - t_vec_reduce_action *vec, bool (*fn)(\ - const t_reduce_action *), bool *result); - -/// @brief Run the function on every element of the vec_reduce_action -/// @param vec The vec_reduce_action to iterate over -/// @param fn The function to run on each element -/// @param state The state to pass to the function -void vec_reduce_action_iter(\ - t_vec_reduce_action *vec, void (*fn)(\ - t_usize index, t_reduce_action *value, void *state), void *state); - -/// @brief Reverse the order of the elements in the vec_reduce_action -/// @param vec The vec_reduce_action to reverse -void vec_reduce_action_reverse(\ - t_vec_reduce_action *vec); - -/// @brief Sort the elements of the vec_reduce_action -/// @param vec The vec_reduce_action to sort -/// @param is_sorted The function to use to compare the elements -void vec_reduce_action_sort(\ - t_vec_reduce_action *vec, t_vec_reduce_action_sort_fn is_sorted); - -/// @brief Get a pointer to the last element of the vec_reduce_action -/// @param vec The vec_reduce_action to get the element from -/// @param[out] out A pointer to the last element of the vec_reduce_action -/// @return true if the operation failed, false otherwise -t_error vec_reduce_action_back(\ - t_vec_reduce_action *vec, t_reduce_action **out); - -/// @brief Get a pointer to the i'th element, or NULL otherwise -/// @param vec The vec_reduce_action to get the element from -/// @return A pointer to the element or NULL -t_reduce_action *vec_reduce_action_get(\ - t_vec_reduce_action *vec, t_usize i); - -/// @brief Get a pointer to the last element, or NULL otherwise -/// @param vec The vec_reduce_action to get the element from -/// @return A pointer to the last element or NULL -t_reduce_action *vec_reduce_action_last(\ - t_vec_reduce_action *vec); - -/// @brief Perform a simple bytewise copy into the other vector -/// @param vec The vec_reduce_action to be copied from -/// @param dest The vec_reduce_action to be copied to -void vec_reduce_action_copy_into(\ - t_vec_reduce_action *vec, t_vec_reduce_action *dest); - -/// read code lol -void vec_reduce_action_splice(\ - t_vec_reduce_action *self, \ - struct s_vec_reduce_action_splice_arguments args); - -struct s_vec_reduce_action_splice_arguments vec_reduce_action_splice_args( \ - t_usize index, t_usize old_count, t_usize new_count, \ - const t_reduce_action *elements); - -#endif diff --git a/output/include/me/vec/vec_str.h b/output/include/me/vec/vec_str.h index c94157dd..c54ab2b5 100644 --- a/output/include/me/vec/vec_str.h +++ b/output/include/me/vec/vec_str.h @@ -1,40 +1,43 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_str.h :+: :+: :+: */ +/* vec_str.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 14:33:44 by rparodi ### ########.fr */ +/* Updated: 2023/12/09 17:53:00 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef VEC_STR_H -# define VEC_STR_H +#define VEC_STR_H -# include "me/types.h" + +#include "me/types.h" /// @brief A function that takes two t_str and compare them -typedef bool (*t_vec_str_sort_fn)(t_str *, t_str *); +typedef bool (*t_vec_str_sort_fn)(t_str *lhs, t_str *rhs); /// @brief A function that free an t_str -typedef void (*t_free_str_item)(t_str); +typedef void (*t_free_str_item)(t_str elem); /// @brief A dynamic array of t_str -typedef struct s_vec_str +typedef struct s_vec_str t_vec_str; + +struct s_vec_str { - t_free_str_item free_func; - t_usize len; - t_usize capacity; - t_str *buffer; -} t_vec_str; + t_free_str_item free_func; + t_usize len; + t_usize capacity; + t_str *buffer; +}; struct s_vec_str_splice_arguments { - t_usize index; - t_usize old_count; - t_usize new_count; - const t_str *elements; + t_usize index; + t_usize old_count; + t_usize new_count; + const t_str *elements; }; /// @brief Create a new vec_str with a given capacity @@ -42,27 +45,26 @@ struct s_vec_str_splice_arguments /// elements) /// @param free_function The function that will be used to free the elements of /// the vec_str -t_vec_str vec_str_new(\ - t_usize capacity, t_free_str_item free_function); - +t_vec_str vec_str_new(t_usize capacity, + t_free_str_item free_function); /// @brief Push an element to the last position of the vec_str /// @param vec The vec_str to push the element to /// @param element The element to push -t_error vec_str_push(t_vec_str *vec, t_str element); +t_error vec_str_push(t_vec_str *vec, t_str element); /// @brief Push an element to the first position of the vec_str /// @param vec The vec_str to push the element to /// @param element The element to push /// @note This operation is O(n) -t_error vec_str_push_front(\ - t_vec_str *vec, t_str element); +t_error vec_str_push_front(t_vec_str *vec, + t_str element); /// @brief Get the last element from the vec_str, and remove it from the /// vec_str /// @param vec The vec_str to get the element from /// @param[out] out The last element of the vec_str /// @return true if the operation failed, false otherwise -t_error vec_str_pop(t_vec_str *vec, t_str *value); +t_error vec_str_pop(t_vec_str *vec, t_str *value); /// @brief Get the first element from the vec_str, and remove it from /// the vec_str @@ -70,28 +72,26 @@ t_error vec_str_pop(t_vec_str *vec, t_str *value); /// @param[out] out The first element of the vec_str /// @return true if the operation failed, false otherwise /// @note This operation is O(n) -t_error vec_str_pop_front(\ - t_vec_str *vec, t_str *value); +t_error vec_str_pop_front(t_vec_str *vec, t_str *value); /// @brief Free the vector and all its elements /// @param vec The vec_str to free -void vec_str_free(t_vec_str vec); +void vec_str_free(t_vec_str vec); /// @brief Make the vec_str at least the given capacity /// @param vec The vec_str to reserve /// @param wanted_capacity The minimum capacity to reserve /// @return true if the operation failed, false otherwise -t_error vec_str_reserve(\ - t_vec_str *vec, t_usize wanted_capacity); +t_error vec_str_reserve(t_vec_str *vec, + t_usize wanted_capacity); /// @brief Run the function and returns the index of the first element that /// returns true /// @param vec The vec_str to search in /// @param fn The function to run on each element /// @param[out] index The index of the first element that returns true -t_error vec_str_find(\ - t_vec_str *vec, bool (*fn)(\ - const t_str *), t_usize *index); +t_error vec_str_find(t_vec_str *vec, + bool (*fn)(const t_str *), t_usize *index); /// @brief Run the function and returns the index of the first element that /// returns true, but starting at index starting_index @@ -99,9 +99,9 @@ t_error vec_str_find(\ /// @param fn The function to run on each element /// @param starting_index The index to start the search from /// @param[out] index The index of the first element that returns true -t_error vec_str_find_starting(\ - t_vec_str *vec, bool (*fn)(\ - const t_str *), t_usize starting_index, t_usize *index); +t_error vec_str_find_starting(t_vec_str *vec, + bool (*fn)(const t_str *), + t_usize starting_index, t_usize *index); /// @brief Run the function on every element of the vec_str and returns /// if all elements returned true @@ -110,9 +110,8 @@ t_error vec_str_find_starting(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_str is empty, result will be true -t_error vec_str_all(\ - t_vec_str *vec, bool (*fn)(\ - const t_str *), bool *result); +t_error vec_str_all(t_vec_str *vec, + bool (*fn)(const t_str *), bool *result); /// @brief Run the function on every element of the vec_str and returns /// if any element returned true @@ -121,56 +120,55 @@ t_error vec_str_all(\ /// @param[out] result The result of the operation /// @return true if the operation failed, false otherwise /// @note If the vec_str is empty, result will be false -t_error vec_str_any(\ - t_vec_str *vec, bool (*fn)(\ - const t_str *), bool *result); +t_error vec_str_any(t_vec_str *vec, + bool (*fn)(const t_str *), bool *result); /// @brief Run the function on every element of the vec_str /// @param vec The vec_str to iterate over /// @param fn The function to run on each element /// @param state The state to pass to the function -void vec_str_iter(\ - t_vec_str *vec, void (*fn)(\ - t_usize index, t_str *value, void *state), void *state); +void vec_str_iter(t_vec_str *vec, + void (*fn)(t_usize index, t_str *value, + void *state), + void *state); /// @brief Reverse the order of the elements in the vec_str /// @param vec The vec_str to reverse -void vec_str_reverse(t_vec_str *vec); +void vec_str_reverse(t_vec_str *vec); /// @brief Sort the elements of the vec_str /// @param vec The vec_str to sort /// @param is_sorted The function to use to compare the elements -void vec_str_sort(\ - t_vec_str *vec, t_vec_str_sort_fn is_sorted); +void vec_str_sort(t_vec_str *vec, + t_vec_str_sort_fn is_sorted); /// @brief Get a pointer to the last element of the vec_str /// @param vec The vec_str to get the element from /// @param[out] out A pointer to the last element of the vec_str /// @return true if the operation failed, false otherwise -t_error vec_str_back(t_vec_str *vec, t_str **out); +t_error vec_str_back(t_vec_str *vec, t_str **out); /// @brief Get a pointer to the i'th element, or NULL otherwise /// @param vec The vec_str to get the element from /// @return A pointer to the element or NULL -t_str *vec_str_get(t_vec_str *vec, t_usize i); +t_str *vec_str_get(t_vec_str *vec, t_usize i); /// @brief Get a pointer to the last element, or NULL otherwise /// @param vec The vec_str to get the element from /// @return A pointer to the last element or NULL -t_str *vec_str_last(t_vec_str *vec); +t_str *vec_str_last(t_vec_str *vec); /// @brief Perform a simple bytewise copy into the other vector /// @param vec The vec_str to be copied from /// @param dest The vec_str to be copied to -void vec_str_copy_into(\ - t_vec_str *vec, t_vec_str *dest); +void vec_str_copy_into(t_vec_str *vec, t_vec_str *dest); /// read code lol -void vec_str_splice(\ - t_vec_str *self, struct s_vec_str_splice_arguments args); +void vec_str_splice(t_vec_str *self, + struct s_vec_str_splice_arguments args); -struct s_vec_str_splice_arguments vec_str_splice_args( \ - t_usize index, t_usize old_count, t_usize new_count, \ +struct s_vec_str_splice_arguments vec_str_splice_args( + t_usize index, t_usize old_count, t_usize new_count, const t_str *elements); #endif diff --git a/output/include/me/vec/vec_subtree.h b/output/include/me/vec/vec_subtree.h deleted file mode 100644 index 97e93d19..00000000 --- a/output/include/me/vec/vec_subtree.h +++ /dev/null @@ -1,182 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* vec_subtree.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maiboyer +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 14:44:48 by rparodi ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef VEC_SUBTREE_H -# define VEC_SUBTREE_H - -# include "parser/inner/subtree_inner.h" -# include "me/types.h" - -/// @brief A function that takes two t_subtree and compare them -typedef bool (*t_vec_subtree_sort_fn)(t_subtree *, t_subtree *); -/// @brief A function that free an t_subtree -typedef void (*t_free_subtree_item)(t_subtree); - -/// @brief A dynamic array of t_subtree -typedef struct s_vec_subtree -{ - t_free_subtree_item free_func; - t_usize len; - t_usize capacity; - t_subtree *buffer; -} t_vec_subtree; - -struct s_vec_subtree_splice_arguments -{ - t_usize index; - t_usize old_count; - t_usize new_count; - const t_subtree *elements; -}; - -/// @brief Create a new vec_subtree with a given capacity -/// @param capacity The capacity of the new vec_subtree (in terms of -/// elements) -/// @param free_function The function that will be used to free the elements of -/// the vec_subtree -t_vec_subtree vec_subtree_new(\ - t_usize capacity, t_free_subtree_item free_function); - -/// @brief Push an element to the last position of the vec_subtree -/// @param vec The vec_subtree to push the element to -/// @param element The element to push -t_error vec_subtree_push(\ - t_vec_subtree *vec, t_subtree element); - -/// @brief Push an element to the first position of the vec_subtree -/// @param vec The vec_subtree to push the element to -/// @param element The element to push -/// @note This operation is O(n) -t_error vec_subtree_push_front(\ - t_vec_subtree *vec, t_subtree element); - -/// @brief Get the last element from the vec_subtree, and remove it from the -/// vec_subtree -/// @param vec The vec_subtree to get the element from -/// @param[out] out The last element of the vec_subtree -/// @return true if the operation failed, false otherwise -t_error vec_subtree_pop(\ - t_vec_subtree *vec, t_subtree *value); - -/// @brief Get the first element from the vec_subtree, and remove it from -/// the vec_subtree -/// @param vec The vec_subtree to get the element from -/// @param[out] out The first element of the vec_subtree -/// @return true if the operation failed, false otherwise -/// @note This operation is O(n) -t_error vec_subtree_pop_front(\ - t_vec_subtree *vec, t_subtree *value); - -/// @brief Free the vector and all its elements -/// @param vec The vec_subtree to free -void vec_subtree_free(\ - t_vec_subtree vec); - -/// @brief Make the vec_subtree at least the given capacity -/// @param vec The vec_subtree to reserve -/// @param wanted_capacity The minimum capacity to reserve -/// @return true if the operation failed, false otherwise -t_error vec_subtree_reserve(\ - t_vec_subtree *vec, t_usize wanted_capacity); - -/// @brief Run the function and returns the index of the first element that -/// returns true -/// @param vec The vec_subtree to search in -/// @param fn The function to run on each element -/// @param[out] index The index of the first element that returns true -t_error vec_subtree_find(\ - t_vec_subtree *vec, bool (*fn)(\ - const t_subtree *), t_usize *index); - -/// @brief Run the function and returns the index of the first element that -/// returns true, but starting at index starting_index -/// @param vec The vec_subtree to search in -/// @param fn The function to run on each element -/// @param starting_index The index to start the search from -/// @param[out] index The index of the first element that returns true -t_error vec_subtree_find_starting(\ - t_vec_subtree *vec, bool (*fn)(\ - const t_subtree *), t_usize starting_index, t_usize *index); - -/// @brief Run the function on every element of the vec_subtree and returns -/// if all elements returned true -/// @param vec The vec_subtree to search in -/// @param fn The function to run on each element -/// @param[out] result The result of the operation -/// @return true if the operation failed, false otherwise -/// @note If the vec_subtree is empty, result will be true -t_error vec_subtree_all(\ - t_vec_subtree *vec, bool (*fn)(\ - const t_subtree *), bool *result); - -/// @brief Run the function on every element of the vec_subtree and returns -/// if any element returned true -/// @param vec The vec_subtree to search in -/// @param fn The function to run on each element -/// @param[out] result The result of the operation -/// @return true if the operation failed, false otherwise -/// @note If the vec_subtree is empty, result will be false -t_error vec_subtree_any(\ - t_vec_subtree *vec, bool (*fn)(\ - const t_subtree *), bool *result); - -/// @brief Run the function on every element of the vec_subtree -/// @param vec The vec_subtree to iterate over -/// @param fn The function to run on each element -/// @param state The state to pass to the function -void vec_subtree_iter(\ - t_vec_subtree *vec, void (*fn)(\ - t_usize index, t_subtree *value, void *state), void *state); - -/// @brief Reverse the order of the elements in the vec_subtree -/// @param vec The vec_subtree to reverse -void vec_subtree_reverse(t_vec_subtree *vec); - -/// @brief Sort the elements of the vec_subtree -/// @param vec The vec_subtree to sort -/// @param is_sorted The function to use to compare the elements -void vec_subtree_sort(\ - t_vec_subtree *vec, t_vec_subtree_sort_fn is_sorted); - -/// @brief Get a pointer to the last element of the vec_subtree -/// @param vec The vec_subtree to get the element from -/// @param[out] out A pointer to the last element of the vec_subtree -/// @return true if the operation failed, false otherwise -t_error vec_subtree_back(\ - t_vec_subtree *vec, t_subtree **out); - -/// @brief Get a pointer to the i'th element, or NULL otherwise -/// @param vec The vec_subtree to get the element from -/// @return A pointer to the element or NULL -t_subtree *vec_subtree_get(\ - t_vec_subtree *vec, t_usize i); - -/// @brief Get a pointer to the last element, or NULL otherwise -/// @param vec The vec_subtree to get the element from -/// @return A pointer to the last element or NULL -t_subtree *vec_subtree_last(t_vec_subtree *vec); - -/// @brief Perform a simple bytewise copy into the other vector -/// @param vec The vec_subtree to be copied from -/// @param dest The vec_subtree to be copied to -void vec_subtree_copy_into(\ - t_vec_subtree *vec, t_vec_subtree *dest); - -/// read code lol -void vec_subtree_splice(\ - t_vec_subtree *self, struct s_vec_subtree_splice_arguments args); - -struct s_vec_subtree_splice_arguments vec_subtree_splice_args(\ - t_usize index, t_usize old_count, t_usize new_count, \ - const t_subtree *elements); - -#endif diff --git a/output/include/me/vec/vec_token.h b/output/include/me/vec/vec_token.h new file mode 100644 index 00000000..a25e85c9 --- /dev/null +++ b/output/include/me/vec/vec_token.h @@ -0,0 +1,151 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* vec_token.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ +/* Updated: 2024/09/26 18:29:43 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef VEC_TOKEN_H +#define VEC_TOKEN_H + +typedef struct s_token t_token; + +#include "me/types.h" + +/// @brief A function that free an t_token +typedef void (*t_free_token_item)(t_token elem); + +/// @brief A dynamic array of t_token +typedef struct s_vec_token t_vec_token; + +struct s_vec_token +{ + t_free_token_item free_func; + t_usize len; + t_usize capacity; + t_token *buffer; +}; + +#ifndef TOKEN_H +# include "parser/token.h" +#endif +/// @brief A function that takes two t_token and compare them +typedef bool (*t_vec_token_sort_fn)(t_token *lhs, t_token *rhs); + +/// @brief Create a new vec_token with a given capacity +/// @param capacity The capacity of the new vec_token (in terms of +/// elements) +/// @param free_function The function that will be used to free the elements of +/// the vec_token +t_vec_token vec_token_new(t_usize capacity, t_free_token_item free_function); +/// @brief Push an element to the last position of the vec_token +/// @param vec The vec_token to push the element to +/// @param element The element to push +t_error vec_token_push(t_vec_token *vec, t_token element); + +/// @brief Push an element to the first position of the vec_token +/// @param vec The vec_token to push the element to +/// @param element The element to push +/// @note This operation is O(n) +t_error vec_token_push_front(t_vec_token *vec, t_token element); + +/// @brief Get the last element from the vec_token, and remove it from the +/// vec_token +/// @param vec The vec_token to get the element from +/// @param[out] out The last element of the vec_token +/// @return true if the operation failed, false otherwise +t_error vec_token_pop(t_vec_token *vec, t_token *value); + +/// @brief Get the first element from the vec_token, and remove it from +/// the vec_token +/// @param vec The vec_token to get the element from +/// @param[out] out The first element of the vec_token +/// @return true if the operation failed, false otherwise +/// @note This operation is O(n) +t_error vec_token_pop_front(t_vec_token *vec, t_token *value); + +/// @brief Free the vector and all its elements +/// @param vec The vec_token to free +void vec_token_free(t_vec_token vec); + +/// @brief Make the vec_token at least the given capacity +/// @param vec The vec_token to reserve +/// @param wanted_capacity The minimum capacity to reserve +/// @return true if the operation failed, false otherwise +t_error vec_token_reserve(t_vec_token *vec, t_usize wanted_capacity); + +/// @brief Run the function and returns the index of the first element that +/// returns true +/// @param vec The vec_token to search in +/// @param fn The function to run on each element +/// @param[out] index The index of the first element that returns true +t_error vec_token_find(t_vec_token *vec, bool (*fn)(const t_token *), t_usize *index); + +/// @brief Run the function and returns the index of the first element that +/// returns true, but starting at index starting_index +/// @param vec The vec_token to search in +/// @param fn The function to run on each element +/// @param starting_index The index to start the search from +/// @param[out] index The index of the first element that returns true +t_error vec_token_find_starting(t_vec_token *vec, bool (*fn)(const t_token *), t_usize starting_index, t_usize *index); + +/// @brief Run the function on every element of the vec_token and returns +/// if all elements returned true +/// @param vec The vec_token to search in +/// @param fn The function to run on each element +/// @param[out] result The result of the operation +/// @return true if the operation failed, false otherwise +/// @note If the vec_token is empty, result will be true +t_error vec_token_all(t_vec_token *vec, bool (*fn)(const t_token *), bool *result); + +/// @brief Run the function on every element of the vec_token and returns +/// if any element returned true +/// @param vec The vec_token to search in +/// @param fn The function to run on each element +/// @param[out] result The result of the operation +/// @return true if the operation failed, false otherwise +/// @note If the vec_token is empty, result will be false +t_error vec_token_any(t_vec_token *vec, bool (*fn)(const t_token *), bool *result); + +/// @brief Run the function on every element of the vec_token +/// @param vec The vec_token to iterate over +/// @param fn The function to run on each element +/// @param state The state to pass to the function +void vec_token_iter(t_vec_token *vec, void (*fn)(t_usize index, t_token *value, void *state), void *state); + +/// @brief Reverse the order of the elements in the vec_token +/// @param vec The vec_token to reverse +void vec_token_reverse(t_vec_token *vec); + +/// @brief Sort the elements of the vec_token +/// @param vec The vec_token to sort +/// @param is_sorted The function to use to compare the elements +void vec_token_sort(t_vec_token *vec, t_vec_token_sort_fn is_sorted); + +/// @brief Get a pointer to the last element of the vec_token +/// @param vec The vec_token to get the element from +/// @param[out] out A pointer to the last element of the vec_token +/// @return true if the operation failed, false otherwise +t_error vec_token_back(t_vec_token *vec, t_token **out); + +/// @brief Get a pointer to the i'th element, or NULL otherwise +/// @param vec The vec_token to get the element from +/// @return A pointer to the element or NULL +t_token *vec_token_get(t_vec_token *vec, t_usize i); + +/// @brief Get a pointer to the last element, or NULL otherwise +/// @param vec The vec_token to get the element from +/// @return A pointer to the last element or NULL +t_token *vec_token_last(t_vec_token *vec); + +/// @brief Perform a simple bytewise copy into the other vector +/// @param vec The vec_token to be copied from +/// @param dest The vec_token to be copied to +void vec_token_copy_into(t_vec_token *vec, t_vec_token *dest); + +#endif diff --git a/output/src/hashmap/env/env.c b/output/src/hashmap/env/env.c index 088db5a2..3e3ccc93 100644 --- a/output/src/hashmap/env/env.c +++ b/output/src/hashmap/env/env.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* env.c :+: :+: :+: */ +/* hashmap_env.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 10:58:20 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 17:50:02 by maiboyer ### ########.fr */ +/* Updated: 2023/12/11 15:32:51 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,16 +17,19 @@ #include "me/types.h" #include -t_hashmap_env *hmap_env_new(t_hash_env_fn hfunc, t_eq_env_fn cfunc, - t_free_env_fn free) +t_hashmap_env *hmap_env_new(t_hash_env_fn hfunc, + t_eq_env_fn cfunc, + t_free_env_fn free) { - return (hmap_env_new_with_buckets(hfunc, cfunc, free, DEFAULT_BUCKETS)); + return ( + hmap_env_new_with_buckets(hfunc, cfunc, free, DEFAULT_BUCKETS)); } -t_hashmap_env *hmap_env_new_with_buckets(t_hash_env_fn hfunc, - t_eq_env_fn cfunc, t_free_env_fn free, t_usize buckets) +t_hashmap_env *hmap_env_new_with_buckets( + t_hash_env_fn hfunc, t_eq_env_fn cfunc, + t_free_env_fn free, t_usize buckets) { - t_hashmap_env *hmap; + t_hashmap_env *hmap; hmap = mem_alloc(sizeof(*hmap)); if (hmap == NULL) @@ -42,11 +45,11 @@ t_hashmap_env *hmap_env_new_with_buckets(t_hash_env_fn hfunc, return (hmap); } -void hmap_env_free(t_hashmap_env *hmap) +void hmap_env_free(t_hashmap_env *hmap) { - t_usize index; - t_entry_env *entry; - t_entry_env *tmp; + t_usize index; + t_entry_env *entry; + t_entry_env *tmp; index = 0; while (index < hmap->num_buckets) @@ -66,10 +69,12 @@ void hmap_env_free(t_hashmap_env *hmap) mem_free(hmap); } -t_entry_env *hmap_env_get_entry(t_hashmap_env *hmap, t_usize hashed_key, - t_str *key, t_entry_env **prev) +t_entry_env *hmap_env_get_entry(t_hashmap_env *hmap, + t_usize hashed_key, + t_str *key, + t_entry_env **prev) { - t_entry_env *entry; + t_entry_env *entry; entry = hmap->buckets[hashed_key % hmap->num_buckets]; while (entry != NULL) @@ -87,11 +92,12 @@ t_entry_env *hmap_env_get_entry(t_hashmap_env *hmap, t_usize hashed_key, return (NULL); } -bool hmap_env_insert(t_hashmap_env *hmap, t_str key, t_str value) +bool hmap_env_insert(t_hashmap_env *hmap, t_str key, + t_str value) { - t_usize hashed_key; - t_entry_env *prev; - t_entry_env *entry; + t_usize hashed_key; + t_entry_env *prev; + t_entry_env *entry; hmap->hfunc(&hmap->hasher, &key); hashed_key = hasher_reset_and_finish(&hmap->hasher); @@ -112,6 +118,8 @@ bool hmap_env_insert(t_hashmap_env *hmap, t_str key, t_str value) else { hmap->free(entry->kv); - return (entry->kv = (typeof(entry->kv)){key, value}, true); + entry->kv.key = key; + entry->kv.val = value; + return (true); } } diff --git a/output/src/hashmap/env/env_clear.c b/output/src/hashmap/env/env_clear.c index c006e61b..6da7c16d 100644 --- a/output/src/hashmap/env/env_clear.c +++ b/output/src/hashmap/env/env_clear.c @@ -1,22 +1,26 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* env_clear.c :+: :+: :+: */ +/* hashmap_env.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 11:00:22 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:22:09 by rparodi ### ########.fr */ +/* Updated: 2023/12/11 15:24:44 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #include "me/types.h" + + + #include "me/hashmap/hashmap_env.h" #include "me/mem/mem.h" + void hmap_env_clear(t_hashmap_env *self) { - t_usize bucket_id; + t_usize bucket_id; t_entry_env *cur; t_entry_env *next; diff --git a/output/src/hashmap/env/env_clone.c b/output/src/hashmap/env/env_clone.c index 627c93f3..08898d7d 100644 --- a/output/src/hashmap/env/env_clone.c +++ b/output/src/hashmap/env/env_clone.c @@ -1,31 +1,33 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* env_clone.c :+: :+: :+: */ +/* hashmap_env.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 11:00:22 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:23:50 by rparodi ### ########.fr */ +/* Updated: 2023/12/11 15:24:44 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #include "me/types.h" + #include "me/hashmap/hashmap_env.h" -t_error hmap_env_clone(\ - t_hashmap_env *self, t_error (*clone)(\ - const t_kv_env *val, void *ctx, t_kv_env *out), \ - void *ctx, t_hashmap_env **out) + + +t_error hmap_env_clone(t_hashmap_env *self, + t_error (*clone)(const t_kv_env *val, void *ctx, t_kv_env *out), + void *ctx, + t_hashmap_env **out) { - t_usize bucket_id; + t_usize bucket_id; t_entry_env *cur; t_kv_env kv; t_hashmap_env *ret; bucket_id = 0; - ret = hmap_env_new_with_buckets(\ - self->hfunc, self->cfunc, self->free, self->num_buckets); + ret = hmap_env_new_with_buckets(self->hfunc, self->cfunc, self->free, self->num_buckets); if (ret == NULL) return (ERROR); while (bucket_id < self->num_buckets) @@ -34,7 +36,7 @@ t_error hmap_env_clone(\ while (cur != NULL) { if (clone(&cur->kv, ctx, &kv)) - return (hmap_env_free(ret), ERROR); + return (hmap_env_free(ret),ERROR); hmap_env_insert(ret, kv.key, kv.val); cur = cur->next; } diff --git a/output/src/hashmap/env/env_iter.c b/output/src/hashmap/env/env_iter.c index 38d97121..04f79742 100644 --- a/output/src/hashmap/env/env_iter.c +++ b/output/src/hashmap/env/env_iter.c @@ -1,24 +1,26 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* env_iter.c :+: :+: :+: */ +/* hashmap_env.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 11:00:22 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:25:10 by rparodi ### ########.fr */ +/* Updated: 2023/12/11 15:24:44 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #include "me/hashmap/hashmap_env.h" -t_error hmap_env_iter(\ - t_hashmap_env *self, t_error (*func)(\ - t_usize idx, const t_str *key, t_str *val, void *ctx), void *ctx) +t_error hmap_env_iter(t_hashmap_env *self, + t_error (*func)(t_usize idx, + const t_str *key, + t_str *val, void *ctx), + void *ctx) { - t_usize bucket_id; - t_usize all_id; - t_entry_env *cur; + t_usize bucket_id; + t_usize all_id; + t_entry_env *cur; bucket_id = 0; all_id = 0; diff --git a/output/src/hashmap/env/env_utils.c b/output/src/hashmap/env/env_utils.c index 9726310f..2d9f53fd 100644 --- a/output/src/hashmap/env/env_utils.c +++ b/output/src/hashmap/env/env_utils.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* env_utils.c :+: :+: :+: */ +/* hashmap_env_utils.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 10:58:20 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:26:18 by rparodi ### ########.fr */ +/* Updated: 2023/12/11 15:35:37 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,11 +16,12 @@ #include "me/types.h" #include -t_str *hmap_env_get(t_hashmap_env *hmap, t_str *key) +t_str *hmap_env_get(t_hashmap_env *hmap, + t_str *key) { - t_usize hashed_key; - t_entry_env *entry; - t_entry_env *prev; + t_usize hashed_key; + t_entry_env *entry; + t_entry_env *prev; hmap->hfunc(&hmap->hasher, key); hashed_key = hasher_reset_and_finish(&hmap->hasher); @@ -30,18 +31,18 @@ t_str *hmap_env_get(t_hashmap_env *hmap, t_str *key) return (&entry->kv.val); } -void hmap_env_remove(t_hashmap_env *hmap, t_str *key) +void hmap_env_remove(t_hashmap_env *hmap, t_str *key) { - t_usize hashed_key; - t_entry_env *prev; - t_entry_env *entry; + t_usize hashed_key; + t_entry_env *prev; + t_entry_env *entry; hmap->hfunc(&hmap->hasher, key); hashed_key = hasher_reset_and_finish(&hmap->hasher); prev = NULL; entry = hmap_env_get_entry(hmap, hashed_key, key, &prev); if (entry == NULL) - return ; + return; if (prev == NULL) hmap->buckets[hashed_key % hmap->num_buckets] = entry->next; else diff --git a/output/src/vec/ast/ast.c b/output/src/vec/ast/ast.c index c7f282ba..60fac8cc 100644 --- a/output/src/vec/ast/ast.c +++ b/output/src/vec/ast/ast.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ast.c :+: :+: :+: */ +/* vec_ast.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/05 18:46:28 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:30:00 by rparodi ### ########.fr */ +/* Updated: 2023/12/09 17:54:11 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,9 +15,10 @@ #include "me/vec/vec_ast.h" #include -t_vec_ast vec_ast_new(t_usize capacity, t_free_ast_item free_function) +t_vec_ast vec_ast_new(t_usize capacity, + t_free_ast_item free_function) { - t_vec_ast out; + t_vec_ast out; out = (t_vec_ast){0}; out.free_func = free_function; @@ -27,8 +28,8 @@ t_vec_ast vec_ast_new(t_usize capacity, t_free_ast_item free_function) return (out); } -/// @return true in case of an error -t_error vec_ast_push(t_vec_ast *vec, t_ast_node element) +/// Return true in case of an error +t_error vec_ast_push(t_vec_ast *vec, t_ast_node element) { if (vec == NULL) return (ERROR); @@ -39,9 +40,9 @@ t_error vec_ast_push(t_vec_ast *vec, t_ast_node element) } /// Return true in case of an error -t_error vec_ast_reserve(t_vec_ast *vec, t_usize wanted_capacity) +t_error vec_ast_reserve(t_vec_ast *vec, t_usize wanted_capacity) { - size_t new_capacity; + size_t new_capacity; if (vec == NULL) return (ERROR); @@ -50,8 +51,8 @@ t_error vec_ast_reserve(t_vec_ast *vec, t_usize wanted_capacity) new_capacity = (vec->capacity * 3) / 2 + 1; while (wanted_capacity > new_capacity) new_capacity = (new_capacity * 3) / 2 + 1; - vec->buffer = mem_realloc_array(\ - vec->buffer, new_capacity, sizeof(t_ast_node)); + vec->buffer = + mem_realloc_array(vec->buffer, new_capacity, sizeof(t_ast_node)); vec->capacity = new_capacity; } return (NO_ERROR); @@ -59,10 +60,10 @@ t_error vec_ast_reserve(t_vec_ast *vec, t_usize wanted_capacity) /// Return true if the vector is empty /// This function is safe to call with value being NULL -t_error vec_ast_pop(t_vec_ast *vec, t_ast_node *value) +t_error vec_ast_pop(t_vec_ast *vec, t_ast_node *value) { - t_ast_node temp_value; - t_ast_node *ptr; + t_ast_node temp_value; + t_ast_node *ptr; if (vec == NULL || vec->len == 0) return (ERROR); @@ -76,10 +77,10 @@ t_error vec_ast_pop(t_vec_ast *vec, t_ast_node *value) } /// This function is safe to call with `free_elem` being NULL -void vec_ast_free(t_vec_ast vec) +void vec_ast_free(t_vec_ast vec) { if (vec.buffer == NULL) - return ; + return; if (vec.free_func) { while (vec.len) diff --git a/output/src/vec/ast/ast_functions2.c b/output/src/vec/ast/ast_functions2.c index 15e5df34..6f741fd0 100644 --- a/output/src/vec/ast/ast_functions2.c +++ b/output/src/vec/ast/ast_functions2.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ast_functions2.c :+: :+: :+: */ +/* vec_ast.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:32:36 by rparodi ### ########.fr */ +/* Updated: 2023/12/30 17:59:28 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,10 +17,10 @@ #include "me/vec/vec_ast.h" #include -t_error vec_ast_find(t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), t_usize *index) +t_error vec_ast_find(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -37,10 +37,11 @@ t_error vec_ast_find(t_vec_ast *vec, bool (*fn)(\ return (ERROR); } -t_error vec_ast_find_starting(t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), t_usize starting_index, t_usize *index) +t_error vec_ast_find_starting(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), + t_usize starting_index, t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -57,10 +58,10 @@ t_error vec_ast_find_starting(t_vec_ast *vec, bool (*fn)(\ return (ERROR); } -t_error vec_ast_all(t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), bool *result) +t_error vec_ast_all(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -75,10 +76,10 @@ t_error vec_ast_all(t_vec_ast *vec, bool (*fn)(\ return (ERROR); } -t_error vec_ast_any(t_vec_ast *vec, bool (*fn)(\ - const t_ast_node *), bool *result) +t_error vec_ast_any(t_vec_ast *vec, + bool (*fn)(const t_ast_node *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -93,13 +94,15 @@ t_error vec_ast_any(t_vec_ast *vec, bool (*fn)(\ return (ERROR); } -void vec_ast_iter(t_vec_ast *vec, void (*fn)(\ - t_usize index, t_ast_node *value, void *state), void *state) +void vec_ast_iter(t_vec_ast *vec, + void (*fn)(t_usize index, t_ast_node *value, + void *state), + void *state) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL) - return ; + return; idx = 0; while (idx < vec->len) { diff --git a/output/src/vec/ast/ast_functions3.c b/output/src/vec/ast/ast_functions3.c index 31b482cd..78e586ae 100644 --- a/output/src/vec/ast/ast_functions3.c +++ b/output/src/vec/ast/ast_functions3.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ast_functions3.c :+: :+: :+: */ +/* vec_ast.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:34:10 by rparodi ### ########.fr */ +/* Updated: 2023/12/30 17:59:28 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,14 +15,15 @@ #include "me/vec/vec_ast.h" #include -t_error vec_ast_push_front(t_vec_ast *vec, t_ast_node element) +t_error vec_ast_push_front(t_vec_ast *vec, + t_ast_node element) { - t_usize i; + t_usize i; if (vec->len == 0) return (vec_ast_push(vec, element)); i = vec->len - 1; - if (vec->capacity < vec->len + 1 && \ + if (vec->capacity < vec->len + 1 && vec_ast_reserve(vec, 3 * vec->len / 2 + 1)) return (ERROR); while (i > 0) @@ -36,9 +37,9 @@ t_error vec_ast_push_front(t_vec_ast *vec, t_ast_node element) return (NO_ERROR); } -t_error vec_ast_pop_front(t_vec_ast *vec, t_ast_node *value) +t_error vec_ast_pop_front(t_vec_ast *vec, t_ast_node *value) { - t_usize i; + t_usize i; if (vec->len <= 1) return (vec_ast_pop(vec, value)); @@ -54,10 +55,10 @@ t_error vec_ast_pop_front(t_vec_ast *vec, t_ast_node *value) return (NO_ERROR); } -void vec_ast_reverse(t_vec_ast *vec) +void vec_ast_reverse(t_vec_ast *vec) { - t_ast_node temporary; - t_usize i; + t_ast_node temporary; + t_usize i; i = 0; while (i < vec->len / 2) @@ -69,9 +70,9 @@ void vec_ast_reverse(t_vec_ast *vec) } } -t_error vec_ast_back(t_vec_ast *vec, t_ast_node **out) +t_error vec_ast_back(t_vec_ast *vec, t_ast_node **out) { - t_ast_node *temporary; + t_ast_node *temporary; if (out == NULL) out = &temporary; diff --git a/output/src/vec/ast/ast_functions4.c b/output/src/vec/ast/ast_functions4.c index a91175dd..b548a698 100644 --- a/output/src/vec/ast/ast_functions4.c +++ b/output/src/vec/ast/ast_functions4.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ast_functions4.c :+: :+: :+: */ +/* vec_ast.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:36:47 by rparodi ### ########.fr */ +/* Updated: 2023/12/30 17:59:28 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ #include "me/vec/vec_ast.h" #include -t_ast_node *vec_ast_get(t_vec_ast *vec, t_usize i) +t_ast_node *vec_ast_get(t_vec_ast *vec, t_usize i) { if (vec == NULL || vec->buffer == NULL) return (NULL); @@ -24,14 +24,14 @@ t_ast_node *vec_ast_get(t_vec_ast *vec, t_usize i) return (NULL); } -t_ast_node *vec_ast_last(t_vec_ast *vec) +t_ast_node *vec_ast_last(t_vec_ast *vec) { if (vec == NULL || vec->len == 0) return (NULL); return (&vec->buffer[vec->len - 1]); } -void vec_ast_copy_into(t_vec_ast *vec, t_vec_ast *dest) +void vec_ast_copy_into(t_vec_ast *vec, t_vec_ast *dest) { if (vec == NULL || dest == NULL) return ; @@ -39,20 +39,21 @@ void vec_ast_copy_into(t_vec_ast *vec, t_vec_ast *dest) mem_copy(dest->buffer, vec->buffer, vec->len * sizeof(t_ast_node)); } -struct s_vec_ast_splice_arguments vec_ast_splice_args( +struct s_vec_ast_splice_arguments vec_ast_splice_args( t_usize index, t_usize old_count, t_usize new_count, const t_ast_node *elements) { - return ((struct s_vec_ast_splice_arguments){index, old_count, \ - new_count, elements}); + return ((struct s_vec_ast_splice_arguments){index, old_count, + new_count, elements}); } -void vec_ast_splice(t_vec_ast *self, struct s_vec_ast_splice_arguments args) +void vec_ast_splice(t_vec_ast *self, + struct s_vec_ast_splice_arguments args) { - t_ast_node *contents; - t_u32 new_size; - t_u32 old_end; - t_u32 new_end; + t_ast_node *contents; + t_u32 new_size; + t_u32 old_end; + t_u32 new_end; new_size = self->len + args.new_count - args.old_count; old_end = args.index + args.old_count; @@ -60,17 +61,17 @@ void vec_ast_splice(t_vec_ast *self, struct s_vec_ast_splice_arguments args) vec_ast_reserve(self, new_size); contents = self->buffer; if (self->len > old_end) - mem_move(contents + new_end, \ - contents + old_end, \ - (self->len - old_end) * sizeof(t_ast_node)); + mem_move(contents + new_end, + contents + old_end, + (self->len - old_end) * sizeof(t_ast_node)); if (args.new_count > 0) { if (args.elements) - mem_copy((contents + args.index * sizeof(t_ast_node)), \ - args.elements, args.new_count * sizeof(t_ast_node)); + mem_copy((contents + args.index * sizeof(t_ast_node)), + args.elements, args.new_count * sizeof(t_ast_node)); else mem_set_zero((contents + args.index * sizeof(t_ast_node)), - args.new_count * sizeof(t_ast_node)); + args.new_count * sizeof(t_ast_node)); } self->len += args.new_count - args.old_count; } diff --git a/output/src/vec/ast/ast_sort.c b/output/src/vec/ast/ast_sort.c index d409a4a8..4fde8c65 100644 --- a/output/src/vec/ast/ast_sort.c +++ b/output/src/vec/ast/ast_sort.c @@ -1,26 +1,27 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ast_sort.c :+: :+: :+: */ +/* best_move.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/29 20:04:33 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 15:37:59 by rparodi ### ########.fr */ +/* Updated: 2024/01/31 14:25:00 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #include "me/types.h" #include "me/vec/vec_ast.h" -void vec_ast_sort(t_vec_ast *v, t_vec_ast_sort_fn is_sorted_fn) +void vec_ast_sort(t_vec_ast *v, + t_vec_ast_sort_fn is_sorted_fn) { - t_usize sorted_part; - t_usize i; - t_ast_node tmp; + t_usize sorted_part; + t_usize i; + t_ast_node tmp; if (v == NULL) - return ; + return; sorted_part = v->len; while (sorted_part > 0) { diff --git a/output/src/vec/estr/estr.c b/output/src/vec/estr/estr.c index df247d6e..e8a2d5cd 100644 --- a/output/src/vec/estr/estr.c +++ b/output/src/vec/estr/estr.c @@ -15,9 +15,10 @@ #include "me/vec/vec_estr.h" #include -t_vec_estr vec_estr_new(t_usize capacity, t_free_estr_item free_function) +t_vec_estr vec_estr_new(t_usize capacity, + t_free_estr_item free_function) { - t_vec_estr out; + t_vec_estr out; out = (t_vec_estr){0}; out.free_func = free_function; @@ -28,7 +29,7 @@ t_vec_estr vec_estr_new(t_usize capacity, t_free_estr_item free_function) } /// Return true in case of an error -t_error vec_estr_push(t_vec_estr *vec, t_expandable_str element) +t_error vec_estr_push(t_vec_estr *vec, t_expandable_str element) { if (vec == NULL) return (ERROR); @@ -39,9 +40,9 @@ t_error vec_estr_push(t_vec_estr *vec, t_expandable_str element) } /// Return true in case of an error -t_error vec_estr_reserve(t_vec_estr *vec, t_usize wanted_capacity) +t_error vec_estr_reserve(t_vec_estr *vec, t_usize wanted_capacity) { - size_t new_capacity; + size_t new_capacity; if (vec == NULL) return (ERROR); @@ -50,8 +51,8 @@ t_error vec_estr_reserve(t_vec_estr *vec, t_usize wanted_capacity) new_capacity = (vec->capacity * 3) / 2 + 1; while (wanted_capacity > new_capacity) new_capacity = (new_capacity * 3) / 2 + 1; - vec->buffer = mem_realloc_array(vec->buffer, new_capacity, - sizeof(t_expandable_str)); + vec->buffer = + mem_realloc_array(vec->buffer, new_capacity, sizeof(t_expandable_str)); vec->capacity = new_capacity; } return (NO_ERROR); @@ -59,10 +60,10 @@ t_error vec_estr_reserve(t_vec_estr *vec, t_usize wanted_capacity) /// Return true if the vector is empty /// This function is safe to call with value being NULL -t_error vec_estr_pop(t_vec_estr *vec, t_expandable_str *value) +t_error vec_estr_pop(t_vec_estr *vec, t_expandable_str *value) { - t_expandable_str temp_value; - t_expandable_str *ptr; + t_expandable_str temp_value; + t_expandable_str *ptr; if (vec == NULL || vec->len == 0) return (ERROR); @@ -76,10 +77,10 @@ t_error vec_estr_pop(t_vec_estr *vec, t_expandable_str *value) } /// This function is safe to call with `free_elem` being NULL -void vec_estr_free(t_vec_estr vec) +void vec_estr_free(t_vec_estr vec) { if (vec.buffer == NULL) - return ; + return; if (vec.free_func) { while (vec.len) diff --git a/output/src/vec/estr/estr_functions2.c b/output/src/vec/estr/estr_functions2.c index 9bd3f2c2..99f4c9ce 100644 --- a/output/src/vec/estr/estr_functions2.c +++ b/output/src/vec/estr/estr_functions2.c @@ -10,15 +10,17 @@ /* */ /* ************************************************************************** */ +#include "me/mem/mem.h" +#include "me/mem/mem.h" #include "me/mem/mem.h" #include "me/types.h" #include "me/vec/vec_estr.h" #include -t_error vec_estr_find(t_vec_estr *vec, bool (*fn)(const t_expandable_str *), - t_usize *index) +t_error vec_estr_find(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -35,11 +37,11 @@ t_error vec_estr_find(t_vec_estr *vec, bool (*fn)(const t_expandable_str *), return (ERROR); } -t_error vec_estr_find_starting(t_vec_estr *vec, - bool (*fn)(const t_expandable_str *), t_usize starting_index, - t_usize *index) +t_error vec_estr_find_starting(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), + t_usize starting_index, t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -56,10 +58,10 @@ t_error vec_estr_find_starting(t_vec_estr *vec, return (ERROR); } -t_error vec_estr_all(t_vec_estr *vec, bool (*fn)(const t_expandable_str *), - bool *result) +t_error vec_estr_all(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -74,10 +76,10 @@ t_error vec_estr_all(t_vec_estr *vec, bool (*fn)(const t_expandable_str *), return (ERROR); } -t_error vec_estr_any(t_vec_estr *vec, bool (*fn)(const t_expandable_str *), - bool *result) +t_error vec_estr_any(t_vec_estr *vec, + bool (*fn)(const t_expandable_str *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -92,13 +94,15 @@ t_error vec_estr_any(t_vec_estr *vec, bool (*fn)(const t_expandable_str *), return (ERROR); } -void vec_estr_iter(t_vec_estr *vec, void (*fn)(t_usize index, - t_expandable_str *value, void *state), void *state) +void vec_estr_iter(t_vec_estr *vec, + void (*fn)(t_usize index, t_expandable_str *value, + void *state), + void *state) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL) - return ; + return; idx = 0; while (idx < vec->len) { diff --git a/output/src/vec/estr/estr_functions3.c b/output/src/vec/estr/estr_functions3.c index 66fbc606..1c242739 100644 --- a/output/src/vec/estr/estr_functions3.c +++ b/output/src/vec/estr/estr_functions3.c @@ -15,15 +15,16 @@ #include "me/vec/vec_estr.h" #include -t_error vec_estr_push_front(t_vec_estr *vec, t_expandable_str element) +t_error vec_estr_push_front(t_vec_estr *vec, + t_expandable_str element) { - t_usize i; + t_usize i; if (vec->len == 0) return (vec_estr_push(vec, element)); i = vec->len - 1; - if (vec->capacity < vec->len + 1 && vec_estr_reserve(vec, 3 * vec->len / 2 - + 1)) + if (vec->capacity < vec->len + 1 && + vec_estr_reserve(vec, 3 * vec->len / 2 + 1)) return (ERROR); while (i > 0) { @@ -36,9 +37,9 @@ t_error vec_estr_push_front(t_vec_estr *vec, t_expandable_str element) return (NO_ERROR); } -t_error vec_estr_pop_front(t_vec_estr *vec, t_expandable_str *value) +t_error vec_estr_pop_front(t_vec_estr *vec, t_expandable_str *value) { - t_usize i; + t_usize i; if (vec->len <= 1) return (vec_estr_pop(vec, value)); @@ -54,10 +55,10 @@ t_error vec_estr_pop_front(t_vec_estr *vec, t_expandable_str *value) return (NO_ERROR); } -void vec_estr_reverse(t_vec_estr *vec) +void vec_estr_reverse(t_vec_estr *vec) { - t_expandable_str temporary; - t_usize i; + t_expandable_str temporary; + t_usize i; i = 0; while (i < vec->len / 2) @@ -69,9 +70,9 @@ void vec_estr_reverse(t_vec_estr *vec) } } -t_error vec_estr_back(t_vec_estr *vec, t_expandable_str **out) +t_error vec_estr_back(t_vec_estr *vec, t_expandable_str **out) { - t_expandable_str *temporary; + t_expandable_str *temporary; if (out == NULL) out = &temporary; diff --git a/output/src/vec/estr/estr_functions4.c b/output/src/vec/estr/estr_functions4.c index f2e786d2..25e10dbf 100644 --- a/output/src/vec/estr/estr_functions4.c +++ b/output/src/vec/estr/estr_functions4.c @@ -15,7 +15,7 @@ #include "me/vec/vec_estr.h" #include -t_expandable_str *vec_estr_get(t_vec_estr *vec, t_usize i) +t_expandable_str *vec_estr_get(t_vec_estr *vec, t_usize i) { if (vec == NULL || vec->buffer == NULL) return (NULL); @@ -24,14 +24,14 @@ t_expandable_str *vec_estr_get(t_vec_estr *vec, t_usize i) return (NULL); } -t_expandable_str *vec_estr_last(t_vec_estr *vec) +t_expandable_str *vec_estr_last(t_vec_estr *vec) { if (vec == NULL || vec->len == 0) return (NULL); return (&vec->buffer[vec->len - 1]); } -void vec_estr_copy_into(t_vec_estr *vec, t_vec_estr *dest) +void vec_estr_copy_into(t_vec_estr *vec, t_vec_estr *dest) { if (vec == NULL || dest == NULL) return ; @@ -39,20 +39,21 @@ void vec_estr_copy_into(t_vec_estr *vec, t_vec_estr *dest) mem_copy(dest->buffer, vec->buffer, vec->len * sizeof(t_expandable_str)); } -struct s_vec_estr_splice_arguments vec_estr_splice_args(t_usize index, - t_usize old_count, t_usize new_count, const t_expandable_str *elements) +struct s_vec_estr_splice_arguments vec_estr_splice_args( + t_usize index, t_usize old_count, t_usize new_count, + const t_expandable_str *elements) { - return ((struct s_vec_estr_splice_arguments){index, old_count, new_count, - elements}); + return ((struct s_vec_estr_splice_arguments){index, old_count, + new_count, elements}); } -void vec_estr_splice(t_vec_estr *self, - struct s_vec_estr_splice_arguments args) +void vec_estr_splice(t_vec_estr *self, + struct s_vec_estr_splice_arguments args) { - t_expandable_str *contents; - t_u32 new_size; - t_u32 old_end; - t_u32 new_end; + t_expandable_str *contents; + t_u32 new_size; + t_u32 old_end; + t_u32 new_end; new_size = self->len + args.new_count - args.old_count; old_end = args.index + args.old_count; @@ -60,16 +61,17 @@ void vec_estr_splice(t_vec_estr *self, vec_estr_reserve(self, new_size); contents = self->buffer; if (self->len > old_end) - mem_move(contents + new_end, contents + old_end, (self->len - old_end) - * sizeof(t_expandable_str)); + mem_move(contents + new_end, + contents + old_end, + (self->len - old_end) * sizeof(t_expandable_str)); if (args.new_count > 0) { if (args.elements) mem_copy((contents + args.index * sizeof(t_expandable_str)), - args.elements, args.new_count * sizeof(t_expandable_str)); + args.elements, args.new_count * sizeof(t_expandable_str)); else mem_set_zero((contents + args.index * sizeof(t_expandable_str)), - args.new_count * sizeof(t_expandable_str)); + args.new_count * sizeof(t_expandable_str)); } self->len += args.new_count - args.old_count; } diff --git a/output/src/vec/estr/estr_sort.c b/output/src/vec/estr/estr_sort.c index 6774643e..9a077e0e 100644 --- a/output/src/vec/estr/estr_sort.c +++ b/output/src/vec/estr/estr_sort.c @@ -13,14 +13,15 @@ #include "me/types.h" #include "me/vec/vec_estr.h" -void vec_estr_sort(t_vec_estr *v, t_vec_estr_sort_fn is_sorted_fn) +void vec_estr_sort(t_vec_estr *v, + t_vec_estr_sort_fn is_sorted_fn) { - t_usize sorted_part; - t_usize i; - t_expandable_str tmp; + t_usize sorted_part; + t_usize i; + t_expandable_str tmp; if (v == NULL) - return ; + return; sorted_part = v->len; while (sorted_part > 0) { diff --git a/output/src/vec/pid/pid.c b/output/src/vec/pid/pid.c index 8a6bafd3..05303095 100644 --- a/output/src/vec/pid/pid.c +++ b/output/src/vec/pid/pid.c @@ -15,9 +15,10 @@ #include "me/vec/vec_pid.h" #include -t_vec_pid vec_pid_new(t_usize capacity, t_free_pid_item free_function) +t_vec_pid vec_pid_new(t_usize capacity, + t_free_pid_item free_function) { - t_vec_pid out; + t_vec_pid out; out = (t_vec_pid){0}; out.free_func = free_function; @@ -28,7 +29,7 @@ t_vec_pid vec_pid_new(t_usize capacity, t_free_pid_item free_function) } /// Return true in case of an error -t_error vec_pid_push(t_vec_pid *vec, t_pid element) +t_error vec_pid_push(t_vec_pid *vec, t_pid element) { if (vec == NULL) return (ERROR); @@ -39,9 +40,9 @@ t_error vec_pid_push(t_vec_pid *vec, t_pid element) } /// Return true in case of an error -t_error vec_pid_reserve(t_vec_pid *vec, t_usize wanted_capacity) +t_error vec_pid_reserve(t_vec_pid *vec, t_usize wanted_capacity) { - size_t new_capacity; + size_t new_capacity; if (vec == NULL) return (ERROR); @@ -50,8 +51,8 @@ t_error vec_pid_reserve(t_vec_pid *vec, t_usize wanted_capacity) new_capacity = (vec->capacity * 3) / 2 + 1; while (wanted_capacity > new_capacity) new_capacity = (new_capacity * 3) / 2 + 1; - vec->buffer = mem_realloc_array(vec->buffer, new_capacity, - sizeof(t_pid)); + vec->buffer = + mem_realloc_array(vec->buffer, new_capacity, sizeof(t_pid)); vec->capacity = new_capacity; } return (NO_ERROR); @@ -59,10 +60,10 @@ t_error vec_pid_reserve(t_vec_pid *vec, t_usize wanted_capacity) /// Return true if the vector is empty /// This function is safe to call with value being NULL -t_error vec_pid_pop(t_vec_pid *vec, t_pid *value) +t_error vec_pid_pop(t_vec_pid *vec, t_pid *value) { - t_pid temp_value; - t_pid *ptr; + t_pid temp_value; + t_pid *ptr; if (vec == NULL || vec->len == 0) return (ERROR); @@ -76,10 +77,10 @@ t_error vec_pid_pop(t_vec_pid *vec, t_pid *value) } /// This function is safe to call with `free_elem` being NULL -void vec_pid_free(t_vec_pid vec) +void vec_pid_free(t_vec_pid vec) { if (vec.buffer == NULL) - return ; + return; if (vec.free_func) { while (vec.len) diff --git a/output/src/vec/pid/pid_functions2.c b/output/src/vec/pid/pid_functions2.c index 116f4e52..e6a59d29 100644 --- a/output/src/vec/pid/pid_functions2.c +++ b/output/src/vec/pid/pid_functions2.c @@ -10,14 +10,17 @@ /* */ /* ************************************************************************** */ +#include "me/mem/mem.h" +#include "me/mem/mem.h" #include "me/mem/mem.h" #include "me/types.h" #include "me/vec/vec_pid.h" #include -t_error vec_pid_find(t_vec_pid *vec, bool (*fn)(const t_pid *), t_usize *index) +t_error vec_pid_find(t_vec_pid *vec, + bool (*fn)(const t_pid *), t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -34,10 +37,11 @@ t_error vec_pid_find(t_vec_pid *vec, bool (*fn)(const t_pid *), t_usize *index) return (ERROR); } -t_error vec_pid_find_starting(t_vec_pid *vec, bool (*fn)(const t_pid *), - t_usize starting_index, t_usize *index) +t_error vec_pid_find_starting(t_vec_pid *vec, + bool (*fn)(const t_pid *), + t_usize starting_index, t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -54,9 +58,10 @@ t_error vec_pid_find_starting(t_vec_pid *vec, bool (*fn)(const t_pid *), return (ERROR); } -t_error vec_pid_all(t_vec_pid *vec, bool (*fn)(const t_pid *), bool *result) +t_error vec_pid_all(t_vec_pid *vec, + bool (*fn)(const t_pid *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -71,9 +76,10 @@ t_error vec_pid_all(t_vec_pid *vec, bool (*fn)(const t_pid *), bool *result) return (ERROR); } -t_error vec_pid_any(t_vec_pid *vec, bool (*fn)(const t_pid *), bool *result) +t_error vec_pid_any(t_vec_pid *vec, + bool (*fn)(const t_pid *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -88,13 +94,15 @@ t_error vec_pid_any(t_vec_pid *vec, bool (*fn)(const t_pid *), bool *result) return (ERROR); } -void vec_pid_iter(t_vec_pid *vec, void (*fn)(t_usize index, t_pid *value, - void *state), void *state) +void vec_pid_iter(t_vec_pid *vec, + void (*fn)(t_usize index, t_pid *value, + void *state), + void *state) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL) - return ; + return; idx = 0; while (idx < vec->len) { diff --git a/output/src/vec/pid/pid_functions3.c b/output/src/vec/pid/pid_functions3.c index 5192b238..5e7dab79 100644 --- a/output/src/vec/pid/pid_functions3.c +++ b/output/src/vec/pid/pid_functions3.c @@ -15,15 +15,16 @@ #include "me/vec/vec_pid.h" #include -t_error vec_pid_push_front(t_vec_pid *vec, t_pid element) +t_error vec_pid_push_front(t_vec_pid *vec, + t_pid element) { - t_usize i; + t_usize i; if (vec->len == 0) return (vec_pid_push(vec, element)); i = vec->len - 1; - if (vec->capacity < vec->len + 1 && vec_pid_reserve(vec, 3 * vec->len / 2 - + 1)) + if (vec->capacity < vec->len + 1 && + vec_pid_reserve(vec, 3 * vec->len / 2 + 1)) return (ERROR); while (i > 0) { @@ -36,9 +37,9 @@ t_error vec_pid_push_front(t_vec_pid *vec, t_pid element) return (NO_ERROR); } -t_error vec_pid_pop_front(t_vec_pid *vec, t_pid *value) +t_error vec_pid_pop_front(t_vec_pid *vec, t_pid *value) { - t_usize i; + t_usize i; if (vec->len <= 1) return (vec_pid_pop(vec, value)); @@ -54,10 +55,10 @@ t_error vec_pid_pop_front(t_vec_pid *vec, t_pid *value) return (NO_ERROR); } -void vec_pid_reverse(t_vec_pid *vec) +void vec_pid_reverse(t_vec_pid *vec) { - t_pid temporary; - t_usize i; + t_pid temporary; + t_usize i; i = 0; while (i < vec->len / 2) @@ -69,9 +70,9 @@ void vec_pid_reverse(t_vec_pid *vec) } } -t_error vec_pid_back(t_vec_pid *vec, t_pid **out) +t_error vec_pid_back(t_vec_pid *vec, t_pid **out) { - t_pid *temporary; + t_pid *temporary; if (out == NULL) out = &temporary; diff --git a/output/src/vec/pid/pid_functions4.c b/output/src/vec/pid/pid_functions4.c index 99de8bb9..8fbf49bd 100644 --- a/output/src/vec/pid/pid_functions4.c +++ b/output/src/vec/pid/pid_functions4.c @@ -15,7 +15,7 @@ #include "me/vec/vec_pid.h" #include -t_pid *vec_pid_get(t_vec_pid *vec, t_usize i) +t_pid *vec_pid_get(t_vec_pid *vec, t_usize i) { if (vec == NULL || vec->buffer == NULL) return (NULL); @@ -24,14 +24,14 @@ t_pid *vec_pid_get(t_vec_pid *vec, t_usize i) return (NULL); } -t_pid *vec_pid_last(t_vec_pid *vec) +t_pid *vec_pid_last(t_vec_pid *vec) { if (vec == NULL || vec->len == 0) return (NULL); return (&vec->buffer[vec->len - 1]); } -void vec_pid_copy_into(t_vec_pid *vec, t_vec_pid *dest) +void vec_pid_copy_into(t_vec_pid *vec, t_vec_pid *dest) { if (vec == NULL || dest == NULL) return ; @@ -39,19 +39,21 @@ void vec_pid_copy_into(t_vec_pid *vec, t_vec_pid *dest) mem_copy(dest->buffer, vec->buffer, vec->len * sizeof(t_pid)); } -struct s_vec_pid_splice_arguments vec_pid_splice_args(t_usize index, - t_usize old_count, t_usize new_count, const t_pid *elements) +struct s_vec_pid_splice_arguments vec_pid_splice_args( + t_usize index, t_usize old_count, t_usize new_count, + const t_pid *elements) { - return ((struct s_vec_pid_splice_arguments){index, old_count, new_count, - elements}); + return ((struct s_vec_pid_splice_arguments){index, old_count, + new_count, elements}); } -void vec_pid_splice(t_vec_pid *self, struct s_vec_pid_splice_arguments args) +void vec_pid_splice(t_vec_pid *self, + struct s_vec_pid_splice_arguments args) { - t_pid *contents; - t_u32 new_size; - t_u32 old_end; - t_u32 new_end; + t_pid *contents; + t_u32 new_size; + t_u32 old_end; + t_u32 new_end; new_size = self->len + args.new_count - args.old_count; old_end = args.index + args.old_count; @@ -59,16 +61,17 @@ void vec_pid_splice(t_vec_pid *self, struct s_vec_pid_splice_arguments args) vec_pid_reserve(self, new_size); contents = self->buffer; if (self->len > old_end) - mem_move(contents + new_end, contents + old_end, (self->len - old_end) - * sizeof(t_pid)); + mem_move(contents + new_end, + contents + old_end, + (self->len - old_end) * sizeof(t_pid)); if (args.new_count > 0) { if (args.elements) - mem_copy((contents + args.index * sizeof(t_pid)), args.elements, - args.new_count * sizeof(t_pid)); + mem_copy((contents + args.index * sizeof(t_pid)), + args.elements, args.new_count * sizeof(t_pid)); else - mem_set_zero((contents + args.index * sizeof(t_pid)), args.new_count - * sizeof(t_pid)); + mem_set_zero((contents + args.index * sizeof(t_pid)), + args.new_count * sizeof(t_pid)); } self->len += args.new_count - args.old_count; } diff --git a/output/src/vec/pid/pid_sort.c b/output/src/vec/pid/pid_sort.c index d350851c..2ca1ffd8 100644 --- a/output/src/vec/pid/pid_sort.c +++ b/output/src/vec/pid/pid_sort.c @@ -13,14 +13,15 @@ #include "me/types.h" #include "me/vec/vec_pid.h" -void vec_pid_sort(t_vec_pid *v, t_vec_pid_sort_fn is_sorted_fn) +void vec_pid_sort(t_vec_pid *v, + t_vec_pid_sort_fn is_sorted_fn) { - t_usize sorted_part; - t_usize i; - t_pid tmp; + t_usize sorted_part; + t_usize i; + t_pid tmp; if (v == NULL) - return ; + return; sorted_part = v->len; while (sorted_part > 0) { diff --git a/output/src/vec/reduce_action/reduce_action.c b/output/src/vec/reduce_action/reduce_action.c deleted file mode 100644 index 63701dd6..00000000 --- a/output/src/vec/reduce_action/reduce_action.c +++ /dev/null @@ -1,95 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* reduce_action.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maiboyer +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/12/05 18:46:28 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 17:50:33 by maiboyer ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "me/mem/mem.h" -#include "me/types.h" -#include "me/vec/vec_reduce_action.h" -#include - -t_vec_reduce_action vec_reduce_action_new(t_usize capacity, - t_free_reduce_action_item free_function) -{ - t_vec_reduce_action out; - - out = (t_vec_reduce_action){0}; - out.free_func = free_function; - out.buffer = mem_alloc_array(capacity, sizeof(*out.buffer)); - if (out.buffer) - out.capacity = capacity; - return (out); -} - -/// Return true in case of an error -t_error vec_reduce_action_push(t_vec_reduce_action *vec, - t_reduce_action element) -{ - if (vec == NULL) - return (ERROR); - vec_reduce_action_reserve(vec, vec->len + 1); - vec->buffer[vec->len] = element; - vec->len += 1; - return (NO_ERROR); -} - -/// Return true in case of an error -t_error vec_reduce_action_reserve(t_vec_reduce_action *vec, - t_usize wanted_capacity) -{ - size_t new_capacity; - - if (vec == NULL) - return (ERROR); - if (wanted_capacity > vec->capacity) - { - new_capacity = (vec->capacity * 3) / 2 + 1; - while (wanted_capacity > new_capacity) - new_capacity = (new_capacity * 3) / 2 + 1; - vec->buffer = mem_realloc_array(vec->buffer, new_capacity, - sizeof(t_reduce_action)); - vec->capacity = new_capacity; - } - return (NO_ERROR); -} - -/// Return true if the vector is empty -/// This function is safe to call with value being NULL -t_error vec_reduce_action_pop(t_vec_reduce_action *vec, t_reduce_action *value) -{ - t_reduce_action temp_value; - t_reduce_action *ptr; - - if (vec == NULL || vec->len == 0) - return (ERROR); - ptr = value; - if (value == NULL) - ptr = &temp_value; - vec->len--; - *ptr = vec->buffer[vec->len]; - mem_set_zero(&vec->buffer[vec->len], sizeof(t_reduce_action)); - return (NO_ERROR); -} - -/// This function is safe to call with `free_elem` being NULL -void vec_reduce_action_free(t_vec_reduce_action vec) -{ - if (vec.buffer == NULL) - return ; - if (vec.free_func) - { - while (vec.len) - { - vec.free_func(vec.buffer[vec.len - 1]); - vec.len--; - } - } - mem_free(vec.buffer); -} diff --git a/output/src/vec/reduce_action/reduce_action_functions2.c b/output/src/vec/reduce_action/reduce_action_functions2.c deleted file mode 100644 index fc96fec1..00000000 --- a/output/src/vec/reduce_action/reduce_action_functions2.c +++ /dev/null @@ -1,109 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* reduce_action_functions2.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maiboyer +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 17:50:57 by maiboyer ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "me/mem/mem.h" -#include "me/types.h" -#include "me/vec/vec_reduce_action.h" -#include - -t_error vec_reduce_action_find(t_vec_reduce_action *vec, - bool (*fn)(const t_reduce_action *), t_usize *index) -{ - t_usize idx; - - if (vec == NULL || fn == NULL || index == NULL) - return (ERROR); - idx = 0; - while (idx < vec->len) - { - if (fn((const t_reduce_action *)&vec->buffer[idx])) - { - *index = idx; - return (NO_ERROR); - } - idx++; - } - return (ERROR); -} - -t_error vec_reduce_action_find_starting(t_vec_reduce_action *vec, - bool (*fn)(const t_reduce_action *), t_usize starting_index, - t_usize *index) -{ - t_usize idx; - - if (vec == NULL || fn == NULL || index == NULL) - return (ERROR); - idx = starting_index; - while (idx < vec->len) - { - if (fn((const t_reduce_action *)&vec->buffer[idx])) - { - *index = idx; - return (NO_ERROR); - } - idx++; - } - return (ERROR); -} - -t_error vec_reduce_action_all(t_vec_reduce_action *vec, - bool (*fn)(const t_reduce_action *), bool *result) -{ - t_usize idx; - - if (vec == NULL || fn == NULL || result == NULL) - return (ERROR); - idx = 0; - *result = true; - while (*result && idx < vec->len) - { - if (!fn((const t_reduce_action *)&vec->buffer[idx])) - *result = false; - idx++; - } - return (ERROR); -} - -t_error vec_reduce_action_any(t_vec_reduce_action *vec, - bool (*fn)(const t_reduce_action *), bool *result) -{ - t_usize idx; - - if (vec == NULL || fn == NULL || result == NULL) - return (ERROR); - idx = 0; - *result = false; - while (*result && idx < vec->len) - { - if (fn((const t_reduce_action *)&vec->buffer[idx])) - *result = true; - idx++; - } - return (ERROR); -} - -void vec_reduce_action_iter(t_vec_reduce_action *vec, - void (*fn)(t_usize index, t_reduce_action *value, void *state), - void *state) -{ - t_usize idx; - - if (vec == NULL || fn == NULL) - return ; - idx = 0; - while (idx < vec->len) - { - fn(idx, &vec->buffer[idx], state); - idx++; - } -} diff --git a/output/src/vec/reduce_action/reduce_action_functions3.c b/output/src/vec/reduce_action/reduce_action_functions3.c deleted file mode 100644 index c9e581c4..00000000 --- a/output/src/vec/reduce_action/reduce_action_functions3.c +++ /dev/null @@ -1,83 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* reduce_action_functions3.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maiboyer +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ -/* Updated: 2023/12/30 17:59:28 by maiboyer ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "me/mem/mem.h" -#include "me/types.h" -#include "me/vec/vec_reduce_action.h" -#include - -t_error vec_reduce_action_push_front(t_vec_reduce_action *vec, - t_reduce_action element) -{ - t_usize i; - - if (vec->len == 0) - return (vec_reduce_action_push(vec, element)); - i = vec->len - 1; - if (vec->capacity < vec->len + 1 && vec_reduce_action_reserve(vec, 3 - * vec->len / 2 + 1)) - return (ERROR); - while (i > 0) - { - vec->buffer[i + 1] = vec->buffer[i]; - i--; - } - vec->buffer[1] = vec->buffer[0]; - vec->buffer[0] = element; - vec->len++; - return (NO_ERROR); -} - -t_error vec_reduce_action_pop_front(t_vec_reduce_action *vec, - t_reduce_action *value) -{ - t_usize i; - - if (vec->len <= 1) - return (vec_reduce_action_pop(vec, value)); - i = 0; - *value = vec->buffer[0]; - vec->len--; - while (i < vec->len) - { - vec->buffer[i] = vec->buffer[i + 1]; - i++; - } - mem_set_zero(&vec->buffer[i], sizeof(*vec->buffer)); - return (NO_ERROR); -} - -void vec_reduce_action_reverse(t_vec_reduce_action *vec) -{ - t_reduce_action temporary; - t_usize i; - - i = 0; - while (i < vec->len / 2) - { - temporary = vec->buffer[vec->len - 1 - i]; - vec->buffer[vec->len - 1 - i] = vec->buffer[i]; - vec->buffer[i] = temporary; - i++; - } -} - -t_error vec_reduce_action_back(t_vec_reduce_action *vec, t_reduce_action **out) -{ - t_reduce_action *temporary; - - if (out == NULL) - out = &temporary; - if (vec->len != 0) - return (*out = &vec->buffer[vec->len - 1], true); - return (false); -} diff --git a/output/src/vec/reduce_action/reduce_action_functions4.c b/output/src/vec/reduce_action/reduce_action_functions4.c deleted file mode 100644 index 9c152b5b..00000000 --- a/output/src/vec/reduce_action/reduce_action_functions4.c +++ /dev/null @@ -1,77 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* reduce_action_functions4.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maiboyer +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ -/* Updated: 2024/09/19 17:51:32 by maiboyer ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "me/mem/mem.h" -#include "me/types.h" -#include "me/vec/vec_reduce_action.h" -#include - -t_reduce_action *vec_reduce_action_get(t_vec_reduce_action *vec, t_usize i) -{ - if (vec == NULL || vec->buffer == NULL) - return (NULL); - if (i < vec->len) - return (&vec->buffer[i]); - return (NULL); -} - -t_reduce_action *vec_reduce_action_last(t_vec_reduce_action *vec) -{ - if (vec == NULL || vec->len == 0) - return (NULL); - return (&vec->buffer[vec->len - 1]); -} - -void vec_reduce_action_copy_into(t_vec_reduce_action *vec, - t_vec_reduce_action *dest) -{ - if (vec == NULL || dest == NULL) - return ; - vec_reduce_action_reserve(dest, vec->capacity); - mem_copy(dest->buffer, vec->buffer, vec->len * sizeof(t_reduce_action)); -} - -struct s_vec_reduce_action_splice_arguments vec_reduce_action_splice_args(\ - t_usize index, \ - t_usize old_count, t_usize new_count, const t_reduce_action *elements) -{ - return ((struct s_vec_reduce_action_splice_arguments){index, old_count, - new_count, elements}); -} - -void vec_reduce_action_splice(t_vec_reduce_action *self, - struct s_vec_reduce_action_splice_arguments args) -{ - t_reduce_action *contents; - t_u32 new_size; - t_u32 old_end; - t_u32 new_end; - - new_size = self->len + args.new_count - args.old_count; - old_end = args.index + args.old_count; - new_end = args.index + args.new_count; - vec_reduce_action_reserve(self, new_size); - contents = self->buffer; - if (self->len > old_end) - mem_move(contents + new_end, contents + old_end, (self->len - old_end) - * sizeof(t_reduce_action)); - if (args.new_count > 0) - { - if (args.elements) - mem_copy((contents + args.index * sizeof(t_reduce_action)), - args.elements, args.new_count * sizeof(t_reduce_action)); - else - mem_set_zero((contents + args.index * sizeof(t_reduce_action)), - args.new_count * sizeof(t_reduce_action)); - } - self->len += args.new_count - args.old_count; -} diff --git a/output/src/vec/str/str.c b/output/src/vec/str/str.c index 79241558..fca3426b 100644 --- a/output/src/vec/str/str.c +++ b/output/src/vec/str/str.c @@ -15,9 +15,10 @@ #include "me/vec/vec_str.h" #include -t_vec_str vec_str_new(t_usize capacity, t_free_str_item free_function) +t_vec_str vec_str_new(t_usize capacity, + t_free_str_item free_function) { - t_vec_str out; + t_vec_str out; out = (t_vec_str){0}; out.free_func = free_function; @@ -28,7 +29,7 @@ t_vec_str vec_str_new(t_usize capacity, t_free_str_item free_function) } /// Return true in case of an error -t_error vec_str_push(t_vec_str *vec, t_str element) +t_error vec_str_push(t_vec_str *vec, t_str element) { if (vec == NULL) return (ERROR); @@ -39,9 +40,9 @@ t_error vec_str_push(t_vec_str *vec, t_str element) } /// Return true in case of an error -t_error vec_str_reserve(t_vec_str *vec, t_usize wanted_capacity) +t_error vec_str_reserve(t_vec_str *vec, t_usize wanted_capacity) { - size_t new_capacity; + size_t new_capacity; if (vec == NULL) return (ERROR); @@ -50,8 +51,8 @@ t_error vec_str_reserve(t_vec_str *vec, t_usize wanted_capacity) new_capacity = (vec->capacity * 3) / 2 + 1; while (wanted_capacity > new_capacity) new_capacity = (new_capacity * 3) / 2 + 1; - vec->buffer = mem_realloc_array(vec->buffer, new_capacity, - sizeof(t_str)); + vec->buffer = + mem_realloc_array(vec->buffer, new_capacity, sizeof(t_str)); vec->capacity = new_capacity; } return (NO_ERROR); @@ -59,10 +60,10 @@ t_error vec_str_reserve(t_vec_str *vec, t_usize wanted_capacity) /// Return true if the vector is empty /// This function is safe to call with value being NULL -t_error vec_str_pop(t_vec_str *vec, t_str *value) +t_error vec_str_pop(t_vec_str *vec, t_str *value) { - t_str temp_value; - t_str *ptr; + t_str temp_value; + t_str *ptr; if (vec == NULL || vec->len == 0) return (ERROR); @@ -76,10 +77,10 @@ t_error vec_str_pop(t_vec_str *vec, t_str *value) } /// This function is safe to call with `free_elem` being NULL -void vec_str_free(t_vec_str vec) +void vec_str_free(t_vec_str vec) { if (vec.buffer == NULL) - return ; + return; if (vec.free_func) { while (vec.len) diff --git a/output/src/vec/str/str_functions2.c b/output/src/vec/str/str_functions2.c index 8a88ee3a..af61b8e1 100644 --- a/output/src/vec/str/str_functions2.c +++ b/output/src/vec/str/str_functions2.c @@ -10,14 +10,17 @@ /* */ /* ************************************************************************** */ +#include "me/mem/mem.h" +#include "me/mem/mem.h" #include "me/mem/mem.h" #include "me/types.h" #include "me/vec/vec_str.h" #include -t_error vec_str_find(t_vec_str *vec, bool (*fn)(const t_str *), t_usize *index) +t_error vec_str_find(t_vec_str *vec, + bool (*fn)(const t_str *), t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -34,10 +37,11 @@ t_error vec_str_find(t_vec_str *vec, bool (*fn)(const t_str *), t_usize *index) return (ERROR); } -t_error vec_str_find_starting(t_vec_str *vec, bool (*fn)(const t_str *), - t_usize starting_index, t_usize *index) +t_error vec_str_find_starting(t_vec_str *vec, + bool (*fn)(const t_str *), + t_usize starting_index, t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); @@ -54,9 +58,10 @@ t_error vec_str_find_starting(t_vec_str *vec, bool (*fn)(const t_str *), return (ERROR); } -t_error vec_str_all(t_vec_str *vec, bool (*fn)(const t_str *), bool *result) +t_error vec_str_all(t_vec_str *vec, + bool (*fn)(const t_str *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -71,9 +76,10 @@ t_error vec_str_all(t_vec_str *vec, bool (*fn)(const t_str *), bool *result) return (ERROR); } -t_error vec_str_any(t_vec_str *vec, bool (*fn)(const t_str *), bool *result) +t_error vec_str_any(t_vec_str *vec, + bool (*fn)(const t_str *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -88,13 +94,15 @@ t_error vec_str_any(t_vec_str *vec, bool (*fn)(const t_str *), bool *result) return (ERROR); } -void vec_str_iter(t_vec_str *vec, void (*fn)(t_usize index, t_str *value, - void *state), void *state) +void vec_str_iter(t_vec_str *vec, + void (*fn)(t_usize index, t_str *value, + void *state), + void *state) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL) - return ; + return; idx = 0; while (idx < vec->len) { diff --git a/output/src/vec/str/str_functions3.c b/output/src/vec/str/str_functions3.c index dcd88550..9c34fdf9 100644 --- a/output/src/vec/str/str_functions3.c +++ b/output/src/vec/str/str_functions3.c @@ -15,15 +15,16 @@ #include "me/vec/vec_str.h" #include -t_error vec_str_push_front(t_vec_str *vec, t_str element) +t_error vec_str_push_front(t_vec_str *vec, + t_str element) { - t_usize i; + t_usize i; if (vec->len == 0) return (vec_str_push(vec, element)); i = vec->len - 1; - if (vec->capacity < vec->len + 1 && vec_str_reserve(vec, 3 * vec->len / 2 - + 1)) + if (vec->capacity < vec->len + 1 && + vec_str_reserve(vec, 3 * vec->len / 2 + 1)) return (ERROR); while (i > 0) { @@ -36,9 +37,9 @@ t_error vec_str_push_front(t_vec_str *vec, t_str element) return (NO_ERROR); } -t_error vec_str_pop_front(t_vec_str *vec, t_str *value) +t_error vec_str_pop_front(t_vec_str *vec, t_str *value) { - t_usize i; + t_usize i; if (vec->len <= 1) return (vec_str_pop(vec, value)); @@ -54,10 +55,10 @@ t_error vec_str_pop_front(t_vec_str *vec, t_str *value) return (NO_ERROR); } -void vec_str_reverse(t_vec_str *vec) +void vec_str_reverse(t_vec_str *vec) { - t_str temporary; - t_usize i; + t_str temporary; + t_usize i; i = 0; while (i < vec->len / 2) @@ -69,9 +70,9 @@ void vec_str_reverse(t_vec_str *vec) } } -t_error vec_str_back(t_vec_str *vec, t_str **out) +t_error vec_str_back(t_vec_str *vec, t_str **out) { - t_str *temporary; + t_str *temporary; if (out == NULL) out = &temporary; diff --git a/output/src/vec/str/str_functions4.c b/output/src/vec/str/str_functions4.c index 4a8d527e..4b4d16f2 100644 --- a/output/src/vec/str/str_functions4.c +++ b/output/src/vec/str/str_functions4.c @@ -15,7 +15,7 @@ #include "me/vec/vec_str.h" #include -t_str *vec_str_get(t_vec_str *vec, t_usize i) +t_str *vec_str_get(t_vec_str *vec, t_usize i) { if (vec == NULL || vec->buffer == NULL) return (NULL); @@ -24,14 +24,14 @@ t_str *vec_str_get(t_vec_str *vec, t_usize i) return (NULL); } -t_str *vec_str_last(t_vec_str *vec) +t_str *vec_str_last(t_vec_str *vec) { if (vec == NULL || vec->len == 0) return (NULL); return (&vec->buffer[vec->len - 1]); } -void vec_str_copy_into(t_vec_str *vec, t_vec_str *dest) +void vec_str_copy_into(t_vec_str *vec, t_vec_str *dest) { if (vec == NULL || dest == NULL) return ; @@ -39,19 +39,21 @@ void vec_str_copy_into(t_vec_str *vec, t_vec_str *dest) mem_copy(dest->buffer, vec->buffer, vec->len * sizeof(t_str)); } -struct s_vec_str_splice_arguments vec_str_splice_args(t_usize index, - t_usize old_count, t_usize new_count, const t_str *elements) +struct s_vec_str_splice_arguments vec_str_splice_args( + t_usize index, t_usize old_count, t_usize new_count, + const t_str *elements) { - return ((struct s_vec_str_splice_arguments){index, old_count, new_count, - elements}); + return ((struct s_vec_str_splice_arguments){index, old_count, + new_count, elements}); } -void vec_str_splice(t_vec_str *self, struct s_vec_str_splice_arguments args) +void vec_str_splice(t_vec_str *self, + struct s_vec_str_splice_arguments args) { - t_str *contents; - t_u32 new_size; - t_u32 old_end; - t_u32 new_end; + t_str *contents; + t_u32 new_size; + t_u32 old_end; + t_u32 new_end; new_size = self->len + args.new_count - args.old_count; old_end = args.index + args.old_count; @@ -59,16 +61,17 @@ void vec_str_splice(t_vec_str *self, struct s_vec_str_splice_arguments args) vec_str_reserve(self, new_size); contents = self->buffer; if (self->len > old_end) - mem_move(contents + new_end, contents + old_end, (self->len - old_end) - * sizeof(t_str)); + mem_move(contents + new_end, + contents + old_end, + (self->len - old_end) * sizeof(t_str)); if (args.new_count > 0) { if (args.elements) - mem_copy((contents + args.index * sizeof(t_str)), args.elements, - args.new_count * sizeof(t_str)); + mem_copy((contents + args.index * sizeof(t_str)), + args.elements, args.new_count * sizeof(t_str)); else - mem_set_zero((contents + args.index * sizeof(t_str)), args.new_count - * sizeof(t_str)); + mem_set_zero((contents + args.index * sizeof(t_str)), + args.new_count * sizeof(t_str)); } self->len += args.new_count - args.old_count; } diff --git a/output/src/vec/str/str_sort.c b/output/src/vec/str/str_sort.c index 090b94fb..a37015ad 100644 --- a/output/src/vec/str/str_sort.c +++ b/output/src/vec/str/str_sort.c @@ -13,14 +13,15 @@ #include "me/types.h" #include "me/vec/vec_str.h" -void vec_str_sort(t_vec_str *v, t_vec_str_sort_fn is_sorted_fn) +void vec_str_sort(t_vec_str *v, + t_vec_str_sort_fn is_sorted_fn) { - t_usize sorted_part; - t_usize i; - t_str tmp; + t_usize sorted_part; + t_usize i; + t_str tmp; if (v == NULL) - return ; + return; sorted_part = v->len; while (sorted_part > 0) { diff --git a/output/src/vec/subtree/subtree_functions4.c b/output/src/vec/subtree/subtree_functions4.c deleted file mode 100644 index a7c32563..00000000 --- a/output/src/vec/subtree/subtree_functions4.c +++ /dev/null @@ -1,75 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* vec_subtree.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maiboyer +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ -/* Updated: 2023/12/30 17:59:28 by maiboyer ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "me/mem/mem.h" -#include "me/types.h" -#include "me/vec/vec_subtree.h" -#include - -t_subtree *vec_subtree_get(t_vec_subtree *vec, t_usize i) -{ - if (vec == NULL || vec->buffer == NULL) - return (NULL); - if (i < vec->len) - return (&vec->buffer[i]); - return (NULL); -} - -t_subtree *vec_subtree_last(t_vec_subtree *vec) -{ - if (vec == NULL || vec->len == 0) - return (NULL); - return (&vec->buffer[vec->len - 1]); -} - -void vec_subtree_copy_into(t_vec_subtree *vec, t_vec_subtree *dest) -{ - if (vec == NULL || dest == NULL) - return ; - vec_subtree_reserve(dest, vec->capacity); - mem_copy(dest->buffer, vec->buffer, vec->len * sizeof(t_subtree)); -} - -struct s_vec_subtree_splice_arguments vec_subtree_splice_args(t_usize index, - t_usize old_count, t_usize new_count, const t_subtree *elements) -{ - return ((struct s_vec_subtree_splice_arguments){index, old_count, new_count, - elements}); -} - -void vec_subtree_splice(t_vec_subtree *self, - struct s_vec_subtree_splice_arguments args) -{ - t_subtree *contents; - t_u32 new_size; - t_u32 old_end; - t_u32 new_end; - - new_size = self->len + args.new_count - args.old_count; - old_end = args.index + args.old_count; - new_end = args.index + args.new_count; - vec_subtree_reserve(self, new_size); - contents = self->buffer; - if (self->len > old_end) - mem_move(contents + new_end, contents + old_end, (self->len - old_end) - * sizeof(t_subtree)); - if (args.new_count > 0) - { - if (args.elements) - mem_copy((contents + args.index * sizeof(t_subtree)), args.elements, - args.new_count * sizeof(t_subtree)); - else - mem_set_zero((contents + args.index * sizeof(t_subtree)), - args.new_count * sizeof(t_subtree)); - } - self->len += args.new_count - args.old_count; -} diff --git a/output/src/vec/subtree/subtree.c b/output/src/vec/token/token.c similarity index 70% rename from output/src/vec/subtree/subtree.c rename to output/src/vec/token/token.c index e34069be..e7373051 100644 --- a/output/src/vec/subtree/subtree.c +++ b/output/src/vec/token/token.c @@ -1,7 +1,7 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_subtree.c :+: :+: :+: */ +/* vec_token.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ @@ -12,37 +12,37 @@ #include "me/mem/mem.h" #include "me/types.h" -#include "me/vec/vec_subtree.h" +#include "me/vec/vec_token.h" #include -t_vec_subtree vec_subtree_new(t_usize capacity, - t_free_subtree_item free_function) +t_vec_token vec_token_new(t_usize capacity, + t_free_token_item free_function) { - t_vec_subtree out; + t_vec_token out; - out = (t_vec_subtree){0}; + out = (t_vec_token){0}; out.free_func = free_function; - out.buffer = mem_alloc_array(capacity, sizeof(t_subtree)); + out.buffer = mem_alloc_array(capacity, sizeof(t_token)); if (out.buffer) out.capacity = capacity; return (out); } /// Return true in case of an error -t_error vec_subtree_push(t_vec_subtree *vec, t_subtree element) +t_error vec_token_push(t_vec_token *vec, t_token element) { if (vec == NULL) return (ERROR); - vec_subtree_reserve(vec, vec->len + 1); + vec_token_reserve(vec, vec->len + 1); vec->buffer[vec->len] = element; vec->len += 1; return (NO_ERROR); } /// Return true in case of an error -t_error vec_subtree_reserve(t_vec_subtree *vec, t_usize wanted_capacity) +t_error vec_token_reserve(t_vec_token *vec, t_usize wanted_capacity) { - size_t new_capacity; + size_t new_capacity; if (vec == NULL) return (ERROR); @@ -51,8 +51,8 @@ t_error vec_subtree_reserve(t_vec_subtree *vec, t_usize wanted_capacity) new_capacity = (vec->capacity * 3) / 2 + 1; while (wanted_capacity > new_capacity) new_capacity = (new_capacity * 3) / 2 + 1; - vec->buffer = mem_realloc_array(vec->buffer, new_capacity, - sizeof(t_subtree)); + vec->buffer = + mem_realloc_array(vec->buffer, new_capacity, sizeof(t_token)); vec->capacity = new_capacity; } return (NO_ERROR); @@ -60,10 +60,10 @@ t_error vec_subtree_reserve(t_vec_subtree *vec, t_usize wanted_capacity) /// Return true if the vector is empty /// This function is safe to call with value being NULL -t_error vec_subtree_pop(t_vec_subtree *vec, t_subtree *value) +t_error vec_token_pop(t_vec_token *vec, t_token *value) { - t_subtree temp_value; - t_subtree *ptr; + t_token temp_value; + t_token *ptr; if (vec == NULL || vec->len == 0) return (ERROR); @@ -72,15 +72,15 @@ t_error vec_subtree_pop(t_vec_subtree *vec, t_subtree *value) ptr = &temp_value; vec->len--; *ptr = vec->buffer[vec->len]; - mem_set_zero(&vec->buffer[vec->len], sizeof(t_subtree)); + mem_set_zero(&vec->buffer[vec->len], sizeof(t_token)); return (NO_ERROR); } /// This function is safe to call with `free_elem` being NULL -void vec_subtree_free(t_vec_subtree vec) +void vec_token_free(t_vec_token vec) { if (vec.buffer == NULL) - return ; + return; if (vec.free_func) { while (vec.len) diff --git a/output/src/vec/subtree/subtree_functions2.c b/output/src/vec/token/token_functions2.c similarity index 64% rename from output/src/vec/subtree/subtree_functions2.c rename to output/src/vec/token/token_functions2.c index 43ecd10b..d41d1ead 100644 --- a/output/src/vec/subtree/subtree_functions2.c +++ b/output/src/vec/token/token_functions2.c @@ -1,7 +1,7 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_subtree.c :+: :+: :+: */ +/* vec_token.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ @@ -10,22 +10,24 @@ /* */ /* ************************************************************************** */ +#include "me/mem/mem.h" +#include "me/mem/mem.h" #include "me/mem/mem.h" #include "me/types.h" -#include "me/vec/vec_subtree.h" +#include "me/vec/vec_token.h" #include -t_error vec_subtree_find(t_vec_subtree *vec, bool (*fn)(const t_subtree *), - t_usize *index) +t_error vec_token_find(t_vec_token *vec, + bool (*fn)(const t_token *), t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); idx = 0; while (idx < vec->len) { - if (fn((const t_subtree *)&vec->buffer[idx])) + if (fn((const t_token *)&vec->buffer[idx])) { *index = idx; return (NO_ERROR); @@ -35,17 +37,18 @@ t_error vec_subtree_find(t_vec_subtree *vec, bool (*fn)(const t_subtree *), return (ERROR); } -t_error vec_subtree_find_starting(t_vec_subtree *vec, - bool (*fn)(const t_subtree *), t_usize starting_index, t_usize *index) +t_error vec_token_find_starting(t_vec_token *vec, + bool (*fn)(const t_token *), + t_usize starting_index, t_usize *index) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || index == NULL) return (ERROR); idx = starting_index; while (idx < vec->len) { - if (fn((const t_subtree *)&vec->buffer[idx])) + if (fn((const t_token *)&vec->buffer[idx])) { *index = idx; return (NO_ERROR); @@ -55,10 +58,10 @@ t_error vec_subtree_find_starting(t_vec_subtree *vec, return (ERROR); } -t_error vec_subtree_all(t_vec_subtree *vec, bool (*fn)(const t_subtree *), - bool *result) +t_error vec_token_all(t_vec_token *vec, + bool (*fn)(const t_token *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -66,17 +69,17 @@ t_error vec_subtree_all(t_vec_subtree *vec, bool (*fn)(const t_subtree *), *result = true; while (*result && idx < vec->len) { - if (!fn((const t_subtree *)&vec->buffer[idx])) + if (!fn((const t_token *)&vec->buffer[idx])) *result = false; idx++; } return (ERROR); } -t_error vec_subtree_any(t_vec_subtree *vec, bool (*fn)(const t_subtree *), - bool *result) +t_error vec_token_any(t_vec_token *vec, + bool (*fn)(const t_token *), bool *result) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL || result == NULL) return (ERROR); @@ -84,20 +87,22 @@ t_error vec_subtree_any(t_vec_subtree *vec, bool (*fn)(const t_subtree *), *result = false; while (*result && idx < vec->len) { - if (fn((const t_subtree *)&vec->buffer[idx])) + if (fn((const t_token *)&vec->buffer[idx])) *result = true; idx++; } return (ERROR); } -void vec_subtree_iter(t_vec_subtree *vec, void (*fn)(t_usize index, - t_subtree *value, void *state), void *state) +void vec_token_iter(t_vec_token *vec, + void (*fn)(t_usize index, t_token *value, + void *state), + void *state) { - t_usize idx; + t_usize idx; if (vec == NULL || fn == NULL) - return ; + return; idx = 0; while (idx < vec->len) { diff --git a/output/src/vec/subtree/subtree_functions3.c b/output/src/vec/token/token_functions3.c similarity index 72% rename from output/src/vec/subtree/subtree_functions3.c rename to output/src/vec/token/token_functions3.c index a53d2de1..81e83655 100644 --- a/output/src/vec/subtree/subtree_functions3.c +++ b/output/src/vec/token/token_functions3.c @@ -1,7 +1,7 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_subtree.c :+: :+: :+: */ +/* vec_token.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ @@ -12,18 +12,19 @@ #include "me/mem/mem.h" #include "me/types.h" -#include "me/vec/vec_subtree.h" +#include "me/vec/vec_token.h" #include -t_error vec_subtree_push_front(t_vec_subtree *vec, t_subtree element) +t_error vec_token_push_front(t_vec_token *vec, + t_token element) { - t_usize i; + t_usize i; if (vec->len == 0) - return (vec_subtree_push(vec, element)); + return (vec_token_push(vec, element)); i = vec->len - 1; - if (vec->capacity < vec->len + 1 && vec_subtree_reserve(vec, 3 * vec->len - / 2 + 1)) + if (vec->capacity < vec->len + 1 && + vec_token_reserve(vec, 3 * vec->len / 2 + 1)) return (ERROR); while (i > 0) { @@ -36,12 +37,12 @@ t_error vec_subtree_push_front(t_vec_subtree *vec, t_subtree element) return (NO_ERROR); } -t_error vec_subtree_pop_front(t_vec_subtree *vec, t_subtree *value) +t_error vec_token_pop_front(t_vec_token *vec, t_token *value) { - t_usize i; + t_usize i; if (vec->len <= 1) - return (vec_subtree_pop(vec, value)); + return (vec_token_pop(vec, value)); i = 0; *value = vec->buffer[0]; vec->len--; @@ -54,10 +55,10 @@ t_error vec_subtree_pop_front(t_vec_subtree *vec, t_subtree *value) return (NO_ERROR); } -void vec_subtree_reverse(t_vec_subtree *vec) +void vec_token_reverse(t_vec_token *vec) { - t_subtree temporary; - t_usize i; + t_token temporary; + t_usize i; i = 0; while (i < vec->len / 2) @@ -69,9 +70,9 @@ void vec_subtree_reverse(t_vec_subtree *vec) } } -t_error vec_subtree_back(t_vec_subtree *vec, t_subtree **out) +t_error vec_token_back(t_vec_token *vec, t_token **out) { - t_subtree *temporary; + t_token *temporary; if (out == NULL) out = &temporary; diff --git a/output/src/vec/reduce_action/reduce_action_sort.c b/output/src/vec/token/token_functions4.c similarity index 51% rename from output/src/vec/reduce_action/reduce_action_sort.c rename to output/src/vec/token/token_functions4.c index 0fc29d29..9c8ab015 100644 --- a/output/src/vec/reduce_action/reduce_action_sort.c +++ b/output/src/vec/token/token_functions4.c @@ -1,41 +1,32 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* reduce_action_sort.c :+: :+: :+: */ +/* token_functions4.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2024/01/29 20:04:33 by maiboyer #+# #+# */ -/* Updated: 2024/01/31 14:25:00 by maiboyer ### ########.fr */ +/* Created: 2023/12/30 17:59:28 by maiboyer #+# #+# */ +/* Updated: 2024/09/26 18:29:18 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ +#include "me/mem/mem.h" #include "me/types.h" -#include "me/vec/vec_reduce_action.h" +#include "me/vec/vec_token.h" +#include -void vec_reduce_action_sort(t_vec_reduce_action *v, - t_vec_reduce_action_sort_fn is_sorted_fn) +t_token *vec_token_get(t_vec_token *vec, t_usize i) { - t_usize sorted_part; - t_usize i; - t_reduce_action tmp; - - if (v == NULL) - return ; - sorted_part = v->len; - while (sorted_part > 0) - { - i = 0; - while (i < sorted_part - 1) - { - if (!is_sorted_fn(&v->buffer[i], &v->buffer[i + 1])) - { - tmp = v->buffer[i]; - v->buffer[i] = v->buffer[i + 1]; - v->buffer[i + 1] = tmp; - } - i++; - } - sorted_part--; - } + if (vec == NULL || vec->buffer == NULL) + return (NULL); + if (i < vec->len) + return (&vec->buffer[i]); + return (NULL); +} + +t_token *vec_token_last(t_vec_token *vec) +{ + if (vec == NULL || vec->len == 0) + return (NULL); + return (&vec->buffer[vec->len - 1]); } diff --git a/output/src/vec/subtree/subtree_sort.c b/output/src/vec/token/token_sort.c similarity index 87% rename from output/src/vec/subtree/subtree_sort.c rename to output/src/vec/token/token_sort.c index 2b64880d..e587c323 100644 --- a/output/src/vec/subtree/subtree_sort.c +++ b/output/src/vec/token/token_sort.c @@ -11,16 +11,17 @@ /* ************************************************************************** */ #include "me/types.h" -#include "me/vec/vec_subtree.h" +#include "me/vec/vec_token.h" -void vec_subtree_sort(t_vec_subtree *v, t_vec_subtree_sort_fn is_sorted_fn) +void vec_token_sort(t_vec_token *v, + t_vec_token_sort_fn is_sorted_fn) { - t_usize sorted_part; - t_usize i; - t_subtree tmp; + t_usize sorted_part; + t_usize i; + t_token tmp; if (v == NULL) - return ; + return; sorted_part = v->len; while (sorted_part > 0) { diff --git a/parser/Filelist.parser.mk b/parser/Filelist.parser.mk index f4ac3c2a..09fc7c68 100644 --- a/parser/Filelist.parser.mk +++ b/parser/Filelist.parser.mk @@ -1,5 +1,5 @@ SRC_FILES = \ - \ +token \ GEN_FILES = \ \ diff --git a/parser/Makefile b/parser/Makefile index bcf8995c..ad036000 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -1,30 +1,96 @@ # **************************************************************************** # # # # ::: :::::::: # -# Makefile :+: :+: :+: # +# Parser.mk :+: :+: :+: # # +:+ +:+ +:+ # -# By: rparodi +#+ +:+ +#+ # +# By: maiboyer +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # -# Created: 2023/11/12 11:05:05 by rparodi #+# #+# # -# Updated: 2024/07/23 20:58:57 by maiboyer ### ########.fr # +# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # +# Updated: 2024/08/02 18:57:55 by maiboyer ### ########.fr # # # # **************************************************************************** # -BUILD_DIR ?= ../build/ +ANAME = parser -all: - @$(MAKE) --no-print-directory -f Parser.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libparser.a - @#$(MAKE) --no-print-directory -f Grammar.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libgmr.a +BUILD_DIR = ../build +SRC_DIR = ./src +GEN_DIR = ./generic -libparser.a: - @$(MAKE) --no-print-directory -f Parser.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libparser.a +BONUS_FLAGS = +NAME = lib$(ANAME).a +LIB_NAME ?= +TARGET = $(BUILD_DIR)/$(NAME) +CC ?= cc +CFLAGS = -Wall -Wextra -Werror -MMD -I./include -I../includes -I../output/include -I$(SRC_DIR) +CFLAGS += $(CFLAGS_ADDITIONAL) +#CFLAGS += -fsanitize=address -fno-omit-frame-pointer -fsanitize-address-use-after-return=runtime -fno-common -fsanitize-address-use-after-scope -libgmr.a: - @$(MAKE) --no-print-directory -f Grammar.mk "LIB_NAME=$(shell realpath .)/" "BUILD_DIR=$(shell realpath $(BUILD_DIR))" libgmr.a +# SRC_FILES = lib +# GEN_FILES = + +# TODO: change from only lib.c to filelist +-include Filelist.$(ANAME).mk + +SRC = $(addsuffix .c,$(addprefix $(SRC_DIR)/,$(SRC_FILES)) $(addprefix $(GEN_DIR)/,$(GEN_FILES))) +OBJ = $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES))) +DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES))) + +INCLUDES = +GREEN = \033[32m +GREY = \033[0;90m +RED = \033[0;31m +GOLD = \033[38;5;220m +END = \033[0m + +.PHONY: all clean fclean re + +all: $(NAME) + +$(NAME): $(TARGET) + +$(TARGET): $(OBJ) + @#echo "ar rcs $(BUILD_DIR)/$(NAME) " + @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' + @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) + +$(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c + @mkdir -p $(dir $@) + @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)' + @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ + +$(BUILD_DIR)/$(ANAME)/%.o: $(GEN_DIR)/%.c + @mkdir -p $(dir $@) + @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)' + @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ + +clean: + @- $(foreach LIB,$(LIBS), \ + make clean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\ + ) + $(if $(LIB_NAME),,\ + rm -rf $(BUILD_DIR) \ + ) + +fclean: clean + @- $(foreach LIB,$(LIBS), \ + make fclean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\ + ) + rm -f $(BUILD_DIR)/$(NAME) + +re: + @$(MAKE) --no-print-directory fclean + @$(MAKE) --no-print-directory all build_filelist: - @$(MAKE) --no-print-directory -f Parser.mk build_filelist - @$(MAKE) --no-print-directory -f Grammar.mk build_filelist + @rm -f Filelist.$(ANAME).mk + @printf '%-78s\\\n' "SRC_FILES =" > Filelist.$(ANAME).mk + @tree $(SRC_DIR) -ifF | rg '$(SRC_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk + @echo "" >> Filelist.$(ANAME).mk + @printf '%-78s\\\n' "GEN_FILES =" >> Filelist.$(ANAME).mk + @tree $(GEN_DIR) -ifF | rg '$(GEN_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk + @echo "" >> Filelist.$(ANAME).mk + @echo -e '$(GREY) Populating $(GREEN) Filelist.$(ANAME).mk$(END)' +%.h: ; -.PHONY: all bonus clean fclean re libparser.a libgmr.a build_filelist +-include $(DEPS) diff --git a/parser/Parser.mk b/parser/Parser.mk deleted file mode 100644 index ad036000..00000000 --- a/parser/Parser.mk +++ /dev/null @@ -1,96 +0,0 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# Parser.mk :+: :+: :+: # -# +:+ +:+ +:+ # -# By: maiboyer +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # -# Updated: 2024/08/02 18:57:55 by maiboyer ### ########.fr # -# # -# **************************************************************************** # - -ANAME = parser - -BUILD_DIR = ../build -SRC_DIR = ./src -GEN_DIR = ./generic - -BONUS_FLAGS = -NAME = lib$(ANAME).a -LIB_NAME ?= -TARGET = $(BUILD_DIR)/$(NAME) -CC ?= cc -CFLAGS = -Wall -Wextra -Werror -MMD -I./include -I../includes -I../output/include -I$(SRC_DIR) -CFLAGS += $(CFLAGS_ADDITIONAL) -#CFLAGS += -fsanitize=address -fno-omit-frame-pointer -fsanitize-address-use-after-return=runtime -fno-common -fsanitize-address-use-after-scope - -# SRC_FILES = lib -# GEN_FILES = - -# TODO: change from only lib.c to filelist --include Filelist.$(ANAME).mk - -SRC = $(addsuffix .c,$(addprefix $(SRC_DIR)/,$(SRC_FILES)) $(addprefix $(GEN_DIR)/,$(GEN_FILES))) -OBJ = $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .o,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES))) -DEPS = $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(SRC_FILES))) $(addsuffix .d,$(addprefix $(BUILD_DIR)/$(ANAME)/,$(GEN_FILES))) - -INCLUDES = -GREEN = \033[32m -GREY = \033[0;90m -RED = \033[0;31m -GOLD = \033[38;5;220m -END = \033[0m - -.PHONY: all clean fclean re - -all: $(NAME) - -$(NAME): $(TARGET) - -$(TARGET): $(OBJ) - @#echo "ar rcs $(BUILD_DIR)/$(NAME) " - @echo -e '$(GREY) Linking \t$(END)$(GOLD)$(NAME)$(END)' - @ar rcs $(BUILD_DIR)/$(NAME) $(OBJ) - -$(BUILD_DIR)/$(ANAME)/%.o: $(SRC_DIR)/%.c - @mkdir -p $(dir $@) - @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)' - @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ - -$(BUILD_DIR)/$(ANAME)/%.o: $(GEN_DIR)/%.c - @mkdir -p $(dir $@) - @echo -e '$(GREY) Building\t$(END)$(GREEN)$<$(END)' - @$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ - -clean: - @- $(foreach LIB,$(LIBS), \ - make clean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\ - ) - $(if $(LIB_NAME),,\ - rm -rf $(BUILD_DIR) \ - ) - -fclean: clean - @- $(foreach LIB,$(LIBS), \ - make fclean LIB_NAME=$(LIB)/ BUILD_DIR=$(realpath $(BUILD_DIR)) -C $(LIB) --no-print-directory || true;\ - ) - rm -f $(BUILD_DIR)/$(NAME) - -re: - @$(MAKE) --no-print-directory fclean - @$(MAKE) --no-print-directory all - -build_filelist: - @rm -f Filelist.$(ANAME).mk - @printf '%-78s\\\n' "SRC_FILES =" > Filelist.$(ANAME).mk - @tree $(SRC_DIR) -ifF | rg '$(SRC_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk - @echo "" >> Filelist.$(ANAME).mk - @printf '%-78s\\\n' "GEN_FILES =" >> Filelist.$(ANAME).mk - @tree $(GEN_DIR) -ifF | rg '$(GEN_DIR)/(.*)\.c$$' --replace '$$1' | sed -re 's/^(.*)_([0-9]+)$$/\1|\2/g' | sort -t'|' --key=1,1 --key=2,2n | sed -e's/|/_/' | xargs printf '%-78s\\\n' >> Filelist.$(ANAME).mk - @echo "" >> Filelist.$(ANAME).mk - @echo -e '$(GREY) Populating $(GREEN) Filelist.$(ANAME).mk$(END)' - -%.h: ; - --include $(DEPS) diff --git a/parser/include/parser/_token.h b/parser/include/parser/_token.h new file mode 100644 index 00000000..3f3e2717 --- /dev/null +++ b/parser/include/parser/_token.h @@ -0,0 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* _token.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rparodi +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/09/25 11:38:28 by rparodi #+# #+# */ +/* Updated: 2024/09/26 18:21:45 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef _TOKEN_H +# define _TOKEN_H + +# include "me/types.h" + +typedef struct s_token t_token; + +#endif diff --git a/parser/includes/token/token.h b/parser/include/parser/token.h similarity index 70% rename from parser/includes/token/token.h rename to parser/include/parser/token.h index d0b24750..6267bba8 100644 --- a/parser/includes/token/token.h +++ b/parser/include/parser/token.h @@ -3,17 +3,20 @@ /* ::: :::::::: */ /* token.h :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: rparodi +#+ +:+ +#+ */ +/* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2024/09/25 11:38:28 by rparodi #+# #+# */ -/* Updated: 2024/09/25 16:32:40 by rparodi ### ########.fr */ +/* Created: 2024/09/26 17:59:23 by maiboyer #+# #+# */ +/* Updated: 2024/09/26 18:29:25 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef TOKEN_H -# define TOKEN_H +#define TOKEN_H + +#include "parser/_token.h" #include "me/string/string.h" +#include "me/vec/vec_token.h" enum e_token { @@ -30,10 +33,13 @@ enum e_token WHITESPACE }; -typedef struct s_token +struct s_token { - t_string raw; - enum e_token TokenType; -} t_token; + t_vec_token subtokens; + t_string string; + enum e_token type; +}; -#endif + + +#endif /* TOKEN_H */ diff --git a/parser/token/token.c b/parser/src/token.c similarity index 94% rename from parser/token/token.c rename to parser/src/token.c index afe6419d..1601be34 100644 --- a/parser/token/token.c +++ b/parser/src/token.c @@ -6,11 +6,11 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/25 16:27:03 by rparodi #+# #+# */ -/* Updated: 2024/09/25 16:59:36 by rparodi ### ########.fr */ +/* Updated: 2024/09/26 17:56:08 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ -#include "parser/token/token.h" +#include "parser/token.h" #include "me/string/string.h" #include "me/types.h" #include diff --git a/sources/_helper_main.c b/sources/_helper_main.c index c314eb50..3d69b9ac 100644 --- a/sources/_helper_main.c +++ b/sources/_helper_main.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/06 16:31:41 by rparodi #+# #+# */ -/* Updated: 2024/09/19 17:32:56 by maiboyer ### ########.fr */ +/* Updated: 2024/09/26 18:14:19 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,15 +23,11 @@ #include "me/str/str.h" #include "me/string/string.h" #include "me/types.h" -#include "parser/api.h" #include #include -#include "parser/inner/parser_inner.h" void ft_exit(t_state *maiboyerlpb, t_u8 exit_status); -void print_node_data(t_node *t, t_usize depth); void parse_str(t_state *state); -t_language *tree_sitter_sh(void); t_error get_user_input(t_state *state) { @@ -81,11 +77,3 @@ void ft_take_args(t_state *state) mem_free(state->str_input); } } - -t_parser *create_myparser(void) -{ - t_parser *parser; - - parser = ts_parser_new(tree_sitter_sh()); - return (parser); -} diff --git a/sources/ft_exit.c b/sources/ft_exit.c index 64929e6a..e91642fd 100644 --- a/sources/ft_exit.c +++ b/sources/ft_exit.c @@ -6,16 +6,14 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/29 11:35:51 by rparodi #+# #+# */ -/* Updated: 2024/09/19 17:27:08 by maiboyer ### ########.fr */ +/* Updated: 2024/09/26 18:14:26 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #include "app/state.h" #include "me/hashmap/hashmap_env.h" #include "me/mem/mem.h" -#include "parser/api.h" -void ts_parser_delete(t_parser *self); void ft_free(void *ptr) { @@ -41,7 +39,6 @@ void ft_free_utils(t_state *s) hmap_env_free(s->env); if (s->tmp_var) hmap_env_free(s->tmp_var); - ts_parser_delete(s->parser); } void ft_exit(t_state *maiboyerlpb, t_u8 exit_status) diff --git a/sources/main.c b/sources/main.c index 9e885847..1c69493d 100644 --- a/sources/main.c +++ b/sources/main.c @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */ -/* Updated: 2024/09/19 23:44:20 by rparodi ### ########.fr */ +/* Updated: 2024/09/26 18:14:59 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,14 +22,10 @@ #include "me/str/str.h" #include "me/string/string.h" #include "me/types.h" -#include "parser/api.h" -#include "parser/inner/parser_inner.h" #include #include -t_error ast_from_node(t_node node, t_str input, t_ast_node *out); t_error get_user_input(t_state *state); -t_parser *create_myparser(void); void ast_print_node(t_ast_node self); void ft_exit(t_state *maiboyerlpb, t_u8 exit_status); void exec_shcat(t_state *state); @@ -40,7 +36,6 @@ void ft_take_args(t_state *state); // cle avant le = // data apres le = -t_language *tree_sitter_sh(void); void ast_free(t_ast_node node); t_error split_str_first(\ @@ -104,21 +99,7 @@ void print_node_data(t_node *t, t_usize depth) void parse_str(t_state *state) { - t_tree *tree; - t_node node; - t_ast_node out; - - tree = ts_parser_parse_string(\ - state->parser, state->str_input, str_len(state->str_input)); - node = ts_tree_root_node(tree); - if (ast_from_node(node, state->str_input, &out)) - { - state->ast = NULL; - printf("Error when building node\n"); - } - else - state->ast = out; - ts_tree_delete(tree); + (void)(state); } t_i32 main(t_i32 argc, t_str argv[], t_str envp[]) @@ -130,7 +111,6 @@ t_i32 main(t_i32 argc, t_str argv[], t_str envp[]) if (install_signal()) me_abort("Unable to install signals"); state = (t_state){}; - state.parser = create_myparser(); state.env = create_env_map(); state.tmp_var = create_env_map(); if (populate_env(state.env, envp)) diff --git a/stdme/generic_sources/header/vec_C__PREFIX__.h__TEMPLATE__ b/stdme/generic_sources/header/vec_C__PREFIX__.h__TEMPLATE__ index 549b12f7..a4b07020 100644 --- a/stdme/generic_sources/header/vec_C__PREFIX__.h__TEMPLATE__ +++ b/stdme/generic_sources/header/vec_C__PREFIX__.h__TEMPLATE__ @@ -17,9 +17,9 @@ C__TYPEHEADER__ #include "me/types.h" /// @brief A function that takes two C__TYPENAME__ and compare them -typedef bool (*t_vec_C__PREFIX___sort_fn)(C__TYPENAME__ *, C__TYPENAME__ *); +typedef bool (*t_vec_C__PREFIX___sort_fn)(C__TYPENAME__ *lhs, C__TYPENAME__ *rhs); /// @brief A function that free an C__TYPENAME__ -typedef void (*t_free_C__PREFIX___item)(C__TYPENAME__); +typedef void (*t_free_C__PREFIX___item)(C__TYPENAME__ elem); /// @brief A dynamic array of C__TYPENAME__ typedef struct s_vec_C__PREFIX__ t_vec_C__PREFIX__;