Progress: Iki Read.

Rename raw mode to whole mode.
I believe the meaning of the word 'whole' is more correct than the word 'raw'.

Implement 'whole' mode.

diff --git a/level_3/iki_read/c/iki_read.c b/level_3/iki_read/c/iki_read.c
index 2b53777366b0cb6fbe805ebd880c4cd262aee56d..6d8fbe00da58a63577865d53fc769475350a881e 100644 (file)
--- a/level_3/iki_read/c/iki_read.c
+++ b/level_3/iki_read/c/iki_read.c
@@ -19,10 +19,10 @@ extern "C" {
 
     printf("%c", f_string_eol[0]);
 
-    fll_program_print_help_option(context, iki_read_short_at, iki_read_long_at, f_console_symbol_short_enable, f_console_symbol_long_enable, "  Select variable at this numeric index.");
-    fll_program_print_help_option(context, iki_read_short_line, iki_read_long_line, f_console_symbol_short_enable, f_console_symbol_long_enable, "Print only the variables at the given line.");
-    fll_program_print_help_option(context, iki_read_short_name, iki_read_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, "Select variables with this name.");
-    fll_program_print_help_option(context, iki_read_short_raw, iki_read_long_raw, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print raw of the data instead of just the variable data.");
+    fll_program_print_help_option(context, iki_read_short_at, iki_read_long_at, f_console_symbol_short_enable, f_console_symbol_long_enable, "   Select variable at this numeric index.");
+    fll_program_print_help_option(context, iki_read_short_line, iki_read_long_line, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print only the variables at the given line.");
+    fll_program_print_help_option(context, iki_read_short_name, iki_read_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select variables with this name.");
+    fll_program_print_help_option(context, iki_read_short_whole, iki_read_long_whole, f_console_symbol_short_enable, f_console_symbol_long_enable, "Print all of the data instead of just the variable data.");
 
     printf("%c", f_string_eol[0]);
 
@@ -322,12 +322,12 @@ extern "C" {
           data->mode = iki_read_mode_content;
         }
 
-        if (data->parameters[iki_read_parameter_raw].result == f_console_result_found) {
+        if (data->parameters[iki_read_parameter_whole].result == f_console_result_found) {
           if (data->parameters[iki_read_parameter_total].result == f_console_result_found) {
             if (data->verbosity != iki_read_verbosity_quiet) {
               fprintf(f_type_error, "%c", f_string_eol[0]);
               fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '");
-              fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, iki_read_long_raw);
+              fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, iki_read_long_whole);
               fl_color_print(f_type_error, data->context.error, data->context.reset, "' parameter with the '");
               fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, iki_read_long_total);
               fl_color_print_line(f_type_error, data->context.error, data->context.reset, "' parameter.");

diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h
index e7a6cf190b2d141888c007ce209624f2b75d6584..fdaa1e14d8dc35e5b952cf74f97d32805ed4763e 100644 (file)
--- a/level_3/iki_read/c/iki_read.h
+++ b/level_3/iki_read/c/iki_read.h
@@ -81,9 +81,9 @@ extern "C" {
   #define iki_read_short_literal    "L"
   #define iki_read_short_name       "n"
   #define iki_read_short_object     "o"
-  #define iki_read_short_raw        "r"
   #define iki_read_short_substitute "s"
   #define iki_read_short_total      "t"
+  #define iki_read_short_whole      "w"
 
   #define iki_read_long_at         "at"
   #define iki_read_long_expand     "expand"
@@ -91,9 +91,9 @@ extern "C" {
   #define iki_read_long_literal    "literal"
   #define iki_read_long_name       "name"
   #define iki_read_long_object     "object"
-  #define iki_read_long_raw        "raw"
   #define iki_read_long_substitute "substitute"
   #define iki_read_long_total      "total"
+  #define iki_read_long_whole      "whole"
 
   enum {
     iki_read_parameter_help,
@@ -110,7 +110,7 @@ extern "C" {
     iki_read_parameter_literal,
     iki_read_parameter_name,
     iki_read_parameter_object,
-    iki_read_parameter_raw,
+    iki_read_parameter_whole,
     iki_read_parameter_substitute,
     iki_read_parameter_total,
   };
@@ -130,7 +130,7 @@ extern "C" {
       f_console_parameter_initialize(iki_read_short_literal, iki_read_long_literal, 0, 0, f_console_type_normal), \
       f_console_parameter_initialize(iki_read_short_name, iki_read_long_name, 0, 1, f_console_type_normal), \
       f_console_parameter_initialize(iki_read_short_object, iki_read_long_object, 0, 0, f_console_type_normal), \
-      f_console_parameter_initialize(iki_read_short_raw, iki_read_long_raw, 0, 0, f_console_type_normal), \
+      f_console_parameter_initialize(iki_read_short_whole, iki_read_long_whole, 0, 0, f_console_type_normal), \
       f_console_parameter_initialize(iki_read_short_substitute, iki_read_long_substitute, 0, 3, f_console_type_normal), \
       f_console_parameter_initialize(iki_read_short_total, iki_read_long_total, 0, 0, f_console_type_normal), \
     }

diff --git a/level_3/iki_read/c/private-iki_read.c b/level_3/iki_read/c/private-iki_read.c
index f95e45a3d8fb5023c197c278051c88de37329e39..f8c5da2de7371088bf06cbf1bcfcb6984316d148 100644 (file)
--- a/level_3/iki_read/c/private-iki_read.c
+++ b/level_3/iki_read/c/private-iki_read.c
@@ -30,6 +30,28 @@ extern "C" {
       return F_none;
     }
 
+    if (status == F_buffer_too_large) {
+      if (verbosity != iki_read_verbosity_quiet) {
+        fprintf(f_type_error, "%c", f_string_eol[0]);
+        fl_color_print(f_type_error, context.error, context.reset, "ERROR: Maximum buffer limit reached while processing ");
+        fl_color_print(f_type_error, context.notable, context.reset, "%s", function);
+        fl_color_print_line(f_type_error, context.error, context.reset, "().");
+      }
+
+      return F_none;
+    }
+
+    if (status == F_string_too_large) {
+      if (verbosity != iki_read_verbosity_quiet) {
+        fprintf(f_type_error, "%c", f_string_eol[0]);
+        fl_color_print(f_type_error, context.error, context.reset, "ERROR: Maximum string limit reached while processing ");
+        fl_color_print(f_type_error, context.notable, context.reset, "%s", function);
+        fl_color_print_line(f_type_error, context.error, context.reset, "().");
+      }
+
+      return F_none;
+    }
+
     if (fallback && verbosity != iki_read_verbosity_quiet) {
       fprintf(f_type_error, "%c", f_string_eol[0]);
       fl_color_print(f_type_error, context.error, context.reset, "UNKNOWN ERROR: (");
@@ -310,7 +332,7 @@ extern "C" {
     f_iki_vocabulary vocabulary = f_iki_vocabulary_initialize;
     f_iki_content content = f_iki_content_initialize;
 
-    if (data->parameters[iki_read_parameter_raw].result == f_console_result_found) {
+    if (data->parameters[iki_read_parameter_whole].result == f_console_result_found) {
       f_string_range buffer_range = f_macro_string_range_initialize(data->buffer.used);
 
       if (iki_read_process_at(arguments, file_name, data, &buffer_range)) {
@@ -320,13 +342,13 @@ extern "C" {
       }
 
       if (data->mode == iki_read_mode_content) {
-        status = iki_read_process_buffer_ranges_raw(arguments, file_name, buffer_range, data, &variable, &vocabulary, &content, &content);
+        status = iki_read_process_buffer_ranges_whole(arguments, file_name, buffer_range, data, &variable, &vocabulary, &content, &content);
       }
       else if (data->mode == iki_read_mode_literal) {
-        status = iki_read_process_buffer_ranges_raw(arguments, file_name, buffer_range, data, &variable, &vocabulary, &content, &variable);
+        status = iki_read_process_buffer_ranges_whole(arguments, file_name, buffer_range, data, &variable, &vocabulary, &content, &variable);
       }
       else if (data->mode == iki_read_mode_object) {
-        status = iki_read_process_buffer_ranges_raw(arguments, file_name, buffer_range, data, &variable, &vocabulary, &content, &vocabulary);
+        status = iki_read_process_buffer_ranges_whole(arguments, file_name, buffer_range, data, &variable, &vocabulary, &content, &vocabulary);
       }
     }
     else if (data->mode == iki_read_mode_total) {
@@ -425,8 +447,8 @@ extern "C" {
   }
 #endif // _di_iki_read_process_buffer_ranges_
 
-#ifndef _di_iki_read_process_buffer_ranges_raw_
-  f_return_status iki_read_process_buffer_ranges_raw(const f_console_arguments arguments, const f_string file_name, const f_string_range buffer_range, iki_read_data *data, f_iki_variable *variable, f_iki_vocabulary *vocabulary, f_iki_content *content, f_string_ranges *ranges) {
+#ifndef _di_iki_read_process_buffer_ranges_whole_
+  f_return_status iki_read_process_buffer_ranges_whole(const f_console_arguments arguments, const f_string file_name, const f_string_range buffer_range, iki_read_data *data, f_iki_variable *variable, f_iki_vocabulary *vocabulary, f_iki_content *content, f_string_ranges *ranges) {
     f_status status = F_none;
     f_string_range range = buffer_range;
 
@@ -436,46 +458,129 @@ extern "C" {
       return status;
     }
 
-    if (data->parameters[iki_read_parameter_name].result == f_console_result_additional) {
-      // @todo (may be better to merge this logic in the block below.)
+    if (!variable->used) {
+      f_print_string_dynamic_partial(f_type_output, data->buffer, buffer_range);
+      return F_none;
     }
-    else if (variable->used) {
-      f_string_length i = buffer_range.start;
+
+    f_string_dynamics names = f_string_dynamics_initialize;
+    f_string_range name_range = f_string_range_initialize;
+    bool name_missed = F_true;
+
+    if (data->parameters[iki_read_parameter_name].result == f_console_result_additional) {
+      f_array_length i = 0;
       f_array_length j = 0;
+      f_string_length length_argument = 0;
 
-      range = buffer_range;
+      for (f_array_length index = 0; i < data->parameters[iki_read_parameter_name].additional.used; i++) {
+        index = data->parameters[iki_read_parameter_name].additional.array[i];
+        length_argument = strnlen(arguments.argv[index], f_console_length_size);
 
-      while (i <= range.stop && j < variable->used) {
-        if (i < variable->array[j].start) {
-          range.stop = variable->array[j].start - 1;
+        for (j = 0, name_missed = F_true; j < names.used; j++) {
+          status = fl_string_compare(arguments.argv[index], names.array[j].string, length_argument, names.array[j].used);
 
-          f_print_string_dynamic_partial(f_type_output, data->buffer, range);
+          if (status == F_equal_to) {
+            name_missed = F_false;
+            break;
+          }
+        } // for
 
-          range.start = variable->array[j].stop + 1;
-          range.stop = buffer_range.stop;
+        if (name_missed) {
+          if (names.used + 1 > names.size) {
+            if (names.used + f_iki_default_allocation_step > f_array_length_size) {
+              if (names.used + 1 > names.size > f_array_length_size) {
+                iki_read_print_error(data->context, data->verbosity, F_buffer_too_large, "iki_read_process_buffer_ranges_whole", F_true);
+
+                f_macro_string_dynamics_delete_simple(names);
+                return F_status_set_error(F_buffer_too_large);
+              }
+              else {
+                f_macro_string_dynamics_resize(status, names, names.used + 1);
+              }
+            }
+            else {
+              f_macro_string_dynamics_resize(status, names, names.used + f_iki_default_allocation_step);
+            }
+
+            if (F_status_is_error(status)) {
+              iki_read_print_error(data->context, data->verbosity, F_status_set_fine(status), "iki_read_process_buffer_ranges_whole", F_true);
+
+              f_macro_string_dynamics_delete_simple(names);
+              return status;
+            }
+          }
+
+          status = fl_string_append_nulless(arguments.argv[index], length_argument, &names.array[names.used]);
+          if (F_status_is_error(status)) {
+            iki_read_print_error(data->context, data->verbosity, F_status_set_fine(status), "fl_string_append_nulless", F_true);
+
+            f_macro_string_dynamics_delete_simple(names);
+            return status;
+          }
 
-          i = variable->array[j].start;
+          names.used++;
         }
+      } // for
+    }
 
-        // @todo handle expansion and substitution.
-        f_print_string_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
+    f_string_length i = buffer_range.start;
+    f_array_length j = 0;
+    f_array_length k = 0;
 
-        i = variable->array[j].stop + 1;
-        j++;
-      } // while
+    range = buffer_range;
+    name_range.start = 0;
+
+    while (i <= range.stop && j < variable->used) {
+      if (i < variable->array[j].start) {
+        range.stop = variable->array[j].start - 1;
 
-      if (i <= buffer_range.stop) {
-        range.start = i;
         f_print_string_dynamic_partial(f_type_output, data->buffer, range);
+
+        range.start = variable->array[j].stop + 1;
+        range.stop = buffer_range.stop;
+
+        i = variable->array[j].start;
       }
-    }
-    else {
-      f_print_string_dynamic_partial(f_type_output, data->buffer, buffer_range);
+
+      // @todo handle expansion and substitution.
+      if (names.used) {
+        name_missed = F_true;
+
+        for (k = 0; k < names.used; k++) {
+          name_range.stop = names.array[k].used - 1;
+
+          status = fl_string_dynamic_partial_compare(data->buffer, names.array[k], vocabulary->array[j], name_range);
+
+          if (status == F_equal_to) {
+            name_missed = F_false;
+            break;
+          }
+        } // for
+
+        if (name_missed) {
+          f_print_string_dynamic_partial(f_type_output, data->buffer, variable->array[j]);
+        }
+        else {
+          f_print_string_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
+        }
+      }
+      else {
+        f_print_string_dynamic_partial(f_type_output, data->buffer, ranges->array[j]);
+      }
+
+      i = variable->array[j].stop + 1;
+      j++;
+    } // while
+
+    if (i <= buffer_range.stop) {
+      range.start = i;
+      f_print_string_dynamic_partial(f_type_output, data->buffer, range);
     }
 
+    f_macro_string_dynamics_delete_simple(names);
     return F_none;
   }
-#endif // _di_iki_read_process_buffer_ranges_raw_
+#endif // _di_iki_read_process_buffer_ranges_whole_
 
 #ifndef _di_iki_read_process_buffer_total_
   f_return_status iki_read_process_buffer_total(const f_console_arguments arguments, const f_string file_name, iki_read_data *data, f_iki_variable *variable, f_iki_vocabulary *vocabulary, f_iki_content *content) {

diff --git a/level_3/iki_read/c/private-iki_read.h b/level_3/iki_read/c/private-iki_read.h
index 71e1b5b989d70dae5fc1a8d10ec618bb49e4f4a4..692427ba4f42e170697c5ad31d8503d7590ffeb9 100644 (file)
--- a/level_3/iki_read/c/private-iki_read.h
+++ b/level_3/iki_read/c/private-iki_read.h
@@ -165,7 +165,7 @@ extern "C" {
 #endif // _di_iki_read_process_buffer_ranges_
 
 /**
- * Process a given buffer, printing the given buffer in raw mode based on the given ranges.
+ * Process a given buffer, printing the given buffer in whole mode based on the given ranges.
  *
  * The entire variable is replaced with the range from the associated ranges.
  *
@@ -193,9 +193,9 @@ extern "C" {
  *
  *   Status codes (with error bit) are returned on any problem.
  */
-#ifndef _di_iki_read_process_buffer_ranges_raw_
-  extern f_return_status iki_read_process_buffer_ranges_raw(const f_console_arguments arguments, const f_string file_name, const f_string_range buffer_range, iki_read_data *data, f_iki_variable *variable, f_iki_vocabulary *vocabulary, f_iki_content *content, f_string_ranges *ranges) f_gcc_attribute_visibility_internal;
-#endif // _di_iki_read_process_buffer_ranges_raw_
+#ifndef _di_iki_read_process_buffer_ranges_whole_
+  extern f_return_status iki_read_process_buffer_ranges_whole(const f_console_arguments arguments, const f_string file_name, const f_string_range buffer_range, iki_read_data *data, f_iki_variable *variable, f_iki_vocabulary *vocabulary, f_iki_content *content, f_string_ranges *ranges) f_gcc_attribute_visibility_internal;
+#endif // _di_iki_read_process_buffer_ranges_whole_
 
 /**
  * Process a given buffer, printing the total.