From: Kevin Day <Kevin@kevux.org>
Date: Fri, 30 Aug 2024 05:06:32 +0000 (-0500)
Subject: Update: The FSS Basic List (FSS-0002) to match recent specification changes regading... 
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=900f510d989300f56002085a66635bf36e723245;p=fll

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.
---

diff --git a/level_1/fl_fss/c/fss/basic_list.c b/level_1/fl_fss/c/fss/basic_list.c
index 5c0fcf8..a9b131c 100644
--- a/level_1/fl_fss/c/fss/basic_list.c
+++ b/level_1/fl_fss/c/fss/basic_list.c
@@ -345,16 +345,15 @@ extern "C" {
 
     const f_number_unsigned_t destination_used = destination->used;
 
-    bool is_comment = F_false;
-    bool has_graph = F_false;
-    bool do_prepend = prepend ? F_true : F_false;
+    uint8_t is_comment = 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 slash_count = 0;
     f_number_unsigned_t start = 0;
 
-    uint8_t width = 0;
-
     while (range->start <= range->stop && range->start < content.used) {
 
       if (state->interrupt) {
@@ -581,36 +580,25 @@ extern "C" {
       return;
     }
 
-    if (state->status == F_okay_eos) {
-      state->status = F_data_not_eos;
-
-      return;
-    }
-
-    if (state->status == F_okay_stop) {
-      state->status = F_data_not_stop;
+    if (state->status == F_okay_eos || state->status == F_okay_stop) {
+      state->status = state->status == F_okay_eos ? F_data_not_eos : F_data_not_stop;
 
       return;
     }
 
     // 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;
 
       f_fss_seek_to_eol(buffer, range, state);
       if (F_status_is_error(state->status)) return;
 
-      if (state->status == F_okay_eos) {
-        state->status = F_data_not_eos;
-
-        return;
-      }
-
-      if (state->status == F_okay_stop) {
-        state->status = F_data_not_stop;
+      if (state->status == F_okay_eos || state->status == F_okay_stop) {
+        state->status = state->status == F_okay_eos ? F_data_not_eos : F_data_not_stop;
 
         return;
       }
@@ -624,10 +612,10 @@ extern "C" {
 
     f_number_unsigned_t slash_first = 0;
     f_number_unsigned_t slash_count = 0;
-    f_number_unsigned_t start = 0;
+    f_number_unsigned_t start = 1;
     f_number_unsigned_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]) {
@@ -656,23 +644,14 @@ extern "C" {
 
         if (range->start >= buffer.used || range->start > range->stop) {
           delimits->used = delimits_used;
-
-          if (range->start >= buffer.used) {
-            found->stop = buffer.used - 1;
-            state->status = F_data_not_eos;
-          }
-          else {
-            found->stop = range->stop;
-            state->status =  F_data_not_stop;
-          }
+          found->start = 1;
+          found->stop = 0;
+          state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop;
 
           return;
         }
 
         if (buffer.string[range->start] == f_fss_basic_list_open_s.string[0]) {
-          graph_first = F_false;
-          stop = range->start;
-
           state->status = f_utf_buffer_increment(buffer, range, 1);
           if (F_status_is_error(state->status)) return;
 
@@ -697,22 +676,15 @@ extern "C" {
 
           if (range->start >= buffer.used || range->start > range->stop) {
             delimits->used = delimits_used;
-
-            if (range->start >= buffer.used) {
-              found->stop = buffer.used - 1;
-              state->status = F_data_not_eos;
-            }
-            else {
-              found->stop = range->stop;
-              state->status =  F_data_not_stop;
-            }
+            found->start = 1;
+            found->stop = 0;
+            state->status = range->start >= buffer.used ?  F_data_not_eos : F_data_not_stop;
 
             return;
           }
 
           if (buffer.string[range->start] == f_fss_eol_s.string[0]) {
-            start = range->start;
-
+            found->stop = range->start;
             range->start = slash_first;
 
             state->status = f_memory_array_increase_by((slash_count / 2) + 1, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
@@ -734,52 +706,49 @@ extern "C" {
 
                 if (F_status_is_error(state->status)) {
                   delimits->used = delimits_used;
+                  found->start = 1;
+                  found->stop = 0;
 
                   return;
                 }
               } // 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;
               state->status = F_fss_found_object;
 
               return;
             }
 
-            range->start = start + 1;
+            range->start = found->stop + 1;
             state->status = F_fss_found_object_not;
 
             return;
           }
         }
         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.
           state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &delimits->array, &delimits->used, &delimits->size);
           if (F_status_is_error(state->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;
-
         state->status = f_utf_buffer_increment(buffer, range, 1);
         if (F_status_is_error(state->status)) break;
 
@@ -792,54 +761,52 @@ extern "C" {
 
           if (buffer.string[range->start] == f_fss_eol_s.string[0]) break;
 
-          if (f_fss_is_space(buffer, *range, state) == F_false) {
-            if (F_status_is_error(state->status)) break;
-
-            break;
-          }
+          state->status = f_fss_is_space(buffer, *range, state);
+          if (F_status_is_error(state->status) || state->status == F_false) break;
 
           state->status = f_utf_buffer_increment(buffer, range, 1);
           if (F_status_is_error(state->status)) break;
         } // while
 
-        if (range->start >= buffer.used) {
-          found->stop = buffer.used - 1;
-          state->status = F_okay_eos;
-
-          return;
-        }
-
-        if (range->start > range->stop) {
-          found->stop = range->stop;
-          state->status = F_okay_stop;
+        if (range->start >= buffer.used || range->start > range->stop) {
+          found->start = 1;
+          found->stop = 0;
+          state->status = range->start >= buffer.used ? F_okay_eos : F_okay_stop;
 
           return;
         }
 
         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;
-          }
-
-          state->status = f_utf_buffer_increment(buffer, range, 1);
-          if (F_status_is_error(state->status)) break;
-
+          found->start = start;
+          found->stop = stop + macro_f_utf_byte_width(buffer.string[stop]) - 1;
+          ++range->start;
           state->status = F_fss_found_object;
 
           return;
         }
 
+        if (graph_first) {
+          graph_first = F_false;
+          start = 1;
+          stop = 0;
+        }
+        else {
+          stop = range->start;
+        }
+
         continue;
       }
-      else if (graph_first) {
-        if (f_fss_is_space(buffer, *range, state) == F_false) {
-          if (F_status_is_error(state->status)) break;
+      else {
+        state->status = f_fss_is_space(buffer, *range, state);
+        if (F_status_is_error(state->status)) break;
 
-          graph_first = F_false;
+        if (state->status == F_false) {
+          if (graph_first) {
+            graph_first = F_false;
+            start = range->start;
+          }
+
+          stop = range->start;
         }
       }
 
@@ -847,20 +814,17 @@ extern "C" {
       if (F_status_is_error(state->status)) break;
     } // while
 
+    found->start = 1;
+    found->stop = 0;
+
     if (F_status_is_error(state->status)) {
       delimits->used = delimits_used;
 
       return;
     }
 
-    if (state->status == F_okay_eos) {
-      state->status = F_data_not_eos;
-
-      return;
-    }
-
-    if (state->status == F_okay_stop) {
-      state->status = F_data_not_stop;
+    if (state->status == F_okay_eos || state->status == F_okay_stop) {
+      state->status = state->status == F_okay_eos ? F_data_not_eos : F_data_not_stop;
 
       return;
     }
diff --git a/level_1/fl_fss/c/fss/basic_list.h b/level_1/fl_fss/c/fss/basic_list.h
index d26f88a..0f4585c 100644
--- a/level_1/fl_fss/c/fss/basic_list.h
+++ b/level_1/fl_fss/c/fss/basic_list.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 /**
- * Read an fss-0002 content from a given string.
+ * Read an fss-0002 Content from a given string.
  *
  * This will record where delimit placeholders exist but will not apply the delimits.
  *
@@ -44,7 +44,7 @@ extern "C" {
  *
  *   Must not be NULL.
  * @param found
- *   A set of all locations where a valid content was found.
+ *   A set of all locations where a valid Content is found.
  *
  *   Must not be NULL.
  * @param delimits
@@ -52,8 +52,8 @@ extern "C" {
  *
  *   Must not be NULL.
  * @param comments
- *   An array of ranges representing where comments are found within any valid content.
- *   This only stores comments found within valid content only.
+ *   An array of ranges representing where comments are found within any valid Content.
+ *   This only stores comments found within valid Content only.
  *   The comment range will include the trailing newline.
  *
  *   Must not be NULL.
@@ -70,10 +70,10 @@ extern "C" {
  *   Must not be NULL.
  *
  *   This alters state.status:
- *     F_fss_found_content on success and content was found (start location is at end of content).
- *     F_fss_found_content_not on success and no content was found (start location is after character designating this is not a content).
- *     F_okay_eos on success after reaching the end of the buffer (a valid object is not yet confirmed).
- *     F_okay_stop on success after reaching stopping point (a valid object is not yet confirmed).
+ *     F_fss_found_content on success and Content is found (start location is at end of Content).
+ *     F_fss_found_content_not on success and no Content is found (start location is after character designating this is not a Content).
+ *     F_okay_eos on success after reaching the end of the buffer (a valid Object is not yet confirmed).
+ *     F_okay_stop on success after reaching stopping point (a valid Object is not yet confirmed).
  *     F_data_not if buffer is empty (buffer.used is 0).
  *     F_data_not_eos no objects found after reaching the end of the buffer (essentially only comments are found).
  *     F_data_not_stop no data found after reaching stopping point (essentially only comments are found).
@@ -102,9 +102,9 @@ extern "C" {
 #endif // _di_fl_fss_basic_list_content_read_
 
 /**
- * Write an fss-0002 content from a given string.
+ * Write an fss-0002 Content from a given string.
  *
- * This will write the given string range as a valid content.
+ * This will write the given string range as a valid Content.
  * Anything within this range will be escaped as necessary.
  *
  * The destination string may have NULLs.
@@ -112,22 +112,22 @@ extern "C" {
  * @param content
  *   The string to write as (does not stop at NULLS, they are ignored and not written).
  * @param complete
- *   If f_fss_complete_none_e, then only the content is written.
- *   If f_fss_complete_next_e, then the content followed by any appropriate "next" character separating one content from the next, if applicable.
- *   If f_fss_complete_end_e, then the content followed by any appropriate "end" character designating the last content for some object, printing final newline, if applicable.
- *   If f_fss_complete_partial_e, this will write any appropriate open and close aspects of this content, except for the final newline.
- *   If f_fss_complete_full_e, this will write any appropriate open and close aspects of this content, including the final newline.
+ *   If f_fss_complete_none_e, then only the Content is written.
+ *   If f_fss_complete_next_e, then the Content followed by any appropriate "next" character separating one Content from the next, if applicable.
+ *   If f_fss_complete_end_e, then the Content followed by any appropriate "end" character designating the last Content for some Object, printing final newline, if applicable.
+ *   If f_fss_complete_partial_e, this will write any appropriate open and close aspects of this Content, except for the final newline.
+ *   If f_fss_complete_full_e, this will write any appropriate open and close aspects of this Content, including the final newline.
  * @param prepend
  *   (optional) A string of whitespace to prepend at the start of each line.
- *   This should only be whitespace, anything else could produce invalid content.
+ *   This should only be whitespace, anything else could produce invalid Content.
  *
  *   Set to NULL to not use.
  * @param range
- *   The start/stop location within the content string to write as an content.
+ *   The start/stop location within the Content string to write as an Content.
  *
  *   Must not be NULL.
  * @param destination
- *   The buffer where the content is written to.
+ *   The buffer where the Content is written to.
  *
  *   Must not be NULL.
  * @param state
@@ -146,7 +146,7 @@ extern "C" {
  *     F_okay on success.
  *     F_okay_eol on success after reaching the end of the line.
  *     F_okay_eos on success after reaching the end of the buffer.
- *     F_data_not if content is empty (content.used is 0).
+ *     F_data_not if Content is empty (content.used is 0).
  *     F_data_not_eos no data to write due start location being greater than or equal to buffer size.
  *     F_data_not_stop no data to write due start location being greater than stop location.
  *     F_okay_stop on success after reaching stopping point.
@@ -175,7 +175,7 @@ extern "C" {
 #endif // _di_fl_fss_basic_list_content_write_
 
 /**
- * Read an fss-0002 object.
+ * Read an fss-0002 Object.
  *
  * This will record where delimit placeholders exist but will not apply the delimits.
  *
@@ -189,7 +189,7 @@ extern "C" {
  *
  *   Must not be NULL.
  * @param found
- *   A location where a valid object was found.
+ *   A location where a valid Object is found.
  *
  *   Must not be NULL.
  * @param delimits
@@ -209,10 +209,10 @@ extern "C" {
  *   Must not be NULL.
  *
  *   This alters state.status:
- *     F_fss_found_object on success and object was found (start location is at end of object).
- *     F_fss_found_object_not on success and no object was found (start location is after character designating this is not an object).
- *     F_okay_eos on success after reaching the end of the buffer (a valid object is not yet confirmed).
- *     F_okay_stop on success after reaching stopping point (a valid object is not yet confirmed).
+ *     F_fss_found_object on success and Object is found (start location is at end of Object).
+ *     F_fss_found_object_not on success and no Object is found (start location is after character designating this is not an Object).
+ *     F_okay_eos on success after reaching the end of the buffer (a valid Object is not yet confirmed).
+ *     F_okay_stop on success after reaching stopping point (a valid Object is not yet confirmed).
  *     F_data_not if buffer is empty (buffer.used is 0).
  *     F_data_not_eos no objects found after reaching the end of the buffer (essentially only comments are found).
  *     F_data_not_stop no data found after reaching stopping point (essentially only comments are found).
@@ -245,9 +245,9 @@ extern "C" {
 #endif // _di_fl_fss_basic_list_object_read_
 
 /**
- * Write an fss-0002 object.
+ * Write an fss-0002 Object.
  *
- * This will write the given string range as a valid object.
+ * This will write the given string range as a valid Object.
  * Anything within this range will be escaped as necessary.
  * This will stop if EOL is reached.
  *
@@ -256,17 +256,17 @@ extern "C" {
  * @param object
  *   The string to write as (does not stop at NULLS, they are ignored and not written).
  * @param complete
- *   If f_fss_complete_none_e, then only the object name is written.
- *   If f_fss_complete_full_e, this will write any appropriate open and close aspects of this object.
- *   If f_fss_complete_full_trim_e, this will write any appropriate open and close aspects of this object, but will omit whitespace before and after the object.
- *   If f_fss_complete_partial_e, this will write any appropriate open and close aspects of this object.
- *   If f_fss_complete_partial_tim, this will write any appropriate open and close aspects of this object, but will omit whitespace before and after the object.
+ *   If f_fss_complete_none_e, then only the Object name is written.
+ *   If f_fss_complete_full_e, this will write any appropriate open and close aspects of this Object.
+ *   If f_fss_complete_full_trim_e, this will write any appropriate open and close aspects of this Object, but will omit whitespace before and after the Object.
+ *   If f_fss_complete_partial_e, this will write any appropriate open and close aspects of this Object.
+ *   If f_fss_complete_partial_tim, this will write any appropriate open and close aspects of this Object, but will omit whitespace before and after the Object.
  * @param range
- *   The start/stop location within the object string to write as an object.
+ *   The start/stop location within the Object string to write as an Object.
  *
  *   Must not be NULL.
  * @param destination
- *   The buffer where the object is written to.
+ *   The buffer where the Object is written to.
  *
  *   Must not be NULL.
  * @param state
@@ -284,7 +284,7 @@ extern "C" {
  *   This alters state.status:
  *     F_okay on success.
  *     F_okay_eos on success after reaching the end of the buffer.
- *     F_data_not if object is empty (object.used is 0).
+ *     F_data_not if Object is empty (object.used is 0).
  *     F_data_not_eos no data to write due start location being greater than or equal to buffer size.
  *     F_data_not_stop no data to write due start location being greater than stop location.
  *     F_okay_stop on success after reaching stopping point.
diff --git a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0-empty.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0-empty.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect
+++ b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-name-hi.expect
@@ -1 +1 @@
-hi     
+hi
diff --git "a/level_3/fss_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_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_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_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-original.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0-original.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object.expect
index 65b0a48..8b46f9e 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-name-hi.expect
+++ b/level_3/fss_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_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_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_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_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-original.expect
index 4c889c7..5965da3 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0-original.expect
index 4c889c7..5965da3 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0.expect
index fbae64d..3ec878c 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content.expect
index fbae64d..3ec878c 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0000-basic-object_and_content.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original-empty.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original.expect
index d588050..16f18f3 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a.expect
index d588050..16f18f3 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-name-a.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-original.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0-original.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object.expect
index f9a7535..755e03d 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-name-a.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-original.expect
index fd42c08..7272fab 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content.expect
index b20589e..4d5f04b 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0001-empty_name_list-object_and_content.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-original.expect
index ba91f64..a9aeac0 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0-original.expect
index ba91f64..a9aeac0 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0.expect
index 9970fa7..faa95bc 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object.expect
index 9970fa7..faa95bc 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-original.expect
index 7071b5f..6ec6c63 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0-original.expect
index 7071b5f..6ec6c63 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0.expect
index 1df3aed..ffa6fcd 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content.expect b/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content.expect
index 1df3aed..ffa6fcd 100644
--- a/level_3/fss_read/tests/runtime/fss_0002/expect/test-0002-mixed-object_and_content.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0-empty.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0-empty.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect
index 57d3a62..45b983b 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect
+++ b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-name-hi.expect
@@ -1 +1 @@
-hi     
+hi
diff --git "a/level_3/fss_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_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_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_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-original.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0-original.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object.expect
index e9afedc..3d8e2e6 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi.expect
index 611668d..5f5a665 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-name-hi.expect
+++ b/level_3/fss_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_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_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_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_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-original.expect
index ce2aa53..6bc0d60 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0-original.expect
index ce2aa53..6bc0d60 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0.expect
index 999a9fe..5b8f5ab 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content.expect
index 999a9fe..5b8f5ab 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0000-basic-object_and_content.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original-empty.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original.expect
index d588050..16f18f3 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a.expect
index d588050..16f18f3 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-name-a.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-original.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0-original.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object.expect
index 74614e2..eb3ec7c 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original-empty.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-name-a.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-original.expect
index 8ed2f73..a4973fc 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0.expect b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content.expect
index 8ed2f73..a4973fc 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0001-empty_name_list-object_and_content.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-original.expect
index 676e545..92f3167 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0-original.expect
index 676e545..92f3167 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0.expect
index ef568b5..cc4fb13 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object.expect
index ef568b5..cc4fb13 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-original.expect
index 1024e7f..3b6abc7 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0-original.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0-original.expect
index 1024e7f..3b6abc7 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0-original.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0.expect
index 52af633..bb37701 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content-select-0.expect
+++ b/level_3/fss_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_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content.expect b/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content.expect
index 52af633..bb37701 100644
--- a/level_3/fss_read/tests/runtime/fss_000e/expect/test-0002-mixed-object_and_content.expect
+++ b/level_3/fss_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: