mirror of
https://codeberg.org/la-chouette/minishell.git
synced 2025-12-06 07:28:09 +01:00
quote marking: ensure that operator detection does not interfere
This commit is contained in:
parent
3a341e601d
commit
33fc88eeed
1 changed files with 22 additions and 3 deletions
|
|
@ -6,7 +6,7 @@
|
||||||
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
|
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2025/02/13 15:17:56 by khais #+# #+# */
|
/* Created: 2025/02/13 15:17:56 by khais #+# #+# */
|
||||||
/* Updated: 2025/03/06 15:50:01 by khais ### ########.fr */
|
/* Updated: 2025/03/06 15:53:03 by khais ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|
@ -156,15 +156,15 @@ static void test_wordsplit_unclosed_double(void)
|
||||||
assert(words == NULL);
|
assert(words == NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// kco work marker
|
|
||||||
|
|
||||||
static void test_wordsplit_operator_word(void)
|
static void test_wordsplit_operator_word(void)
|
||||||
{
|
{
|
||||||
t_wordlist *words;
|
t_wordlist *words;
|
||||||
|
|
||||||
words = minishell_wordsplit(">test");
|
words = minishell_wordsplit(">test");
|
||||||
assert_strequal(">", wordlist_get(words, 0)->word);
|
assert_strequal(">", wordlist_get(words, 0)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 0)->marker);
|
||||||
assert_strequal("test", wordlist_get(words, 1)->word);
|
assert_strequal("test", wordlist_get(words, 1)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 1)->marker);
|
||||||
assert(NULL == wordlist_get(words, 2));
|
assert(NULL == wordlist_get(words, 2));
|
||||||
wordlist_destroy(words);
|
wordlist_destroy(words);
|
||||||
}
|
}
|
||||||
|
|
@ -175,14 +175,23 @@ static void test_wordsplit_all_operators(void)
|
||||||
|
|
||||||
words = minishell_wordsplit("|&&||()<>><<>");
|
words = minishell_wordsplit("|&&||()<>><<>");
|
||||||
assert_strequal("|", wordlist_get(words, 0)->word);
|
assert_strequal("|", wordlist_get(words, 0)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 0)->marker);
|
||||||
assert_strequal("&&", wordlist_get(words, 1)->word);
|
assert_strequal("&&", wordlist_get(words, 1)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 1)->marker);
|
||||||
assert_strequal("||", wordlist_get(words, 2)->word);
|
assert_strequal("||", wordlist_get(words, 2)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 2)->marker);
|
||||||
assert_strequal("(", wordlist_get(words, 3)->word);
|
assert_strequal("(", wordlist_get(words, 3)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 3)->marker);
|
||||||
assert_strequal(")", wordlist_get(words, 4)->word);
|
assert_strequal(")", wordlist_get(words, 4)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 4)->marker);
|
||||||
assert_strequal("<", wordlist_get(words, 5)->word);
|
assert_strequal("<", wordlist_get(words, 5)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 5)->marker);
|
||||||
assert_strequal(">>", wordlist_get(words, 6)->word);
|
assert_strequal(">>", wordlist_get(words, 6)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 6)->marker);
|
||||||
assert_strequal("<<", wordlist_get(words, 7)->word);
|
assert_strequal("<<", wordlist_get(words, 7)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 7)->marker);
|
||||||
assert_strequal(">", wordlist_get(words, 8)->word);
|
assert_strequal(">", wordlist_get(words, 8)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 8)->marker);
|
||||||
assert(NULL == wordlist_get(words, 9));
|
assert(NULL == wordlist_get(words, 9));
|
||||||
wordlist_destroy(words);
|
wordlist_destroy(words);
|
||||||
}
|
}
|
||||||
|
|
@ -193,17 +202,27 @@ static void test_wordsplit_operator_combining(void)
|
||||||
|
|
||||||
words = minishell_wordsplit("|||>>><<<&&&");
|
words = minishell_wordsplit("|||>>><<<&&&");
|
||||||
assert_strequal("||", wordlist_get(words, 0)->word);
|
assert_strequal("||", wordlist_get(words, 0)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 0)->marker);
|
||||||
assert_strequal("|", wordlist_get(words, 1)->word);
|
assert_strequal("|", wordlist_get(words, 1)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 1)->marker);
|
||||||
assert_strequal(">>", wordlist_get(words, 2)->word);
|
assert_strequal(">>", wordlist_get(words, 2)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 2)->marker);
|
||||||
assert_strequal(">", wordlist_get(words, 3)->word);
|
assert_strequal(">", wordlist_get(words, 3)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 3)->marker);
|
||||||
assert_strequal("<<", wordlist_get(words, 4)->word);
|
assert_strequal("<<", wordlist_get(words, 4)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 4)->marker);
|
||||||
assert_strequal("<", wordlist_get(words, 5)->word);
|
assert_strequal("<", wordlist_get(words, 5)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 5)->marker);
|
||||||
assert_strequal("&&", wordlist_get(words, 6)->word);
|
assert_strequal("&&", wordlist_get(words, 6)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 6)->marker);
|
||||||
assert_strequal("&", wordlist_get(words, 7)->word);
|
assert_strequal("&", wordlist_get(words, 7)->word);
|
||||||
|
assert_strequal(" ", wordlist_get(words, 7)->marker);
|
||||||
assert(NULL == wordlist_get(words, 8));
|
assert(NULL == wordlist_get(words, 8));
|
||||||
wordlist_destroy(words);
|
wordlist_destroy(words);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// kco work marker
|
||||||
|
|
||||||
static void test_wordsplit_var_substitution(void)
|
static void test_wordsplit_var_substitution(void)
|
||||||
{
|
{
|
||||||
t_wordlist *words;
|
t_wordlist *words;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue