From 1bb437477b65836c415ad36e1bb9b1fb1c8bb96c Mon Sep 17 00:00:00 2001
From: Kevin Day <Kevin@kevux.org>
Date: Fri, 30 Aug 2024 00:07:55 -0500
Subject: [PATCH] Update: The FSS Basic List (FSS-0002) to match recent
 specification changes regading Objects.

The runtime tests are also updated.
The FSS Payload (FSS-000E) tests are also updated as they use the FSS-0002 code.
---
 level_1/fl_fss/c/fss/basic_list.c                  | 100 +++++++++++----------
 level_1/fl_fss/c/fss/macro.h                       |  12 ++-
 ...0000-basic-object-name-hi-select-0-empty.expect |   2 +-
 .../test-0000-basic-object-name-hi-select-0.expect |   2 +-
 .../expect/test-0000-basic-object-name-hi.expect   |   2 +-
 ...0\270\320\262\320\265\321\202_has_space.expect" |   2 +-
 .../expect/test-0000-basic-object-original.expect  |   6 +-
 ...test-0000-basic-object-select-0-original.expect |   6 +-
 .../expect/test-0000-basic-object-select-0.expect  |   6 +-
 .../fss_0002/expect/test-0000-basic-object.expect  |   6 +-
 ...bject_and_content-name-hi-select-0-empty.expect |   2 +-
 ...asic-object_and_content-name-hi-select-0.expect |   2 +-
 ...st-0000-basic-object_and_content-name-hi.expect |   2 +-
 ...\262\320\265\321\202_has_space-select-0.expect" |   2 +-
 ...t-0000-basic-object_and_content-original.expect |   6 +-
 ...sic-object_and_content-select-0-original.expect |   6 +-
 ...t-0000-basic-object_and_content-select-0.expect |   6 +-
 .../test-0000-basic-object_and_content.expect      |   6 +-
 ...y_name_list-object-name-a-original-empty.expect |   2 +-
 ...1-empty_name_list-object-name-a-original.expect |   2 +-
 ...1-empty_name_list-object-name-a-select-0.expect |   2 +-
 .../test-0001-empty_name_list-object-name-a.expect |   2 +-
 ...est-0001-empty_name_list-object-original.expect |   2 +-
 ...empty_name_list-object-select-0-original.expect |   2 +-
 ...est-0001-empty_name_list-object-select-0.expect |   2 +-
 .../expect/test-0001-empty_name_list-object.expect |   2 +-
 ...object_and_content-name-a-original-empty.expect |   2 +-
 ..._list-object_and_content-name-a-original.expect |   2 +-
 ..._list-object_and_content-name-a-select-0.expect |   2 +-
 ...mpty_name_list-object_and_content-name-a.expect |   2 +-
 ...ty_name_list-object_and_content-original.expect |   2 +-
 ...ist-object_and_content-select-0-original.expect |   2 +-
 ...ty_name_list-object_and_content-select-0.expect |   2 +-
 ...-0001-empty_name_list-object_and_content.expect |   2 +-
 .../expect/test-0002-mixed-object-original.expect  |   2 +-
 ...test-0002-mixed-object-select-0-original.expect |   2 +-
 .../expect/test-0002-mixed-object-select-0.expect  |   2 +-
 .../fss_0002/expect/test-0002-mixed-object.expect  |   2 +-
 ...t-0002-mixed-object_and_content-original.expect |   2 +-
 ...xed-object_and_content-select-0-original.expect |   2 +-
 ...t-0002-mixed-object_and_content-select-0.expect |   2 +-
 .../test-0002-mixed-object_and_content.expect      |   2 +-
 level_3/fss_payload_read/data/build/testfile       |   5 +-
 ...0000-basic-object-name-hi-select-0-empty.expect |   2 +-
 .../test-0000-basic-object-name-hi-select-0.expect |   2 +-
 .../expect/test-0000-basic-object-name-hi.expect   |   2 +-
 ...0\270\320\262\320\265\321\202_has_space.expect" |   2 +-
 .../expect/test-0000-basic-object-original.expect  |   6 +-
 ...test-0000-basic-object-select-0-original.expect |   6 +-
 .../expect/test-0000-basic-object-select-0.expect  |   6 +-
 .../fss_000e/expect/test-0000-basic-object.expect  |   6 +-
 ...bject_and_content-name-hi-select-0-empty.expect |   2 +-
 ...asic-object_and_content-name-hi-select-0.expect |   2 +-
 ...st-0000-basic-object_and_content-name-hi.expect |   2 +-
 ...\262\320\265\321\202_has_space-select-0.expect" |   2 +-
 ...t-0000-basic-object_and_content-original.expect |   6 +-
 ...sic-object_and_content-select-0-original.expect |   6 +-
 ...t-0000-basic-object_and_content-select-0.expect |   6 +-
 .../test-0000-basic-object_and_content.expect      |   6 +-
 ...y_name_list-object-name-a-original-empty.expect |   2 +-
 ...1-empty_name_list-object-name-a-original.expect |   2 +-
 ...1-empty_name_list-object-name-a-select-0.expect |   2 +-
 .../test-0001-empty_name_list-object-name-a.expect |   2 +-
 ...est-0001-empty_name_list-object-original.expect |   2 +-
 ...empty_name_list-object-select-0-original.expect |   2 +-
 ...est-0001-empty_name_list-object-select-0.expect |   2 +-
 .../expect/test-0001-empty_name_list-object.expect |   2 +-
 ...object_and_content-name-a-original-empty.expect |   2 +-
 ..._list-object_and_content-name-a-original.expect |   2 +-
 ..._list-object_and_content-name-a-select-0.expect |   2 +-
 ...mpty_name_list-object_and_content-name-a.expect |   2 +-
 ...ty_name_list-object_and_content-original.expect |   2 +-
 ...ist-object_and_content-select-0-original.expect |   2 +-
 ...ty_name_list-object_and_content-select-0.expect |   2 +-
 ...-0001-empty_name_list-object_and_content.expect |   2 +-
 .../expect/test-0002-mixed-object-original.expect  |   2 +-
 ...test-0002-mixed-object-select-0-original.expect |   2 +-
 .../expect/test-0002-mixed-object-select-0.expect  |   2 +-
 .../fss_000e/expect/test-0002-mixed-object.expect  |   2 +-
 ...t-0002-mixed-object_and_content-original.expect |   2 +-
 ...xed-object_and_content-select-0-original.expect |   2 +-
 ...t-0002-mixed-object_and_content-select-0.expect |   2 +-
 .../test-0002-mixed-object_and_content.expect      |   2 +-
 83 files changed, 175 insertions(+), 166 deletions(-)

