Update: implement recursive depth handling for FSS Extended List Read.

diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
index 2f6bd801c9f54c16a5f9154eac0b8ac1e0e75d98..93331981432c7c0ad7a18e7c827ae3de7af498cf 100644 (file)
--- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
+++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
@@ -315,22 +315,20 @@ extern "C" {
       }
     }
 
-    if (data->parameters[fss_extended_list_read_parameter_depth].result == f_console_result_none || (data->parameters[fss_extended_list_read_parameter_depth].result == f_console_result_additional && depths.used == 1)) {
+    fss_extended_list_read_process_delimits(*data, objects_delimits, contents_delimits);
 
-      fss_extended_list_read_process_delimits(*data, objects_delimits, contents_delimits);
+    const fss_extended_list_read_skip_t parents = fss_extended_list_read_skip_t_initialize;
 
-      return fss_extended_list_read_main_process_for_depth(arguments, data, filename, depths.array[0], line, objects_delimits, contents_delimits);
-    }
-
-    return F_none;
+    return fss_extended_list_read_main_process_for_depth(arguments, data, filename, depths.array[0], line, parents, objects_delimits, contents_delimits);
   }
 #endif // _di_fss_extended_list_read_main_process_file_
 
 #ifndef _di_fss_extended_list_read_main_process_for_depth_
