mirror of
https://codeberg.org/la-chouette/minishell.git
synced 2025-12-06 07:28:09 +01:00
token_build: rename current_index to idx
This commit is contained in:
parent
6f8a86732b
commit
f2469f1600
3 changed files with 22 additions and 22 deletions
|
|
@ -6,7 +6,7 @@
|
|||
/* By: jguelen <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/02/19 13:20:01 by jguelen #+# #+# */
|
||||
/* Updated: 2025/02/20 11:50:44 by khais ### ########.fr */
|
||||
/* Updated: 2025/02/20 11:52:28 by khais ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
*/
|
||||
bool rule_eof(t_token_build *builder, char *original)
|
||||
{
|
||||
if (original[builder->current_index] == '\0')
|
||||
if (original[builder->idx] == '\0')
|
||||
{
|
||||
delimit(builder);
|
||||
return (true);
|
||||
|
|
@ -40,10 +40,10 @@ bool rule_eof(t_token_build *builder, char *original)
|
|||
bool rule_combine_operator(t_token_build *builder, char *original)
|
||||
{
|
||||
if (builder->currently_in_operator && builder->quote == '\0'
|
||||
&& is_operator_combo(builder->cur_token->buffer, original[builder->current_index]))
|
||||
&& is_operator_combo(builder->cur_token->buffer, original[builder->idx]))
|
||||
{
|
||||
push_char(builder, original[builder->current_index]);
|
||||
builder->current_index++;
|
||||
push_char(builder, original[builder->idx]);
|
||||
builder->idx++;
|
||||
return (true);
|
||||
}
|
||||
return (false);
|
||||
|
|
@ -57,7 +57,7 @@ bool rule_combine_operator(t_token_build *builder, char *original)
|
|||
bool rule_operator_end(t_token_build *builder, char *original)
|
||||
{
|
||||
if (builder->currently_in_operator && builder->quote == '\0'
|
||||
&& !is_operator_combo(builder->cur_token->buffer, original[builder->current_index]))
|
||||
&& !is_operator_combo(builder->cur_token->buffer, original[builder->idx]))
|
||||
{
|
||||
delimit(builder);
|
||||
return (true);
|
||||
|
|
@ -75,10 +75,10 @@ bool rule_operator_end(t_token_build *builder, char *original)
|
|||
*/
|
||||
bool rule_quote(t_token_build *builder, char *original)
|
||||
{
|
||||
if (original[builder->current_index] == '\'' || original[builder->current_index] == '"')
|
||||
if (original[builder->idx] == '\'' || original[builder->idx] == '"')
|
||||
{
|
||||
quote_flip(builder, original[builder->current_index]);
|
||||
builder->current_index++;
|
||||
quote_flip(builder, original[builder->idx]);
|
||||
builder->idx++;
|
||||
return (true);
|
||||
}
|
||||
return (false);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
/* By: jguelen <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/02/19 13:21:18 by jguelen #+# #+# */
|
||||
/* Updated: 2025/02/20 11:50:59 by khais ### ########.fr */
|
||||
/* Updated: 2025/02/20 11:52:28 by khais ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -27,10 +27,10 @@
|
|||
*/
|
||||
bool rule_new_operator(t_token_build *builder, char *original)
|
||||
{
|
||||
if (builder->quote == '\0' && is_operator_start(original[builder->current_index]))
|
||||
if (builder->quote == '\0' && is_operator_start(original[builder->idx]))
|
||||
{
|
||||
operator_start(builder, original[builder->current_index]);
|
||||
builder->current_index++;
|
||||
operator_start(builder, original[builder->idx]);
|
||||
builder->idx++;
|
||||
return (true);
|
||||
}
|
||||
return (false);
|
||||
|
|
@ -42,10 +42,10 @@ bool rule_new_operator(t_token_build *builder, char *original)
|
|||
*/
|
||||
bool rule_delimit_blank(t_token_build *builder, char *original)
|
||||
{
|
||||
if (is_blank(original[builder->current_index]) && builder->quote == '\0')
|
||||
if (is_blank(original[builder->idx]) && builder->quote == '\0')
|
||||
{
|
||||
delimit(builder);
|
||||
builder->current_index++;
|
||||
builder->idx++;
|
||||
return (true);
|
||||
}
|
||||
return (false);
|
||||
|
|
@ -59,8 +59,8 @@ bool rule_combine_word(t_token_build *builder, char *original)
|
|||
{
|
||||
if (builder->currently_in_word)
|
||||
{
|
||||
push_char(builder, original[builder->current_index]);
|
||||
builder->current_index++;
|
||||
push_char(builder, original[builder->idx]);
|
||||
builder->idx++;
|
||||
return (true);
|
||||
}
|
||||
return (false);
|
||||
|
|
@ -71,7 +71,7 @@ bool rule_combine_word(t_token_build *builder, char *original)
|
|||
*/
|
||||
bool rule_new_word(t_token_build *builder, char *original)
|
||||
{
|
||||
new_word(builder, original[builder->current_index]);
|
||||
builder->current_index++;
|
||||
new_word(builder, original[builder->idx]);
|
||||
builder->idx++;
|
||||
return (true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
/* +:+ +:+ +:+ */
|
||||
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/02/20 11:48/20 by khais #+# #+# */
|
||||
/* Updated: 2025/02/20 11:48:20 by khais ### ########.fr */
|
||||
/* Created: 2025/02/20 11:52/28 by khais #+# #+# */
|
||||
/* Updated: 2025/02/20 11:52:28 by khais ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ typedef struct s_token_build
|
|||
bool currently_in_word;
|
||||
bool currently_in_operator;
|
||||
char quote;
|
||||
size_t current_index;
|
||||
size_t idx;
|
||||
} t_token_build;
|
||||
|
||||
void delimit(t_token_build *builder);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue