willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: make it norminette compliant

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-04 20:52:28 +01:00
parent 8170eec2ae
commit 34867c05a3
4 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tokenizer/lexer.c
View File

@ -6,15 +6,15 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/04 18:04:07 by qmennen #+# #+# */
/* Updated: 2025/02/04 20:40:27 by qmennen ### ########.fr */
/* Updated: 2025/02/04 20:50:37 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
t_lexer *ft_lexer_new(const char *input)
t_lexer *ft_lexer_new(const char *input)
{
t_lexer *lexer;
t_lexer *lexer;
lexer = malloc(sizeof(t_lexer));
if (!lexer)
@ -31,12 +31,12 @@ t_lexer *ft_lexer_new(const char *input)
return (lexer);
}
void ft_lexer_readchar(t_lexer *lexer)
void ft_lexer_readchar(t_lexer *lexer)
{
if ((size_t)lexer->n_pos > ft_strlen(lexer->input))
{
lexer->current_char = '\0';
return;
return ;
}
lexer->current_char = lexer->input[lexer->n_pos];
lexer->pos = lexer->n_pos;
@ -66,24 +66,28 @@ static char *ft_parse_quotes(t_lexer *lexer)
char *ft_lexer_readword(t_lexer *lexer)
{
int start;
int len;
char *word;
int start;
int len;
char *word;
start = lexer->pos;
if (lexer->current_char == '"' || lexer->current_char == '\'')
{
return (ft_parse_quotes(lexer));
}
while (ft_isprint(lexer->current_char) && lexer->current_char != '<' && lexer->current_char != '>' && lexer->current_char != '|' && lexer->current_char != '\0')
while (ft_isprint(lexer->current_char) && lexer->current_char != '<'
&& lexer->current_char != '>' && lexer->current_char != '|'
&& lexer->current_char != '\0')
{
ft_lexer_readchar(lexer);
}
len = lexer->pos - start;
word = malloc(sizeof(char) * len);
ft_strlcpy(word, lexer->input + start, len + 1);
return (word);
}
void ft_lexer_free(t_lexer *lexer)
void ft_lexer_free(t_lexer *lexer)
{
if (lexer->input)
free(lexer->input);

19
src/tokenizer/tokenizer.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/04 16:07:58 by qmennen #+# #+# */
/* Updated: 2025/02/04 20:45:45 by qmennen ### ########.fr */
/* Updated: 2025/02/04 20:48:17 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,18 +22,18 @@ t_list *ft_parse_input(t_lexer *lexer)
{
token = ft_token_next(lexer);
if (token->type == T_EOF || token->type == T_ERROR)
break;
break ;
ft_lstadd_back(&list, ft_lstnew(token));
}
ft_token_free(token);
return (list);
}
t_token *ft_token_next(t_lexer *lexer)
t_token *ft_token_next(t_lexer *lexer)
{
t_token *token;
char *word;
int current_pos;
t_token *token;
char *word;
int current_pos;
token = NULL;
while (ft_isspace(lexer->current_char))
@ -41,7 +41,8 @@ t_token *ft_token_next(t_lexer *lexer)
current_pos = lexer->pos;
if (lexer->current_char == '\0')
token = ft_token_new(T_EOF, NULL, current_pos);
else if (lexer->current_char == '<' || lexer->current_char == '>' || lexer->current_char == '|')
else if (lexer->current_char == '<' || lexer->current_char == '>'
|| lexer->current_char == '|')
token = ft_parse_token(lexer);
else if (ft_isprint(lexer->current_char))
{
@ -54,9 +55,9 @@ t_token *ft_token_next(t_lexer *lexer)
return (token);
}
void ft_clear_tokenlist(void *content)
void ft_clear_tokenlist(void *content)
{
t_token *token;
t_token *token;
token = (t_token *)content;
ft_token_free(token);

5
src/tokenizer/tokens.c
View File

@ -6,11 +6,11 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/04 18:02:56 by qmennen #+# #+# */
/* Updated: 2025/02/04 20:29:06 by qmennen ### ########.fr */
/* Updated: 2025/02/04 20:49:28 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
# include "minishell.h"
#include "minishell.h"
t_token *ft_parse_token(t_lexer *lexer)
{
@ -34,7 +34,6 @@ t_token *ft_parse_token(t_lexer *lexer)
{
token = ft_token_new(T_REDIRECT_OUT, ">", lexer->pos);
}
ft_lexer_readchar(lexer);
return (token);
}

4
src/util.c
View File

@ -6,11 +6,11 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/04 16:31:29 by qmennen #+# #+# */
/* Updated: 2025/02/04 16:32:08 by qmennen ### ########.fr */
/* Updated: 2025/02/04 20:51:04 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
# include "minishell.h"
#include "minishell.h"
int ft_isspace(const char c)
{