diff --git a/level_1/fl_fss/c/fss/basic_list.c b/level_1/fl_fss/c/fss/basic_list.c
index 2f7504f..db7873f 100644
--- a/level_1/fl_fss/c/fss/basic_list.c
+++ b/level_1/fl_fss/c/fss/basic_list.c
@@ -575,15 +575,15 @@ extern "C" {
     if (status == F_none_stop) return F_data_not_stop;
 
     // Begin the search.
-    const f_number_unsigned_t begin = range->start;
     found->start = range->start;
 
     // Ignore all comment lines.
     if (buffer.string[range->start] == f_fss_comment_s.string[0]) {
+      found->start = 1;
+      found->stop = 0;
 
       status = f_fss_seek_to_eol(state, buffer, range);
       if (F_status_is_error(status)) return status;
-
       if (status == F_none_eos) return F_data_not_eos;
       if (status == F_none_stop) return F_data_not_stop;
 
@@ -595,10 +595,10 @@ extern "C" {
 
     f_array_length_t slash_first = 0;
     f_array_length_t slash_count = 0;
-    f_array_length_t start = 0;
+    f_array_length_t start = 1;
     f_array_length_t stop = 0;
 
-    bool graph_first = F_true;
+    uint8_t graph_first = F_true;
 
     // Identify where the object ends.
     while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) {
@@ -629,11 +629,8 @@ extern "C" {
             }
           }
 
-          if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) {
-            continue;
-          } else if (buffer.string[range->start] != f_fss_delimit_slash_s.string[0]) {
-            break;
-          }
+          if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) continue;
+          else if (buffer.string[range->start] != f_fss_delimit_slash_s.string[0]) break;
 
           ++slash_count;
         } // for