-  f_return_status fss_extended_list_read_main_process_for_depth(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t filename, const fss_extended_list_read_depth_t depth_setting, const f_array_length_t line, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) {
+  f_return_status fss_extended_list_read_main_process_for_depth(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t filename, const fss_extended_list_read_depth_t depth_setting, const f_array_length_t line, const fss_extended_list_read_skip_t parents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) {
     f_status_t status = F_none;
 
     f_fss_items_t *items = &data->nest.depth[depth_setting.depth];
+
     bool skip[items->used];
 
     f_array_length_t i = 0;
@@ -338,29 +336,45 @@ extern "C" {
 
     const f_string_lengths_t except_none = f_string_lengths_t_initialize;
 
+    // setup defaults to be not skipped unless any given parent is skipped.
+    memset(skip, F_false, sizeof(skip) * items->used);
+
+    if (parents.used) {
+      for (i = 0; i < items->used; ++i) {
+
+        if (items->array[i].parent >= parents.used || parents.skip[items->array[i].parent]) {
+          skip[i] = F_true;
+        }
+      } // for
+    }
+
     if (depth_setting.index_name || depth_setting.index_at) {
-      memset(skip, F_true, sizeof(skip) * items->used);
 
       if (!depth_setting.index_name || (depth_setting.index_at && depth_setting.index_at < depth_setting.index_name)) {
 
-        if (depth_setting.value_at < items->used) {
+        // all other non-"at" parameters must be FALSE.
+        for (i = 0; i < items->used; ++i) {
+
+          if (i != depth_setting.value_at) {
+            skip[i] = F_true;
+          }
+        } // for
+
+        if (depth_setting.value_at < items->used && !skip[depth_setting.value_at]) {
           if (depth_setting.index_name) {
+
             if (data->parameters[fss_extended_list_read_parameter_trim].result == f_console_result_found) {
 
-              if (fl_string_dynamic_partial_compare_except_trim_dynamic(depth_setting.value_name, data->buffer, items->array[depth_setting.value_at].object, except_none, *objects_delimits) == F_equal_to) {
-                skip[depth_setting.value_at] = F_false;
+              if (fl_string_dynamic_partial_compare_except_trim_dynamic(depth_setting.value_name, data->buffer, items->array[depth_setting.value_at].object, except_none, *objects_delimits) != F_equal_to) {
+                skip[depth_setting.value_at] = F_true;
               }
             }
             else {
-
-              if (fl_string_dynamic_partial_compare_except_dynamic(depth_setting.value_name, data->buffer, items->array[depth_setting.value_at].object, except_none, *objects_delimits) == F_equal_to) {
-                skip[depth_setting.value_at] = F_false;
+              if (fl_string_dynamic_partial_compare_except_dynamic(depth_setting.value_name, data->buffer, items->array[depth_setting.value_at].object, except_none, *objects_delimits) != F_equal_to) {
+                skip[depth_setting.value_at] = F_true;
               }
             }
           }
-          else {
-            skip[depth_setting.value_at] = F_false;
-          }
         }
       }
       else {
@@ -369,8 +383,10 @@ extern "C" {
 
           for (i = 0; i < items->used; ++i) {
 
-            if (fl_string_dynamic_partial_compare_except_trim_dynamic(depth_setting.value_name, data->buffer, items->array[i].object, except_none, *objects_delimits) == F_equal_to) {
-              skip[i] = F_false;
+            if (skip[i]) continue;
+
+            if (fl_string_dynamic_partial_compare_except_trim_dynamic(depth_setting.value_name, data->buffer, items->array[i].object, except_none, *objects_delimits) != F_equal_to) {
+              skip[i] = F_true;
             }
           } // for
         }
@@ -378,8 +394,10 @@ extern "C" {
 
           for (i = 0; i < items->used; ++i) {
 
-            if (fl_string_dynamic_partial_compare_except_dynamic(depth_setting.value_name, data->buffer, items->array[i].object, except_none, *objects_delimits) == F_equal_to) {
-              skip[i] = F_false;
+            if (skip[i]) continue;
+
+            if (fl_string_dynamic_partial_compare_except_dynamic(depth_setting.value_name, data->buffer, items->array[i].object, except_none, *objects_delimits) != F_equal_to) {
+              skip[i] = F_true;
             }
           } // for
         }
@@ -396,9 +414,6 @@ extern "C" {
         }
       }
     }
-    else {
-      memset(skip, F_false, sizeof(skip) * items->used);
-    }
 
     // process objects.
 

diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h
index a608d3d6e1e099de5e80140efc756da63186a046..179f4a93b9269c590ecd403ac601098b08ef3b07 100644 (file)
--- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h
+++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h
@@ -58,6 +58,31 @@ extern "C" {
 #endif // _di_fss_extended_list_read_depth_t_
 
 /**
+ * A structure containing a statically allocated array of booleans and the array length.
+ *
+ * skip: a statically allocated array representing list items that are to be skipped.
+ * used: the length of the statically allocated skip array.
+ */
+#ifndef _di_fss_extended_list_read_skip_t_
+  typedef struct {
+    bool *skip;
+    f_array_length_t used;
+  } fss_extended_list_read_skip_t;
+
+  #define fss_extended_list_read_skip_t_initialize \
+    { \
+      0, \
+      0, \
+    }
+
+  #define macro_fss_extended_list_read_skip_t_initialize(skip, used) \
+    { \
+      skip, \
+      used, \
+    }
+#endif // _di_fss_extended_list_read_skip_t_
+
+/**
  * An array of depth parameters.
  *
  * array: the array of depths.
@@ -225,6 +250,9 @@ extern "C" {
  *   The depth settings specific to the desired depth.
  * @param line
  *   The line number parameter value, used for printing a specific line number for content.
+ * @param parents
+ *   The skip status of any parent lists.
+ *   Set parents.length to 0 for depth 0.
  * @param objects_delimits
  *   An array of delimits detected during processing, for top-level objects.
  * @param contents_delimits
@@ -238,7 +266,7 @@ extern "C" {
  * @see fss_extended_list_read_main_process_file()
  */
 #ifndef _di_fss_extended_list_read_main_process_for_depth_
-  extern f_return_status fss_extended_list_read_main_process_for_depth(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t filename, const fss_extended_list_read_depth_t depth_setting, const f_array_length_t line, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) f_gcc_attribute_visibility_internal;
+  extern f_return_status fss_extended_list_read_main_process_for_depth(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t filename, const fss_extended_list_read_depth_t depth_setting, const f_array_length_t line, const fss_extended_list_read_skip_t parents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) f_gcc_attribute_visibility_internal;
 #endif // _di_fss_extended_list_read_main_process_for_depth_
 
 /**