Progress: Begin next development pass on fl_fss_payload_header_map().

Preserve the error status when exiting by checking and returning at the end of the function (before setting F_okay).

Fix the logic regarding the number macros when it comes to expanding an array of numbers into multiple destinations.
The object key must be set.
The macro needs to be accepting the destinations array rather than the specific destination string.
The case where f_fss_payload_header_map_flag_join_digits_e is set is not yet tested or reviewed.

diff --git a/level_1/fl_fss/c/fss/payload.c b/level_1/fl_fss/c/fss/payload.c
index eeec63743b17654426362e440f82404226263ae6..d3fe7510996abe17582d2a8ea48c909eeb08d820 100644 (file)
--- a/level_1/fl_fss/c/fss/payload.c
+++ b/level_1/fl_fss/c/fss/payload.c
@@ -121,52 +121,52 @@ extern "C" {
               break;
 
             case f_abstruse_int8s_e:
-              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i8s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i8s, destinations);
 
               break;
 
             case f_abstruse_int16s_e:
-              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i16s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i16s, destinations);
 
               break;
 
             case f_abstruse_int32s_e:
-              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i32s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i32s, destinations);
 
               break;
 
             case f_abstruse_int64s_e:
-              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i64s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_i64s, destinations);
 
               break;
 
             case f_abstruse_signeds_e:
-              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_signeds, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, headers.array[internal.i].value.is.a_signeds, destinations);
 
               break;
 
             case f_abstruse_uint8s_e:
-              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u8s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u8s, destinations);
 
               break;
 
             case f_abstruse_uint16s_e:
-              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u16s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u16s, destinations);
 
               break;
 
             case f_abstruse_uint32s_e:
-              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u32s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u32s, destinations);
 
               break;
 
             case f_abstruse_uint64s_e:
-              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u64s, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_u64s, destinations);
 
               break;
 
             case f_abstruse_unsigneds_e:
-              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_unsigneds, destinations->array[destinations->used].value);
+              macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, headers.array[internal.i].value.is.a_unsigneds, destinations);
 
               break;
 
@@ -350,6 +350,8 @@ extern "C" {
       } // for
     }
 
+    if (F_status_is_error(state->status)) return;
+
     state->status = F_okay;
   }
 #endif // _di_fl_fss_payload_header_map_

diff --git a/level_1/fl_fss/c/fss/payload/define.h b/level_1/fl_fss/c/fss/payload/define.h
index 35fadefeef95027fbdabffb2ab8fee022c4ac44d..01327554c09968bf365d1318faab869827d740d2 100644 (file)
--- a/level_1/fl_fss/c/fss/payload/define.h
+++ b/level_1/fl_fss/c/fss/payload/define.h
@@ -32,13 +32,13 @@ extern "C" {
  *   This requires private_fl_payload_header_map_number_signed() from payload.c.
  *
  *   Parameters:
- *     - data:        The f_fss_payload_header_state_t pointer.
- *     - state:       The state passed directly from the fl_fss_payload_header_map() parameters.
- *     - internal:    The internal state, f_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
- *     - numbers:     The is.a representing the array of signed numbers.
- *     - destination: The destination string to append to.
- *     - function:    The private signed/unsigned function to call.
- *     - cast:        The signed/unsigned structure to cast to.
+ *     - data:         The f_fss_payload_header_state_t pointer.
+ *     - state:        The state passed directly from the fl_fss_payload_header_map() parameters.
+ *     - internal:     The internal state, f_fss_payload_header_internal_t, created inside of fl_fss_payload_header_map().
+ *     - numbers:      The is.a representing the array of signed numbers.
+ *     - destinations: The destination strings to append to.
+ *     - function:     The private signed/unsigned function to call.
+ *     - cast:         The signed/unsigned structure to cast to.
  *
  * macro_f_fss_payload_header_write_process_numbers_signed_d:
  *   This wraps macro_f_fss_payload_header_write_process_numbers_d, passing the signed function and cast.
@@ -69,47 +69,57 @@ extern "C" {
       } \
     }
 
-  #define macro_f_fss_payload_header_write_process_numbers_d(data, state, internal, numbers, destination, function, cast) \
+  #define macro_f_fss_payload_header_write_process_numbers_d(data, state, internal, numbers, destinations, function, cast) \
     data->cache->used = 0; \
     \
