mirror of
https://codeberg.org/la-chouette/minishell.git
synced 2025-12-06 07:28:09 +01:00
rule utils: unquoted
This commit is contained in:
parent
f86de825bd
commit
b13f8f096b
3 changed files with 16 additions and 8 deletions
|
|
@ -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');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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++;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue