rule utils: unquoted

This commit is contained in:
Khaïs COLIN 2025-02-20 13:13:44 +01:00
parent f86de825bd
commit b13f8f096b
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
3 changed files with 16 additions and 8 deletions

View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/20 12:01:57 by khais #+# #+# */
/* Updated: 2025/02/20 12:04:15 by khais ### ########.fr */
/* Updated: 2025/02/20 12:27:45 by khais ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,5 +17,13 @@
*/
bool unquoted_operator(t_token_build *builder)
{
return (builder->quote == '\0' && builder->currently_in_operator);
return (unquoted(builder) && builder->currently_in_operator);
}
/*
** return true if we are in an unquoted state
*/
bool unquoted(t_token_build *builder)
{
return (builder->quote == '\0');
}

View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/20 12:01:31 by khais #+# #+# */
/* Updated: 2025/02/20 12:03:50 by khais ### ########.fr */
/* Updated: 2025/02/20 12:27:05 by khais ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,5 +17,6 @@
# include "wordsplit.h"
bool unquoted_operator(t_token_build *builder);
bool unquoted(t_token_build *builder);
#endif

View file

@ -6,11 +6,12 @@
/* By: jguelen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/19 13:21:18 by jguelen #+# #+# */
/* Updated: 2025/02/20 11:59:57 by khais ### ########.fr */
/* Updated: 2025/02/20 13:14:21 by khais ### ########.fr */
/* */
/* ************************************************************************** */
#include "wordsplit.h"
#include "rule_utils.h"
#include "../matchers/operator_start.h"
#include "../matchers/blank.h"
@ -27,8 +28,7 @@
*/
bool rule_new_operator(t_token_build *builder, char *original)
{
// FIXME: unquoted
if (builder->quote == '\0' && is_operator_start(original[builder->idx]))
if (unquoted(builder) && is_operator_start(original[builder->idx]))
{
operator_start(builder, original[builder->idx]);
builder->idx++;
@ -43,8 +43,7 @@ bool rule_new_operator(t_token_build *builder, char *original)
*/
bool rule_delimit_blank(t_token_build *builder, char *original)
{
// FIXME: unquoted
if (is_blank(original[builder->idx]) && builder->quote == '\0')
if (unquoted(builder) && is_blank(original[builder->idx]))
{
delimit(builder);
builder->idx++;