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

last rework for the day, hello""world now read helloworld correctly

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-27 19:21:05 +01:00
parent 48256b2c81
commit e07d4b4d79
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
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 19:03:15 by qmennen ### ########.fr */ /* Updated: 2025/02/27 19:20:22 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -28,6 +28,22 @@ static int match_quotes(t_minishell *msh, t_lexer *lexer)
return ((qts % 2) == 0); return ((qts % 2) == 0);
} }
static int calculate_word_len(t_minishell *msh, t_lexer *lexer)
{
int i;
int len;
len = 1;
i = lexer->pos;
while (ft_isprint(lexer->input[i]) && lexer->input[i] != '<' && lexer->input[i]!= '>' && lexer->input[i] != '|' && lexer->input[i] != '\0' && !ft_isspace(lexer->input[i]))
{
if(lexer->input[i] != '\'' && lexer->input[i] != '"')
len++;
i++;
}
return (len);
}
char *lexer_readword(t_minishell *msh, t_lexer *lexer) char *lexer_readword(t_minishell *msh, t_lexer *lexer)
{ {
int start; int start;
@ -40,15 +56,17 @@ char *lexer_readword(t_minishell *msh, t_lexer *lexer)
return (NULL); return (NULL);
if (lexer->current_char == '"' || lexer->current_char == '\'') if (lexer->current_char == '"' || lexer->current_char == '\'')
return (lexer_parse_quotes(msh, lexer)); return (lexer_parse_quotes(msh, lexer));
len = calculate_word_len(msh, lexer);
word = malloc_safe(msh, sizeof(char) * len);
c = lexer->current_char; c = lexer->current_char;
while (ft_isprint(c) && c != '<' &&c != '>' && c != '|' && c != '\0' len = 0;
&& !ft_isspace(lexer->current_char)) while (ft_isprint(c) && c != '<' && c != '>' && c != '|' && c != '\0' && !ft_isspace(c))
{ {
if(c != '\'' && c != '"')
word[len++] = lexer->current_char;
lexer_readchar(lexer); lexer_readchar(lexer);
c = lexer->current_char; c = lexer->current_char;
} }
len = lexer->pos - start; word[len] = 0;
word = malloc_safe(msh, sizeof(char) * len + 1);
ft_strlcpy(word, lexer->input + start, len + 1);
return (word); return (word);
} }