From aa0e84a82ee936626f271df3b092c15e1e9498c5 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 25 Aug 2024 11:36:39 -0500 Subject: [PATCH] Bugfix: FSS Embedded Read is printing a single line with --line parameter with --object. The entire Content is being displayed when `--object` is used with `--line`. The logic for printing the `--line` is entirely missing. This adds the necessary logic to process the Object (and Content) when the `--line` is used. Update the runtime tests accordingly. --- level_3/fss_embedded_list_read/c/private-read.c | 82 ++++++++++++++++++++++ .../expect/test-0000-basic-object-line-0.expect | 12 ---- .../expect/test-0000-basic-object-line-1.expect | 12 ---- .../expect/test-0000-basic-object-line-100.expect | 13 ---- .../expect/test-0000-basic-object-line-5.expect | 12 ---- .../expect/test-0000-basic-object-line-6.expect | 12 ---- ...est-0000-basic-object_and_content-line-0.expect | 36 ---------- ...est-0000-basic-object_and_content-line-1.expect | 36 ---------- ...t-0000-basic-object_and_content-line-100.expect | 37 ---------- ...est-0000-basic-object_and_content-line-5.expect | 36 ---------- ...est-0000-basic-object_and_content-line-6.expect | 36 ---------- .../test-0001-empty_name_list-object-line-0.expect | 6 -- .../test-0001-empty_name_list-object-line-1.expect | 6 -- ...est-0001-empty_name_list-object-line-100.expect | 7 -- .../test-0001-empty_name_list-object-line-5.expect | 6 -- .../test-0001-empty_name_list-object-line-6.expect | 6 -- ...mpty_name_list-object_and_content-line-0.expect | 16 ----- ...mpty_name_list-object_and_content-line-1.expect | 16 ----- ...ty_name_list-object_and_content-line-100.expect | 17 ----- ...mpty_name_list-object_and_content-line-5.expect | 16 ----- ...mpty_name_list-object_and_content-line-6.expect | 16 ----- .../expect/test-0002-mixed-object-line-0.expect | 6 -- .../expect/test-0002-mixed-object-line-1.expect | 6 -- .../expect/test-0002-mixed-object-line-100.expect | 7 -- .../expect/test-0002-mixed-object-line-5.expect | 6 -- .../expect/test-0002-mixed-object-line-6.expect | 6 -- ...est-0002-mixed-object_and_content-line-0.expect | 32 --------- ...est-0002-mixed-object_and_content-line-1.expect | 32 --------- ...t-0002-mixed-object_and_content-line-100.expect | 33 --------- ...est-0002-mixed-object_and_content-line-5.expect | 34 +-------- ...est-0002-mixed-object_and_content-line-6.expect | 32 --------- 31 files changed, 83 insertions(+), 547 deletions(-) diff --git a/level_3/fss_embedded_list_read/c/private-read.c b/level_3/fss_embedded_list_read/c/private-read.c index 43b76bb..37f44ff 100644 --- a/level_3/fss_embedded_list_read/c/private-read.c +++ b/level_3/fss_embedded_list_read/c/private-read.c @@ -553,6 +553,88 @@ extern "C" { print_object = &fl_print_trim_except_dynamic_partial; } + if (data->main->parameters.array[fss_embedded_list_read_parameter_line_e].result == f_console_result_additional_e) { + f_array_length_t line_current = 0; + uint8_t newline_missing = F_true; + + flockfile(data->main->output.to.stream); + + for (; i < items->used; ++i) { + + if (skip[i]) continue; + + // Handle Object begin. + if (line_current++ == line) { + print_object(data->buffer, items->array[i].object, *objects_delimits, data->main->output.to.stream); + fss_embedded_list_read_print_object_end(data); + + break; + } + + if (data->main->parameters.array[fss_embedded_list_read_parameter_content_e].result == f_console_result_found_e) { + if (items->array[i].content.used) { + j = items->array[i].content.array[0].start; + + if (line_current != line) { + newline_missing = F_true; + + for (; j <= items->array[i].content.array[0].stop; ++j) { + + if (data->buffer.string[j] == f_string_eol_s.string[0]) { + if (++line_current == line) { + ++j; + newline_missing = F_false; + + break; + } + } + } // for + } + + if (line_current == line) { + + // If the matched line is after the stop, then this matches the end of Object line. + if (j > items->array[i].content.array[0].stop) { + fss_embedded_list_read_print_set_end(data); + } + else { + for (; j <= items->array[i].content.array[0].stop; ++j) { + + if (!data->buffer.string[j]) continue; + + if (data->buffer.string[j] == f_string_eol_s.string[0]) { + f_print_dynamic_raw(f_string_eol_s, data->main->output.to.stream); + + break; + } + + f_print_character(data->buffer.string[j], data->main->output.to.stream); + } // for + } + + break; + } + + // The content always ends on a new line so if it is missing from the Content then treat the end of Content as a new line. + if (newline_missing) ++line_current; + } + else { + + // Handle the Object end. + if (line_current++ == line) { + fss_embedded_list_read_print_set_end(data); + + break; + } + } + } + } // for + + funlockfile(data->main->output.to.stream); + + return F_none; + } + flockfile(data->main->output.to.stream); for (i = 0; i < items->used; ++i) { diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect index 65b0a48..c6cac69 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0.expect @@ -1,13 +1 @@ empty -d -a -привет -y -"мир" -привет has space -"This is quoted" -AlsoGood -hi -привет has space -a -also_empty diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect index 65b0a48..4bcfe98 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1.expect @@ -1,13 +1 @@ -empty d -a -привет -y -"мир" -привет has space -"This is quoted" -AlsoGood -hi -привет has space -a -also_empty diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect index 65b0a48..e69de29 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-100.expect @@ -1,13 +0,0 @@ -empty -d -a -привет -y -"мир" -привет has space -"This is quoted" -AlsoGood -hi -привет has space -a -also_empty diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect index 65b0a48..2057e0f 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5.expect @@ -1,13 +1 @@ -empty -d -a -привет -y "мир" -привет has space -"This is quoted" -AlsoGood -hi -привет has space -a -also_empty diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect index 65b0a48..9a900be 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6.expect @@ -1,13 +1 @@ -empty -d -a -привет -y -"мир" привет has space -"This is quoted" -AlsoGood -hi -привет has space -a -also_empty diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect index a3d6a83..fec5380 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0.expect @@ -1,37 +1 @@ empty{ -} -d{ - b c -} -a{ - e f - g h -} -привет{ - мир -} -y { - z -} -"мир"{ - quoted, "yep". -} -привет has space{ - \"and so does this" "have space" -} -"This is quoted"{ - But still a valid list. -} -AlsoGood{ -} -hi { - Check this. -} -привет has space { - ... -} -a{ - a second "a". -} -also_empty{ -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect index a3d6a83..5c34318 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1.expect @@ -1,37 +1 @@ -empty{ -} -d{ - b c -} -a{ - e f - g h -} -привет{ - мир -} -y { - z -} -"мир"{ - quoted, "yep". -} -привет has space{ - \"and so does this" "have space" -} -"This is quoted"{ - But still a valid list. -} -AlsoGood{ -} -hi { - Check this. -} -привет has space { - ... -} -a{ - a second "a". -} -also_empty{ } diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect index a3d6a83..e69de29 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-100.expect @@ -1,37 +0,0 @@ -empty{ -} -d{ - b c -} -a{ - e f - g h -} -привет{ - мир -} -y { - z -} -"мир"{ - quoted, "yep". -} -привет has space{ - \"and so does this" "have space" -} -"This is quoted"{ - But still a valid list. -} -AlsoGood{ -} -hi { - Check this. -} -привет has space { - ... -} -a{ - a second "a". -} -also_empty{ -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect index a3d6a83..85a90f6 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5.expect @@ -1,37 +1 @@ -empty{ -} -d{ - b c -} a{ - e f - g h -} -привет{ - мир -} -y { - z -} -"мир"{ - quoted, "yep". -} -привет has space{ - \"and so does this" "have space" -} -"This is quoted"{ - But still a valid list. -} -AlsoGood{ -} -hi { - Check this. -} -привет has space { - ... -} -a{ - a second "a". -} -also_empty{ -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect index a3d6a83..b19e23b 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6.expect @@ -1,37 +1 @@ -empty{ -} -d{ - b c -} -a{ e f - g h -} -привет{ - мир -} -y { - z -} -"мир"{ - quoted, "yep". -} -привет has space{ - \"and so does this" "have space" -} -"This is quoted"{ - But still a valid list. -} -AlsoGood{ -} -hi { - Check this. -} -привет has space { - ... -} -a{ - a second "a". -} -also_empty{ -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect index f9a7535..7898192 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0.expect @@ -1,7 +1 @@ a -hi -a -a - - -"" diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect index f9a7535..45b983b 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1.expect @@ -1,7 +1 @@ -a hi -a -a - - -"" diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect index f9a7535..e69de29 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-100.expect @@ -1,7 +0,0 @@ -a -hi -a -a - - -"" diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect index f9a7535..8b13789 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5.expect @@ -1,7 +1 @@ -a -hi -a -a - -"" diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect index f9a7535..e16c76d 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6.expect @@ -1,7 +1 @@ -a -hi -a -a - - "" diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect index 49d85ba..85a90f6 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0.expect @@ -1,17 +1 @@ a{ -} -hi{ -} -a{ -} -a { -} -{ - The object name is an empty string. -} -{ -} -""{ - Quotes aren't supported here, so this is not an empty object.. -} -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect index 49d85ba..5c34318 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1.expect @@ -1,17 +1 @@ -a{ -} -hi{ -} -a{ -} -a { -} -{ - The object name is an empty string. -} -{ -} -""{ - Quotes aren't supported here, so this is not an empty object.. -} } diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect index 49d85ba..e69de29 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-100.expect @@ -1,17 +0,0 @@ -a{ -} -hi{ -} -a{ -} -a { -} -{ - The object name is an empty string. -} -{ -} -""{ - Quotes aren't supported here, so this is not an empty object.. -} -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect index 49d85ba..5c34318 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5.expect @@ -1,17 +1 @@ -a{ -} -hi{ -} -a{ -} -a { -} -{ - The object name is an empty string. -} -{ -} -""{ - Quotes aren't supported here, so this is not an empty object.. -} } diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect index 49d85ba..2c3a87c 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6.expect @@ -1,17 +1 @@ -a{ -} -hi{ -} -a{ -} a { -} -{ - The object name is an empty string. -} -{ -} -""{ - Quotes aren't supported here, so this is not an empty object.. -} -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect index 67eb63b..7898192 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0.expect @@ -1,7 +1 @@ a -a -"мир" -привет has space -empty -hi -has spaces diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect index 67eb63b..7898192 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1.expect @@ -1,7 +1 @@ a -a -"мир" -привет has space -empty -hi -has spaces diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect index 67eb63b..e69de29 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-100.expect @@ -1,7 +0,0 @@ -a -a -"мир" -привет has space -empty -hi -has spaces diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect index 67eb63b..45b983b 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5.expect @@ -1,7 +1 @@ -a -a -"мир" -привет has space -empty hi -has spaces diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect index 67eb63b..0fb99b1 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6.expect @@ -1,7 +1 @@ -a -a -"мир" -привет has space -empty -hi has spaces diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect index 0a7c3b0..85a90f6 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0.expect @@ -1,33 +1 @@ a{ -a b привет -c d - # not a comment - \\# nor is this. -\# even this is not. -привет мир a - - # a valid list: - with content. -} -a{ - another "A" list. -} -"мир"{ - quoted, "yep". -} -привет has space{ - But this is not a comment. -} -empty{ -} -hi{ - not a list\: - a b привет - c d - привет мир a - -} -has spaces { - yep. - fin -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect index 0a7c3b0..e50021b 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1.expect @@ -1,33 +1 @@ -a{ a b привет -c d - # not a comment - \\# nor is this. -\# even this is not. -привет мир a - - # a valid list: - with content. -} -a{ - another "A" list. -} -"мир"{ - quoted, "yep". -} -привет has space{ - But this is not a comment. -} -empty{ -} -hi{ - not a list\: - a b привет - c d - привет мир a - -} -has spaces { - yep. - fin -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect index 0a7c3b0..e69de29 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-100.expect @@ -1,33 +0,0 @@ -a{ -a b привет -c d - # not a comment - \\# nor is this. -\# even this is not. -привет мир a - - # a valid list: - with content. -} -a{ - another "A" list. -} -"мир"{ - quoted, "yep". -} -привет has space{ - But this is not a comment. -} -empty{ -} -hi{ - not a list\: - a b привет - c d - привет мир a - -} -has spaces { - yep. - fin -} diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect index 0a7c3b0..311f4e4 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect @@ -1,33 +1 @@ -a{ -a b привет -c d - # not a comment - \\# nor is this. -\# even this is not. -привет мир a - - # a valid list: - with content. -} -a{ - another "A" list. -} -"мир"{ - quoted, "yep". -} -привет has space{ - But this is not a comment. -} -empty{ -} -hi{ - not a list\: - a b привет - c d - привет мир a - -} -has spaces { - yep. - fin -} +\\# even this is not. diff --git a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect index 0a7c3b0..9c5d8ed 100644 --- a/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect +++ b/level_3/fss_embedded_list_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6.expect @@ -1,33 +1 @@ -a{ -a b привет -c d - # not a comment - \\# nor is this. -\# even this is not. привет мир a - - # a valid list: - with content. -} -a{ - another "A" list. -} -"мир"{ - quoted, "yep". -} -привет has space{ - But this is not a comment. -} -empty{ -} -hi{ - not a list\: - a b привет - c d - привет мир a - -} -has spaces { - yep. - fin -} -- 1.8.3.1