diff options
| author | Dominik Kaiser | 2024-08-29 15:27:07 +0200 |
|---|---|---|
| committer | Dominik Kaiser | 2024-08-29 15:27:07 +0200 |
| commit | ad4591381f9c3bb713da4d519caeea60ff3b99e7 (patch) | |
| tree | 6883f97be0f8587a2aef9595954da672c2e68121 /src/tokenizer.c | |
| parent | 99e8655aaf9827c7d5248c7f3d0913fcb1377cfb (diff) | |
| parent | 0d4f9e94f6d28a154ae4be3b918bfb014b4fa1e0 (diff) | |
| download | minishell-ad4591381f9c3bb713da4d519caeea60ff3b99e7.tar.gz minishell-ad4591381f9c3bb713da4d519caeea60ff3b99e7.zip | |
Merge branch 'main' into parser
Diffstat (limited to 'src/tokenizer.c')
| -rw-r--r-- | src/tokenizer.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/tokenizer.c b/src/tokenizer.c index efbf723..ab8a6ac 100644 --- a/src/tokenizer.c +++ b/src/tokenizer.c @@ -6,7 +6,7 @@ /* By: chuhlig <chuhlig@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/28 20:55:50 by chuhlig #+# #+# */ -/* Updated: 2024/08/11 11:40:35 by dkaiser ### ########.fr */ +/* Updated: 2024/08/29 15:26:55 by dkaiser ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,7 +36,7 @@ void print_token(t_token *token) } } -void conditional_print(char *string, int start_of_string, int i, +void snap_string_token(char *string, int start_of_string, int i, t_token **token_list) { char *line; @@ -64,7 +64,7 @@ void conditional_print(char *string, int start_of_string, int i, void handle_special_chars(char *s, int *i, int *start, t_token **token_list) { - conditional_print(s, *start, *i - 1, token_list); + snap_string_token(s, *start, *i - 1, token_list); if (s[*i] == '<' && s[*i + 1] == '<') *token_list = new_redir_token(INPUT_LIMITER, *token_list, NULL); else if (s[*i] == '>' && s[*i + 1] == '>') @@ -78,14 +78,15 @@ void handle_special_chars(char *s, int *i, int *start, t_token **token_list) else if (s[*i] == '\n') *token_list = new_token(NEWLINE_TOKEN, *token_list, NULL); print_token(*token_list); - if (s[*i + 1] == '<' || s[*i + 1] == '>') + if (s[*i] == '<' && s[*i + 1] == '<') + (*i)++; + if (s[*i] == '>' && s[*i + 1] == '>') (*i)++; *start = *i + 1; } -void tokenizer(char *s, t_token **token_list) +void tokenizer(char *s, t_token **token_list, char quote_check) { - char quote_check; int pos; int i; int f; @@ -104,9 +105,9 @@ void tokenizer(char *s, t_token **token_list) f = 1; quote_check = s[i]; } - if ((!f && (s[i] == ' ' || s[i] == '\t')) || i == ft_strlen(s) - 1) + if ((!f && (ft_isspace(s[i + 1]))) || i == ft_strlen(s) - 1) { - conditional_print(s, pos, i, token_list); + snap_string_token(s, pos, i, token_list); pos = i + 1; } } |