-    for (internal.j = 0; internal.j < numbers.used; ++internal.j) { \
-      \
-      if (state->interrupt) { \
-        state->interrupt((void * const) state, (void * const) &internal); \
-        if (F_status_set_fine(state->status) == F_interrupt) break; \
-      } \
-      \
-      if (!(data->flag & f_fss_payload_header_map_flag_join_digits_e)) { \
-        data->cache->used = 0; \
-      } \
-      \
-      if (function(data, state, &internal, (cast) numbers.array[internal.j])) { \
-        data->cache->used = 0; \
+    if (!(data->flag & f_fss_payload_header_map_flag_join_digits_e)) { \
+      state->status = f_memory_array_increase_by(numbers.used, sizeof(f_string_map_t), (void **) &destinations->array, &destinations->used, &destinations->size); \
+    } \
+    \
+    if (F_status_is_error_not(state->status)) { \
+      for (internal.j = 0; internal.j < numbers.used; ++internal.j) { \
         \
-        break; \
-      } \
-      \
-      if (!(data->flag & f_fss_payload_header_map_flag_join_digits_e)) { \
-        if (data->cache->used && internal.j + 1 < numbers.used) { \
-          state->status = f_string_dynamic_append(f_fss_extended_open_s, &destination); \
-          if (F_status_is_error(state->status)) break; \
+        if (state->interrupt) { \
+          state->interrupt((void * const) state, (void * const) &internal); \
+          if (F_status_set_fine(state->status) == F_interrupt) break; \
         } \
         \
-        ++destinations->used; \
-      } \
-    } /* for */ \
-    \
-    if (data->cache->used && (data->flag & f_fss_payload_header_map_flag_join_digits_e)) { \
-      if (private_fl_payload_helper_header_map_destination_write_buffer(data, state, &internal, data->cache, destinations) == F_false) { \
-        ++destinations->used; \
+        if (!(data->flag & f_fss_payload_header_map_flag_join_digits_e)) { \
+          data->cache->used = 0; \
+        } \
+        \
+        if (function(data, state, &internal, (cast) numbers.array[internal.j])) { \
+          data->cache->used = 0; \
+          \
+          break; \
+        } \
+        \
+        if (!(data->flag & f_fss_payload_header_map_flag_join_digits_e)) { \
+          destinations->array[destinations->used].name.used = 0; \
+          destinations->array[destinations->used].value.used = 0; \
+          \
+          state->status = f_string_dynamic_append(headers.array[internal.i].key, &destinations->array[destinations->used].name); \
+          if (F_status_is_error(state->status)) break; \
+          \
+          state->status = f_string_dynamic_append(*data->cache, &destinations->array[destinations->used].value); \
+          if (F_status_is_error(state->status)) break; \
+          \
+          ++destinations->used; \
+        } \
+      } /* for */ \
+      \
+      if (data->cache->used && (data->flag & f_fss_payload_header_map_flag_join_digits_e)) { \
+        if (private_fl_payload_helper_header_map_destination_write_buffer(data, state, &internal, data->cache, destinations) == F_false) { \
+          ++destinations->used; \
+        } \
       } \
     }
 
-  #define macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, numbers, destination) \
-    macro_f_fss_payload_header_write_process_numbers_d(data, state, internal, numbers, destination, private_fl_payload_header_map_number_signed, f_number_signed_t)
+  #define macro_f_fss_payload_header_write_process_numbers_signed_d(data, state, internal, numbers, destinations) \
+    macro_f_fss_payload_header_write_process_numbers_d(data, state, internal, numbers, destinations, private_fl_payload_header_map_number_signed, f_number_signed_t)
 
-  #define macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, numbers, destination) \
-    macro_f_fss_payload_header_write_process_numbers_d(data, state, internal, numbers, destination, private_fl_payload_header_map_number_unsigned, f_number_unsigned_t)
+  #define macro_f_fss_payload_header_write_process_numbers_unsigned_d(data, state, internal, numbers, destinations) \
+    macro_f_fss_payload_header_write_process_numbers_d(data, state, internal, numbers, destinations, private_fl_payload_header_map_number_unsigned, f_number_unsigned_t)
 
   #define macro_f_fss_payload_header_write_process_dynamic_d(data, state, internal, dynamic) \
     if (dynamic.used || (data->flag & f_fss_payload_header_map_flag_null_dynamic_e)) { \