Skip to content

tokenizerのquote処理見直し #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dayano74 merged 1 commit into from
May 5, 2025
Merged

tokenizerのquote処理見直し #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions src/tokenizer/read_token.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,15 @@
/* By: ttsubo <[email protected]> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/15 16:33:33 by ttsubo #+# #+# */
/* Updated: 2025/04/29 15:20:11 by ttsubo ### ########.fr */
/* Updated: 2025/05/05 13:02:17 by ttsubo ### ########.fr */
/* */
/* ************************************************************************** */

#include "tokenizer.h"

static char *_read_quoted_token(t_tokenizer *tkn)
static int _is_token_end(char c)
{
char quote;
int start;

quote = tkn->input[tkn->pos];
start = tkn->pos++;
while (tkn->input[tkn->pos] && tkn->input[tkn->pos] != quote)
tkn->pos++;
if (tkn->input[tkn->pos] == quote)
tkn->pos++;
return (ft_substr(tkn->input, start, tkn->pos - start));
return (ft_isspace(c) || c == '|' || c == '<' || c == '>' || c == '\0');
}

static char *_read_op_token(t_tokenizer *tkn)
Expand All @@ -40,16 +31,23 @@ static char *_read_op_token(t_tokenizer *tkn)

static char *_read_word_token(t_tokenizer *tkn)
{
int start;
int start;
char quote;

start = tkn->pos;
while (tkn->input[tkn->pos]
&& !ft_isspace(tkn->input[tkn->pos])
&& !(tkn->input[tkn->pos] == '\'' || tkn->input[tkn->pos] == '"')
&& tkn->input[tkn->pos] != '|'
&& tkn->input[tkn->pos] != '>'
&& tkn->input[tkn->pos] != '<')
tkn->pos++;
while (!_is_token_end(tkn->input[tkn->pos]))
{
if (tkn->input[tkn->pos] == '\'' || tkn->input[tkn->pos] == '"')
{
quote = tkn->input[tkn->pos++];
while (tkn->input[tkn->pos] && tkn->input[tkn->pos] != quote)
tkn->pos++;
if (tkn->input[tkn->pos] == quote)
tkn->pos++;
}
else
tkn->pos++;
}
return (ft_substr(tkn->input, start, tkn->pos - start));
}

Expand All @@ -63,8 +61,6 @@ char *read_token(t_tokenizer *tkn)
{
char *op;

if (tkn->input[tkn->pos] == '\'' || tkn->input[tkn->pos] == '"')
return (_read_quoted_token(tkn));
op = _read_op_token(tkn);
if (op)
return (op);
Expand Down