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

refactor: naming conventions

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-18 17:03:40 +01:00
parent adee957c2d
commit 4005f98b16
6 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
inc/tokenizer.h
View File

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* :::::::: */ /* ::: :::::::: */
/* tokenizer.h :+: :+: */ /* tokenizer.h :+: :+: :+: */
/* +:+ */ /* +:+ +:+ +:+ */
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 12:36:00 by whaffman #+# #+# */ /* Created: 2025/02/05 12:36:00 by whaffman #+# #+# */
/* Updated: 2025/02/05 12:36:01 by whaffman ######## odam.nl */ /* Updated: 2025/02/18 17:02:17 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -18,16 +18,16 @@
*/ */
t_lexer *ft_lexer_new(const char *input); t_lexer *ft_lexer_new(const char *input);
void ft_lexer_free(t_lexer *lexer); void ft_lexer_free(t_lexer *lexer);
void ft_lexer_readchar(t_lexer *lexer); void lexer_readchar(t_lexer *lexer);
char *ft_lexer_readword(t_lexer *lexer); char *lexer_readword(t_lexer *lexer);
t_list *ft_parse_input(t_lexer *lexer); t_list *ft_parse_input(t_lexer *lexer);
/** /**
* Token * Token
*/ */
t_token *ft_token_next(t_lexer *lexer); t_token *ft_token_next(t_lexer *lexer);
t_token *ft_token_new(t_token_type type, char *c, int pos); t_token *token_new(t_token_type type, char *c, int pos);
void ft_token_free(t_token *token); void ft_token_free(t_token *token);
void ft_clear_tokenlist(void *content); void ft_clear_tokenlist(void *content);
t_token *ft_parse_token(t_lexer *lexer); t_token *token_parse(t_lexer *lexer);
#endif // TOKENIZER_H #endif // TOKENIZER_H

2
inc/typedef.h
View File

@ -19,6 +19,8 @@ typedef enum e_token_type
T_PIPE, T_PIPE,
T_REDIRECT_IN, T_REDIRECT_IN,
T_REDIRECT_OUT, T_REDIRECT_OUT,
T_AND,
T_OR,
T_APPEND_OUT, T_APPEND_OUT,
T_HEREDOC, T_HEREDOC,
T_EOF, T_EOF,

6
src/lexer/lexer_read_char.c
View File

@ -1,18 +1,18 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* lexer_readchar.c :+: :+: :+: */ /* lexer_read_char.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 19:04:53 by qmennen #+# #+# */ /* Created: 2025/02/05 19:04:53 by qmennen #+# #+# */
/* Updated: 2025/02/05 19:05:06 by qmennen ### ########.fr */ /* Updated: 2025/02/18 17:02:17 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
void ft_lexer_readchar(t_lexer *lexer) void lexer_readchar(t_lexer *lexer)
{ {
if ((size_t)lexer->n_pos > ft_strlen(lexer->input)) if ((size_t)lexer->n_pos > ft_strlen(lexer->input))
{ {

12
src/lexer/lexer_read_word.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 19:03:47 by qmennen #+# #+# */ /* Created: 2025/02/05 19:03:47 by qmennen #+# #+# */
/* Updated: 2025/02/05 19:28:17 by qmennen ### ########.fr */ /* Updated: 2025/02/18 17:02:17 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,15 +21,15 @@ static char *parse_quotes(t_lexer *lexer)
qc = lexer->current_char; qc = lexer->current_char;
word = NULL; word = NULL;
ft_lexer_readchar(lexer); lexer_readchar(lexer);
start = lexer->pos; start = lexer->pos;
while (lexer->current_char != '\0' && lexer->current_char != qc) while (lexer->current_char != '\0' && lexer->current_char != qc)
ft_lexer_readchar(lexer); lexer_readchar(lexer);
len = lexer->pos - start; len = lexer->pos - start;
word = malloc(sizeof(char) * len + 1); word = malloc(sizeof(char) * len + 1);
ft_strlcpy(word, lexer->input + start, len + 1); ft_strlcpy(word, lexer->input + start, len + 1);
if (lexer->current_char == qc) if (lexer->current_char == qc)
ft_lexer_readchar(lexer); lexer_readchar(lexer);
else else
{ {
free(word); free(word);
@ -38,7 +38,7 @@ static char *parse_quotes(t_lexer *lexer)
return (word); return (word);
} }
char *ft_lexer_readword(t_lexer *lexer) char *lexer_readword(t_lexer *lexer)
{ {
int start; int start;
int len; int len;
@ -54,7 +54,7 @@ char *ft_lexer_readword(t_lexer *lexer)
&& lexer->current_char != '\0' && !ft_isspace(lexer->current_char) && lexer->current_char != '\0' && !ft_isspace(lexer->current_char)
&& lexer->current_char != '"' && lexer->current_char != '\'') && lexer->current_char != '"' && lexer->current_char != '\'')
{ {
ft_lexer_readchar(lexer); lexer_readchar(lexer);
} }
len = lexer->pos - start; len = lexer->pos - start;
word = malloc(sizeof(char) * len + 1); word = malloc(sizeof(char) * len + 1);

2
src/main.c
View File

@ -38,7 +38,7 @@ int main(int argc, char **argv, char **envp)
minishell->lexer = ft_lexer_new(minishell->line); minishell->lexer = ft_lexer_new(minishell->line);
minishell->tokens = ft_parse_input(minishell->lexer); minishell->tokens = ft_parse_input(minishell->lexer);
ft_lstiter(minishell->tokens, token_print); ft_lstiter(minishell->tokens, token_print);
minishell->commands = parser_get_commands(minishell->tokens); //minishell->commands = parser_get_commands(minishell->tokens);
simple_builtins(minishell); simple_builtins(minishell);
free_minishell_line(minishell); free_minishell_line(minishell);
ft_lstclear(&minishell->commands, free_command_list); ft_lstclear(&minishell->commands, free_command_list);

4
src/token/token_new.c
View File

@ -6,13 +6,13 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 19:10:49 by qmennen #+# #+# */ /* Created: 2025/02/05 19:10:49 by qmennen #+# #+# */
/* Updated: 2025/02/05 19:11:32 by qmennen ### ########.fr */ /* Updated: 2025/02/18 17:01:52 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
t_token *ft_token_new(t_token_type type, char *c, int pos) t_token *token_new(t_token_type type, char *c, int pos)
{ {
t_token *token; t_token *token;