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

extracting more

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-27 19:04:02 +01:00
parent 547dacc0ba
commit 48256b2c81
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/tokenizer.h
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@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/27 18:27:33 by qmennen ### ########.fr */ /* Updated: 2025/02/27 19:03:09 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,6 +21,7 @@ void ft_lexer_free(t_minishell *msh, t_lexer *lexer);
void lexer_readchar(t_lexer *lexer); void lexer_readchar(t_lexer *lexer);
char *lexer_readword(t_minishell *msh, t_lexer *lexer); char *lexer_readword(t_minishell *msh, t_lexer *lexer);
t_list *ft_parse_input(t_minishell *msh); t_list *ft_parse_input(t_minishell *msh);
char *lexer_parse_quotes(t_minishell *msh, t_lexer *lexer);
/** /**
* Token * Token
*/ */

33
src/lexer/lexer_parse_quotes.c Normal file
View File

@ -0,0 +1,33 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* lexer_parse_quotes.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/27 19:02:37 by qmennen #+# #+# */
/* Updated: 2025/02/27 19:02:54 by qmennen ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
char *lexer_parse_quotes(t_minishell *msh, t_lexer *lexer)
{
int start;
int len;
char qc;
char *word;
qc = lexer->current_char;
word = NULL;
lexer_readchar(lexer);
start = lexer->pos;
while (lexer->current_char != '\0' && lexer->current_char != qc)
lexer_readchar(lexer);
len = lexer->pos - start;
word = malloc_safe(msh, sizeof(char) * len + 1);
ft_strlcpy(word, lexer->input + start, len + 1);
lexer_readchar(lexer);
return (word);
}

24
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/27 18:47:33 by qmennen ### ########.fr */ /* Updated: 2025/02/27 19:03:15 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -28,26 +28,6 @@ static int match_quotes(t_minishell *msh, t_lexer *lexer)
return ((qts % 2) == 0); return ((qts % 2) == 0);
} }
static char *parse_quotes(t_minishell *msh, t_lexer *lexer)
{
int start;
int len;
char qc;
char *word;
qc = lexer->current_char;
word = NULL;
lexer_readchar(lexer);
start = lexer->pos;
while (lexer->current_char != '\0' && lexer->current_char != qc)
lexer_readchar(lexer);
len = lexer->pos - start;
word = malloc_safe(msh, sizeof(char) * len + 1);
ft_strlcpy(word, lexer->input + start, len + 1);
lexer_readchar(lexer);
return (word);
}
char *lexer_readword(t_minishell *msh, t_lexer *lexer) char *lexer_readword(t_minishell *msh, t_lexer *lexer)
{ {
int start; int start;
@ -59,7 +39,7 @@ char *lexer_readword(t_minishell *msh, t_lexer *lexer)
if (!match_quotes(msh, lexer)) if (!match_quotes(msh, lexer))
return (NULL); return (NULL);
if (lexer->current_char == '"' || lexer->current_char == '\'') if (lexer->current_char == '"' || lexer->current_char == '\'')
return (parse_quotes(msh, lexer)); return (lexer_parse_quotes(msh, lexer));
c = lexer->current_char; c = lexer->current_char;
while (ft_isprint(c) && c != '<' &&c != '>' && c != '|' && c != '\0' while (ft_isprint(c) && c != '<' &&c != '>' && c != '|' && c != '\0'
&& !ft_isspace(lexer->current_char)) && !ft_isspace(lexer->current_char))