From f60e922680c1775ce879146ec86df56701e42cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Thu, 6 Mar 2025 15:56:30 +0100 Subject: [PATCH] quote marking: ensure that $ detection does not interfere --- tests/word_splitting.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/word_splitting.c b/tests/word_splitting.c index c99ab41..276cb8d 100644 --- a/tests/word_splitting.c +++ b/tests/word_splitting.c @@ -6,7 +6,7 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/13 15:17:56 by khais #+# #+# */ -/* Updated: 2025/03/06 15:53:03 by khais ### ########.fr */ +/* Updated: 2025/03/06 16:42:12 by khais ### ########.fr */ /* */ /* ************************************************************************** */ @@ -221,18 +221,19 @@ static void test_wordsplit_operator_combining(void) wordlist_destroy(words); } -// kco work marker - static void test_wordsplit_var_substitution(void) { t_wordlist *words; words = minishell_wordsplit("echo VAR=$VAR here"); assert_strequal("echo", wordlist_get(words, 0)->word); + assert_strequal(" ", wordlist_get(words, 0)->marker); assert(0 == wordlist_get(words, 0)->flags); assert_strequal("VAR=$VAR", wordlist_get(words, 1)->word); + assert_strequal(" ", wordlist_get(words, 1)->marker); assert(W_HASDOLLAR == wordlist_get(words, 1)->flags); assert_strequal("here", wordlist_get(words, 2)->word); + assert_strequal(" ", wordlist_get(words, 2)->marker); assert(0 == wordlist_get(words, 2)->flags); wordlist_destroy(words); } @@ -242,13 +243,19 @@ static void test_wordsplit_var_substitution_quotes(void) t_wordlist *words; words = minishell_wordsplit("VAR=\"$VAR\""); + assert_strequal("VAR=\"$VAR\"", wordlist_get(words, 0)->word); + assert_strequal(" \"\"\"\" ", wordlist_get(words, 0)->marker); assert(W_HASDOLLAR & wordlist_get(words, 0)->flags); wordlist_destroy(words); words = minishell_wordsplit("VAR='$VAR'"); + assert_strequal("VAR='$VAR'", wordlist_get(words, 0)->word); assert((W_HASDOLLAR & wordlist_get(words, 0)->flags) == 0); + assert_strequal(" '''' ", wordlist_get(words, 0)->marker); wordlist_destroy(words); } +// kco work marker + static void test_wordsplit_quote_detection_nonnested(void) { t_wordlist *words;