From b2314b116cec13c58e4e991ef96ec03c13292f9a Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 27 Aug 2024 22:26:32 -0500 Subject: [PATCH] Progress: Continue working on getting FSS Embedded Read working. The runtime tests currently pass but I am not done with the changes. Fix several problems with the Embedded List processing from fl_fss. - The comments are now being handled correctly along with the `close`. I noticed that the `--columns` could be opposing `--object` and `--content`. This would make more sense as the combination of `--object` is meaningless. I could also just throw a parameter error the `--columns` cannot be used with `--object`. Then I could update the runtime tests to make more sense regarding the combination of `--object` and `--columns`. --- level_1/fl_fss/c/fss/embedded_list.c | 32 ++++++++-------- .../fss_read/c/embedded_list/process_normal.c | 11 ++++++ ...ontent-name-hi-select-0-empty-total.expect | 2 +- ...asic-content-name-hi-select-0-empty.expect | 1 + ...asic-content-name-hi-select-0-total.expect | 2 +- ...0000-basic-content-name-hi-select-0.expect | 1 + ...st-0000-basic-content-name-hi-total.expect | 2 +- .../test-0000-basic-content-name-hi.expect | 1 + ...5\321\202_has_space-select-0-total.expect" | 2 +- ...320\265\321\202_has_space-select-0.expect" | 1 + ...62\320\265\321\202_has_space-total.expect" | 2 +- ...\320\262\320\265\321\202_has_space.expect" | 1 + .../test-0000-basic-object-columns.expect | 2 +- ...t-0000-basic-object-line-0-original.expect | 1 + ...t-0000-basic-object-line-1-original.expect | 1 + ...t-0000-basic-object-line-5-original.expect | 1 + ...t-0000-basic-object-line-6-original.expect | 1 + ...0-basic-object-name-a-columns-empty.expect | 2 +- ...st-0000-basic-object-name-a-columns.expect | 2 +- ...object-name-hi-select-0-empty-total.expect | 2 +- ...basic-object-name-hi-select-0-empty.expect | 1 + ...basic-object-name-hi-select-0-total.expect | 2 +- ...-0000-basic-object-name-hi-select-0.expect | 1 + ...est-0000-basic-object-name-hi-total.expect | 2 +- .../test-0000-basic-object-name-hi.expect | 1 + ...5\321\202_has_space-select-0-total.expect" | 2 +- ...62\320\265\321\202_has_space-total.expect" | 2 +- ...\320\262\320\265\321\202_has_space.expect" | 1 + ...0000-basic-object-select-0-original.expect | 13 +++++++ ...-object_and_content-line-0-original.expect | 1 + ...-object_and_content-line-1-original.expect | 1 + ...-object_and_content-line-5-original.expect | 1 + ...-object_and_content-line-6-original.expect | 1 + ...ontent-name-hi-select-0-empty-total.expect | 2 +- ..._and_content-name-hi-select-0-empty.expect | 3 ++ ..._and_content-name-hi-select-0-total.expect | 2 +- ...object_and_content-name-hi-select-0.expect | 3 ++ ...ic-object_and_content-name-hi-total.expect | 2 +- ...00-basic-object_and_content-name-hi.expect | 3 ++ ...5\321\202_has_space-select-0-total.expect" | 2 +- ...320\265\321\202_has_space-select-0.expect" | 3 ++ ...62\320\265\321\202_has_space-total.expect" | 2 +- ...bject_and_content-select-0-original.expect | 37 +++++++++++++++++++ ...ty_name_list-content-name-a-columns.expect | 2 +- ...0001-empty_name_list-object-columns.expect | 2 +- ...ty_name_list-object-line-0-original.expect | 1 + ...ty_name_list-object-line-1-original.expect | 1 + ...ty_name_list-object-line-5-original.expect | 1 + ...ty_name_list-object-line-6-original.expect | 1 + ...me_list-object-name-a-columns-empty.expect | 2 +- ...pty_name_list-object-name-a-columns.expect | 2 +- ...e_list-object-name-a-original-empty.expect | 1 + ...ty_name_list-object-name-a-original.expect | 1 + ...e_list-object-name-a-select-0-total.expect | 2 +- ...ty_name_list-object-name-a-select-0.expect | 1 + ...empty_name_list-object-name-a-total.expect | 2 +- ...-0001-empty_name_list-object-name-a.expect | 1 + ..._name_list-object-select-0-original.expect | 7 ++++ ...-object_and_content-line-0-original.expect | 1 + ...-object_and_content-line-1-original.expect | 1 + ...-object_and_content-line-5-original.expect | 1 + ...-object_and_content-line-6-original.expect | 1 + ...t-object_and_content-name-a-columns.expect | 2 +- ...t_and_content-name-a-original-empty.expect | 2 + ...-object_and_content-name-a-original.expect | 2 + ...t_and_content-name-a-select-0-total.expect | 2 +- ...-object_and_content-name-a-select-0.expect | 2 + ...ist-object_and_content-name-a-total.expect | 2 +- ...name_list-object_and_content-name-a.expect | 2 + ...bject_and_content-select-0-original.expect | 17 +++++++++ .../test-0002-mixed-object-columns.expect | 2 +- ...t-0002-mixed-object-line-0-original.expect | 1 + ...t-0002-mixed-object-line-1-original.expect | 1 + ...t-0002-mixed-object-line-5-original.expect | 1 + ...t-0002-mixed-object-line-6-original.expect | 1 + ...2-mixed-object-name-a-columns-empty.expect | 2 +- ...st-0002-mixed-object-name-a-columns.expect | 2 +- ...0002-mixed-object-select-0-original.expect | 7 ++++ ...-object_and_content-line-0-original.expect | 1 + ...-object_and_content-line-1-original.expect | 1 + ...-object_and_content-line-5-original.expect | 1 + ...002-mixed-object_and_content-line-5.expect | 2 +- ...-object_and_content-line-6-original.expect | 1 + ...bject_and_content-select-0-original.expect | 33 +++++++++++++++++ 84 files changed, 228 insertions(+), 48 deletions(-) diff --git a/level_1/fl_fss/c/fss/embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c index 668f1d6fe..2e18dcee0 100644 --- a/level_1/fl_fss/c/fss/embedded_list.c +++ b/level_1/fl_fss/c/fss/embedded_list.c @@ -64,7 +64,7 @@ extern "C" { uint8_t is_open = F_false; // 0x0 = false, 0x1 = true, 0x2 = false, but there is a delimited comment, comment_delimit is set. - uint8_t graph_first = 0x0; + uint8_t graph_first = 0x1; // Initialize depth 1 start position. // Positions_start.used is used as a max depth (such that cache->positions->used == max depth + 1). @@ -92,6 +92,7 @@ extern "C" { newline_last = range->start; position_previous = range->start++; graph_first = 0x1; + line_start = range->start; if (depth) { if (range->start >= buffer.used || range->start > range->stop) { @@ -111,8 +112,6 @@ extern "C" { } } - line_start = range->start; - continue; } @@ -466,6 +465,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol_s.string[0]) { newline_last = range->start; line_start = range->start + 1; + graph_first = 0x1; break; } @@ -501,8 +501,6 @@ extern "C" { } } else if (buffer.string[range->start] == f_fss_embedded_list_close_s.string[0]) { - graph_first = 0x0; - while (range->start <= range->stop && range->start < buffer.used) { if (state->interrupt) { @@ -683,12 +681,11 @@ extern "C" { } } else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s.string[0]) { - position = newline_last + 1; - f_fss_seek_to_eol(buffer, range, state); - if (F_status_is_error(state->status)) break; + // The newline_last is initialized to the range->start, which may not actually be a new line. + position = (buffer.string[newline_last] == f_string_eol_s.string[0]) ? newline_last + 1 : newline_last; - state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &comments->array, &comments->used, &comments->size); + f_fss_seek_to_eol(buffer, range, state); if (F_status_is_error(state->status)) break; if (range->start > range->stop || range->start >= buffer.used) { @@ -706,6 +703,9 @@ extern "C" { graph_first = 0x1; } + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &comments->array, &comments->used, &comments->size); + if (F_status_is_error(state->status)) break; + comments->array[comments->used].start = position; comments->array[comments->used++].stop = range->start++; @@ -793,19 +793,17 @@ extern "C" { const f_number_unsigned_t destination_used = destination->used; - bool is_comment = F_false; - bool ends_on_eol = F_false; - bool has_graph = F_false; - bool do_prepend = prepend ? F_true : F_false; + uint8_t is_comment = F_false; + uint8_t ends_on_eol = F_false; + uint8_t has_graph = F_false; + uint8_t do_prepend = prepend ? F_true : F_false; + uint8_t width = 0; f_number_unsigned_t i = 0; + f_number_unsigned_t r = 0; f_number_unsigned_t slash_count = 0; f_number_unsigned_t start = 0; - f_number_unsigned_t r = 0; - - uint8_t width = 0; - while (range->start <= range->stop && range->start < content.used) { if (state->interrupt) { diff --git a/level_3/fss_read/c/embedded_list/process_normal.c b/level_3/fss_read/c/embedded_list/process_normal.c index 15ee63992..3665e4ae3 100644 --- a/level_3/fss_read/c/embedded_list/process_normal.c +++ b/level_3/fss_read/c/embedded_list/process_normal.c @@ -15,6 +15,17 @@ extern "C" { // The process_load() callback is required to be non-NULL. if (!main->callback.process_load) return; + // This standard does not support multiple select, so any select greater than 0 can be predicted without processing the buffer. + if ((main->setting.flag & fss_read_main_flag_select_d) && main->setting.select) { + if (main->setting.flag & fss_read_main_flag_total_d) { + fss_read_print_number(&main->program.output, 0); + } + + main->setting.state.status = F_okay; + + return; + } + // @todo this now needs to handle this case: main->setting.flag & fss_read_main_flag_depth_multiple_d and this case main->setting.flag & fss_read_main_flag_select_d. if (main->setting.buffer.used) { diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty-total.expect index 573541ac9..d00491fd7 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty-total.expect @@ -1 +1 @@ -0 +1 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty.expect index e69de29bb..b23c95d1e 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-empty.expect @@ -0,0 +1 @@ + Check this. diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-total.expect index 573541ac9..d00491fd7 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0-total.expect @@ -1 +1 @@ -0 +1 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0.expect index e69de29bb..b23c95d1e 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-select-0.expect @@ -0,0 +1 @@ + Check this. diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-total.expect index 573541ac9..d00491fd7 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi-total.expect @@ -1 +1 @@ -0 +1 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi.expect index e69de29bb..b23c95d1e 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-hi.expect @@ -0,0 +1 @@ + Check this. diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" index d00491fd7..0cfbf0888 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" @@ -1 +1 @@ -1 +2 diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" index 159ed5353..ff991a1e6 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" @@ -1 +1,2 @@ \"and so does this" "have space" + ... diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" index d00491fd7..0cfbf0888 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" @@ -1 +1 @@ -1 +2 diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" index 159ed5353..ff991a1e6 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" @@ -1 +1,2 @@ \"and so does this" "have space" + ... diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0-original.expect index e69de29bb..c6cac6926 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-0-original.expect @@ -0,0 +1 @@ +empty diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1-original.expect index e69de29bb..4bcfe98e6 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-1-original.expect @@ -0,0 +1 @@ +d diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5-original.expect index e69de29bb..2057e0fc8 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-5-original.expect @@ -0,0 +1 @@ +"мир" diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6-original.expect index e69de29bb..9a900be18 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-line-6-original.expect @@ -0,0 +1 @@ +привет has space diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns-empty.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-a-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty-total.expect index 573541ac9..d00491fd7 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty-total.expect @@ -1 +1 @@ -0 +1 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty.expect index e69de29bb..57d3a6255 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-empty.expect @@ -0,0 +1 @@ +hi diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-total.expect index 573541ac9..d00491fd7 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0-total.expect @@ -1 +1 @@ -0 +1 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0.expect index e69de29bb..57d3a6255 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-select-0.expect @@ -0,0 +1 @@ +hi diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-total.expect index 573541ac9..d00491fd7 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi-total.expect @@ -1 +1 @@ -0 +1 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi.expect index e69de29bb..57d3a6255 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-hi.expect @@ -0,0 +1 @@ +hi diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" index d00491fd7..0cfbf0888 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" @@ -1 +1 @@ -1 +2 diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" index d00491fd7..0cfbf0888 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" @@ -1 +1 @@ -1 +2 diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" index 9a900be18..a4e499b3c 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect" @@ -1 +1,2 @@ привет has space +привет has space diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-select-0-original.expect index e69de29bb..65b0a48c6 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-select-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object-select-0-original.expect @@ -0,0 +1,13 @@ +empty +d +a +привет +y +"мир" +привет has space +"This is quoted" +AlsoGood +hi +привет has space +a +also_empty diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0-original.expect index e69de29bb..fec53807c 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-0-original.expect @@ -0,0 +1 @@ +empty{ diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1-original.expect index e69de29bb..5c34318c2 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-1-original.expect @@ -0,0 +1 @@ +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5-original.expect index e69de29bb..85a90f600 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-5-original.expect @@ -0,0 +1 @@ +a{ diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6-original.expect index e69de29bb..b19e23b28 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-line-6-original.expect @@ -0,0 +1 @@ + e f diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty-total.expect index 573541ac9..00750edc0 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty-total.expect @@ -1 +1 @@ -0 +3 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect index e69de29bb..ff3a22a5e 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect @@ -0,0 +1,3 @@ +hi { + Check this. +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-total.expect index 573541ac9..00750edc0 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0-total.expect @@ -1 +1 @@ -0 +3 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0.expect index e69de29bb..ff3a22a5e 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-select-0.expect @@ -0,0 +1,3 @@ +hi { + Check this. +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-total.expect index 573541ac9..00750edc0 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi-total.expect @@ -1 +1 @@ -0 +3 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi.expect index e69de29bb..ff3a22a5e 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-hi.expect @@ -0,0 +1,3 @@ +hi { + Check this. +} diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" index 00750edc0..1e8b31496 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0-total.expect" @@ -1 +1 @@ -3 +6 diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" index 7a7eb83b0..6f1047594 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-select-0.expect" @@ -1,3 +1,6 @@ привет has space{ \"and so does this" "have space" } +привет has space { + ... +} diff --git "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" index 00750edc0..1e8b31496 100644 --- "a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" +++ "b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space-total.expect" @@ -1 +1 @@ -3 +6 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-select-0-original.expect index e69de29bb..a3d6a8389 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-select-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0000-basic-object_and_content-select-0-original.expect @@ -0,0 +1,37 @@ +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_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-content-name-a-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0-original.expect index e69de29bb..789819226 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-0-original.expect @@ -0,0 +1 @@ +a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1-original.expect index e69de29bb..45b983be3 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-1-original.expect @@ -0,0 +1 @@ +hi diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5-original.expect index e69de29bb..8b1378917 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-5-original.expect @@ -0,0 +1 @@ + diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6-original.expect index e69de29bb..e16c76dff 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-line-6-original.expect @@ -0,0 +1 @@ +"" diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns-empty.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original-empty.expect index 7e8a1653b..d5880505d 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original-empty.expect @@ -1,2 +1,3 @@ a a +a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original.expect index 7e8a1653b..d5880505d 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-original.expect @@ -1,2 +1,3 @@ a a +a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0-total.expect index 0cfbf0888..00750edc0 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0-total.expect @@ -1 +1 @@ -2 +3 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0.expect index 7e8a1653b..d5880505d 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-select-0.expect @@ -1,2 +1,3 @@ a a +a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-total.expect index 0cfbf0888..00750edc0 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a-total.expect @@ -1 +1 @@ -2 +3 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a.expect index 7e8a1653b..d5880505d 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-name-a.expect @@ -1,2 +1,3 @@ a a +a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-select-0-original.expect index e69de29bb..f9a753539 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-select-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object-select-0-original.expect @@ -0,0 +1,7 @@ +a +hi +a +a + + +"" diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0-original.expect index e69de29bb..85a90f600 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-0-original.expect @@ -0,0 +1 @@ +a{ diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1-original.expect index e69de29bb..5c34318c2 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-1-original.expect @@ -0,0 +1 @@ +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5-original.expect index e69de29bb..5c34318c2 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-5-original.expect @@ -0,0 +1 @@ +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6-original.expect index e69de29bb..2c3a87cce 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-line-6-original.expect @@ -0,0 +1 @@ +a { diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect index 4d470a376..3290c7805 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect @@ -2,3 +2,5 @@ a{ } a{ } +a { +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect index 4d470a376..3290c7805 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect @@ -2,3 +2,5 @@ a{ } a{ } +a { +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect index b8626c4cf..1e8b31496 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0-total.expect @@ -1 +1 @@ -4 +6 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect index 4d470a376..3290c7805 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect @@ -2,3 +2,5 @@ a{ } a{ } +a { +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect index b8626c4cf..1e8b31496 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a-total.expect @@ -1 +1 @@ -4 +6 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a.expect index 4d470a376..3290c7805 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-name-a.expect @@ -2,3 +2,5 @@ a{ } a{ } +a { +} diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect index e69de29bb..f83a97dd5 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect @@ -0,0 +1,17 @@ +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_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0-original.expect index e69de29bb..789819226 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-0-original.expect @@ -0,0 +1 @@ +a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1-original.expect index e69de29bb..789819226 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-1-original.expect @@ -0,0 +1 @@ +a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5-original.expect index e69de29bb..45b983be3 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-5-original.expect @@ -0,0 +1 @@ +hi diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6-original.expect index e69de29bb..0fb99b103 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-line-6-original.expect @@ -0,0 +1 @@ +has spaces diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns-empty.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect index d00491fd7..573541ac9 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-name-a-columns.expect @@ -1 +1 @@ -1 +0 diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-select-0-original.expect index e69de29bb..67eb63b27 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-select-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object-select-0-original.expect @@ -0,0 +1,7 @@ +a +a +"мир" +привет has space +empty +hi +has spaces diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0-original.expect index e69de29bb..85a90f600 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-0-original.expect @@ -0,0 +1 @@ +a{ diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1-original.expect index e69de29bb..e50021b65 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-1-original.expect @@ -0,0 +1 @@ +a b привет diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5-original.expect index e69de29bb..311f4e4f2 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5-original.expect @@ -0,0 +1 @@ +\\# even this is not. diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect index 311f4e4f2..e8c057fb7 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-5.expect @@ -1 +1 @@ -\\# even this is not. +\# even this is not. diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6-original.expect index e69de29bb..9c5d8edc4 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-line-6-original.expect @@ -0,0 +1 @@ +привет мир a diff --git a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0-original.expect index e69de29bb..025cdb431 100644 --- a/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0-original.expect +++ b/level_3/fss_read/tests/runtime/fss_0008/expect/test-0002-mixed-object_and_content-select-0-original.expect @@ -0,0 +1,33 @@ +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 +} -- 2.47.3