From 3d11b63428f77632d4e2ac723cf990eb52b09248 Mon Sep 17 00:00:00 2001 From: maix0 Date: Sat, 12 Oct 2024 15:45:45 +0200 Subject: [PATCH] normed: output directory --- output/include/me/hashmap/hashmap_env.h | 106 ++++++++-------- .../include/me/vec/include_token_workaround.h | 34 ++++++ output/include/me/vec/vec_ast.h | 111 +++++++++-------- output/include/me/vec/vec_estr.h | 113 +++++++++--------- output/include/me/vec/vec_pid.h | 107 +++++++++-------- output/include/me/vec/vec_str.h | 106 ++++++++-------- output/include/me/vec/vec_token.h | 80 ++++++------- output/src/hashmap/env/env.c | 50 ++++---- output/src/hashmap/env/env_clear.c | 12 +- output/src/hashmap/env/env_clone.c | 19 ++- output/src/hashmap/env/env_iter.c | 13 +- output/src/hashmap/env/env_utils.c | 19 ++- output/src/vec/ast/ast.c | 25 ++-- output/src/vec/ast/ast_functions2.c | 37 +++--- output/src/vec/ast/ast_functions3.c | 23 ++-- output/src/vec/ast/ast_functions4.c | 37 +++--- output/src/vec/ast/ast_sort.c | 11 +- output/src/vec/estr/estr.c | 25 ++-- output/src/vec/estr/estr_functions2.c | 38 +++--- output/src/vec/estr/estr_functions3.c | 23 ++-- output/src/vec/estr/estr_functions4.c | 36 +++--- output/src/vec/estr/estr_sort.c | 11 +- output/src/vec/pid/pid.c | 25 ++-- output/src/vec/pid/pid_functions2.c | 34 ++---- output/src/vec/pid/pid_functions3.c | 23 ++-- output/src/vec/pid/pid_functions4.c | 39 +++--- output/src/vec/pid/pid_sort.c | 11 +- output/src/vec/str/str.c | 25 ++-- output/src/vec/str/str_functions2.c | 34 ++---- output/src/vec/str/str_functions3.c | 23 ++-- output/src/vec/str/str_functions4.c | 39 +++--- output/src/vec/str/str_sort.c | 11 +- output/src/vec/token/token.c | 25 ++-- output/src/vec/token/token_functions2.c | 37 +++--- output/src/vec/token/token_functions3.c | 23 ++-- output/src/vec/token/token_functions4.c | 4 +- output/src/vec/token/token_sort.c | 11 +- 37 files changed, 692 insertions(+), 708 deletions(-) create mode 100644 output/include/me/vec/include_token_workaround.h diff --git a/output/include/me/hashmap/hashmap_env.h b/output/include/me/hashmap/hashmap_env.h index b36c130e..616d6a1b 100644 --- a/output/include/me/hashmap/hashmap_env.h +++ b/output/include/me/hashmap/hashmap_env.h @@ -1,44 +1,41 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* hashmap_env.h :+: :+: :+: */ +/* hashmap_env.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 11:00:22 by maiboyer #+# #+# */ -/* Updated: 2023/12/11 15:24:44 by maiboyer ### ########.fr */ +/* Updated: 2024/10/12 15:40:37 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 and 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 eq +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 @@ -46,10 +43,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 @@ -60,54 +57,60 @@ 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, 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 /// @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 @@ -116,23 +119,30 @@ 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 and 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/include_token_workaround.h b/output/include/me/vec/include_token_workaround.h new file mode 100644 index 00000000..bbc4b4ac --- /dev/null +++ b/output/include/me/vec/include_token_workaround.h @@ -0,0 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* include_token_workaround.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/10/12 15:44:15 by maiboyer #+# #+# */ +/* Updated: 2024/10/12 15:44:35 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef INCLUDE_TOKEN_WORKAROUND_H +# define INCLUDE_TOKEN_WORKAROUND_H + +# include "me/types.h" + +typedef struct s_token t_token; + +/// @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; +}; + +#endif /* INCLUDE_TOKEN_WORKAROUND_H */ diff --git a/output/include/me/vec/vec_ast.h b/output/include/me/vec/vec_ast.h index 6a7dc78c..fd9e6ee3 100644 --- a/output/include/me/vec/vec_ast.h +++ b/output/include/me/vec/vec_ast.h @@ -11,33 +11,34 @@ /* ************************************************************************** */ #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 *lhs, t_ast_node *rhs); +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 elem); +typedef void (*t_free_ast_item)(t_ast_node elem); /// @brief A dynamic array of t_ast_node -typedef struct s_vec_ast t_vec_ast; +typedef struct s_vec_ast t_vec_ast; -struct s_vec_ast +struct s_vec_ast { - t_free_ast_item free_func; - t_usize len; - t_usize capacity; - t_ast_node *buffer; + t_free_ast_item free_func; + t_usize len; + t_usize capacity; + t_ast_node *buffer; }; -struct s_vec_ast_splice_arguments +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 @@ -45,26 +46,28 @@ 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,26 +75,28 @@ t_error vec_ast_pop(t_vec_ast *vec, t_ast_node *value); /// @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 @@ -99,9 +104,9 @@ t_error vec_ast_find(t_vec_ast *vec, /// @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 @@ -110,8 +115,9 @@ t_error vec_ast_find_starting(t_vec_ast *vec, /// @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 @@ -120,55 +126,58 @@ t_error vec_ast_all(t_vec_ast *vec, /// @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 ce4fc893..c2d07cf6 100644 --- a/output/include/me/vec/vec_estr.h +++ b/output/include/me/vec/vec_estr.h @@ -1,43 +1,44 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_estr.h :+: :+: :+: */ +/* vec_estr.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ -/* Updated: 2023/12/09 17:53:00 by maiboyer ### ########.fr */ +/* Updated: 2024/10/12 15:43:26 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 *lhs, t_expandable_str *rhs); +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 elem); +typedef void (*t_free_estr_item)(t_expandable_str elem); /// @brief A dynamic array of t_expandable_str -typedef struct s_vec_estr t_vec_estr; +typedef struct s_vec_estr t_vec_estr; -struct s_vec_estr +struct s_vec_estr { - t_free_estr_item free_func; - t_usize len; - t_usize capacity; - t_expandable_str *buffer; + t_free_estr_item free_func; + t_usize len; + t_usize capacity; + t_expandable_str *buffer; }; -struct s_vec_estr_splice_arguments +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 @@ -45,26 +46,28 @@ 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 @@ -72,26 +75,28 @@ t_error vec_estr_pop(t_vec_estr *vec, t_expandable_str *value); /// @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 @@ -99,9 +104,9 @@ t_error vec_estr_find(t_vec_estr *vec, /// @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 @@ -110,8 +115,9 @@ t_error vec_estr_find_starting(t_vec_estr *vec, /// @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 @@ -120,55 +126,50 @@ t_error vec_estr_all(t_vec_estr *vec, /// @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); - -/// read code lol -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, - const t_expandable_str *elements); +void vec_estr_copy_into(t_vec_estr *vec, + t_vec_estr *dest); #endif diff --git a/output/include/me/vec/vec_pid.h b/output/include/me/vec/vec_pid.h index 426bd103..81116d17 100644 --- a/output/include/me/vec/vec_pid.h +++ b/output/include/me/vec/vec_pid.h @@ -11,33 +11,34 @@ /* ************************************************************************** */ #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 *lhs, t_pid *rhs); +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 elem); +typedef void (*t_free_pid_item)(t_pid elem); /// @brief A dynamic array of t_pid -typedef struct s_vec_pid t_vec_pid; +typedef struct s_vec_pid t_vec_pid; -struct s_vec_pid +struct s_vec_pid { - t_free_pid_item free_func; - t_usize len; - t_usize capacity; - t_pid *buffer; + t_free_pid_item free_func; + t_usize len; + t_usize capacity; + t_pid *buffer; }; -struct s_vec_pid_splice_arguments +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 @@ -45,26 +46,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,26 +73,28 @@ t_error vec_pid_pop(t_vec_pid *vec, t_pid *value); /// @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 @@ -99,9 +102,9 @@ t_error vec_pid_find(t_vec_pid *vec, /// @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 @@ -110,8 +113,9 @@ t_error vec_pid_find_starting(t_vec_pid *vec, /// @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 @@ -120,55 +124,56 @@ t_error vec_pid_all(t_vec_pid *vec, /// @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, - 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); #endif diff --git a/output/include/me/vec/vec_str.h b/output/include/me/vec/vec_str.h index c54ab2b5..c5ad9888 100644 --- a/output/include/me/vec/vec_str.h +++ b/output/include/me/vec/vec_str.h @@ -11,33 +11,33 @@ /* ************************************************************************** */ #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 *lhs, t_str *rhs); +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 elem); +typedef void (*t_free_str_item)(t_str elem); /// @brief A dynamic array of t_str -typedef struct s_vec_str t_vec_str; +typedef struct s_vec_str t_vec_str; -struct s_vec_str +struct s_vec_str { - t_free_str_item free_func; - t_usize len; - t_usize capacity; - t_str *buffer; + t_free_str_item free_func; + t_usize len; + t_usize capacity; + t_str *buffer; }; -struct s_vec_str_splice_arguments +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 @@ -45,26 +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 @@ -72,26 +72,28 @@ 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 +101,9 @@ t_error vec_str_find(t_vec_str *vec, /// @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,8 +112,9 @@ t_error vec_str_find_starting(t_vec_str *vec, /// @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 @@ -120,55 +123,56 @@ t_error vec_str_all(t_vec_str *vec, /// @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, - 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); #endif diff --git a/output/include/me/vec/vec_token.h b/output/include/me/vec/vec_token.h index a25e85c9..0b050a4b 100644 --- a/output/include/me/vec/vec_token.h +++ b/output/include/me/vec/vec_token.h @@ -6,60 +6,45 @@ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/04 18:46:53 by maiboyer #+# #+# */ -/* Updated: 2024/09/26 18:29:43 by maiboyer ### ########.fr */ +/* Updated: 2024/10/12 15:43:58 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef VEC_TOKEN_H -#define 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 +# include "./include_token_workaround.h" +# 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); +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); +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); +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); +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); +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 @@ -67,24 +52,27 @@ t_error vec_token_pop(t_vec_token *vec, t_token *value); /// @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); +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); +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); +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); +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 @@ -92,7 +80,9 @@ t_error vec_token_find(t_vec_token *vec, bool (*fn)(const t_token *), t_usize *i /// @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); +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 @@ -101,7 +91,8 @@ t_error vec_token_find_starting(t_vec_token *vec, bool (*fn)(const t_token *), t /// @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); +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 @@ -110,42 +101,47 @@ t_error vec_token_all(t_vec_token *vec, bool (*fn)(const t_token *), bool *resul /// @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); +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); +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); +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); +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); +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); +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); +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); +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 3e3ccc93..389fcb79 100644 --- a/output/src/hashmap/env/env.c +++ b/output/src/hashmap/env/env.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* hashmap_env.c :+: :+: :+: */ +/* env.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/06 10:58:20 by maiboyer #+# #+# */ -/* Updated: 2023/12/11 15:32:51 by maiboyer ### ########.fr */ +/* Updated: 2024/10/12 15:43:01 by maiboyer ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,19 +17,16 @@ #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) @@ -45,11 +42,11 @@ t_hashmap_env *hmap_env_new_with_buckets( 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) @@ -69,12 +66,10 @@ 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) @@ -92,12 +87,11 @@ t_entry_env *hmap_env_get_entry(t_hashmap_env *hmap, 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); @@ -117,9 +111,7 @@ bool hmap_env_insert(t_hashmap_env *hmap, t_str key, } else { - hmap->free(entry->kv); - entry->kv.key = key; - entry->kv.val = value; - return (true); + entry->kv.key = (hmap->free(entry->kv), key); + return (entry->kv.val = value, true); } } diff --git a/output/src/hashmap/env/env_clear.c b/output/src/hashmap/env/env_clear.c index 6da7c16d..068c71dc 100644 --- a/output/src/hashmap/env/env_clear.c +++ b/output/src/hashmap/env/env_clear.c @@ -10,19 +10,15 @@ /* */ /* ************************************************************************** */ -#include "me/types.h" - - - #include "me/hashmap/hashmap_env.h" #include "me/mem/mem.h" - +#include "me/types.h" void hmap_env_clear(t_hashmap_env *self) { - t_usize bucket_id; - t_entry_env *cur; - t_entry_env *next; + t_usize bucket_id; + t_entry_env *cur; + t_entry_env *next; bucket_id = 0; while (bucket_id < self->num_buckets) diff --git a/output/src/hashmap/env/env_clone.c b/output/src/hashmap/env/env_clone.c index 08898d7d..9ec3b950 100644 --- a/output/src/hashmap/env/env_clone.c +++ b/output/src/hashmap/env/env_clone.c @@ -10,24 +10,21 @@ /* */ /* ************************************************************************** */ +#include "me/hashmap/hashmap_env.h" #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) @@ -36,7 +33,7 @@ t_error hmap_env_clone(t_hashmap_env *self, 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 04f79742..a17908ff 100644 --- a/output/src/hashmap/env/env_iter.c +++ b/output/src/hashmap/env/env_iter.c @@ -12,15 +12,12 @@ #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 2d9f53fd..a00d75ff 100644 --- a/output/src/hashmap/env/env_utils.c +++ b/output/src/hashmap/env/env_utils.c @@ -16,12 +16,11 @@ #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); @@ -31,18 +30,18 @@ t_str *hmap_env_get(t_hashmap_env *hmap, 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 60fac8cc..e5183a17 100644 --- a/output/src/vec/ast/ast.c +++ b/output/src/vec/ast/ast.c @@ -15,10 +15,9 @@ #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; @@ -29,7 +28,7 @@ t_vec_ast vec_ast_new(t_usize capacity, } /// Return true in case of an error -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) { if (vec == NULL) return (ERROR); @@ -40,9 +39,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); @@ -51,8 +50,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); @@ -60,10 +59,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); @@ -77,10 +76,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 6f741fd0..94e72e1e 100644 --- a/output/src/vec/ast/ast_functions2.c +++ b/output/src/vec/ast/ast_functions2.c @@ -10,17 +10,15 @@ /* */ /* ************************************************************************** */ -#include "me/mem/mem.h" -#include "me/mem/mem.h" #include "me/mem/mem.h" #include "me/types.h" #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,11 +35,10 @@ t_error vec_ast_find(t_vec_ast *vec, 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); @@ -58,10 +55,10 @@ t_error vec_ast_find_starting(t_vec_ast *vec, 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); @@ -76,10 +73,10 @@ t_error vec_ast_all(t_vec_ast *vec, 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); @@ -94,15 +91,13 @@ t_error vec_ast_any(t_vec_ast *vec, 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 78e586ae..0c7713ea 100644 --- a/output/src/vec/ast/ast_functions3.c +++ b/output/src/vec/ast/ast_functions3.c @@ -15,16 +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 && - vec_ast_reserve(vec, 3 * vec->len / 2 + 1)) + if (vec->capacity < vec->len + 1 && vec_ast_reserve(vec, 3 * vec->len / 2 + + 1)) return (ERROR); while (i > 0) { @@ -37,9 +36,9 @@ t_error vec_ast_push_front(t_vec_ast *vec, 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)); @@ -55,10 +54,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) @@ -70,9 +69,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 b548a698..11ea0b03 100644 --- a/output/src/vec/ast/ast_functions4.c +++ b/output/src/vec/ast/ast_functions4.c @@ -1,7 +1,7 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* vec_ast.c :+: :+: :+: */ +/* ast_functions4.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: maiboyer +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ @@ -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,21 +39,19 @@ 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( - 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) { - 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; @@ -61,17 +59,16 @@ void vec_ast_splice(t_vec_ast *self, 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)); + 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 4fde8c65..f8796c49 100644 --- a/output/src/vec/ast/ast_sort.c +++ b/output/src/vec/ast/ast_sort.c @@ -13,15 +13,14 @@ #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 e8a2d5cd..df247d6e 100644 --- a/output/src/vec/estr/estr.c +++ b/output/src/vec/estr/estr.c @@ -15,10 +15,9 @@ #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; @@ -29,7 +28,7 @@ t_vec_estr vec_estr_new(t_usize capacity, } /// 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); @@ -40,9 +39,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); @@ -51,8 +50,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); @@ -60,10 +59,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); @@ -77,10 +76,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 99f4c9ce..9bd3f2c2 100644 --- a/output/src/vec/estr/estr_functions2.c +++ b/output/src/vec/estr/estr_functions2.c @@ -10,17 +10,15 @@ /* */ /* ************************************************************************** */ -#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); @@ -37,11 +35,11 @@ t_error vec_estr_find(t_vec_estr *vec, 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); @@ -58,10 +56,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); @@ -76,10 +74,10 @@ t_error vec_estr_all(t_vec_estr *vec, 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); @@ -94,15 +92,13 @@ t_error vec_estr_any(t_vec_estr *vec, 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 1c242739..66fbc606 100644 --- a/output/src/vec/estr/estr_functions3.c +++ b/output/src/vec/estr/estr_functions3.c @@ -15,16 +15,15 @@ #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) { @@ -37,9 +36,9 @@ t_error vec_estr_push_front(t_vec_estr *vec, 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)); @@ -55,10 +54,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) @@ -70,9 +69,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 25e10dbf..f2e786d2 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,21 +39,20 @@ 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; @@ -61,17 +60,16 @@ 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 9a077e0e..6774643e 100644 --- a/output/src/vec/estr/estr_sort.c +++ b/output/src/vec/estr/estr_sort.c @@ -13,15 +13,14 @@ #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 05303095..8a6bafd3 100644 --- a/output/src/vec/pid/pid.c +++ b/output/src/vec/pid/pid.c @@ -15,10 +15,9 @@ #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; @@ -29,7 +28,7 @@ t_vec_pid vec_pid_new(t_usize capacity, } /// 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); @@ -40,9 +39,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); @@ -51,8 +50,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); @@ -60,10 +59,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); @@ -77,10 +76,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 e6a59d29..116f4e52 100644 --- a/output/src/vec/pid/pid_functions2.c +++ b/output/src/vec/pid/pid_functions2.c @@ -10,17 +10,14 @@ /* */ /* ************************************************************************** */ -#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); @@ -37,11 +34,10 @@ t_error vec_pid_find(t_vec_pid *vec, 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); @@ -58,10 +54,9 @@ t_error vec_pid_find_starting(t_vec_pid *vec, 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); @@ -76,10 +71,9 @@ t_error vec_pid_all(t_vec_pid *vec, 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); @@ -94,15 +88,13 @@ t_error vec_pid_any(t_vec_pid *vec, 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 5e7dab79..5192b238 100644 --- a/output/src/vec/pid/pid_functions3.c +++ b/output/src/vec/pid/pid_functions3.c @@ -15,16 +15,15 @@ #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) { @@ -37,9 +36,9 @@ t_error vec_pid_push_front(t_vec_pid *vec, 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)); @@ -55,10 +54,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) @@ -70,9 +69,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 8fbf49bd..99de8bb9 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,21 +39,19 @@ 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; @@ -61,17 +59,16 @@ void vec_pid_splice(t_vec_pid *self, 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 2ca1ffd8..d350851c 100644 --- a/output/src/vec/pid/pid_sort.c +++ b/output/src/vec/pid/pid_sort.c @@ -13,15 +13,14 @@ #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/str/str.c b/output/src/vec/str/str.c index fca3426b..79241558 100644 --- a/output/src/vec/str/str.c +++ b/output/src/vec/str/str.c @@ -15,10 +15,9 @@ #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; @@ -29,7 +28,7 @@ t_vec_str vec_str_new(t_usize capacity, } /// 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); @@ -40,9 +39,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); @@ -51,8 +50,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); @@ -60,10 +59,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); @@ -77,10 +76,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 af61b8e1..8a88ee3a 100644 --- a/output/src/vec/str/str_functions2.c +++ b/output/src/vec/str/str_functions2.c @@ -10,17 +10,14 @@ /* */ /* ************************************************************************** */ -#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); @@ -37,11 +34,10 @@ t_error vec_str_find(t_vec_str *vec, 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); @@ -58,10 +54,9 @@ t_error vec_str_find_starting(t_vec_str *vec, 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); @@ -76,10 +71,9 @@ t_error vec_str_all(t_vec_str *vec, 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); @@ -94,15 +88,13 @@ t_error vec_str_any(t_vec_str *vec, 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 9c34fdf9..dcd88550 100644 --- a/output/src/vec/str/str_functions3.c +++ b/output/src/vec/str/str_functions3.c @@ -15,16 +15,15 @@ #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) { @@ -37,9 +36,9 @@ t_error vec_str_push_front(t_vec_str *vec, 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)); @@ -55,10 +54,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) @@ -70,9 +69,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 4b4d16f2..4a8d527e 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,21 +39,19 @@ 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; @@ -61,17 +59,16 @@ void vec_str_splice(t_vec_str *self, 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 a37015ad..090b94fb 100644 --- a/output/src/vec/str/str_sort.c +++ b/output/src/vec/str/str_sort.c @@ -13,15 +13,14 @@ #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/token/token.c b/output/src/vec/token/token.c index e7373051..d5573ba8 100644 --- a/output/src/vec/token/token.c +++ b/output/src/vec/token/token.c @@ -15,10 +15,9 @@ #include "me/vec/vec_token.h" #include -t_vec_token vec_token_new(t_usize capacity, - t_free_token_item free_function) +t_vec_token vec_token_new(t_usize capacity, t_free_token_item free_function) { - t_vec_token out; + t_vec_token out; out = (t_vec_token){0}; out.free_func = free_function; @@ -29,7 +28,7 @@ t_vec_token vec_token_new(t_usize capacity, } /// Return true in case of an error -t_error vec_token_push(t_vec_token *vec, t_token element) +t_error vec_token_push(t_vec_token *vec, t_token element) { if (vec == NULL) return (ERROR); @@ -40,9 +39,9 @@ t_error vec_token_push(t_vec_token *vec, t_token element) } /// Return true in case of an error -t_error vec_token_reserve(t_vec_token *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 +50,8 @@ t_error vec_token_reserve(t_vec_token *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_token)); + vec->buffer = mem_realloc_array(vec->buffer, new_capacity, + sizeof(t_token)); vec->capacity = new_capacity; } return (NO_ERROR); @@ -60,10 +59,10 @@ t_error vec_token_reserve(t_vec_token *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_token_pop(t_vec_token *vec, t_token *value) +t_error vec_token_pop(t_vec_token *vec, t_token *value) { - t_token temp_value; - t_token *ptr; + t_token temp_value; + t_token *ptr; if (vec == NULL || vec->len == 0) return (ERROR); @@ -77,10 +76,10 @@ t_error vec_token_pop(t_vec_token *vec, t_token *value) } /// This function is safe to call with `free_elem` being NULL -void vec_token_free(t_vec_token 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/token/token_functions2.c b/output/src/vec/token/token_functions2.c index d41d1ead..709ccfbe 100644 --- a/output/src/vec/token/token_functions2.c +++ b/output/src/vec/token/token_functions2.c @@ -10,17 +10,15 @@ /* */ /* ************************************************************************** */ -#include "me/mem/mem.h" -#include "me/mem/mem.h" #include "me/mem/mem.h" #include "me/types.h" #include "me/vec/vec_token.h" #include -t_error vec_token_find(t_vec_token *vec, - bool (*fn)(const t_token *), 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); @@ -37,11 +35,10 @@ t_error vec_token_find(t_vec_token *vec, return (ERROR); } -t_error vec_token_find_starting(t_vec_token *vec, - bool (*fn)(const t_token *), - 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); @@ -58,10 +55,10 @@ t_error vec_token_find_starting(t_vec_token *vec, return (ERROR); } -t_error vec_token_all(t_vec_token *vec, - bool (*fn)(const t_token *), 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); @@ -76,10 +73,10 @@ t_error vec_token_all(t_vec_token *vec, return (ERROR); } -t_error vec_token_any(t_vec_token *vec, - bool (*fn)(const t_token *), 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); @@ -94,15 +91,13 @@ t_error vec_token_any(t_vec_token *vec, return (ERROR); } -void vec_token_iter(t_vec_token *vec, - void (*fn)(t_usize index, t_token *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/token/token_functions3.c b/output/src/vec/token/token_functions3.c index 81e83655..a261768e 100644 --- a/output/src/vec/token/token_functions3.c +++ b/output/src/vec/token/token_functions3.c @@ -15,16 +15,15 @@ #include "me/vec/vec_token.h" #include -t_error vec_token_push_front(t_vec_token *vec, - t_token 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_token_push(vec, element)); i = vec->len - 1; - if (vec->capacity < vec->len + 1 && - vec_token_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) { @@ -37,9 +36,9 @@ t_error vec_token_push_front(t_vec_token *vec, return (NO_ERROR); } -t_error vec_token_pop_front(t_vec_token *vec, t_token *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_token_pop(vec, value)); @@ -55,10 +54,10 @@ t_error vec_token_pop_front(t_vec_token *vec, t_token *value) return (NO_ERROR); } -void vec_token_reverse(t_vec_token *vec) +void vec_token_reverse(t_vec_token *vec) { - t_token temporary; - t_usize i; + t_token temporary; + t_usize i; i = 0; while (i < vec->len / 2) @@ -70,9 +69,9 @@ void vec_token_reverse(t_vec_token *vec) } } -t_error vec_token_back(t_vec_token *vec, t_token **out) +t_error vec_token_back(t_vec_token *vec, t_token **out) { - t_token *temporary; + t_token *temporary; if (out == NULL) out = &temporary; diff --git a/output/src/vec/token/token_functions4.c b/output/src/vec/token/token_functions4.c index 9c8ab015..c005ea5c 100644 --- a/output/src/vec/token/token_functions4.c +++ b/output/src/vec/token/token_functions4.c @@ -15,7 +15,7 @@ #include "me/vec/vec_token.h" #include -t_token *vec_token_get(t_vec_token *vec, t_usize i) +t_token *vec_token_get(t_vec_token *vec, t_usize i) { if (vec == NULL || vec->buffer == NULL) return (NULL); @@ -24,7 +24,7 @@ t_token *vec_token_get(t_vec_token *vec, t_usize i) return (NULL); } -t_token *vec_token_last(t_vec_token *vec) +t_token *vec_token_last(t_vec_token *vec) { if (vec == NULL || vec->len == 0) return (NULL); diff --git a/output/src/vec/token/token_sort.c b/output/src/vec/token/token_sort.c index e587c323..cac81520 100644 --- a/output/src/vec/token/token_sort.c +++ b/output/src/vec/token/token_sort.c @@ -13,15 +13,14 @@ #include "me/types.h" #include "me/vec/vec_token.h" -void vec_token_sort(t_vec_token *v, - t_vec_token_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_token tmp; + t_usize sorted_part; + t_usize i; + t_token tmp; if (v == NULL) - return; + return ; sorted_part = v->len; while (sorted_part > 0) {