@@ -642,7 +639,6 @@ extern "C" {
 
         if (buffer.string[range->start] == f_fss_basic_list_open_s.string[0]) {
           graph_first = F_false;
-          stop = range->start;
 
           status = f_utf_buffer_increment(buffer, range, 1);
           if (F_status_is_error(status)) return status;
@@ -662,9 +658,7 @@ extern "C" {
             if (buffer.string[range->start] == f_fss_eol_s.string[0]) break;
 
             status = f_fss_is_space(state, buffer, *range);
-            if (F_status_is_error(status)) break;
-
-            if (status == F_false) break;
+            if (F_status_is_error(status) || status == F_false) break;
 
             status = f_utf_buffer_increment(buffer, range, 1);
             if (F_status_is_error(status)) break;
@@ -673,12 +667,16 @@ extern "C" {
           private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
           if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
-            start = range->start;
-
+            found->stop = range->start;
             range->start = slash_first;
 
             status = f_array_lengths_increase_by((slash_count / 2) + 1, delimits);
-            if (F_status_is_error(status)) break;
+
+            if (F_status_is_error(status)) {
+              range->start = found->stop;
+
+              break;
+            }
 
             if (slash_count % 2 == 0) {
               while (slash_count > 0) {
@@ -695,51 +693,49 @@ extern "C" {
                 status = f_utf_buffer_increment(buffer, range, 1);
 
                 if (F_status_is_error(status)) {
+                  range->start = found->stop + 1;
+                  found->start = 1;
+                  found->stop = 0;
                   delimits->used = delimits_used;
 
                   return status;
                 }
               } // while
 
-              if (stop > begin) {
-                found->stop = stop - 1;
-              }
-              else {
-                found->start = 1;
-                found->stop = 0;
-              }
-
-              range->start = start + 1;
+              range->start = found->stop + 1;
+              found->start = start;
+              found->stop = stop + macro_f_utf_byte_width(buffer.string[stop]) - 1;
 
               return F_fss_found_object;
             }
 
-            range->start = start + 1;
+            range->start = found->stop + 1;
 
             return F_fss_found_object_not;
           }
         }
         else if (graph_first && buffer.string[range->start] == f_fss_comment_s.string[0]) {
-          graph_first = F_false;
+          if (graph_first) {
+            graph_first = F_false;
+            start = slash_first;
+          }
 
           // Comments may only have white space before the '#', therefore only the first slash needs to be delimited.
           status = f_array_lengths_increase(state.step_small, delimits);
           if (F_status_is_error(status)) break;
 
           delimits->array[delimits->used++] = slash_first;
-          ++range->start;
+          stop = range->start++;
         }
         else {
           graph_first = F_false;
+          stop = range->start;
         }
 
         continue;
       }
 
       if (buffer.string[range->start] == f_fss_basic_list_open_s.string[0]) {
-        graph_first = F_false;
-        stop = range->start;
-
         status = f_utf_buffer_increment(buffer, range, 1);
         if (F_status_is_error(status)) break;
 
@@ -758,9 +754,7 @@ extern "C" {
           if (buffer.string[range->start] == f_fss_eol_s.string[0]) break;
 
           status = f_fss_is_space(state, buffer, *range);
-          if (F_status_is_error(status)) break;
-
-          if (status == F_false) break;
+          if (F_status_is_error(status) || status == F_false) break;
 
           status = f_utf_buffer_increment(buffer, range, 1);
           if (F_status_is_error(status)) break;
@@ -769,28 +763,35 @@ extern "C" {
         private_macro_fl_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
         if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
-          if (stop > begin) {
-            found->stop = stop - 1;
-          }
-          else {
-            found->start = 1;
-            found->stop = 0;
-          }
-
-          status = f_utf_buffer_increment(buffer, range, 1);
-          if (F_status_is_error(status)) break;
+          found->start = start;
+          found->stop = stop + macro_f_utf_byte_width(buffer.string[stop]) - 1;
+          ++range->start;
 
           return F_fss_found_object;
         }
 
+        if (graph_first) {
+          graph_first = F_false;
+          start = 1;
+          stop = 0;
+        }
+        else {
+          stop = range->start;
+        }
+
         continue;
       }
-      else if (graph_first) {
+      else {
         status = f_fss_is_space(state, buffer, *range);
         if (F_status_is_error(status)) break;
 
         if (status == F_false) {
-          graph_first = F_false;
+          if (graph_first) {
+            graph_first = F_false;
+            start = range->start;
+          }
+
+          stop = range->start;
         }
       }
 
@@ -798,6 +799,9 @@ extern "C" {
       if (F_status_is_error(status)) break;
     } // while
 
+    found->start = 1;
+    found->stop = 0;
+
     if (F_status_is_error(status)) {
       delimits->used = delimits_used;
 
@@ -807,10 +811,10 @@ extern "C" {
     if (status == F_none_eos) return F_data_not_eos;
     if (status == F_none_stop) return F_data_not_stop;
 
-    // seek to the end of the line when no valid object is found.
+    // Seek to the end of the line when no valid object is found.
     status = f_fss_seek_to_eol(state, buffer, range);
 
-    // move the start position to after the EOL.
+    // Move the start position to after the EOL.
     ++range->start;
 
     return F_fss_found_object_not;
diff --git a/level_1/fl_fss/c/fss/macro.h b/level_1/fl_fss/c/fss/macro.h
index dbd3853..f5460c0 100644
--- a/level_1/fl_fss/c/fss/macro.h
+++ b/level_1/fl_fss/c/fss/macro.h
@@ -18,12 +18,14 @@ extern "C" {
   #define private_macro_fl_fss_object_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
-      found.stop = buffer.used - 1; \
+      found.start = 1; \
+      found.stop = 0; \
       return eos_status; \
     } \
     else if (range.start > range.stop) { \
       delimits.used = delimits_used; \
-      found.stop = range.stop; \
+      found.start = 1; \
+      found.stop = 0; \
       return stop_status; \
     }
 #endif // _di_private_macro_fl_fss_object_return_on_overflow_
@@ -31,11 +33,13 @@ extern "C" {
 #ifndef _di_private_macro_fl_fss_object_return_on_overflow_delimited_
   #define private_macro_fl_fss_object_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
-      found.stop = buffer.used - 1; \
+      found.start = 1; \
+      found.stop = 0; \
       return eos_status; \
     } \
     else if (range.start > range.stop) { \
-      found.stop = range.stop; \
+      found.start = 1; \
+      found.stop = 0; \
       return stop_status; \
     }
 #endif // _di_private_macro_fl_fss_object_return_on_overflow_delimited_
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0-empty.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0-empty.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0-empty.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0-empty.expect
@@ -1 +1 @@
-hi     
+hi
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0.expect
@@ -1 +1 @@
-hi     
+hi
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect
@@ -1 +1 @@
-hi     
+hi
diff --git "a/level_3/fss_basic_list_read/tests/runtime/fss_0002/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_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect"
index a4e499b..aa34602 100644
--- "a/level_3/fss_basic_list_read/tests/runtime/fss_0002/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_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect"
@@ -1,2 +1,2 @@
 привет has space
-привет has space   
+привет has space
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-original.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-original.expect
@@ -2,12 +2,12 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0-original.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0-original.expect
@@ -2,12 +2,12 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0.expect
@@ -2,12 +2,12 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object.expect
@@ -2,12 +2,12 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
@@ -1,2 +1,2 @@
-hi     :
+hi:
   Check this.
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
@@ -1,2 +1,2 @@
-hi     :
+hi:
   Check this.
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi.expect
@@ -1,2 +1,2 @@
-hi     :
+hi:
   Check this.
diff --git "a/level_3/fss_basic_list_read/tests/runtime/fss_0002/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_basic_list_read/tests/runtime/fss_0002/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 ac45850..65fa9c7 100644
--- "a/level_3/fss_basic_list_read/tests/runtime/fss_0002/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_basic_list_read/tests/runtime/fss_0002/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,4 +1,4 @@
 привет has space:
   \"and so does this" "have space"
-привет has space   :
+привет has space:
   ...
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-original.expect
index 4c889c7..5965da3 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-original.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0-original.expect
index 4c889c7..5965da3 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0-original.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0.expect
index fbae64d..3ec878c 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content.expect
index fbae64d..3ec878c 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original-empty.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
index d588050..16f18f3 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original.expect
index d588050..16f18f3 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-select-0.expect
index d588050..16f18f3 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-select-0.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a.expect
index d588050..16f18f3 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-original.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-original.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0-original.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0-original.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-original.expect
index fd42c08..7272fab 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-original.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
index fd42c08..7272fab 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0.expect
index b20589e..4d5f04b 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content.expect
index b20589e..4d5f04b 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-original.expect
index ba91f64..a9aeac0 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-original.expect
@@ -5,4 +5,4 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0-original.expect
index ba91f64..a9aeac0 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0-original.expect
@@ -5,4 +5,4 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0.expect
index 9970fa7..faa95bc 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0.expect
@@ -5,4 +5,4 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object.expect
index 9970fa7..faa95bc 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object.expect
@@ -5,4 +5,4 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-original.expect
index 7071b5f..6ec6c63 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-original.expect
@@ -21,6 +21,6 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0-original.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0-original.expect
index 7071b5f..6ec6c63 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0-original.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0-original.expect
@@ -21,6 +21,6 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0.expect
index 1df3aed..ffa6fcd 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0.expect
@@ -21,6 +21,6 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
diff --git a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content.expect b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content.expect
index 1df3aed..ffa6fcd 100644
--- a/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content.expect
+++ b/level_3/fss_basic_list_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content.expect
@@ -21,6 +21,6 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
diff --git a/level_3/fss_payload_read/data/build/testfile b/level_3/fss_payload_read/data/build/testfile
index 7e93a0c..bbf6e7e 100644
--- a/level_3/fss_payload_read/data/build/testfile
+++ b/level_3/fss_payload_read/data/build/testfile
@@ -40,6 +40,7 @@ generate_process:
   print
   print Generating Test 0000 for Payload (FSS-000E).
   print
+
   touch directory parameter:"build_path"test/fss_000e
   run parameter:"script" ./tests/runtime/script/generate.sh parameter:"test_prefix"000e tests/runtime/fss_000e/source/test-0000-basic.fss parameter:"build_path"test/fss_000e
 
@@ -55,9 +56,9 @@ generate_process:
 
 verify_process:
   print
-  print Verifying Tests for Payload (FSS-000e).
+  print Verifying Tests for Payload (FSS-000E).
   print
-  run parameter:"script" ./tests/runtime/script/verify.sh build/test/fss_000e/ tests/runtime/fss_000e/expect/
+  run parameter:"script" ./tests/runtime/script/verify.sh build/test/fss_000e/ tests/runtime/fss_000e/expect/ "Payload (FSS-000E)"
 
 build_path:
   parameter build_path build/
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0-empty.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0-empty.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0-empty.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0-empty.expect
@@ -1 +1 @@
-hi     
+hi
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0.expect
@@ -1 +1 @@
-hi     
+hi
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect
@@ -1 +1 @@
-hi     
+hi
diff --git "a/level_3/fss_payload_read/tests/runtime/fss_000e/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_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect"
index a4e499b..aa34602 100644
--- "a/level_3/fss_payload_read/tests/runtime/fss_000e/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_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-\320\277\321\200\320\270\320\262\320\265\321\202_has_space.expect"
@@ -1,2 +1,2 @@
 привет has space
-привет has space   
+привет has space
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-original.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-original.expect
@@ -2,13 +2,13 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0-original.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0-original.expect
@@ -2,13 +2,13 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0.expect
@@ -2,13 +2,13 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object.expect
@@ -2,13 +2,13 @@ empty
 d
 a
 привет
-y 
+y
 "мир"
 привет has space
 "This is quoted"
 AlsoGood
-hi     
-привет has space   
+hi
+привет has space
 a
 also_empty
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
@@ -1,2 +1,2 @@
-hi     :
+hi:
   Check this.
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
@@ -1,2 +1,2 @@
-hi     :
+hi:
   Check this.
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi.expect
@@ -1,2 +1,2 @@
-hi     :
+hi:
   Check this.
diff --git "a/level_3/fss_payload_read/tests/runtime/fss_000e/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_payload_read/tests/runtime/fss_000e/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 ac45850..65fa9c7 100644
--- "a/level_3/fss_payload_read/tests/runtime/fss_000e/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_payload_read/tests/runtime/fss_000e/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,4 +1,4 @@
 привет has space:
   \"and so does this" "have space"
-привет has space   :
+привет has space:
   ...
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-original.expect
index ce2aa53..6bc0d60 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-original.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0-original.expect
index ce2aa53..6bc0d60 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0-original.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0.expect
index 999a9fe..5b8f5ab 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content.expect
index 999a9fe..5b8f5ab 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content.expect
@@ -15,7 +15,7 @@ list
 привет:
   мир
 
-y :
+y:
   z
 "мир":
   quoted, "yep".
@@ -24,9 +24,9 @@ y :
 "This is quoted":
   But still a valid list.
 AlsoGood:
-hi     :
+hi:
   Check this.
-привет has space   :
+привет has space:
   ...
 a:
   a second "a".
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original-empty.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
index d588050..16f18f3 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original.expect
index d588050..16f18f3 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-select-0.expect
index d588050..16f18f3 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-select-0.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a.expect
index d588050..16f18f3 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a.expect
@@ -1,3 +1,3 @@
 a
 a
-a  
+a
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-original.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-original.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0-original.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0-original.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object.expect
@@ -1,7 +1,7 @@
 a
 hi
 a
-a  
+a
 
 
 ""
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a.expect
index 5589af8..a5c7614 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a.expect
@@ -1,3 +1,3 @@
 a:
 a:
-a  :
+a:
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-original.expect
index 8ed2f73..a4973fc 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-original.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
index 8ed2f73..a4973fc 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0.expect
index 8ed2f73..a4973fc 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content.expect
index 8ed2f73..a4973fc 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content.expect
@@ -1,7 +1,7 @@
 a:
 hi:
 a:
-a  :
+a:
 :
   The object name is an empty string.
 
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-original.expect
index 676e545..92f3167 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-original.expect
@@ -5,5 +5,5 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0-original.expect
index 676e545..92f3167 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0-original.expect
@@ -5,5 +5,5 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0.expect
index ef568b5..cc4fb13 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0.expect
@@ -5,5 +5,5 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object.expect
index ef568b5..cc4fb13 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object.expect
@@ -5,5 +5,5 @@ a
 привет has space
 empty
 hi
-has spaces 
+has spaces
 payload
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-original.expect
index 1024e7f..3b6abc7 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-original.expect
@@ -21,7 +21,7 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
 payload:
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0-original.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0-original.expect
index 1024e7f..3b6abc7 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0-original.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0-original.expect
@@ -21,7 +21,7 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
 payload:
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0.expect
index 52af633..bb37701 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0.expect
@@ -21,7 +21,7 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
 payload:
diff --git a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content.expect b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content.expect
index 52af633..bb37701 100644
--- a/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content.expect
+++ b/level_3/fss_payload_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content.expect
@@ -21,7 +21,7 @@ hi:
   c d
   привет мир a 
 
-has spaces :
+has spaces:
   yep.
   fin  
 payload:
-- 
1.8.3.1