From 0ed724ba83b7285cbc827face4d19767cc0679fc Mon Sep 17 00:00:00 2001 From: Quinten Mennen Date: Tue, 4 Feb 2025 20:54:58 +0100 Subject: [PATCH] chore: more organisation --- src/tokenizer/lexer.c | 9 +-------- src/tokenizer/lexer_utils.c | 35 +++++++++++++++++++++++++++++++++++ src/tokenizer/tokenizer.c | 10 +--------- src/tokenizer/tokens.c | 9 +-------- src/util.c | 2 +- 5 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 src/tokenizer/lexer_utils.c diff --git a/src/tokenizer/lexer.c b/src/tokenizer/lexer.c index 1374e31..ed9a65a 100644 --- a/src/tokenizer/lexer.c +++ b/src/tokenizer/lexer.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/04 18:04:07 by qmennen #+# #+# */ -/* Updated: 2025/02/04 20:50:37 by qmennen ### ########.fr */ +/* Updated: 2025/02/04 20:53:26 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -86,10 +86,3 @@ char *ft_lexer_readword(t_lexer *lexer) ft_strlcpy(word, lexer->input + start, len + 1); return (word); } - -void ft_lexer_free(t_lexer *lexer) -{ - if (lexer->input) - free(lexer->input); - free(lexer); -} diff --git a/src/tokenizer/lexer_utils.c b/src/tokenizer/lexer_utils.c new file mode 100644 index 0000000..aad99ce --- /dev/null +++ b/src/tokenizer/lexer_utils.c @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* lexer_utils.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/02/04 20:54:09 by qmennen #+# #+# */ +/* Updated: 2025/02/04 20:54:36 by qmennen ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "minishell.h" + +void ft_clear_tokenlist(void *content) +{ + t_token *token; + + token = (t_token *)content; + ft_token_free(token); +} + +void ft_token_free(t_token *token) +{ + if (token->value) + free(token->value); + free(token); +} + +void ft_lexer_free(t_lexer *lexer) +{ + if (lexer->input) + free(lexer->input); + free(lexer); +} diff --git a/src/tokenizer/tokenizer.c b/src/tokenizer/tokenizer.c index c750b43..89b34a4 100644 --- a/src/tokenizer/tokenizer.c +++ b/src/tokenizer/tokenizer.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/04 16:07:58 by qmennen #+# #+# */ -/* Updated: 2025/02/04 20:48:17 by qmennen ### ########.fr */ +/* Updated: 2025/02/04 20:52:58 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -54,11 +54,3 @@ t_token *ft_token_next(t_lexer *lexer) token = ft_token_new(T_ERROR, NULL, current_pos); return (token); } - -void ft_clear_tokenlist(void *content) -{ - t_token *token; - - token = (t_token *)content; - ft_token_free(token); -} diff --git a/src/tokenizer/tokens.c b/src/tokenizer/tokens.c index f7eac72..00ad78f 100644 --- a/src/tokenizer/tokens.c +++ b/src/tokenizer/tokens.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/04 18:02:56 by qmennen #+# #+# */ -/* Updated: 2025/02/04 20:49:28 by qmennen ### ########.fr */ +/* Updated: 2025/02/04 20:53:10 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -56,10 +56,3 @@ t_token *ft_token_new(TokenType type, char *c, int pos) token->value = NULL; return (token); } - -void ft_token_free(t_token *token) -{ - if (token->value) - free(token->value); - free(token); -} diff --git a/src/util.c b/src/util.c index a01ae2e..c9d402a 100644 --- a/src/util.c +++ b/src/util.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/04 16:31:29 by qmennen #+# #+# */ -/* Updated: 2025/02/04 20:51:04 by qmennen ### ########.fr */ +/* Updated: 2025/02/04 20:54:21 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */