]> Kevux Git Server - fll/commitdiff
Cleanup: rename f_strings to f_string and fl_strings to fl_string
authorKevin Day <thekevinday@gmail.com>
Sun, 1 Sep 2019 19:49:11 +0000 (14:49 -0500)
committerKevin Day <thekevinday@gmail.com>
Sun, 1 Sep 2019 19:53:02 +0000 (14:53 -0500)
Update functions and macros accordingly.

124 files changed:
build/level_0/settings
build/level_1/settings
build/monolithic/settings
level_0/f_colors/c/colors.h
level_0/f_colors/data/build/dependencies
level_0/f_console/c/console.h
level_0/f_console/data/build/dependencies
level_0/f_conversion/c/conversion.h
level_0/f_conversion/data/build/dependencies
level_0/f_file/c/file.c
level_0/f_file/c/file.h
level_0/f_fss/c/fss.h
level_0/f_fss/data/build/dependencies
level_0/f_print/c/print.c
level_0/f_print/c/print.h
level_0/f_print/data/build/dependencies
level_0/f_serialized/c/serialized.h
level_0/f_serialized/data/build/dependencies
level_0/f_socket/c/socket.h
level_0/f_string/c/string.h [moved from level_0/f_strings/c/strings.h with 70% similarity]
level_0/f_string/data/build/defines [moved from level_0/f_strings/data/build/defines with 100% similarity]
level_0/f_string/data/build/dependencies [moved from level_0/f_strings/data/build/dependencies with 100% similarity]
level_0/f_string/data/build/settings [moved from level_0/f_strings/data/build/settings with 87% similarity]
level_0/f_utf/c/utf.c
level_0/f_utf/c/utf.h
level_0/f_utf/data/build/dependencies
level_1/fl_colors/c/colors.c
level_1/fl_colors/c/colors.h
level_1/fl_colors/data/build/dependencies
level_1/fl_console/c/console.c
level_1/fl_console/c/console.h
level_1/fl_console/data/build/dependencies
level_1/fl_directory/c/directory.c
level_1/fl_directory/c/directory.h
level_1/fl_directory/data/build/dependencies
level_1/fl_file/c/file.c
level_1/fl_file/c/file.h
level_1/fl_file/data/build/dependencies
level_1/fl_fss/c/fss.c
level_1/fl_fss/c/fss.h
level_1/fl_fss/c/fss_basic.c
level_1/fl_fss/c/fss_basic.h
level_1/fl_fss/c/fss_basic_list.c
level_1/fl_fss/c/fss_basic_list.h
level_1/fl_fss/c/fss_extended.c
level_1/fl_fss/c/fss_extended.h
level_1/fl_fss/c/fss_macro.h
level_1/fl_fss/data/build/dependencies
level_1/fl_program/c/program.h
level_1/fl_program/data/build/dependencies
level_1/fl_serialized/c/serialized.c
level_1/fl_serialized/c/serialized.h
level_1/fl_serialized/data/build/dependencies
level_1/fl_socket/c/socket.h
level_1/fl_status/c/status.h
level_1/fl_status/data/build/dependencies
level_1/fl_string/c/string.c [moved from level_1/fl_strings/c/strings.c with 80% similarity]
level_1/fl_string/c/string.h [moved from level_1/fl_strings/c/strings.h with 75% similarity]
level_1/fl_string/data/build/dependencies [moved from level_1/fl_strings/data/build/dependencies with 76% similarity]
level_1/fl_string/data/build/settings [moved from level_1/fl_strings/data/build/settings with 81% similarity]
level_1/fl_utf/c/utf.c
level_1/fl_utf/c/utf.h
level_1/fl_utf/data/build/dependencies
level_2/fll_colors/c/colors.h
level_2/fll_colors/data/build/dependencies
level_2/fll_execute/c/execute.c
level_2/fll_execute/c/execute.h
level_2/fll_execute/data/build/dependencies
level_2/fll_fss/c/fss_basic.c
level_2/fll_fss/c/fss_basic.h
level_2/fll_fss/c/fss_basic_list.c
level_2/fll_fss/c/fss_basic_list.h
level_2/fll_fss/c/fss_extended.c
level_2/fll_fss/c/fss_extended.h
level_2/fll_fss/c/fss_status.c
level_2/fll_fss/c/fss_status.h
level_2/fll_fss/data/build/dependencies
level_2/fll_fss/data/build/settings
level_2/fll_status/c/status.c
level_2/fll_status/c/status.h
level_2/fll_status/data/build/dependencies
level_2/fll_status/data/build/settings
level_3/firewall/c/firewall.c
level_3/firewall/c/firewall.h
level_3/firewall/c/private-firewall.c
level_3/firewall/c/private-firewall.h
level_3/firewall/data/build/dependencies
level_3/firewall/data/build/settings
level_3/fss_basic_list_read/c/fss_basic_list_read.c
level_3/fss_basic_list_read/c/fss_basic_list_read.h
level_3/fss_basic_list_read/data/build/dependencies
level_3/fss_basic_list_read/data/build/settings
level_3/fss_basic_list_write/c/fss_basic_list_write.c
level_3/fss_basic_list_write/c/fss_basic_list_write.h
level_3/fss_basic_list_write/data/build/dependencies
level_3/fss_basic_list_write/data/build/settings
level_3/fss_basic_read/c/fss_basic_read.c
level_3/fss_basic_read/c/fss_basic_read.h
level_3/fss_basic_read/data/build/dependencies
level_3/fss_basic_read/data/build/settings
level_3/fss_basic_write/c/fss_basic_write.c
level_3/fss_basic_write/c/fss_basic_write.h
level_3/fss_basic_write/data/build/dependencies
level_3/fss_basic_write/data/build/settings
level_3/fss_extended_read/c/fss_extended_read.c
level_3/fss_extended_read/c/fss_extended_read.h
level_3/fss_extended_read/data/build/dependencies
level_3/fss_extended_read/data/build/settings
level_3/fss_extended_write/c/fss_extended_write.c
level_3/fss_extended_write/c/fss_extended_write.h
level_3/fss_extended_write/data/build/dependencies
level_3/fss_extended_write/data/build/settings
level_3/fss_status_code/c/fss_status_code.c
level_3/fss_status_code/c/fss_status_code.h
level_3/fss_status_code/data/build/dependencies
level_3/fss_status_code/data/build/settings
level_3/init/c/private-init.c
level_3/init/c/private-init.h
level_3/init/data/build/dependencies
level_3/init/data/build/settings
level_3/status_code/c/status_code.c
level_3/status_code/c/status_code.h
level_3/status_code/data/build/dependencies
level_3/status_code/data/build/settings

index 650f7d4558a0d204ba9f071d268334de473b6285..f4eda935e0b1e30e34c029134a964ae56723e38e 100644 (file)
@@ -13,7 +13,7 @@ build_libraries -lc
 build_libraries_fll
 build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c
 build_sources_program
-build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/strings.h level_0/types.h level_0/types_array.h level_0/utf.h
+build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h
 build_shared yes
 build_static yes
 
index ccb2097dfbb748924ef23b7807f604151dbfdc41..d08c3d5e92a2d164c5adccd87300ac57a7c7e0d4 100644 (file)
@@ -11,9 +11,9 @@ build_compiler gcc
 build_linker ar
 build_libraries -lc
 build_libraries_fll -lfll_0
-build_sources_library level_1/colors.c level_1/console.c level_1/directory.c level_1/status.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/program.c level_1/serialized.c level_1/strings.c level_1/utf.c
+build_sources_library level_1/colors.c level_1/console.c level_1/directory.c level_1/status.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/program.c level_1/serialized.c level_1/string.c level_1/utf.c
 build_sources_program 
-build_sources_headers level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/strings.h level_1/utf.h
+build_sources_headers level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h
 build_shared yes
 build_static yes
 
index 043100c3e6df7499247111a3054e5b48c3ad75ad..45ce8bed8ee34535e8ad2412eb758050050e74c9 100644 (file)
@@ -11,9 +11,9 @@ build_compiler gcc
 build_linker ar
 build_libraries -lc
 build_libraries_fll
-build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c level_1/colors.c level_1/console.c level_1/directory.c level_1/status.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/program.c level_1/serialized.c level_1/strings.c level_1/utf.c level_2/colors.c level_2/execute.c level_2/status.c
+build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c level_1/colors.c level_1/console.c level_1/directory.c level_1/status.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/program.c level_1/serialized.c level_1/string.c level_1/utf.c level_2/colors.c level_2/execute.c level_2/status.c
 build_sources_program
-build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/strings.h level_0/types.h level_0/types_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/strings.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h
+build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h
 build_sources_bash
 build_sources_settings
 build_shared yes
index cfcae9281635f433f42279cb59c884535ac9885d..5bdf5d24bbb1592db94e5090f20e7a07d999bcee 100644 (file)
@@ -12,7 +12,7 @@
 #define _F_colors_h
 
 // fll-0 includes
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
index 98ec83401bf4b736a6cab2c4a7cd3a8573302beb..b1ee0363272dc08870d4c923f8bd64f0f72c0ee9 100644 (file)
@@ -1,3 +1,3 @@
 f_types
 f_memory
-f_strings
+f_string
index f751357cbf512478dfe805d1c1dd6fd8584035c2..940e663e833384ae633380e9bdf3f0f48bc603d4 100644 (file)
@@ -16,7 +16,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/types.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 
 #ifdef __cplusplus
 extern "C" {
index 9594c4ed1103486b9389eb37c5d6661310feaa25..176f52862b4e47d599579aefed281788186fe3f5 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_errors
 f_memory
-f_strings
+f_string
index 7aab70ce5fcd31d6523b9ac4afd913a29cf58223..f970d0cea4359b60051a4e8cd7dd3f2eee19aeed 100644 (file)
@@ -27,7 +27,7 @@
 
 // fll includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
index 9594c4ed1103486b9389eb37c5d6661310feaa25..176f52862b4e47d599579aefed281788186fe3f5 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_errors
 f_memory
-f_strings
+f_string
index f67d0aa5ae77b841b353cfa1e23cde4c0aeeed4e..d8e7833d441d91aa1cbec1c8d35147b7e8269bbe 100644 (file)
@@ -72,7 +72,7 @@ extern "C" {
 #endif // _di_f_file_flush_
 
 #ifndef _di_f_file_read_
-  f_return_status f_file_read(f_file *file_information, f_dynamic_string *buffer, const f_file_position location) {
+  f_return_status f_file_read(f_file *file_information, f_string_dynamic *buffer, const f_file_position location) {
     #ifndef _di_level_0_parameter_checking_
       if (file_information == 0) return f_status_set_error(f_invalid_parameter);
       if (buffer->used >= buffer->size) return f_status_set_error(f_invalid_parameter);
@@ -123,7 +123,7 @@ extern "C" {
 
     // append an EOS only when the total elements were set to 0
     if (location.total_elements == 0) {
-      buffer->string[buffer->used] = f_eos;
+      buffer->string[buffer->used] = f_string_eos;
     }
 
     // make sure to communicate that we are done without a problem and the eof was reached
@@ -136,7 +136,7 @@ extern "C" {
 #endif // _di_f_file_read_
 
 #ifndef _di_f_file_read_fifo_
-  f_return_status f_file_read_fifo(f_file *file_information, f_dynamic_string *buffer) {
+  f_return_status f_file_read_fifo(f_file *file_information, f_string_dynamic *buffer) {
     #ifndef _di_level_0_parameter_checking_
       if (file_information == 0) return f_status_set_error(f_invalid_parameter);
       if (buffer->used >= buffer->size) return f_status_set_error(f_invalid_parameter);
index efc902a4610e9b423ac9801a61150b7350139666..67cbb403b7d11aa94a480833446f4d89a56b224f 100644 (file)
@@ -21,7 +21,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
@@ -224,14 +224,14 @@ extern "C" {
   /**
    * read a given amount of data from the buffer, will auto-seek to where.
    */
-  extern f_return_status f_file_read(f_file *file_information, f_dynamic_string *buffer, const f_file_position location);
+  extern f_return_status f_file_read(f_file *file_information, f_string_dynamic *buffer, const f_file_position location);
 #endif // _di_f_file_read_
 
 #ifndef _di_f_file_read_fifo_
   /**
    * read a given amount of data from the buffer, will not auto seek.
    */
-  extern f_return_status f_file_read_fifo(f_file *file_information, f_dynamic_string *buffer);
+  extern f_return_status f_file_read_fifo(f_file *file_information, f_string_dynamic *buffer);
 #endif // _di_f_file_read_fifo_
 
 #ifndef _di_f_file_stat_
index 0ff55c8422cc38efd74209c8f8d7adea02599cc8..4a6373c3a14d1e6297c2f515695740a90df10dbb 100644 (file)
@@ -15,7 +15,7 @@
 
 // fll includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
@@ -44,7 +44,7 @@ extern "C" {
   #define f_fss_type_header_close   '\n'
 
   #define f_fss_id            f_u_long
-  #define f_fss_checksum      f_dynamic_string
+  #define f_fss_checksum      f_string_dynamic
   #define f_fss_header_length f_string_length
 
   #define f_fss_id_initialize            0
@@ -56,7 +56,7 @@ extern "C" {
   #define f_fss_delimit_slash        '\\'
   #define f_fss_delimit_single_quote '\''
   #define f_fss_delimit_double_quote '"'
-  #define f_fss_delimit_placeholder  f_placeholder
+  #define f_fss_delimit_placeholder  f_string_placeholder
 #endif //_di_f_fss_delimiters_
 
 #ifndef _di_f_fss_codes_
@@ -95,12 +95,12 @@ enum {
 
   #define f_macro_fss_delimits_clear(delimits) f_macro_memory_structure_clear(delimits)
 
-  #define f_macro_fss_delimits_new(status, delimits)  f_macro_strings_string_locations_new(status, delimits)
-  #define f_macro_fss_delimits_delete(status, delimits)  f_macro_strings_string_locations_delete(status, delimits)
-  #define f_macro_fss_delimits_destroy(status, delimits) f_macro_strings_string_locations_destroy(status, delimits)
+  #define f_macro_fss_delimits_new(status, delimits)  f_macro_string_locations_new(status, delimits)
+  #define f_macro_fss_delimits_delete(status, delimits)  f_macro_string_locations_delete(status, delimits)
+  #define f_macro_fss_delimits_destroy(status, delimits) f_macro_string_locations_destroy(status, delimits)
 
-  #define f_macro_fss_delimits_resize(status, delimits, new_length) f_macro_strings_string_locations_resize(status, delimits, new_length)
-  #define f_macro_fss_delimits_adjust(status, delimits, new_length) f_macro_strings_string_locations_adjust(status, delimits  , new_length)
+  #define f_macro_fss_delimits_resize(status, delimits, new_length) f_macro_string_locations_resize(status, delimits, new_length)
+  #define f_macro_fss_delimits_adjust(status, delimits, new_length) f_macro_string_locations_adjust(status, delimits  , new_length)
 #endif // _di_f_fss_delimits_
 
 /**
index 9594c4ed1103486b9389eb37c5d6661310feaa25..176f52862b4e47d599579aefed281788186fe3f5 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_errors
 f_memory
-f_strings
+f_string
index 7339d24694ff28f6373a16eb0c7ec4ed9009a68a..bd8e8e6ecd100533c6dc59c0084582e5bbf182c9 100644 (file)
@@ -14,7 +14,7 @@ extern "C" {
     register f_string_length i = 0;
 
     for (; i < length; i++) {
-      if (string[i] != f_eos) {
+      if (string[i] != f_string_eos) {
         if (fputc(string[i], output) == 0) {
           return f_status_set_error(f_output_error);
         }
@@ -25,8 +25,8 @@ extern "C" {
   }
 #endif // _di_f_print_string_
 
-#ifndef _di_f_print_dynamic_string_
-  f_return_status f_print_dynamic_string(FILE *output, const f_dynamic_string buffer) {
+#ifndef _di_f_print_string_dynamic_
+  f_return_status f_print_string_dynamic(FILE *output, const f_string_dynamic buffer) {
     #ifndef _di_level_0_parameter_checking_
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -34,7 +34,7 @@ extern "C" {
     register f_string_length i = 0;
 
     for (; i < buffer.used; i++) {
-      if (buffer.string[i] != f_eos) {
+      if (buffer.string[i] != f_string_eos) {
         if (fputc(buffer.string[i], output) == 0) {
           return f_status_set_error(f_output_error);
         }
@@ -43,10 +43,10 @@ extern "C" {
 
     return f_none;
   }
-#endif // _di_f_print_dynamic_string_
+#endif // _di_f_print_string_dynamic_
 
-#ifndef _di_f_print_partial_dynamic_string_
-  f_return_status f_print_partial_dynamic_string(FILE *output, const f_dynamic_string buffer, const f_string_location location) {
+#ifndef _di_f_print_string_dynamic_partial_
+  f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_dynamic buffer, const f_string_location location) {
     #ifndef _di_level_0_parameter_checking_
       if (location.start < 0) return f_status_set_error(f_invalid_parameter);
       if (location.stop < location.start) return f_status_set_error(f_invalid_parameter);
@@ -58,7 +58,7 @@ extern "C" {
     register f_string_length i = location.start;
 
     for (; i <= location.stop; i++) {
-      if (buffer.string[i] != f_eos) {
+      if (buffer.string[i] != f_string_eos) {
         if (fputc(buffer.string[i], output) == 0) {
           return f_status_set_error(f_output_error);
         }
@@ -67,7 +67,7 @@ extern "C" {
 
     return f_none;
   }
-#endif // _di_f_print_partial_dynamic_string_
+#endif // _di_f_print_string_dynamic_partial_
 
 #ifdef __cplusplus
 } // extern "C"
index 5df5df2fd1fbbe5732302e136ebac3933666a1e1..ac2181ac959e80326bd9aa0055eb6b439caa1c5d 100644 (file)
@@ -18,7 +18,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
@@ -66,9 +66,9 @@ extern "C" {
  *   f_output_error (with error bit) on failure.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
-#ifndef _di_f_print_dynamic_string_
-  extern f_return_status f_print_dynamic_string(FILE *output, const f_dynamic_string buffer);
-#endif // _di_f_print_dynamic_string_
+#ifndef _di_f_print_string_dynamic_
+  extern f_return_status f_print_string_dynamic(FILE *output, const f_string_dynamic buffer);
+#endif // _di_f_print_string_dynamic_
 
 /**
  * Similar to a c-library printf, except that this will only print a specific range.
@@ -91,9 +91,9 @@ extern "C" {
  *   f_output_error (with error bit) on failure.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
-#ifndef _di_f_print_partial_dynamic_string_
-  extern f_return_status f_print_partial_dynamic_string(FILE *output, const f_dynamic_string buffer, const f_string_location location);
-#endif // _di_f_print_partial_dynamic_string_
+#ifndef _di_f_print_string_dynamic_partial_
+  extern f_return_status f_print_string_dynamic_partial(FILE *output, const f_string_dynamic buffer, const f_string_location location);
+#endif // _di_f_print_string_dynamic_partial_
 
 #ifdef __cplusplus
 } // extern "C"
index 9594c4ed1103486b9389eb37c5d6661310feaa25..176f52862b4e47d599579aefed281788186fe3f5 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_errors
 f_memory
-f_strings
+f_string
index fa97c99989f87a858b38fc67616558a16e8168ea..8556df091d5a96b358753d51e4e7a78feba069a2 100644 (file)
@@ -16,7 +16,7 @@
 #include <string.h>
 
 // fll-0 includes
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
index 98ec83401bf4b736a6cab2c4a7cd3a8573302beb..b1ee0363272dc08870d4c923f8bd64f0f72c0ee9 100644 (file)
@@ -1,3 +1,3 @@
 f_types
 f_memory
-f_strings
+f_string
index a6d6d63eeb69089c5fe5834e6cea5e31e0765d46..c99b7d5c5c3ea07804e4782a0b821f6a56578d98 100644 (file)
@@ -17,7 +17,7 @@
 
 // fll includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
similarity index 70%
rename from level_0/f_strings/c/strings.h
rename to level_0/f_string/c/string.h
index ad76920d4d0af66cdc65128ff5d316de700e99bf..3f0c8899b6fc975880883a2f0db6971ec8d619de 100644 (file)
@@ -1,14 +1,14 @@
 /**
  * FLL - Level 0
  *
- * Project: Strings
+ * Project: String
  * API Version: 0.5
  * Licenses: lgplv2.1
  *
  * Provides string capabilities.
  */
-#ifndef _F_strings_h
-#define _F_strings_h
+#ifndef _F_string_h
+#define _F_string_h
 
 // libc includes
 #include <string.h>
@@ -33,21 +33,21 @@ extern "C" {
 /**
  * Define the end of string character.
  */
-#ifndef _di_f_have_eos_
-  #define f_eos '\0'
-#endif // _di_f_have_eos_
+#ifndef _di_f_string_has_eos_
+  #define f_string_eos '\0'
+#endif // _di_f_string_has_eos_
 
 /**
  * Define the end of line character.
  * FLL forbids '\r' and '\r\n' as end of line characters, \r will be silently ignored.
  */
-#ifndef _di_f_have_eol_
-  #define f_eol '\n'
-#endif // _di_f_have_eol_
+#ifndef _di_f_string_has_eol_
+  #define f_string_eol '\n'
+#endif // _di_f_string_has_eol_
 
-#ifndef _di_f_have_placeholder_
-  #define f_placeholder '\0'
-#endif // _di_f_have_placeholder_
+#ifndef _di_f_string_has_placeholder_
+  #define f_string_placeholder '\0'
+#endif // _di_f_string_has_placeholder_
 
 #ifndef _di_string_format_pointers_
   #define string_format_string             "%s"
@@ -76,36 +76,36 @@ extern "C" {
 /**
  * define the basic string type.
  */
-#ifndef _di_f_have_string_
+#ifndef _di_f_string_
   typedef char *f_string;
 
   #define f_string_max_size   f_signed_long_size
-  #define f_string_initialize f_eos
+  #define f_string_initialize f_string_eos
 
-  #define f_macro_strings_string_new(status, string, length)   status = f_new_array((void **) & string, sizeof(f_string), length)
-  #define f_macro_strings_string_delete(status, string, size)  status = f_delete((void **) & string, sizeof(f_string), size)
-  #define f_macro_strings_string_destroy(status, string, size) status = f_destroy((void **) & string, sizeof(f_string), size)
+  #define f_macro_string_new(status, string, length)   status = f_new_array((void **) & string, sizeof(f_string), length)
+  #define f_macro_string_delete(status, string, size)  status = f_delete((void **) & string, sizeof(f_string), size)
+  #define f_macro_string_destroy(status, string, size) status = f_destroy((void **) & string, sizeof(f_string), size)
 
-  #define f_macro_strings_string_resize(status, string, old_length, new_length) \
+  #define f_macro_string_resize(status, string, old_length, new_length) \
     status = f_resize((void **) & string, sizeof(f_string), old_length, new_length)
 
-  #define f_macro_strings_string_adjust(status, string, old_length, new_length) \
+  #define f_macro_string_adjust(status, string, old_length, new_length) \
     status = f_adjust((void **) & string, sizeof(f_string), old_length, new_length)
-#endif // _di_f_have_string_
+#endif // _di_f_string_
 
 #ifndef _di_f_string_length_
   typedef f_s_long f_string_length;
 
   #define f_string_length_printf string_format_long_integer
 
-  #define f_macro_strings_string_length_new(status, string, length)    status = f_new_array((void **) & string, sizeof(f_string_length), length)
-  #define f_macro_strings_string_length_delete(status, string, length) status = f_delete((void **) & string, sizeof(f_string_length), length)
-  #define f_macro_strings_string_length_destroy(status, string, size)  status = f_destroy((f_void_P *) & string, sizeof(f_string_length), size)
+  #define f_macro_string_length_new(status, string, length)    status = f_new_array((void **) & string, sizeof(f_string_length), length)
+  #define f_macro_string_length_delete(status, string, length) status = f_delete((void **) & string, sizeof(f_string_length), length)
+  #define f_macro_string_length_destroy(status, string, size)  status = f_destroy((f_void_P *) & string, sizeof(f_string_length), size)
 
-  #define f_macro_strings_string_length_resize(status, length, old_length, new_length) \
+  #define f_macro_string_length_resize(status, length, old_length, new_length) \
     status = f_resize((void **) & length, sizeof(f_string_length), old_length, new_length)
 
-  #define f_macro_strings_string_length_adjust(status, length, old_length, new_length) \
+  #define f_macro_string_length_adjust(status, length, old_length, new_length) \
     status = f_adjust((void **) & length, sizeof(f_string_length), old_length, new_length)
 #endif // _di_f_string_length_
 
@@ -122,19 +122,19 @@ extern "C" {
 
   #define f_string_lengths_initialize { 0, 0, 0 }
 
-  #define f_macro_strings_string_lengths_new(status, lengths) \
+  #define f_macro_string_lengths_new(status, lengths) \
     f_macro_memory_structure_new(status, lengths, f_string_length)
 
-  #define f_macro_strings_string_lengths_delete(status, lengths) \
+  #define f_macro_string_lengths_delete(status, lengths) \
     f_macro_memory_structure_delete(status, lengths, f_string_length)
 
-  #define f_macro_strings_string_lengths_destroy(status, lengths) \
+  #define f_macro_string_lengths_destroy(status, lengths) \
     f_macro_memory_structure_destroy(status, lengths, f_string_length)
 
-  #define f_macro_strings_string_lengths_resize(status, lengths, new_length) \
+  #define f_macro_string_lengths_resize(status, lengths, new_length) \
     f_macro_memory_structure_resize(status, lengths, f_string_length, new_length)
 
-  #define f_macro_strings_string_lengths_adjust(status, lengths, new_length) \
+  #define f_macro_string_lengths_adjust(status, lengths, new_length) \
     f_macro_memory_structure_adjust(status, lengths, f_string_length, new_length)
 #endif // _di_f_string_lengths_
 
@@ -150,14 +150,14 @@ extern "C" {
 
   #define f_string_location_initialize { 1, 0 }
 
-  #define f_macro_strings_string_location_new(status, string_location, length)   status = f_new_array((void **) & string_location, sizeof(f_string_location), length)
-  #define f_macro_strings_string_location_delete(status, string_location, size)  status = f_delete((void **) & string_location, sizeof(f_string_location), size)
-  #define f_macro_strings_string_location_destroy(status, string_location, size) status = f_destroy((void **) & string_location, sizeof(f_string_location), size)
+  #define f_macro_string_location_new(status, string_location, length)   status = f_new_array((void **) & string_location, sizeof(f_string_location), length)
+  #define f_macro_string_location_delete(status, string_location, size)  status = f_delete((void **) & string_location, sizeof(f_string_location), size)
+  #define f_macro_string_location_destroy(status, string_location, size) status = f_destroy((void **) & string_location, sizeof(f_string_location), size)
 
-  #define f_macro_strings_string_location_resize(status, string_location, old_length, new_length) \
+  #define f_macro_string_location_resize(status, string_location, old_length, new_length) \
     status = f_resize((void **) & string_location, sizeof(f_string_location), old_length, new_length)
 
-  #define f_macro_strings_string_location_adjust(status, string_location, old_length, new_length) \
+  #define f_macro_string_location_adjust(status, string_location, old_length, new_length) \
     status = f_adjust((void **) & string_location, sizeof(f_string_location), old_length, new_length)
 #endif // _di_f_string_location_
 
@@ -179,19 +179,19 @@ extern "C" {
   #define f_clear_string_locations(locations) \
     f_macro_memory_structure_clear(locations)
 
-  #define f_macro_strings_string_locations_new(status, locations, length) \
+  #define f_macro_string_locations_new(status, locations, length) \
     f_macro_memory_structure_new(status, locations, f_string_location, length)
 
-  #define f_macro_strings_string_locations_delete(status, locations) \
+  #define f_macro_string_locations_delete(status, locations) \
     f_macro_memory_structure_delete(status, locations, f_string_location)
 
-  #define f_macro_strings_string_locations_destroy(status, locations) \
+  #define f_macro_string_locations_destroy(status, locations) \
     f_macro_memory_structure_destroy(status, locations, f_string_location)
 
-  #define f_macro_strings_string_locations_resize(status, locations, new_length) \
+  #define f_macro_string_locations_resize(status, locations, new_length) \
     f_macro_memory_structure_resize(status, locations, f_string_location, new_length)
 
-  #define f_macro_strings_string_locations_adjust(status, locations, new_length) \
+  #define f_macro_string_locations_adjust(status, locations, new_length) \
     f_macro_memory_structure_adjust(status, locations, f_string_location, new_length)
 #endif // _di_f_string_locations_
 
@@ -202,22 +202,22 @@ extern "C" {
  * size: total amount of allocated space.
  * used: total number of allocated spaces used.
  */
-#ifndef _di_f_dynamic_string_
+#ifndef _di_f_string_dynamic_
   typedef struct {
     f_string        string;
     f_string_length size;
     f_string_length used;
-  } f_dynamic_string;
+  } f_string_dynamic;
 
-  #define f_dynamic_string_initialize { f_string_initialize, 0, 0 }
+  #define f_string_dynamic_initialize { f_string_initialize, 0, 0 }
 
-  #define f_clear_dynamic_string(dynamic) \
+  #define f_clear_string_dynamic(dynamic) \
     dynamic.string = 0; \
     dynamic.size = 0; \
     dynamic.used = 0;
 
   #define f_macro_string_dynamic_new(status, dynamic, new_length) \
-    f_clear_dynamic_string(dynamic) \
+    f_clear_string_dynamic(dynamic) \
     status = f_new_array((void **) & dynamic.string, sizeof(f_string), new_length); \
     if (status == f_none) { \
       dynamic.size = new_length; \
@@ -251,7 +251,7 @@ extern "C" {
       dynamic.size = new_length; \
       if (dynamic.used > dynamic.size) dynamic.used = new_length; \
     }
-#endif // _di_f_dynamic_string_
+#endif // _di_f_string_dynamic_
 
 /**
  * an array of dynamic strings.
@@ -259,16 +259,16 @@ extern "C" {
  * size: total amount of allocated space.
  * used: total number of allocated spaces used.
  */
-#ifndef _di_f_dynamic_strings_
+#ifndef _di_f_string_dynamics_
   typedef struct {
-    f_dynamic_string *array;
+    f_string_dynamic *array;
     f_string_length  size;
     f_string_length  used;
-  } f_dynamic_strings;
+  } f_string_dynamics;
 
-  #define f_dynamic_strings_initialize { 0, 0, 0 }
+  #define f_string_dynamics_initialize { 0, 0, 0 }
 
-  #define f_clear_dynamic_strings(dynamics) \
+  #define f_clear_string_dynamics(dynamics) \
     dynamics.array = 0; \
     dynamics.size = 0; \
     dynamics.used = 0;
@@ -277,7 +277,7 @@ extern "C" {
     dynamics.array = 0; \
     dynamics.size = 0; \
     dynamics.used = 0; \
-    status = f_new_array((void **) & dynamics.array, sizeof(f_dynamic_string), length); \
+    status = f_new_array((void **) & dynamics.array, sizeof(f_string_dynamic), length); \
     if (status == f_none) { \
       dynamics.size = length; \
       dynamics.used = 0; \
@@ -290,7 +290,7 @@ extern "C" {
       f_macro_string_dynamic_destroy(status, dynamics.array[dynamics.size]); \
       if (status != f_none) break; \
     } \
-    if (status == f_none) status = f_delete((void **) & dynamics.array, sizeof(f_dynamic_string), dynamics.size); \
+    if (status == f_none) status = f_delete((void **) & dynamics.array, sizeof(f_string_dynamic), dynamics.size); \
     if (status == f_none) dynamics.used = 0;
 
   #define f_macro_string_dynamics_destroy(status, dynamics) \
@@ -300,7 +300,7 @@ extern "C" {
       f_macro_string_dynamic_destroy(status, dynamics.array[dynamics.size]); \
       if (status != f_none) break; \
     } \
-    if (status == f_none) status = f_destroy((void **) & dynamics.array, sizeof(f_dynamic_string), dynamics.size); \
+    if (status == f_none) status = f_destroy((void **) & dynamics.array, sizeof(f_string_dynamic), dynamics.size); \
     if (status == f_none) dynamics.used = 0;
 
   #define f_macro_string_dynamics_resize(status, dynamics, new_length) \
@@ -312,12 +312,12 @@ extern "C" {
         if (status != f_none) break; \
       } \
     } \
-    if (status == f_none) status = f_resize((void **) & dynamics.array, sizeof(f_dynamic_string), dynamics.size, new_length); \
+    if (status == f_none) status = f_resize((void **) & dynamics.array, sizeof(f_string_dynamic), dynamics.size, new_length); \
     if (status == f_none) { \
       if (new_length > dynamics.size) { \
         f_string_length i = dynamics.size; \
         for (; i < new_length; ++i) { \
-          memset(&dynamics.array[i], 0, sizeof(f_dynamic_string)); \
+          memset(&dynamics.array[i], 0, sizeof(f_string_dynamic)); \
         } \
       } \
       dynamics.size = new_length; \
@@ -329,25 +329,25 @@ extern "C" {
     if (new_length < dynamics.size) { \
       f_string_length i = dynamics.size - new_length; \
       for (; i < dynamics.size; ++i) { \
-        f_macro_string_dynamic_destroy(status, dynamics.array[i], f_dynamic_string); \
+        f_macro_string_dynamic_destroy(status, dynamics.array[i], f_string_dynamic); \
         if (status != f_none) break; \
       } \
     } \
-    if (status == f_none) status = f_adjust((void **) & dynamics.array, sizeof(f_dynamic_string), dynamics.size, new_length); \
+    if (status == f_none) status = f_adjust((void **) & dynamics.array, sizeof(f_string_dynamic), dynamics.size, new_length); \
     if (status == f_none) { \
       if (new_length > dynamics.size) { \
         f_string_length i = dynamics.size; \
         for (; i < new_length; ++i) { \
-          memset(&dynamics.array[i], 0, sizeof(f_dynamic_string)); \
+          memset(&dynamics.array[i], 0, sizeof(f_string_dynamic)); \
         } \
       } \
       dynamics.size = new_length; \
       if (dynamics.used > dynamics.size) dynamics.used = new_length; \
     }
-#endif // _di_f_dynamic_string_
+#endif // _di_f_string_dynamic_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _F_strings_h
+#endif // _F_string_h
similarity index 87%
rename from level_0/f_strings/data/build/settings
rename to level_0/f_string/data/build/settings
index 770b7f3b91f31d2b4a74b9eb8c3161defffdf6aa..1895ecf1dc7aec0db09a89c866198e7e92753bb0 100644 (file)
@@ -1,6 +1,6 @@
 # fss-0000
 
-project_name f_strings
+project_name f_string
 project_level 0
 
 version_major 0
@@ -13,7 +13,7 @@ build_libraries -lc
 build_libraries_fll
 build_sources_library 
 build_sources_program 
-build_sources_headers strings.h
+build_sources_headers string.h
 build_sources_bash
 build_sources_settings
 build_shared yes
index 0b694c4db80724ceb09a3d97f3be829e4e88163d..5db64bb1071ce5e7c22c1886f666da9e338b7be4 100644 (file)
@@ -856,7 +856,7 @@ extern "C" {
     f_u_short width = f_macro_utf_character_width_is(utf_character);
 
     if (max_width == 0) {
-      f_macro_strings_string_new(status, *character, width);
+      f_macro_string_new(status, *character, width);
 
       if (f_status_is_error(status)) return status;
 
index 51df91c2aa22f6dd462ff8328cdcb4eeecb14aa5..32fe7d74dd7dfa9a477c0f24178489d75eecd98a 100644 (file)
@@ -41,7 +41,7 @@
 // fll includes
 #include <level_0/status.h>
 #include <level_0/types.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 
 #ifdef __cplusplus
 extern "C" {
index 9594c4ed1103486b9389eb37c5d6661310feaa25..176f52862b4e47d599579aefed281788186fe3f5 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_errors
 f_memory
-f_strings
+f_string
index ec116f1cd8694d3badd364cf6b1f756a1179d806..491635079f55bf76a412471a6a82fb843321a82a 100644 (file)
@@ -27,7 +27,7 @@ extern "C" {
 #endif // _di_fl_color_set_
 
 #ifndef _di_fl_color_save_
-  f_return_status fl_color_save(f_dynamic_string *buffer, const f_colors_format format, const char *color1, const char *color2, const char *color3, const char *color4, const char *color5) {
+  f_return_status fl_color_save(f_string_dynamic *buffer, const f_colors_format format, const char *color1, const char *color2, const char *color3, const char *color4, const char *color5) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (color1 == 0) return f_status_set_error(f_invalid_parameter);
@@ -107,21 +107,21 @@ extern "C" {
     buffer->used += string_size;
 
     // do not forget the EOS
-    buffer->string[buffer->used] = f_eos;
+    buffer->string[buffer->used] = f_string_eos;
 
     return f_none;
   }
 #endif // _di_fl_color_save_
 
 #ifndef _di_fl_color_print_
-  f_return_status fl_color_print(FILE *file, const f_dynamic_string start_color, const f_dynamic_string end_color, const char *string, ...) {
+  f_return_status fl_color_print(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const char *string, ...) {
     #ifndef _di_level_1_parameter_checking_
       if (file == 0) return f_status_set_error(f_invalid_parameter);
       if (string == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (start_color.used != 0) {
-      f_status status = f_print_dynamic_string(file, start_color);
+      f_status status = f_print_string_dynamic(file, start_color);
 
       if (f_status_is_error(status)) return status;
     }
@@ -135,7 +135,7 @@ extern "C" {
     va_end(ap);
 
     if (end_color.used != 0) {
-      f_status status = f_print_dynamic_string(file, end_color);
+      f_status status = f_print_string_dynamic(file, end_color);
 
       if (f_status_is_error(status)) return status;
     }
@@ -145,14 +145,14 @@ extern "C" {
 #endif // _di_fl_color_print_
 
 #ifndef _di_fl_color_print_line_
-  f_return_status fl_color_print_line(FILE *file, const f_dynamic_string start_color, const f_dynamic_string end_color, const char *string, ...) {
+  f_return_status fl_color_print_line(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const char *string, ...) {
     #ifndef _di_level_1_parameter_checking_
       if (file == 0) return f_status_set_error(f_invalid_parameter);
       if (string == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
 
     if (start_color.used != 0) {
-      f_status status = f_print_dynamic_string(file, start_color);
+      f_status status = f_print_string_dynamic(file, start_color);
 
       if (f_status_is_error(status)) return status;
     }
@@ -166,7 +166,7 @@ extern "C" {
     va_end(ap);
 
     if (end_color.used != 0) {
-      f_status status = f_print_dynamic_string(file, end_color);
+      f_status status = f_print_string_dynamic(file, end_color);
 
       if (f_status_is_error(status)) return status;
     }
@@ -179,9 +179,9 @@ extern "C" {
 #endif // _di_fl_color_print_line_
 
 #ifndef _di_fl_color_print_code_
-  f_return_status fl_color_print_code(FILE *file, const f_dynamic_string color) {
+  f_return_status fl_color_print_code(FILE *file, const f_string_dynamic color) {
     if (color.used != 0) {
-      f_status status = f_print_dynamic_string(file, color);
+      f_status status = f_print_string_dynamic(file, color);
 
       if (f_status_is_error(status)) return status;
     }
index 4b4af76aa4ae6bfa2ecde2227c2d05c1dbd02767..a9b8d0b1f72b0d15d352467355f29f5cab58a60d 100644 (file)
@@ -19,7 +19,7 @@
 #include <level_0/colors.h>
 #include <level_0/status.h>
 #include <level_0/file.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/print.h>
 
@@ -31,18 +31,18 @@ extern "C" {
   typedef struct {
     f_colors color_list;
     f_colors_format color_format;
-    f_dynamic_string reset;
-    f_dynamic_string warning;
-    f_dynamic_string error;
-    f_dynamic_string title;
-    f_dynamic_string notable;
-    f_dynamic_string important;
-    f_dynamic_string standout;
-    f_dynamic_string normal;
-    f_dynamic_string normal_reset;
+    f_string_dynamic reset;
+    f_string_dynamic warning;
+    f_string_dynamic error;
+    f_string_dynamic title;
+    f_string_dynamic notable;
+    f_string_dynamic important;
+    f_string_dynamic standout;
+    f_string_dynamic normal;
+    f_string_dynamic normal_reset;
   } fl_color_context;
 
-  #define fl_color_context_initialize { f_colors_initialize_linux, f_colors_format_initialize_linux, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize }
+  #define fl_color_context_initialize { f_colors_initialize_linux, f_colors_format_initialize_linux, f_string_dynamic_initialize, f_string_dynamic_initialize, f_string_dynamic_initialize, f_string_dynamic_initialize, f_string_dynamic_initialize, f_string_dynamic_initialize, f_string_dynamic_initialize, f_string_dynamic_initialize, f_string_dynamic_initialize }
 
   #define fl_new_color_context(status, color_context) \
     f_macro_string_dynamic_resize(status, color_context.reset, f_color_max_size + 1); \
@@ -138,7 +138,7 @@ extern "C" {
  *   f_reallocation_error (with error bit) on memory reallocation error.
  */
 #ifndef _di_fl_color_save_
-  extern f_return_status fl_color_save(f_dynamic_string *buffer, const f_colors_format format, const char *color1, const char *color2, const char *color3, const char *color4, const char *color5);
+  extern f_return_status fl_color_save(f_string_dynamic *buffer, const f_colors_format format, const char *color1, const char *color2, const char *color3, const char *color4, const char *color5);
 
   #define fl_macro_color_save_1(buffer, format, color1)                                 fl_color_save(buffer, format, color1, 0, 0, 0, 0)
   #define fl_macro_color_save_2(buffer, format, color1, color2)                         fl_color_save(buffer, format, color1, color2, 0, 0, 0)
@@ -171,7 +171,7 @@ extern "C" {
  *   f_output_error (with error bit) on output error.
  */
 #ifndef _di_fl_color_print_
-  extern f_return_status fl_color_print(FILE *file, const f_dynamic_string start_color, const f_dynamic_string end_color, const char *string, ...);
+  extern f_return_status fl_color_print(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const char *string, ...);
 #endif // _di_fl_color_print_
 
 /**
@@ -198,7 +198,7 @@ extern "C" {
  *   f_output_error (with error bit) on output error.
  */
 #ifndef _di_fl_color_print_line_
-  extern f_return_status fl_color_print_line(FILE *file, const f_dynamic_string start_color, const f_dynamic_string end_color, const char *string, ...);
+  extern f_return_status fl_color_print_line(FILE *file, const f_string_dynamic start_color, const f_string_dynamic end_color, const char *string, ...);
 #endif // _di_fl_color_print_line_
 
 /**
@@ -217,7 +217,7 @@ extern "C" {
  *   f_output_error (with error bit) on output error.
  */
 #ifndef _di_fl_color_print_code_
-  extern f_return_status fl_color_print_code(FILE *file, const f_dynamic_string color);
+  extern f_return_status fl_color_print_code(FILE *file, const f_string_dynamic color);
 #endif // _di_fl_color_print_code_
 
 #ifdef __cplusplus
index b24ed89bb2f733a8fa0a65201ff90f42c5ec2e02..352d3dfe61ae1846b1c2ad06c1c6e00e1eb04951 100644 (file)
@@ -1,6 +1,6 @@
 f_types
 f_errors
-f_strings
+f_string
 f_colors
 f_file
 f_memory
index 0719cbbef7c3cc8fdf0b3d4e8b426da4e23a2231..348054b678fe6cbb5e5e37ae59219369c70f5c72 100644 (file)
@@ -68,10 +68,10 @@ extern "C" {
         if (parameters[parameter_counter].additional.used >= parameters[parameter_counter].additional.size) {
           f_status allocation_status = f_none;
 
-          f_macro_strings_string_lengths_resize(allocation_status, parameters[parameter_counter].additional, parameters[parameter_counter].additional.size + f_console_default_allocation_step);
+          f_macro_string_lengths_resize(allocation_status, parameters[parameter_counter].additional, parameters[parameter_counter].additional.size + f_console_default_allocation_step);
 
           if (f_status_is_error(allocation_status)) {
-            f_macro_strings_string_lengths_delete(status, needs_additional);
+            f_macro_string_lengths_delete(status, needs_additional);
             return f_status_set_error(allocation_status);
           }
         }
@@ -124,10 +124,10 @@ extern "C" {
               if (needs_additional.used + parameters[parameter_counter].has_additional > needs_additional.size) {
                 f_status allocation_status = f_none;
 
-                f_macro_strings_string_lengths_resize(allocation_status, needs_additional, needs_additional.used + parameters[parameter_counter].has_additional);
+                f_macro_string_lengths_resize(allocation_status, needs_additional, needs_additional.used + parameters[parameter_counter].has_additional);
 
                 if (f_status_is_error(allocation_status)) {
-                  f_macro_strings_string_lengths_delete(status, needs_additional);
+                  f_macro_string_lengths_delete(status, needs_additional);
                   return f_status_set_error(allocation_status);
                 }
               }
@@ -167,10 +167,10 @@ extern "C" {
             if (needs_additional.used + parameters[parameter_counter].has_additional > needs_additional.size) {
               f_status allocation_status = f_none;
 
-              f_macro_strings_string_lengths_resize(allocation_status, needs_additional, needs_additional.used + parameters[parameter_counter].has_additional);
+              f_macro_string_lengths_resize(allocation_status, needs_additional, needs_additional.used + parameters[parameter_counter].has_additional);
 
               if (f_status_is_error(allocation_status)) {
-                f_macro_strings_string_lengths_delete(status, needs_additional);
+                f_macro_string_lengths_delete(status, needs_additional);
                 return f_status_set_error(allocation_status);
               }
             }
@@ -190,10 +190,10 @@ extern "C" {
           if (remaining->used >= remaining->size) {
             f_status allocation_status = f_none;
 
-            f_macro_strings_string_lengths_resize(allocation_status, (*remaining), remaining->size + f_console_default_allocation_step);
+            f_macro_string_lengths_resize(allocation_status, (*remaining), remaining->size + f_console_default_allocation_step);
 
             if (f_status_is_error(allocation_status)) {
-              f_macro_strings_string_lengths_delete(status, needs_additional);
+              f_macro_string_lengths_delete(status, needs_additional);
               return f_status_set_error(allocation_status);
             }
           }
@@ -215,7 +215,7 @@ extern "C" {
 
     {
       f_status allocation_status = f_none;
-      f_macro_strings_string_lengths_delete(allocation_status, needs_additional);
+      f_macro_string_lengths_delete(allocation_status, needs_additional);
     }
 
     return status;
index a5c6823feb5b4b6b1b7096752f07f43abb5f6b27..03a8f04ad1ba02c47ecfc20aab940155cfdabecd 100644 (file)
@@ -16,7 +16,7 @@
 // fll-0 includes
 #include <level_0/console.h>
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
index a355d97dbe250fa8c02e5d9c3d18d4cb99f35a49..8c1debbb18b0b6527584f84d54db31e6577c4711 100644 (file)
@@ -1,6 +1,6 @@
 f_types
 f_errors
-f_strings
+f_string
 f_console
 f_memory
 f_utf
index 490ae3a0df741b398233496475131d3ec7166308..8b616542a6e37d5a2c454a7e7211e4ec64d08076 100644 (file)
@@ -6,7 +6,7 @@ extern "C" {
 
 #ifndef _di_fl_directory_list_
   // put the names of each file and/or directory inside the names parameter
-  f_return_status fl_directory_list(const f_string directory_path, f_dynamic_strings *names) {
+  f_return_status fl_directory_list(const f_string directory_path, f_string_dynamics *names) {
     #ifndef _di_level_1_parameter_checking_
       if (names == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
index 5651fb96ded65fd1b4b37ce47209882f0522e7b8..9b4fc0eec93abb04a0b7e98fd70585ba1bfb2e05 100644 (file)
@@ -21,7 +21,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
@@ -38,7 +38,7 @@ extern "C" {
   /**
    * put the names of each file and/or directory inside the names parameter.
    */
-  extern f_return_status fl_directory_list(const f_string directory_path, f_dynamic_strings *names);
+  extern f_return_status fl_directory_list(const f_string directory_path, f_string_dynamics *names);
 #endif // _di_fl_directory_list_
 
 #ifdef __cplusplus
index a2496a1fa0782112d706db7ae82285f16a225949..5e3048cb94d6d8fa85917c7a6adae14b20b15574 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_errors
-f_strings
+f_string
 f_memory
index a61d7e424340a353b1b4cf46061a505acf95a53b..2ed2a4bebd6a02969a66d4a5986fcb715ef29789 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_file_read_
-  f_return_status fl_file_read(f_file file, const f_file_position position, f_dynamic_string *buffer) {
+  f_return_status fl_file_read(f_file file, const f_file_position position, f_string_dynamic *buffer) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
 
@@ -62,7 +62,7 @@ extern "C" {
 #endif // _di_fl_file_read_
 
 #ifndef _di_fl_file_read_fifo_
-  f_return_status fl_file_read_fifo(f_file file, f_dynamic_string *buffer) {
+  f_return_status fl_file_read_fifo(f_file file, f_string_dynamic *buffer) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -105,7 +105,7 @@ extern "C" {
 #endif // _di_fl_file_read_fifo_
 
 #ifndef _di_fl_file_write_
-  f_return_status fl_file_write(f_file file, const f_dynamic_string buffer) {
+  f_return_status fl_file_write(f_file file, const f_string_dynamic buffer) {
     if (file.file == 0) return f_status_set_error(f_file_not_open);
 
     f_status status = f_none;
@@ -122,7 +122,7 @@ extern "C" {
 #endif // _di_fl_file_write_
 
 #ifndef _di_fl_file_write_partial_
-  f_return_status fl_file_write_partial(f_file file, const f_dynamic_string buffer, const f_string_location position) {
+  f_return_status fl_file_write_partial(f_file file, const f_string_dynamic buffer, const f_string_location position) {
     #ifndef _di_level_1_parameter_checking_
       if (position.start < position.stop) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
index d5b3996fcc8f2be8aa46ce9d95de5986ef063455..537fee2b7045ecfac27be71801418e46f394ac01 100644 (file)
@@ -12,7 +12,7 @@
 
 // fll-0 includes
 #include <level_0/file.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
@@ -23,28 +23,28 @@ extern "C" {
   /**
    * read file, specific positions.
    */
-  extern f_return_status fl_file_read(f_file file, const f_file_position position, f_dynamic_string *buffer);
+  extern f_return_status fl_file_read(f_file file, const f_file_position position, f_string_dynamic *buffer);
 #endif // _di_fl_file_read_
 
 #ifndef _di_fl_file_read_fifo_
   /**
    * read file, entire file.
    */
-  extern f_return_status fl_file_read_fifo(f_file file, f_dynamic_string *buffer);
+  extern f_return_status fl_file_read_fifo(f_file file, f_string_dynamic *buffer);
 #endif // _di_fl_file_read_fifo_
 
 #ifndef _di_fl_file_write_
   /**
    * write file, entire file.
    */
-  extern f_return_status fl_file_write(f_file file, const f_dynamic_string buffer);
+  extern f_return_status fl_file_write(f_file file, const f_string_dynamic buffer);
 #endif // _di_fl_file_write_
 
 #ifndef _di_fl_file_write_partial_
   /**
    * write file, specific positions.
    */
-  extern f_return_status fl_file_write_partial(f_file file, const f_dynamic_string buffer, const f_string_location position);
+  extern f_return_status fl_file_write_partial(f_file file, const f_string_dynamic buffer, const f_string_location position);
 #endif // _di_fl_file_write_partial_
 
 #ifdef __cplusplus
index 02b5936dfaa61468b7fcf3764ea840a9ae85a8b5..7ac3626650a07d7f50c5887eb26f85dfa3542a33 100644 (file)
@@ -1,5 +1,5 @@
 f_types
 f_errors
-f_strings
+f_string
 f_file
 f_memory
index f10f79202387304620904905709ceef5e8981b40..02c7ea4e636f3fed50320ec6f481c063d43c458a 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_fss_decrement_buffer_
-  f_return_status fl_fss_decrement_buffer(const f_dynamic_string buffer, f_string_location *input, const f_string_length step) {
+  f_return_status fl_fss_decrement_buffer(const f_string_dynamic buffer, f_string_location *input, const f_string_length step) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (input->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -39,7 +39,7 @@ extern "C" {
 #endif // _di_fl_fss_decrement_buffer_
 
 #ifndef _di_fl_fss_identify_
-  f_return_status fl_fss_identify(const f_dynamic_string buffer, f_fss_header *header) {
+  f_return_status fl_fss_identify(const f_string_dynamic buffer, f_fss_header *header) {
     #ifndef _di_level_1_parameter_checking_
       if (header == 0) return f_status_set_error(f_invalid_parameter);
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
@@ -198,7 +198,7 @@ extern "C" {
     clearerr(file_information->file);
 
     f_status         status = f_none;
-    f_dynamic_string buffer = f_dynamic_string_initialize;
+    f_string_dynamic buffer = f_string_dynamic_initialize;
     f_file_position  location = f_file_position_initialize;
 
     // make sure we are in the proper location in the file
@@ -232,7 +232,7 @@ extern "C" {
 #endif // _di_fl_fss_identify_file_
 
 #ifndef _di_fl_fss_increment_buffer_
-  f_return_status fl_fss_increment_buffer(const f_dynamic_string buffer, f_string_location *input, const f_string_length step) {
+  f_return_status fl_fss_increment_buffer(const f_string_dynamic buffer, f_string_location *input, const f_string_length step) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (input->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -273,7 +273,7 @@ extern "C" {
 #endif // _di_fl_fss_increment_buffer_
 
 #ifndef _di_fl_fss_is_graph_
-  f_return_status fl_fss_is_graph(const f_dynamic_string buffer, const f_string_location input) {
+  f_return_status fl_fss_is_graph(const f_string_dynamic buffer, const f_string_location input) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (input.start < 0) return f_status_set_error(f_invalid_parameter);
@@ -292,7 +292,7 @@ extern "C" {
 #endif // _di_fl_fss_is_graph_
 
 #ifndef _di_fl_fss_is_space_
-  f_return_status fl_fss_is_space(const f_dynamic_string buffer, const f_string_location input) {
+  f_return_status fl_fss_is_space(const f_string_dynamic buffer, const f_string_location input) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (input.start < 0) return f_status_set_error(f_invalid_parameter);
@@ -311,7 +311,7 @@ extern "C" {
 #endif // _di_fl_fss_is_space_
 
 #ifndef _di_fl_fss_skip_past_whitespace_
-  f_return_status fl_fss_skip_past_whitespace(const f_dynamic_string buffer, f_string_location *input) {
+  f_return_status fl_fss_skip_past_whitespace(const f_string_dynamic buffer, f_string_location *input) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -329,12 +329,12 @@ extern "C" {
       max_width = buffer.used - input->start;
     }
 
-    while (buffer.string[input->start] == f_eos || (status = f_utf_is_graph(buffer.string + input->start, max_width)) == f_false) {
+    while (buffer.string[input->start] == f_string_eos || (status = f_utf_is_graph(buffer.string + input->start, max_width)) == f_false) {
       if (f_status_is_error(status)) {
         return status;
       }
 
-      if (buffer.string[input->start] == f_eol) return f_none_on_eol;
+      if (buffer.string[input->start] == f_string_eol) return f_none_on_eol;
 
       width = f_macro_utf_byte_width_is(buffer.string[input->start]);
 
@@ -371,7 +371,7 @@ extern "C" {
 #endif // _di_fl_fss_skip_past_whitespace_
 
 #ifndef _di_fl_fss_skip_past_all_whitespace_
-  f_return_status fl_fss_skip_past_all_whitespace(const f_dynamic_string buffer, f_string_location *input) {
+  f_return_status fl_fss_skip_past_all_whitespace(const f_string_dynamic buffer, f_string_location *input) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -389,7 +389,7 @@ extern "C" {
       max_width = buffer.used - input->start;
     }
 
-    while (buffer.string[input->start] == f_eos || (status = f_utf_is_graph(buffer.string + input->start, max_width)) == f_false) {
+    while (buffer.string[input->start] == f_string_eos || (status = f_utf_is_graph(buffer.string + input->start, max_width)) == f_false) {
       if (f_status_is_error(status)) {
         return status;
       }
@@ -429,7 +429,7 @@ extern "C" {
 #endif // _di_fl_fss_skip_past_all_whitespace_
 
 #ifndef _di_fl_fss_shift_delimiters_
-  f_return_status fl_fss_shift_delimiters(f_dynamic_string *buffer, const f_string_location input) {
+  f_return_status fl_fss_shift_delimiters(f_string_dynamic *buffer, const f_string_location input) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer->used <= 0) return f_status_set_error(f_invalid_parameter);
       if (input.start < 0) return f_status_set_error(f_invalid_parameter);
index f710a02f05831099b0fa240786a49570fea277a7..6f54496d4d3d55664a81b659a06fa04b9047c162 100644 (file)
@@ -17,7 +17,7 @@
 #include <level_0/status.h>
 #include <level_0/file.h>
 #include <level_0/fss.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
@@ -54,7 +54,7 @@ extern "C" {
  *   f_incomplete_utf_on_eos (with error bit) if the end of buffer is reached before the complete UTF-8 character can be processed.
  */
 #ifndef _di_fl_fss_decrement_buffer_
-  extern f_return_status fl_fss_decrement_buffer(const f_dynamic_string buffer, f_string_location *input, const f_string_length step);
+  extern f_return_status fl_fss_decrement_buffer(const f_string_dynamic buffer, f_string_location *input, const f_string_length step);
 #endif // _di_fl_fss_decrement_buffer_
 
 /**
@@ -73,7 +73,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_fss_identify_
-  extern f_return_status fl_fss_identify(const f_dynamic_string buffer, f_fss_header *header);
+  extern f_return_status fl_fss_identify(const f_string_dynamic buffer, f_fss_header *header);
 #endif // _di_fl_fss_identify_
 
 /**
@@ -125,7 +125,7 @@ extern "C" {
  *   f_incomplete_utf_on_eos (with error bit) if the end of buffer is reached before the complete UTF-8 character can be processed.
  */
 #ifndef _di_fl_fss_increment_buffer_
-  extern f_return_status fl_fss_increment_buffer(const f_dynamic_string buffer, f_string_location *input, const f_string_length step);
+  extern f_return_status fl_fss_increment_buffer(const f_string_dynamic buffer, f_string_location *input, const f_string_length step);
 #endif // _di_fl_fss_increment_buffer_
 
 /**
@@ -146,7 +146,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_fss_is_graph_
-  extern f_return_status fl_fss_is_graph(const f_dynamic_string buffer, const f_string_location input);
+  extern f_return_status fl_fss_is_graph(const f_string_dynamic buffer, const f_string_location input);
 #endif // _di_fl_fss_is_graph_
 
 /**
@@ -167,7 +167,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_fss_is_space_
-  extern f_return_status fl_fss_is_space(const f_dynamic_string buffer, const f_string_location input);
+  extern f_return_status fl_fss_is_space(const f_string_dynamic buffer, const f_string_location input);
 #endif // _di_fl_fss_is_space_
 
 /**
@@ -188,7 +188,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_fss_shift_delimiters_
-  extern f_return_status fl_fss_shift_delimiters(f_dynamic_string *buffer, const f_string_location input);
+  extern f_return_status fl_fss_shift_delimiters(f_string_dynamic *buffer, const f_string_location input);
 #endif // _di_fl_fss_shift_delimiters_
 
 /**
@@ -205,7 +205,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_fss_skip_past_whitespace_
-  extern f_return_status fl_fss_skip_past_whitespace(const f_dynamic_string buffer, f_string_location *input);
+  extern f_return_status fl_fss_skip_past_whitespace(const f_string_dynamic buffer, f_string_location *input);
 #endif // _di_fl_fss_skip_past_whitespace_
 
 /**
@@ -222,7 +222,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_fss_skip_past_all_whitespace_
-  extern f_return_status fl_fss_skip_past_all_whitespace(const f_dynamic_string buffer, f_string_location *input);
+  extern f_return_status fl_fss_skip_past_all_whitespace(const f_string_dynamic buffer, f_string_location *input);
 #endif // _di_fl_fss_skip_past_all_whitespace_
 
 #ifdef __cplusplus
index 3cee4be6ba3649b7b2a208920df414b3d122cfbb..9e3c36a1ffb7531b9e08150bccbeec726c1228bc 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_fss_basic_object_read_
-  f_return_status fl_fss_basic_object_read(f_dynamic_string *buffer, f_string_location *input, f_fss_object *found) {
+  f_return_status fl_fss_basic_object_read(f_string_dynamic *buffer, f_string_location *input, f_fss_object *found) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -50,7 +50,7 @@ extern "C" {
     }
 
     // handle quote support
-    char quoted = f_eos;
+    char quoted = f_string_eos;
 
     // identify where the object begins
     if (buffer->string[input->start] == f_fss_delimit_slash) {
@@ -98,10 +98,10 @@ extern "C" {
         if (delimits.used >= delimits.size) {
           f_status allocation_status = f_none;
 
-           f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + f_fss_default_allocation_step);
+           f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + f_fss_default_allocation_step);
 
           if (f_status_is_error(allocation_status)) {
-            f_macro_strings_string_lengths_delete(allocation_status, delimits);
+            f_macro_string_lengths_delete(allocation_status, delimits);
             return allocation_status;
           }
         }
@@ -123,7 +123,7 @@ extern "C" {
     }
 
     // identify where the object ends
-    if (quoted == f_eos) {
+    if (quoted == f_string_eos) {
       status = f_none;
       while (buffer->string[input->start] == f_fss_delimit_placeholder || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
         status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -140,7 +140,7 @@ extern "C" {
 
         fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
-        if (buffer->string[input->start] == f_eol) {
+        if (buffer->string[input->start] == f_string_eol) {
           status = fl_fss_increment_buffer(*buffer, input, 1);
           if (f_status_is_error(status)) return status;
 
@@ -195,10 +195,10 @@ extern "C" {
               if (delimits.used + (slash_count / 2) >= delimits.size) {
                 f_status allocation_status = f_none;
 
-                f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+                f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
                 if (f_status_is_error(allocation_status)) {
-                  f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                  f_macro_string_lengths_delete(allocation_status, delimits);
                   return allocation_status;
                 }
               }
@@ -224,7 +224,7 @@ extern "C" {
               fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
 
               if ((status = fl_fss_is_graph(*buffer, *input)) == f_true) {
-                while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+                while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
                   status = fl_fss_increment_buffer(*buffer, input, 1);
                   if (f_status_is_error(status)) return status;
                 } // while
@@ -234,7 +234,7 @@ extern "C" {
                 {
                   f_status allocation_status = f_none;
 
-                  f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                  f_macro_string_lengths_delete(allocation_status, delimits);
                 }
 
                 status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -245,7 +245,7 @@ extern "C" {
               else if (f_status_is_error(status)) {
                 return status;
               }
-              else if (buffer->string[input->start] == f_eol) {
+              else if (buffer->string[input->start] == f_string_eol) {
                 fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
                 found->stop = location - 1;
@@ -270,10 +270,10 @@ extern "C" {
               if (delimits.used + (slash_count / 2) >= delimits.size) {
                 f_status allocation_status = f_none;
 
-                f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+                f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
                 if (f_status_is_error(allocation_status)) {
-                  f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                  f_macro_string_lengths_delete(allocation_status, delimits);
                   return allocation_status;
                 }
               }
@@ -303,7 +303,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
 
           while (input->start <= input->stop && input->start < buffer->used) {
-            if (buffer->string[input->start] == f_eol) {
+            if (buffer->string[input->start] == f_string_eol) {
               fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
               status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -323,7 +323,7 @@ extern "C" {
               return status;
             }
             else if (buffer->string[input->start] != f_fss_delimit_placeholder) {
-              while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+              while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
 
                 status = fl_fss_increment_buffer(*buffer, input, 1);
                 if (f_status_is_error(status)) return status;
@@ -335,7 +335,7 @@ extern "C" {
               {
                 f_status allocation_status = f_none;
 
-                f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                f_macro_string_lengths_delete(allocation_status, delimits);
               }
 
               status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -351,11 +351,11 @@ extern "C" {
 
           fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
         }
-        else if (buffer->string[input->start] == f_eol) {
+        else if (buffer->string[input->start] == f_string_eol) {
           {
             f_status allocation_status = f_none;
 
-            f_macro_strings_string_lengths_delete(allocation_status, delimits);
+            f_macro_string_lengths_delete(allocation_status, delimits);
           }
 
           status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -373,7 +373,7 @@ extern "C" {
     }
 
     // seek to the end of the line when no valid object is found
-    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
       status = fl_fss_increment_buffer(*buffer, input, 1);
       if (f_status_is_error(status)) return status;
     } // while
@@ -383,7 +383,7 @@ extern "C" {
     {
       f_status allocation_status = f_none;
 
-      f_macro_strings_string_lengths_delete(allocation_status, delimits);
+      f_macro_string_lengths_delete(allocation_status, delimits);
     }
 
 
@@ -395,7 +395,7 @@ extern "C" {
 #endif // _di_fl_fss_basic_object_read_
 
 #ifndef _di_fl_fss_basic_content_read_
-  f_return_status fl_fss_basic_content_read(f_dynamic_string *buffer, f_string_location *input, f_fss_content *found) {
+  f_return_status fl_fss_basic_content_read(f_string_dynamic *buffer, f_string_location *input, f_fss_content *found) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -415,7 +415,7 @@ extern "C" {
     fl_macro_fss_content_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
 
     // return found nothing if this line only contains whitespace and delimit placeholders
-    if (buffer->string[input->start] == f_eol) {
+    if (buffer->string[input->start] == f_string_eol) {
       status = fl_fss_increment_buffer(*buffer, input, 1);
       if (f_status_is_error(status)) return status;
 
@@ -447,7 +447,7 @@ extern "C" {
 #endif // _di_fl_fss_basic_content_read_
 
 #ifndef _di_fl_fss_basic_object_write_
-  f_return_status fl_fss_basic_object_write(f_dynamic_string *buffer, const f_dynamic_string object, f_string_location *input) {
+  f_return_status fl_fss_basic_object_write(f_string_dynamic *buffer, const f_string_dynamic object, f_string_location *input) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -545,7 +545,7 @@ extern "C" {
 
         continue;
       }
-      else if (object.string[input->start] == f_eol) {
+      else if (object.string[input->start] == f_string_eol) {
         if (quoted) {
           buffer->string[buffer_position.stop] = f_fss_delimit_double_quote;
           buffer_position.stop++;
@@ -634,7 +634,7 @@ extern "C" {
 
             continue;
           }
-          else if (object.string[input->start] == f_eol) {
+          else if (object.string[input->start] == f_string_eol) {
             buffer->string[buffer_position.stop] = f_fss_delimit_double_quote;
             buffer_position.stop++;
 
@@ -686,7 +686,7 @@ extern "C" {
 #endif // _di_fl_fss_basic_object_write_
 
 #ifndef _di_fl_fss_basic_content_write_
-  f_return_status fl_fss_basic_content_write(f_dynamic_string *buffer, const f_dynamic_string content, f_string_location *input) {
+  f_return_status fl_fss_basic_content_write(f_string_dynamic *buffer, const f_string_dynamic content, f_string_location *input) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -710,8 +710,8 @@ extern "C" {
     }
 
     while (input->start <= input->stop && input->start < content.used) {
-      if (content.string[input->start] == f_eol){
-        buffer->string[buffer_position.stop] = f_eol;
+      if (content.string[input->start] == f_string_eol){
+        buffer->string[buffer_position.stop] = f_string_eol;
         buffer->used = buffer_position.stop + 1;
         return f_none_on_eos;
       }
@@ -724,7 +724,7 @@ extern "C" {
       fl_fss_increment_buffer(*buffer, input, 1);
     } // while
 
-    buffer->string[buffer_position.stop] = f_eol;
+    buffer->string[buffer_position.stop] = f_string_eol;
     buffer->used = buffer_position.stop + 1;
 
     if (input->start > input->stop) {
index 8f8f2b1f190486025587bc541faf3b461ecb16cd..df3ce0d5b214c446d6de4c347f6db78c35ad6007 100644 (file)
@@ -17,7 +17,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/fss.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/memory.h>
 #include <level_0/utf.h>
@@ -35,28 +35,28 @@ extern "C" {
   /**
    * read an fss-0000 object.
    */
-  extern f_return_status fl_fss_basic_object_read(f_dynamic_string *buffer, f_string_location *input, f_fss_object *found);
+  extern f_return_status fl_fss_basic_object_read(f_string_dynamic *buffer, f_string_location *input, f_fss_object *found);
 #endif // _di_fl_fss_basic_object_read_
 
 #ifndef _di_fl_fss_basic_content_read_
   /**
    * read an fss-0000 content.
    */
-  extern f_return_status fl_fss_basic_content_read(f_dynamic_string *buffer, f_string_location *input, f_fss_content *found);
+  extern f_return_status fl_fss_basic_content_read(f_string_dynamic *buffer, f_string_location *input, f_fss_content *found);
 #endif // _di_fl_fss_basic_content_read_
 
 #ifndef _di_fl_fss_basic_object_write_
   /**
    * write an fss-0000 object.
    */
-  extern f_return_status fl_fss_basic_object_write(f_dynamic_string *buffer, const f_dynamic_string object, f_string_location *input);
+  extern f_return_status fl_fss_basic_object_write(f_string_dynamic *buffer, const f_string_dynamic object, f_string_location *input);
 #endif // _di_fl_fss_basic_object_write_
 
 #ifndef _di_fl_fss_basic_content_write_
   /**
    * write an fss-0000 content.
    */
-  extern f_return_status fl_fss_basic_content_write(f_dynamic_string *buffer, const f_dynamic_string content, f_string_location *input);
+  extern f_return_status fl_fss_basic_content_write(f_string_dynamic *buffer, const f_string_dynamic content, f_string_location *input);
 #endif // _di_fl_fss_basic_content_write_
 
 #ifdef __cplusplus
index 335d2f779ee3af747d3501973b2f5b58ff1ebb42..0eea92f4d5e4dcbb0b384743cf22badddae49af4 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_fss_basic_list_object_read_
-  f_return_status fl_fss_basic_list_object_read(f_dynamic_string *buffer, f_string_location *input, f_fss_object *found) {
+  f_return_status fl_fss_basic_list_object_read(f_string_dynamic *buffer, f_string_location *input, f_fss_object *found) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -25,7 +25,7 @@ extern "C" {
     fl_macro_fss_object_return_on_overflow((*buffer), (*input), (*found), delimits, f_no_data_on_eos, f_no_data_on_stop)
 
     // return found nothing if this line only contains whitespace and delimit placeholders
-    if (buffer->string[input->start] == f_eol) {
+    if (buffer->string[input->start] == f_string_eol) {
       status = fl_fss_increment_buffer(*buffer, input, 1);
       if (f_status_is_error(status)) return status;
 
@@ -46,7 +46,7 @@ extern "C" {
     }
 
     // identify where the object ends
-    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
       if (buffer->string[input->start] == f_fss_delimit_slash) {
         f_string_length first_slash = input->start;
         f_string_length slash_count = 1;
@@ -72,7 +72,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
 
           while (input->start < buffer->used && input->start <= input->stop) {
-            if (buffer->string[input->start] == f_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
+            if (buffer->string[input->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
               break;
             }
 
@@ -84,7 +84,7 @@ extern "C" {
 
           fl_macro_fss_object_return_on_overflow((*buffer), (*input), (*found), delimits, f_no_data_on_eos, f_no_data_on_stop)
 
-          if (buffer->string[input->start] == f_eol) {
+          if (buffer->string[input->start] == f_string_eol) {
             f_string_length location = input->start;
 
             input->start = first_slash;
@@ -92,10 +92,10 @@ extern "C" {
             if (delimits.used + (slash_count / 2) >= delimits.size) {
               f_status allocation_status = f_none;
 
-              f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+              f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
               if (f_status_is_error(allocation_status)) {
-                f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                f_macro_string_lengths_delete(allocation_status, delimits);
                 return allocation_status;
               }
             }
@@ -137,7 +137,7 @@ extern "C" {
         if (f_status_is_error(status)) return status;
 
         while (input->start < buffer->used && input->start <= input->stop) {
-          if (buffer->string[input->start] == f_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
+          if (buffer->string[input->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
             break;
           }
 
@@ -149,7 +149,7 @@ extern "C" {
 
         fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
 
-        if (buffer->string[input->start] == f_eol) {
+        if (buffer->string[input->start] == f_string_eol) {
           fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
           found->stop = stop_point;
@@ -168,7 +168,7 @@ extern "C" {
     } // while
 
     // seek to the end of the line when no valid object is found
-    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
       status = fl_fss_increment_buffer(*buffer, input, 1);
       if (f_status_is_error(status)) return status;
     } // while
@@ -183,7 +183,7 @@ extern "C" {
 #endif // _di_fl_fss_basic_list_object_read_
 
 #ifndef _di_fl_fss_basic_list_content_read_
-  f_return_status fl_fss_basic_list_content_read(f_dynamic_string *buffer, f_string_location *input, f_fss_content *found) {
+  f_return_status fl_fss_basic_list_content_read(f_string_dynamic *buffer, f_string_location *input, f_fss_content *found) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -210,7 +210,7 @@ extern "C" {
 
     // identify where the content ends
     while (input->start < buffer->used && input->start <= input->stop) {
-      if (buffer->string[input->start] == f_eol) {
+      if (buffer->string[input->start] == f_string_eol) {
         found_newline = f_true;
         last_newline = input->start;
 
@@ -252,7 +252,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
 
           while (input->start < buffer->used && input->start <= input->stop) {
-            if (buffer->string[input->start] == f_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
+            if (buffer->string[input->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
               break;
             }
 
@@ -269,7 +269,7 @@ extern "C" {
             fl_macro_fss_content_return_on_overflow((*buffer), (*input), (*found), delimits, f_no_data_on_eos, f_no_data_on_stop)
           }
 
-          if (buffer->string[input->start] == f_eol) {
+          if (buffer->string[input->start] == f_string_eol) {
             f_string_length location = input->start;
 
             input->start = first_slash;
@@ -292,10 +292,10 @@ extern "C" {
             if (delimits.used + (slash_count / 2) >= delimits.size) {
               f_status allocation_status = f_none;
 
-              f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+              f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
               if (f_status_is_error(allocation_status)) {
-                f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                f_macro_string_lengths_delete(allocation_status, delimits);
                 return allocation_status;
               }
             }
@@ -326,7 +326,7 @@ extern "C" {
         if (f_status_is_error(status)) return status;
 
         while (input->start < buffer->used && input->start <= input->stop) {
-          if (buffer->string[input->start] == f_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
+          if (buffer->string[input->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
             break;
           }
 
@@ -343,7 +343,7 @@ extern "C" {
           fl_macro_fss_content_return_on_overflow((*buffer), (*input), (*found), delimits, f_no_data_on_eos, f_no_data_on_stop)
         }
 
-        if (buffer->string[input->start] == f_eol) {
+        if (buffer->string[input->start] == f_string_eol) {
           if (found_newline) {
             fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
@@ -387,7 +387,7 @@ extern "C" {
 #endif // _di_fl_fss_basic_list_content_read_
 
 #ifndef _di_fl_fss_basic_list_object_write_
-  f_return_status fl_fss_basic_list_object_write(const f_dynamic_string object, f_string_location *input, f_dynamic_string *buffer) {
+  f_return_status fl_fss_basic_list_object_write(const f_string_dynamic object, f_string_location *input, f_string_dynamic *buffer) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -490,7 +490,7 @@ extern "C" {
           break;
         }
       }
-      else if (object.string[input->start] == f_eol) {
+      else if (object.string[input->start] == f_string_eol) {
         if (buffer_position.stop == buffer_position.start) {
           return f_no_data_on_eol;
         }
@@ -508,7 +508,7 @@ extern "C" {
     } // while
 
     buffer->string[buffer_position.stop] = f_fss_basic_list_open;
-    buffer->string[buffer_position.stop + 1] = f_eol;
+    buffer->string[buffer_position.stop + 1] = f_string_eol;
     buffer->used = buffer_position.stop + 2;
 
     if (input->start > input->stop) {
@@ -523,7 +523,7 @@ extern "C" {
 #endif // _di_fl_fss_basic_list_object_write_
 
 #ifndef _di_fl_fss_basic_list_content_write_
-  f_return_status fl_fss_basic_list_content_write(const f_dynamic_string content, f_string_location *input, f_dynamic_string *buffer) {
+  f_return_status fl_fss_basic_list_content_write(const f_string_dynamic content, f_string_location *input, f_string_dynamic *buffer) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -597,7 +597,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
 
           while (input->start < content.used && input->start <= input->stop) {
-            if (content.string[input->start] == f_eol || (status = fl_fss_is_graph(content, *input)) == f_true) {
+            if (content.string[input->start] == f_string_eol || (status = fl_fss_is_graph(content, *input)) == f_true) {
               break;
             }
 
@@ -607,7 +607,7 @@ extern "C" {
             if (f_status_is_error(status)) return status;
           } // while
 
-          if (content.string[input->start] == f_eol || input->start >= content.used || input->start > input->stop) {
+          if (content.string[input->start] == f_string_eol || input->start >= content.used || input->start > input->stop) {
             pre_allocate_size += slash_count + 1;
 
             if (pre_allocate_size > buffer->size) {
@@ -643,7 +643,7 @@ extern "C" {
         if (f_status_is_error(status)) return status;
 
         while (input->start < content.used && input->start <= input->stop) {
-          if (content.string[input->start] == f_eol || (status = fl_fss_is_graph(content, *input)) == f_true) {
+          if (content.string[input->start] == f_string_eol || (status = fl_fss_is_graph(content, *input)) == f_true) {
             break;
           }
 
@@ -653,7 +653,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
         } // while
 
-        if (content.string[input->start] == f_eol || input->start >= content.used || input->start > input->stop) {
+        if (content.string[input->start] == f_string_eol || input->start >= content.used || input->start > input->stop) {
           pre_allocate_size++;
 
           if (pre_allocate_size > buffer->size) {
@@ -676,7 +676,7 @@ extern "C" {
       else if (content.string[input->start] == f_fss_comment && !has_graph) {
         is_comment = f_true;
       }
-      else if (content.string[input->start] == f_eol) {
+      else if (content.string[input->start] == f_string_eol) {
         has_graph = f_false;
         is_comment = f_false;
       }
@@ -696,7 +696,7 @@ extern "C" {
       if (f_status_is_error(status)) return status;
     } // while
 
-    buffer->string[buffer_position.stop] = f_eol;
+    buffer->string[buffer_position.stop] = f_string_eol;
     buffer->used = buffer_position.stop + 1;
 
     if (input->start > input->stop) {
index 7bc72bf6cf2aa2c0f6f56868e809ed170fc7e168..e6d4b6c0d700189b9307142b9416254f317e53c8 100644 (file)
@@ -18,7 +18,7 @@
 #include <level_0/status.h>
 #include <level_0/fss.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
@@ -36,28 +36,28 @@ extern "C" {
   /**
    * read an fss-0002 object.
    */
-  extern f_return_status fl_fss_basic_list_object_read(f_dynamic_string *buffer, f_string_location *input, f_fss_object *found);
+  extern f_return_status fl_fss_basic_list_object_read(f_string_dynamic *buffer, f_string_location *input, f_fss_object *found);
 #endif // _di_fl_fss_basic_list_object_read_
 
 #ifndef _di_fl_fss_basic_list_content_read_
   /**
    * read an fss-0002 content.
    */
-  extern f_return_status fl_fss_basic_list_content_read(f_dynamic_string *buffer, f_string_location *input, f_fss_content *found);
+  extern f_return_status fl_fss_basic_list_content_read(f_string_dynamic *buffer, f_string_location *input, f_fss_content *found);
 #endif // _di_fl_fss_basic_list_content_read_
 
 #ifndef _di_fl_fss_basic_list_object_write_
   /**
    * write an fss-0002 object.
    */
-  extern f_return_status fl_fss_basic_list_object_write(const f_dynamic_string object, f_string_location *input, f_dynamic_string *buffer);
+  extern f_return_status fl_fss_basic_list_object_write(const f_string_dynamic object, f_string_location *input, f_string_dynamic *buffer);
 #endif // _di_fl_fss_basic_list_object_write_
 
 #ifndef _di_fl_fss_basic_list_content_write_
   /**
    * write an fss-0002 content.
    */
-  extern f_return_status fl_fss_basic_list_content_write(const f_dynamic_string content, f_string_location *input, f_dynamic_string *buffer);
+  extern f_return_status fl_fss_basic_list_content_write(const f_string_dynamic content, f_string_location *input, f_string_dynamic *buffer);
 #endif // _di_fl_fss_basic_list_content_write_
 
 #ifdef __cplusplus
index 4ddf9c8bc8664eb0da263dc20c0f31a68e9e9290..b7c777c2b619cbdf71e11e13cdc37a262b26f2c3 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_fss_extended_object_read_
-  f_return_status fl_fss_extended_object_read(f_dynamic_string *buffer, f_string_location *input, f_fss_object *found) {
+  f_return_status fl_fss_extended_object_read(f_string_dynamic *buffer, f_string_location *input, f_fss_object *found) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -50,7 +50,7 @@ extern "C" {
     }
 
     // handle quote support
-    char quoted = f_eos;
+    char quoted = f_string_eos;
 
     // identify where the object begins
     if (buffer->string[input->start] == f_fss_delimit_slash) {
@@ -93,10 +93,10 @@ extern "C" {
         if (delimits.used >= delimits.size) {
           f_status allocation_status = f_none;
 
-           f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + f_fss_default_allocation_step);
+           f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + f_fss_default_allocation_step);
 
           if (f_status_is_error(allocation_status)) {
-            f_macro_strings_string_lengths_delete(allocation_status, delimits);
+            f_macro_string_lengths_delete(allocation_status, delimits);
             return allocation_status;
           }
         }
@@ -118,7 +118,7 @@ extern "C" {
     }
 
     // identify where the object ends
-    if (quoted == f_eos) {
+    if (quoted == f_string_eos) {
       status = f_none;
       while (buffer->string[input->start] == f_fss_delimit_placeholder || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
         status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -134,7 +134,7 @@ extern "C" {
 
         fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
-        if (buffer->string[input->start] == f_eol) {
+        if (buffer->string[input->start] == f_string_eol) {
           status = fl_fss_increment_buffer(*buffer, input, 1);
           if (f_status_is_error(status)) return status;
 
@@ -186,10 +186,10 @@ extern "C" {
             if (delimits.used + (slash_count / 2) >= delimits.size) {
               f_status allocation_status = f_none;
 
-              f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+              f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
               if (f_status_is_error(allocation_status)) {
-                f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                f_macro_string_lengths_delete(allocation_status, delimits);
                 return allocation_status;
               }
             }
@@ -215,7 +215,7 @@ extern "C" {
               fl_macro_fss_object_return_on_overflow((*buffer), (*input), (*found), delimits, f_status_is_warning(f_unterminated_group_on_eos), f_status_is_warning(f_unterminated_group_on_stop))
 
               if ((status = fl_fss_is_graph(*buffer, *input)) == f_true) {
-                while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+                while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
                   status = fl_fss_increment_buffer(*buffer, input, 1);
                   if (f_status_is_error(status)) return status;
                 } // while
@@ -230,7 +230,7 @@ extern "C" {
               else if (f_status_is_error(status)) {
                 return status;
               }
-              else if (buffer->string[input->start] == f_eol) {
+              else if (buffer->string[input->start] == f_string_eol) {
                 fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
                 found->stop = location - 1;
@@ -254,10 +254,10 @@ extern "C" {
               if (delimits.used + (slash_count / 2) >= delimits.size) {
                 f_status allocation_status = f_none;
 
-                f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+                f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
                 if (f_status_is_error(allocation_status)) {
-                  f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                  f_macro_string_lengths_delete(allocation_status, delimits);
                   return allocation_status;
                 }
               }
@@ -287,7 +287,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
 
           while (input->start <= input->stop && input->start < buffer->used) {
-            if (buffer->string[input->start] == f_eol) {
+            if (buffer->string[input->start] == f_string_eol) {
               fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
               status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -307,7 +307,7 @@ extern "C" {
               return status;
             }
             else if (buffer->string[input->start] != f_fss_delimit_placeholder) {
-              while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+              while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
                 status = fl_fss_increment_buffer(*buffer, input, 1);
                 if (f_status_is_error(status)) return status;
               } // while
@@ -326,7 +326,7 @@ extern "C" {
 
           fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
         }
-        else if (buffer->string[input->start] == f_eol) {
+        else if (buffer->string[input->start] == f_string_eol) {
           status = fl_fss_increment_buffer(*buffer, input, 1);
           if (f_status_is_error(status)) return status;
 
@@ -341,7 +341,7 @@ extern "C" {
     }
 
     // seek to the end of the line when no valid object is found
-    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
       status = fl_fss_increment_buffer(*buffer, input, 1);
       if (f_status_is_error(status)) return status;
     } // while
@@ -356,7 +356,7 @@ extern "C" {
 #endif // _di_fl_fss_extended_object_read_
 
 #ifndef _di_fl_fss_extended_content_read_
-  f_return_status fl_fss_extended_content_read(f_dynamic_string *buffer, f_string_location *input, f_fss_content *found) {
+  f_return_status fl_fss_extended_content_read(f_string_dynamic *buffer, f_string_location *input, f_fss_content *found) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (input == 0) return f_status_set_error(f_invalid_parameter);
@@ -384,7 +384,7 @@ extern "C" {
     }
 
     f_bool has_delimit = f_false;
-    char quoted = f_eos;
+    char quoted = f_string_eos;
 
     f_bool continue_main_loop = f_false;
 
@@ -392,14 +392,14 @@ extern "C" {
     f_array_length already_used = found->used;
 
     while (input->start <= input->stop && input->start < buffer->used) {
-      quoted = f_eos;
+      quoted = f_string_eos;
 
       if (found->used >= found->size) {
         f_macro_fss_content_resize(status, (*found), found->size + f_fss_default_allocation_step);
 
         if (f_status_is_error(status)){
           f_status allocation_status = f_none;
-          f_macro_strings_string_lengths_delete(allocation_status, delimits);
+          f_macro_string_lengths_delete(allocation_status, delimits);
 
           return status;
         }
@@ -432,7 +432,7 @@ extern "C" {
 
             found->used++;
 
-            if (buffer->string[input->start] == f_eol) {
+            if (buffer->string[input->start] == f_string_eol) {
               fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
               return fl_fss_found_content;
@@ -465,10 +465,10 @@ extern "C" {
           if (delimits.used >= delimits.size) {
             f_status allocation_status = f_none;
 
-             f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + f_fss_default_allocation_step);
+             f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + f_fss_default_allocation_step);
 
             if (f_status_is_error(allocation_status)) {
-              f_macro_strings_string_lengths_delete(allocation_status, delimits);
+              f_macro_string_lengths_delete(allocation_status, delimits);
               return allocation_status;
             }
           }
@@ -490,7 +490,7 @@ extern "C" {
       }
 
       // identify where the content ends
-      if (quoted == f_eos) {
+      if (quoted == f_string_eos) {
         status = f_none;
         while (buffer->string[input->start] == f_fss_delimit_placeholder || (status = fl_fss_is_graph(*buffer, *input)) == f_true) {
           status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -505,7 +505,7 @@ extern "C" {
           found->array[found->used].stop = input->start - 1;
           found->used++;
 
-          if (buffer->string[input->start] == f_eol) {
+          if (buffer->string[input->start] == f_string_eol) {
             fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
             status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -559,10 +559,10 @@ extern "C" {
                 if (delimits.used + (slash_count / 2) >= delimits.size) {
                   f_status allocation_status = f_none;
 
-                  f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+                  f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
                   if (f_status_is_error(allocation_status)) {
-                    f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                    f_macro_string_lengths_delete(allocation_status, delimits);
                     return allocation_status;
                   }
                 }
@@ -587,7 +587,7 @@ extern "C" {
                 fl_macro_fss_content_delimited_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
 
                 if ((status = fl_fss_is_graph(*buffer, *input)) == f_true) {
-                  while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+                  while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
                     status = fl_fss_increment_buffer(*buffer, input, 1);
                     if (f_status_is_error(status)) return status;
                   } // while
@@ -602,7 +602,7 @@ extern "C" {
                 else if (f_status_is_error(status)) {
                   return status;
                 }
-                else if (buffer->string[input->start] == f_eol) {
+                else if (buffer->string[input->start] == f_string_eol) {
                   fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
                   found->array[found->used].stop = location - 1;
@@ -627,10 +627,10 @@ extern "C" {
                 if (delimits.used + (slash_count / 2) >= delimits.size) {
                   f_status allocation_status = f_none;
 
-                  f_macro_strings_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
+                  f_macro_string_lengths_resize(allocation_status, delimits, delimits.size + (slash_count / 2) + f_fss_default_allocation_step);
 
                   if (f_status_is_error(allocation_status)) {
-                    f_macro_strings_string_lengths_delete(allocation_status, delimits);
+                    f_macro_string_lengths_delete(allocation_status, delimits);
                     return allocation_status;
                   }
                 }
@@ -660,7 +660,7 @@ extern "C" {
 
 
             while (input->start <= input->stop && input->start < buffer->used) {
-              if (buffer->string[input->start] == f_eol) {
+              if (buffer->string[input->start] == f_string_eol) {
                 fl_macro_fss_apply_delimit_placeholders((*buffer), delimits);
 
                 status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -682,7 +682,7 @@ extern "C" {
                 return status;
               }
               else if (buffer->string[input->start] != f_fss_delimit_placeholder) {
-                while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+                while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
                   status = fl_fss_increment_buffer(*buffer, input, 1);
                   if (f_status_is_error(status)) return status;
                 } // while
@@ -705,7 +705,7 @@ extern "C" {
 
             fl_macro_fss_content_delimited_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
           }
-          else if (buffer->string[input->start] == f_eol) {
+          else if (buffer->string[input->start] == f_string_eol) {
 
             if (found->used == already_used) {
               status = fl_fss_increment_buffer(*buffer, input, 1);
@@ -745,7 +745,7 @@ extern "C" {
     fl_macro_fss_content_delimited_return_on_overflow((*buffer), (*input), (*found), delimits, f_none_on_eos, f_none_on_stop)
 
     // seek to the end of the line when no valid content is found
-    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_eol) {
+    while (input->start < buffer->used && input->start <= input->stop && buffer->string[input->start] != f_string_eol) {
       status = fl_fss_increment_buffer(*buffer, input, 1);
       if (f_status_is_error(status)) return status;
     } // while
@@ -769,7 +769,7 @@ extern "C" {
 #endif // _di_fl_fss_extended_content_read_
 
 #ifndef _di_fl_fss_extended_object_write_
-  f_return_status fl_fss_extended_object_write(const f_dynamic_string object, f_string_location *input, f_dynamic_string *buffer) {
+  f_return_status fl_fss_extended_object_write(const f_string_dynamic object, f_string_location *input, f_string_dynamic *buffer) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
@@ -866,7 +866,7 @@ extern "C" {
 
         continue;
       }
-      else if (object.string[input->start] == f_eol) {
+      else if (object.string[input->start] == f_string_eol) {
         if (quoted) {
           buffer->string[buffer_position.stop] = f_fss_delimit_double_quote;
           buffer_position.stop++;
@@ -973,7 +973,7 @@ extern "C" {
 
             continue;
           }
-          else if (object.string[input->start] == f_eol) {
+          else if (object.string[input->start] == f_string_eol) {
             buffer->string[buffer_position.stop] = f_fss_delimit_double_quote;
             buffer_position.stop++;
 
@@ -1025,13 +1025,13 @@ extern "C" {
 #endif // _di_fl_fss_extended_object_write_
 
 #ifndef _di_fl_fss_extended_content_write_
-  f_return_status fl_fss_extended_content_write(const f_dynamic_string content, f_string_location *input, f_dynamic_string *buffer) {
+  f_return_status fl_fss_extended_content_write(const f_string_dynamic content, f_string_location *input, f_string_dynamic *buffer) {
     #ifndef _di_level_1_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_1_parameter_checking_
 
     f_status status = f_none;
-    char quoted = f_eos;
+    char quoted = f_string_eos;
 
     f_string_location buffer_position = f_string_location_initialize;
     f_string_length start_position = 0;
@@ -1133,7 +1133,7 @@ extern "C" {
     }
 
     while (input->start <= input->stop && input->start < content.used) {
-      if (content.string[input->start] == f_eol) {
+      if (content.string[input->start] == f_string_eol) {
         buffer->string[buffer_position.stop] = ' ';
         buffer->used = buffer_position.stop + 1;
         return f_none_on_eol;
@@ -1167,7 +1167,7 @@ extern "C" {
       if (f_status_is_error(status)) return status;
     } // while
 
-    if (quoted != f_eos) {
+    if (quoted != f_string_eos) {
       while (input->start <= input->stop && input->start < content.used) {
         if (content.string[input->start] == f_fss_delimit_slash) {
           f_string_length slash_count = 1;
@@ -1239,7 +1239,7 @@ extern "C" {
           buffer->string[buffer_position.stop + 1] = quoted;
           buffer_position.stop += 2;
         }
-        else if (content.string[input->start] == f_eol) {
+        else if (content.string[input->start] == f_string_eol) {
           buffer->string[buffer_position.stop] = quoted;
           buffer->string[buffer_position.stop + 1] = ' ';
           buffer->used = buffer_position.stop + 2;
index ffede5410d5c5101862cf92ebc0ebe0e44c4e332..95fea2d3179d99e6a70d0e992371c87c164777eb 100644 (file)
@@ -18,7 +18,7 @@
 #include <level_0/status.h>
 #include <level_0/fss.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
@@ -35,28 +35,28 @@ extern "C" {
   /**
    * read an fss-0001 object.
    */
-  extern f_return_status fl_fss_extended_object_read(f_dynamic_string *buffer, f_string_location *input, f_fss_object *found);
+  extern f_return_status fl_fss_extended_object_read(f_string_dynamic *buffer, f_string_location *input, f_fss_object *found);
 #endif // _di_fl_fss_extended_object_read_
 
 #ifndef _di_fl_fss_extended_content_read_
   /**
    * read an fss-0001 content.
    */
-  extern f_return_status fl_fss_extended_content_read(f_dynamic_string *buffer, f_string_location *input, f_fss_content *found);
+  extern f_return_status fl_fss_extended_content_read(f_string_dynamic *buffer, f_string_location *input, f_fss_content *found);
 #endif // _di_fl_fss_extended_content_read_
 
 #ifndef _di_fl_fss_extended_object_write_
   /**
    * write an fss-0001 object.
    */
-  extern f_return_status fl_fss_extended_object_write(const f_dynamic_string object, f_string_location *input, f_dynamic_string *buffer);
+  extern f_return_status fl_fss_extended_object_write(const f_string_dynamic object, f_string_location *input, f_string_dynamic *buffer);
 #endif // _di_fl_fss_extended_object_write_
 
 #ifndef _di_fl_fss_extended_content_write_
   /**
    * write an fss-0001 content.
    */
-  extern f_return_status fl_fss_extended_content_write(const f_dynamic_string content, f_string_location *input, f_dynamic_string *buffer);
+  extern f_return_status fl_fss_extended_content_write(const f_string_dynamic content, f_string_location *input, f_string_dynamic *buffer);
 #endif // _di_fl_fss_extended_content_write_
 
 #ifdef __cplusplus
index b6d6a1747abe888353b008b78aa26774005823d1..4f9496d25c1ef7e153294c8f7bee674dcfd518a9 100644 (file)
@@ -27,7 +27,7 @@ extern "C" {
       i++; \
     } \
     \
-    f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+    f_macro_string_lengths_delete(allocation_status, delimits); \
   }
 #endif // _di_fl_macro_fss_apply_delimit_placeholders_
 
@@ -45,14 +45,14 @@ extern "C" {
   #define fl_macro_fss_object_return_on_overflow(buffer, input, found, delimits, eos_status, stop_status) \
     if (input.start >= buffer.used) { \
       f_status allocation_status = f_none; \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.stop = buffer.used - 1; \
       return eos_status; \
     } \
     else if (input.start > input.stop) { \
       f_status allocation_status = f_none; \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.stop = input.stop; \
       return stop_status; \
@@ -69,7 +69,7 @@ extern "C" {
         buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
         i++; \
       } \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.stop = buffer.used - 1; \
       return eos_status; \
@@ -82,7 +82,7 @@ extern "C" {
         buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
         i++; \
       } \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.stop = input.stop; \
       return stop_status; \
@@ -93,14 +93,14 @@ extern "C" {
   #define fl_macro_fss_content_return_on_overflow(buffer, input, found, delimits, eos_status, stop_status) \
     if (input.start >= buffer.used) { \
       f_status allocation_status = f_none; \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.array[found.used].stop = buffer.used - 1; \
       return eos_status; \
     } \
     else if (input.start > input.stop) { \
       f_status allocation_status = f_none; \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.array[found.used].stop = input.stop; \
       return stop_status; \
@@ -117,7 +117,7 @@ extern "C" {
         buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
         i++; \
       } \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.array[found.used].stop = buffer.used - 1; \
       return eos_status; \
@@ -130,7 +130,7 @@ extern "C" {
         buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
         i++; \
       } \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       found.array[found.used].stop = input.stop; \
       return stop_status; \
@@ -141,7 +141,7 @@ extern "C" {
   #define fl_macro_fss_content_return_on_overflow_reset(buffer, input, found, delimits, eos_status, stop_status, set_stop) \
     if (input.start >= buffer.used) { \
       f_status allocation_status = f_none; \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       input.start = set_stop; \
       found.array[found.used].stop = set_stop; \
@@ -149,7 +149,7 @@ extern "C" {
     } \
     else if (input.start > input.stop) { \
       f_status allocation_status = f_none; \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       input.start = set_stop; \
       found.array[found.used].stop = set_stop; \
@@ -167,7 +167,7 @@ extern "C" {
         buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
         i++; \
       } \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       input.start = set_stop; \
       found.array[found.used].stop = set_stop; \
@@ -181,7 +181,7 @@ extern "C" {
         buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
         i++; \
       } \
-      f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+      f_macro_string_lengths_delete(allocation_status, delimits); \
       \
       input.start = set_stop; \
       found.array[found.used].stop = set_stop; \
@@ -197,7 +197,7 @@ extern "C" {
       f_macro_fss_content_resize(status, content, content.size + f_fss_default_allocation_step); \
       if (f_status_is_error(status)) { \
         f_status allocation_status = f_none; \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         return status; \
       } \
@@ -206,17 +206,17 @@ extern "C" {
 
 #ifndef _di_fl_macro_fss_object_seek_till_newline_
   #define fl_macro_fss_object_seek_till_newline(buffer, input, delimits, eos_status, stop_status) \
-    while (buffer.string[input.start] != f_eol) { \
+    while (buffer.string[input.start] != f_string_eol) { \
       ++input.start; \
       if (input.start >= buffer.used) { \
         f_status allocation_status = f_none; \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         return eos_status; \
       } \
       if (input.start > input.stop) { \
         f_status allocation_status = f_none; \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         return stop_status; \
       } \
@@ -225,7 +225,7 @@ extern "C" {
 
 #ifndef _di_fl_macro_fss_object_delimited_seek_till_newline_
   #define fl_macro_fss_object_delimited_seek_till_newline(buffer, input, delimits, eos_status, stop_status) \
-    while (buffer.string[input.start] != f_eol) { \
+    while (buffer.string[input.start] != f_string_eol) { \
       ++input.start; \
       if (input.start >= buffer.used) { \
         f_status allocation_status = f_none; \
@@ -235,7 +235,7 @@ extern "C" {
           buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
           i++; \
         } \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         return eos_status; \
       } \
@@ -247,7 +247,7 @@ extern "C" {
           buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
           i++; \
         } \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         return stop_status; \
       } \
@@ -256,18 +256,18 @@ extern "C" {
 
 #ifndef _di_fl_macro_fss_content_seek_till_newline_
   #define fl_macro_fss_content_seek_till_newline(buffer, input, found, delimits, eos_status, stop_status) \
-    while (buffer.string[input.start] != f_eol) { \
+    while (buffer.string[input.start] != f_string_eol) { \
       ++input.start; \
       if (input.start >= buffer.used) { \
         f_status allocation_status = f_none; \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         found.array[found.used].stop = input.stop; \
         return eos_status; \
       } \
       if (input.start > input.stop) { \
         f_status allocation_status = f_none; \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         found.array[found.used].stop = input.stop; \
         return stop_status; \
@@ -277,7 +277,7 @@ extern "C" {
 
 #ifndef _di_fl_macro_fss_content_delimited_seek_till_newline_
   #define fl_macro_fss_content_delimited_seek_till_newline(buffer, input, found, delimits, eos_status, stop_status) \
-    while (buffer.string[input.start] != f_eol) { \
+    while (buffer.string[input.start] != f_string_eol) { \
       ++input.start; \
       if (input.start >= buffer.used) { \
         f_status allocation_status = f_none; \
@@ -287,7 +287,7 @@ extern "C" {
           buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
           i++; \
         } \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         found.array[found.used].stop = input.stop; \
         return eos_status; \
@@ -300,7 +300,7 @@ extern "C" {
           buffer.string[delimits.array[i]] = f_fss_delimit_placeholder; \
           i++; \
         } \
-        f_macro_strings_string_lengths_delete(allocation_status, delimits); \
+        f_macro_string_lengths_delete(allocation_status, delimits); \
         \
         found.array[found.used].stop = input.stop; \
         return stop_status; \
index 241fc92546db7fc921c1bb77e1ec17bb2e12b791..34d23567406423fb380bb2c1c447b727462e3622 100644 (file)
@@ -1,6 +1,6 @@
 f_types
 f_status
-f_strings
+f_string
 f_memory
 f_file
 f_conversion
index d5966d9651ebce03651b1c85063c4b40203624bd..64785d707ea48771a70a00ca809eb798350718bd 100644 (file)
@@ -15,7 +15,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 #ifdef __cplusplus
index 90e12bc50925d49367a22b4c528800bc67934a3f..4e716aac668009a323653d68fda95109253f1529 100644 (file)
@@ -1,3 +1,3 @@
 f_types
 f_errors
-f_strings
+f_string
index bf9750e865539cb60dd1618525fb56960ad9865e..5e604d5abb38eea38778cf8881f41b8892f83e11 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fl_serialize_simple_
-  f_return_status fl_serialize_simple(const f_dynamic_string value, f_dynamic_string *serialized) {
+  f_return_status fl_serialize_simple(const f_string_dynamic value, f_string_dynamic *serialized) {
     #ifndef _di_level_0_parameter_checking_
       if (serialized == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -33,7 +33,7 @@ extern "C" {
 #endif // _di_fl_serialize_simple_
 
 #ifndef _di_fl_unserialize_simple_map_
-  f_return_status fl_unserialize_simple_map(const f_dynamic_string serialized, f_string_locations *locations) {
+  f_return_status fl_unserialize_simple_map(const f_string_dynamic serialized, f_string_locations *locations) {
     #ifndef _di_level_0_parameter_checking_
       if (locations == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -50,7 +50,7 @@ extern "C" {
 
       if (serialized.string[i] == f_serialized_simple_splitter || i == serialized.used) {
         if (locations->used + width >= locations->size) {
-          f_macro_strings_string_locations_resize(status, (*locations), locations->size + f_serialized_default_allocation_step);
+          f_macro_string_locations_resize(status, (*locations), locations->size + f_serialized_default_allocation_step);
 
           if (f_status_is_error(status)) return status;
         }
@@ -85,7 +85,7 @@ extern "C" {
 #endif // _di_fl_unserialize_simple_map_
 
 #ifndef _di_fl_unserialize_simple_find_
-  f_return_status fl_unserialize_simple_find(const f_dynamic_string serialized, const f_array_length index, f_string_location *location) {
+  f_return_status fl_unserialize_simple_find(const f_string_dynamic serialized, const f_array_length index, f_string_location *location) {
     #ifndef _di_level_0_parameter_checking_
       if (location == 0) return f_status_set_error(f_invalid_parameter);
     #endif // _di_level_0_parameter_checking_
index d0c7b968464a1665bee84783d45f655e7f800947..b46d59c1aa9ec18571dc4ec75154d64e8774face 100644 (file)
@@ -18,7 +18,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/serialized.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
@@ -47,7 +47,7 @@ extern "C" {
  *   f_reallocation_error (with error bit) on memory reallocation error.
  */
 #ifndef _di_fl_serialize_simple_
-  extern f_return_status fl_serialize_simple(const f_dynamic_string value, f_dynamic_string *serialized);
+  extern f_return_status fl_serialize_simple(const f_string_dynamic value, f_string_dynamic *serialized);
 #endif // _di_fl_serialize_simple_
 
 // @todo: implement fl_unserialize_simple() such that a new array of strings is allocated.
@@ -74,7 +74,7 @@ extern "C" {
  *   f_reallocation_error (with error bit) on memory reallocation error.
  */
 #ifndef _di_fl_unserialize_simple_map_
-  extern f_return_status fl_unserialize_simple_map(const f_dynamic_string serialized, f_string_locations *locations);
+  extern f_return_status fl_unserialize_simple_map(const f_string_dynamic serialized, f_string_locations *locations);
 #endif // _di_fl_unserialize_simple_map_
 
 /**
@@ -102,7 +102,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_unserialize_simple_find_
-  extern f_return_status fl_unserialize_simple_find(const f_dynamic_string serialized, const f_array_length index, f_string_location *location);
+  extern f_return_status fl_unserialize_simple_find(const f_string_dynamic serialized, const f_array_length index, f_string_location *location);
 #endif // _di_fl_unserialize_simple_find_
 
 // @todo: implement fl_unserialize_simple_get() such that a new string is allocated, if found.
index a34ebfa74ae5010c8b6f52b3870028bd3edded23..39f4cf4eb3fa69273cde9b6321b1a3675f9499da 100644 (file)
@@ -1,6 +1,6 @@
 f_types
 f_errors
-f_strings
+f_string
 f_serialized
 f_memory
 f_utf
index f56957f54eb8a5c3a8a45ee992102e80fcd3a5f9..f04dae57c0c7ff11f29accb875fc2c5492e837a1 100644 (file)
@@ -21,7 +21,7 @@
 
 // fll includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/socket.h>
 
index 1157554db8d6223cf9d4b84f9533b9035c8b24fc..f9c1b3dee2537ee500790ed8c55d3a076de224bf 100644 (file)
@@ -12,7 +12,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
index 8c5b80b4e35a216e33dc737bbdbe16ac212cb949..014c195628da30ee99b2f6332f50741999828b8f 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_status
-f_strings
+f_string
 f_utf
similarity index 80%
rename from level_1/fl_strings/c/strings.c
rename to level_1/fl_string/c/string.c
index 7416fadc35f6477b909386c150fed94c33f0f646..8fed032ce76502a842d513b489002a1182220e5f 100644 (file)
@@ -1,11 +1,11 @@
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _di_fl_rip_string_
-  f_return_status fl_rip_string(const f_dynamic_string buffer, const f_string_location location, f_dynamic_string *result) {
+#ifndef _di_fl_string_rip_
+  f_return_status fl_string_rip(const f_string_dynamic buffer, const f_string_location location, f_string_dynamic *result) {
     #ifndef _di_level_1_parameter_checking_
       if (location.start < 0) return f_status_set_error(f_invalid_parameter);
       if (location.stop < location.start) return f_status_set_error(f_invalid_parameter);
@@ -38,10 +38,10 @@ extern "C" {
 
     return f_no_data;
   }
-#endif // _di_fl_rip_string_
+#endif // _di_fl_string_rip_
 
-#ifndef _di_fl_seek_line_until_graph_
-  f_return_status fl_seek_line_until_graph(const f_dynamic_string buffer, f_string_location *location, const char placeholder) {
+#ifndef _di_fl_string_seek_line_until_graph_
+  f_return_status fl_string_seek_line_until_graph(const f_string_dynamic buffer, f_string_location *location, const char placeholder) {
     #ifndef _di_level_1_parameter_checking_
       if (location == 0) return f_status_set_error(f_invalid_parameter);
       if (location->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -64,7 +64,7 @@ extern "C" {
         return status;
       }
 
-      if (buffer.string[location->start] == f_eol) return f_none_on_eol;
+      if (buffer.string[location->start] == f_string_eol) return f_none_on_eol;
 
       width = f_macro_utf_byte_width_is(buffer.string[location->start]);
 
@@ -98,10 +98,10 @@ extern "C" {
 
     return f_none;
   }
-#endif // _di_fl_seek_line_until_graph_
+#endif // _di_fl_string_seek_line_until_graph_
 
-#ifndef _di_fl_seek_line_until_non_graph_
-  f_return_status fl_seek_line_until_non_graph(const f_dynamic_string buffer, f_string_location *location, const char placeholder) {
+#ifndef _di_fl_string_seek_line_until_non_graph_
+  f_return_status fl_string_seek_line_until_non_graph(const f_string_dynamic buffer, f_string_location *location, const char placeholder) {
     #ifndef _di_level_1_parameter_checking_
       if (location == 0) return f_status_set_error(f_invalid_parameter);
       if (location->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -124,7 +124,7 @@ extern "C" {
         return status;
       }
 
-      if (buffer.string[location->start] == f_eol) return f_none_on_eol;
+      if (buffer.string[location->start] == f_string_eol) return f_none_on_eol;
 
       width = f_macro_utf_byte_width_is(buffer.string[location->start]);
 
@@ -158,10 +158,10 @@ extern "C" {
 
     return f_none;
   }
-#endif // _di_fl_seek_line_until_non_graph_
+#endif // _di_fl_string_seek_line_until_non_graph_
 
-#ifndef _di_fl_seek_line_to_
-  f_return_status fl_seek_line_to(const f_dynamic_string buffer, f_string_location *location, const char seek_to_this) {
+#ifndef _di_fl_string_seek_line_to_
+  f_return_status fl_string_seek_line_to(const f_string_dynamic buffer, f_string_location *location, const char seek_to_this) {
     #ifndef _di_level_1_parameter_checking_
       if (location == 0) return f_status_set_error(f_invalid_parameter);
       if (location->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -171,7 +171,7 @@ extern "C" {
     #endif // _di_level_1_parameter_checking_
 
     while (buffer.string[location->start] != seek_to_this) {
-      if (buffer.string[location->start] == f_eol) return f_none_on_eol;
+      if (buffer.string[location->start] == f_string_eol) return f_none_on_eol;
 
       location->start++;
 
@@ -181,10 +181,10 @@ extern "C" {
 
     return f_none;
   }
-#endif // _di_fl_seek_line_to_
+#endif // _di_fl_string_seek_line_to_
 
-#ifndef _di_fl_seek_line_to_utf_character_
-  f_return_status fl_seek_line_to_utf_character(const f_dynamic_string buffer, f_string_location *location, const f_utf_character seek_to_this) {
+#ifndef _di_fl_string_seek_line_to_utf_character_
+  f_return_status fl_string_seek_line_to_utf_character(const f_string_dynamic buffer, f_string_location *location, const f_utf_character seek_to_this) {
     #ifndef _di_level_1_parameter_checking_
       if (location == 0) return f_status_set_error(f_invalid_parameter);
       if (location->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -213,7 +213,7 @@ extern "C" {
       if (width == 0) {
         width = 1;
 
-        if (buffer.string[location->start] == f_eol) return f_none_on_eol;
+        if (buffer.string[location->start] == f_string_eol) return f_none_on_eol;
 
         if (seek_width == width) {
           if (buffer.string[location->start] == seek_to_this) return f_none;
@@ -248,10 +248,10 @@ extern "C" {
 
     return f_none_on_eos;
   }
-#endif // _di_fl_seek_line_to_utf_character_
+#endif // _di_fl_string_seek_line_to_utf_character_
 
-#ifndef _di_fl_seek_to_
-  f_return_status fl_seek_to(const f_dynamic_string buffer, f_string_location *location, const char seek_to_this) {
+#ifndef _di_fl_string_seek_to_
+  f_return_status fl_string_seek_to(const f_string_dynamic buffer, f_string_location *location, const char seek_to_this) {
     #ifndef _di_level_1_parameter_checking_
       if (location == 0) return f_status_set_error(f_invalid_parameter);
       if (location->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -269,10 +269,10 @@ extern "C" {
 
     return f_none;
   }
-#endif // _di_fl_seek_to_
+#endif // _di_fl_string_seek_to_
 
-#ifndef _di_fl_seek_to_utf_character_
-  f_return_status fl_seek_to_utf_character(const f_dynamic_string buffer, f_string_location *location, const f_utf_character seek_to_this) {
+#ifndef _di_fl_string_seek_to_utf_character_
+  f_return_status fl_string_seek_to_utf_character(const f_string_dynamic buffer, f_string_location *location, const f_utf_character seek_to_this) {
     #ifndef _di_level_1_parameter_checking_
       if (location == 0) return f_status_set_error(f_invalid_parameter);
       if (location->start < 0) return f_status_set_error(f_invalid_parameter);
@@ -334,10 +334,10 @@ extern "C" {
 
     return f_none_on_eos;
   }
-#endif // _di_fl_seek_to_utf_character_
+#endif // _di_fl_string_seek_to_utf_character_
 
-#ifndef _di_fl_compare_strings_
-  f_return_status fl_compare_strings(const f_string string1, const f_string string2, const f_string_length length1, const f_string_length length2) {
+#ifndef _di_fl_string_compare_
+  f_return_status fl_string_compare(const f_string string1, const f_string string2, const f_string_length length1, const f_string_length length2) {
     #ifndef _di_level_1_parameter_checking_
       if (length1 <= 0) return f_status_set_error(f_invalid_parameter);
       if (length2 <= 0) return f_status_set_error(f_invalid_parameter);
@@ -348,11 +348,11 @@ extern "C" {
 
     for (; i1 < length1 && i2 < length2; i1++, i2++) {
       // skip past newlines in string1.
-      while (i1 < length1 && string1[i1] == f_eos) i1++;
+      while (i1 < length1 && string1[i1] == f_string_eos) i1++;
       if (i1 == length1) break;
 
       // skip past newlines in string2.
-      while (i2 < length2 && string2[i2] == f_eos) i2++;
+      while (i2 < length2 && string2[i2] == f_string_eos) i2++;
       if (i2 == length2) break;
 
       if (string1[i1] != string2[i2]) return f_not_equal_to;
@@ -360,21 +360,21 @@ extern "C" {
 
     // only return f_equal_to if all remaining characters are NULL.
     while (i1 < length1) {
-      if (string1[i1] != f_eos) return f_not_equal_to;
+      if (string1[i1] != f_string_eos) return f_not_equal_to;
       i1++;
     } // while
 
     while (i2 < length2) {
-      if (string2[i2] != f_eos) return f_not_equal_to;
+      if (string2[i2] != f_string_eos) return f_not_equal_to;
       i2++;
     } // while
 
     return f_equal_to;
   }
-#endif // _di_fl_compare_strings_
+#endif // _di_fl_string_compare_
 
-#ifndef _di_fl_compare_dynamic_strings_
-  f_return_status fl_compare_dynamic_strings(const f_dynamic_string string1, const f_dynamic_string string2) {
+#ifndef _di_fl_string_dynamics_compare_
+  f_return_status fl_string_dynamics_compare(const f_string_dynamic string1, const f_string_dynamic string2) {
     #ifndef _di_level_1_parameter_checking_
       if (string1.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (string2.used <= 0) return f_status_set_error(f_invalid_parameter);
@@ -385,11 +385,11 @@ extern "C" {
 
     for (; i1 < string1.used && i2 < string2.used; i1++, i2++) {
       // skip past newlines in string1.
-      while (i1 < string1.used && string1.string[i1] == f_eos) i1++;
+      while (i1 < string1.used && string1.string[i1] == f_string_eos) i1++;
       if (i1 == string1.used) break;
 
       // skip past newlines in string2.
-      while (i2 < string2.used && string2.string[i2] == f_eos) i2++;
+      while (i2 < string2.used && string2.string[i2] == f_string_eos) i2++;
       if (i2 == string2.used) break;
 
       if (string1.string[i1] != string2.string[i2]) return f_not_equal_to;
@@ -397,21 +397,21 @@ extern "C" {
 
     // only return f_equal_to if all remaining characters are NULL.
     while (i1 < string1.used) {
-      if (string1.string[i1] != f_eos) return f_not_equal_to;
+      if (string1.string[i1] != f_string_eos) return f_not_equal_to;
       i1++;
     } // while
 
     while (i2 < string2.used) {
-      if (string2.string[i2] != f_eos) return f_not_equal_to;
+      if (string2.string[i2] != f_string_eos) return f_not_equal_to;
       i2++;
     } // while
 
     return f_equal_to;
   }
-#endif // _di_fl_compare_dynamic_strings_
+#endif // _di_fl_string_dynamics_compare_
 
-#ifndef _di_fl_compare_partial_dynamic_strings_
-  f_return_status fl_compare_dynamic_strings_partial(const f_dynamic_string string1, const f_dynamic_string string2, const f_string_location offset1, const f_string_location offset2) {
+#ifndef _di_fl_string_dynamic_partial_compare_
+  f_return_status fl_string_dynamic_partial_compare(const f_string_dynamic string1, const f_string_dynamic string2, const f_string_location offset1, const f_string_location offset2) {
     #ifndef _di_level_1_parameter_checking_
       if (string1.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (string2.used <= 0) return f_status_set_error(f_invalid_parameter);
@@ -431,11 +431,11 @@ extern "C" {
 
     for (; i1 < stop1 && i2 < stop2; i1++, i2++) {
       // skip past newlines in string1.
-      while (i1 < stop1 && string1.string[i1] == f_eos) i1++;
+      while (i1 < stop1 && string1.string[i1] == f_string_eos) i1++;
       if (i1 == stop1) break;
 
       // skip past newlines in string2.
-      while (i2 < stop2 && string2.string[i2] == f_eos) i2++;
+      while (i2 < stop2 && string2.string[i2] == f_string_eos) i2++;
       if (i2 == stop2) break;
 
       if (string1.string[i1] != string2.string[i2]) return f_not_equal_to;
@@ -443,18 +443,18 @@ extern "C" {
 
     // only return f_equal_to if all remaining characters are NULL.
     while (i1 < stop1) {
-      if (string1.string[i1] != f_eos) return f_not_equal_to;
+      if (string1.string[i1] != f_string_eos) return f_not_equal_to;
       i1++;
     } // while
 
     while (i2 < stop2) {
-      if (string2.string[i2] != f_eos) return f_not_equal_to;
+      if (string2.string[i2] != f_string_eos) return f_not_equal_to;
       i2++;
     } // while
 
     return f_equal_to;
   }
-#endif // _di_fl_compare_partial_dynamic_strings_
+#endif // _di_fl_string_dynamic_partial_compare_
 
 #ifdef __cplusplus
 } // extern "C"
similarity index 75%
rename from level_1/fl_strings/c/strings.h
rename to level_1/fl_string/c/string.h
index 6bbf5d364fabc4be557664f9aeb7033fe361d3b8..5fde2d9a7ce40fbfaed82f736cad4ce1b87d8f41 100644 (file)
@@ -1,14 +1,14 @@
 /**
  * FLL - Level 1
  *
- * Project: Strings
+ * Project: String
  * API Version: 0.5
  * Licenses: lgplv2.1
  *
  * Provides basic string manipulation and processing capabilities.
  */
-#ifndef _FL_strings_h
-#define _FL_strings_h
+#ifndef _FL_string_h
+#define _FL_string_h
 
 // libc includes
 #include <ctype.h>
@@ -17,7 +17,7 @@
 // fll includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
@@ -42,9 +42,9 @@ extern "C" {
  *   f_allocation_error (with error bit) on memory allocation error.
  *   f_reallocation_error (with error bit) on memory reallocation error.
  */
-#ifndef _di_fl_rip_string_
-  extern f_return_status fl_rip_string(const f_dynamic_string buffer, const f_string_location location, f_dynamic_string *result);
-#endif // _di_fl_rip_string_
+#ifndef _di_fl_string_rip_
+  extern f_return_status fl_string_rip(const f_string_dynamic buffer, const f_string_location location, f_string_dynamic *result);
+#endif // _di_fl_string_rip_
 
 /**
  * Increment buffer location until a graph character (including UTF-8) or an EOL is matched.
@@ -69,9 +69,9 @@ extern "C" {
  *   f_allocation_error (with error bit) on memory allocation error.
  *   f_reallocation_error (with error bit) on memory reallocation error.
  */
-#ifndef _di_fl_seek_line_until_graph_
-  extern f_return_status fl_seek_line_until_graph(const f_dynamic_string buffer, f_string_location *location, const char placeholder);
-#endif // _di_fl_seek_line_until_graph_
+#ifndef _di_fl_string_seek_line_until_graph_
+  extern f_return_status fl_string_seek_line_until_graph(const f_string_dynamic buffer, f_string_location *location, const char placeholder);
+#endif // _di_fl_string_seek_line_until_graph_
 
 /**
  * Increment buffer location until a non-graph character (including UTF-8) or an EOL is matched.
@@ -97,9 +97,9 @@ extern "C" {
  *   f_allocation_error (with error bit) on memory allocation error.
  *   f_reallocation_error (with error bit) on memory reallocation error.
  */
-#ifndef _di_fl_seek_line_until_non_graph_
-  extern f_return_status fl_seek_line_until_non_graph(const f_dynamic_string buffer, f_string_location *location, const char placeholder);
-#endif // _di_fl_seek_line_until_non_graph_
+#ifndef _di_fl_string_seek_line_until_non_graph_
+  extern f_return_status fl_string_seek_line_until_non_graph(const f_string_dynamic buffer, f_string_location *location, const char placeholder);
+#endif // _di_fl_string_seek_line_until_non_graph_
 
 /**
  * Seek the buffer location forward until the character (1-byte wide) or EOL is reached.
@@ -119,11 +119,11 @@ extern "C" {
  *   f_none_on_stop on success, but stopped stop location.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
- * @see fl_seek_line_to_utf_character()
+ * @see fl_string_seek_line_to_utf_character()
  */
-#ifndef _di_fl_seek_line_to_
-  extern f_return_status fl_seek_line_to(const f_dynamic_string buffer, f_string_location *location, const char seek_to_this);
-#endif // _di_fl_seek_line_to_
+#ifndef _di_fl_string_seek_line_to_
+  extern f_return_status fl_string_seek_line_to(const f_string_dynamic buffer, f_string_location *location, const char seek_to_this);
+#endif // _di_fl_string_seek_line_to_
 
 /**
  * Seek the buffer location forward until the character (up to 4-byte wide) or EOL is reached.
@@ -146,11 +146,11 @@ extern "C" {
  *   f_incomplete_utf_on_eos (with error bit) if end of string is reached before a complete UTF-8 character can be processed.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
- * @see fl_seek_line_to()
+ * @see fl_string_seek_line_to()
  */
-#ifndef _di_fl_seek_line_to_utf_character_
-  extern f_return_status fl_seek_line_to_utf_character(const f_dynamic_string buffer, f_string_location *location, const f_utf_character seek_to_this);
-#endif // _di_fl_seek_line_to_utf_character_
+#ifndef _di_fl_string_seek_line_to_utf_character_
+  extern f_return_status fl_string_seek_line_to_utf_character(const f_string_dynamic buffer, f_string_location *location, const f_utf_character seek_to_this);
+#endif // _di_fl_string_seek_line_to_utf_character_
 
 /**
  * Seek the buffer location forward until the character (1-byte wide) is reached.
@@ -172,11 +172,11 @@ extern "C" {
  *   f_incomplete_utf_on_eos (with error bit) if end of string is reached before a complete UTF-8 character can be processed.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
- * @see fl_seek_to_utf_character()
+ * @see fl_string_seek_to_utf_character()
  */
-#ifndef _di_fl_seek_to_
-  extern f_return_status fl_seek_to(const f_dynamic_string buffer, f_string_location *location, const char seek_to_this);
-#endif // _di_fl_seek_to_
+#ifndef _di_fl_string_seek_to_
+  extern f_return_status fl_string_seek_to(const f_string_dynamic buffer, f_string_location *location, const char seek_to_this);
+#endif // _di_fl_string_seek_to_
 
 /**
  * Seek the buffer location forward until the UTF-8 character (up to 4-byte wide) is reached.
@@ -199,11 +199,11 @@ extern "C" {
  *   f_incomplete_utf_on_eos (with error bit) if end of string is reached before a complete UTF-8 character can be processed.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
- * @see fl_seek_to()
+ * @see fl_string_seek_to()
  */
-#ifndef _di_fl_seek_to_utf_character_
-  extern f_return_status fl_seek_to_utf_character(const f_dynamic_string buffer, f_string_location *location, const f_utf_character seek_to_this);
-#endif // _di_fl_seek_to_utf_character_
+#ifndef _di_fl_string_seek_to_utf_character_
+  extern f_return_status fl_string_seek_to_utf_character(const f_string_dynamic buffer, f_string_location *location, const f_utf_character seek_to_this);
+#endif // _di_fl_string_seek_to_utf_character_
 
 /**
  * Compare two strings, similar to strncmp().
@@ -225,12 +225,12 @@ extern "C" {
  *   f_not_equal_to when both strings do not equal.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
- * @see fl_compare_dynamic_strings()
- * @see fl_compare_dynamic_strings_partial()
+ * @see fl_string_dynamics_compare()
+ * @see fl_string_dynamic_partial_compare()
  */
-#ifndef _di_fl_compare_strings_
-  extern f_return_status fl_compare_strings(const f_string string1, const f_string string2, const f_string_length length1, const f_string_length length2);
-#endif // _di_fl_compare_strings_
+#ifndef _di_fl_string_compare_
+  extern f_return_status fl_string_compare(const f_string string1, const f_string string2, const f_string_length length1, const f_string_length length2);
+#endif // _di_fl_string_compare_
 
 /**
  * Compare two strings, similar to strncmp().
@@ -248,12 +248,12 @@ extern "C" {
  *   f_not_equal_to when both strings do not equal.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
- * @see fl_compare_strings()
- * @see fl_compare_dynamic_strings_partial()
+ * @see fl_string_compare()
+ * @see fl_string_dynamic_partial_compare()
  */
-#ifndef _di_fl_compare_dynamic_strings_
-  extern f_return_status fl_compare_dynamic_strings(const f_dynamic_string string1, const f_dynamic_string string2);
-#endif // _di_fl_compare_dynamic_strings_
+#ifndef _di_fl_string_dynamics_compare_
+  extern f_return_status fl_string_dynamics_compare(const f_string_dynamic string1, const f_string_dynamic string2);
+#endif // _di_fl_string_dynamics_compare_
 
 /**
  * Compare two strings, similar to strncmp(), but restricted to the given ranges.
@@ -275,15 +275,15 @@ extern "C" {
  *   f_not_equal_to when both strings do not equal.
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
- * @see fl_compare_strings()
- * @see fl_compare_dynamic_strings()
+ * @see fl_string_compare()
+ * @see fl_string_dynamics_compare()
  */
-#ifndef _di_fl_compare_partial_dynamic_strings_
-  extern f_return_status fl_compare_dynamic_strings_partial(const f_dynamic_string string1, const f_dynamic_string string2, const f_string_location offset1, const f_string_location offset2);
-#endif // _di_fl_compare_partial_dynamic_strings_
+#ifndef _di_fl_string_dynamic_partial_compare_
+  extern f_return_status fl_string_dynamic_partial_compare(const f_string_dynamic string1, const f_string_dynamic string2, const f_string_location offset1, const f_string_location offset2);
+#endif // _di_fl_string_dynamic_partial_compare_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _FL_strings_h
+#endif // _FL_string_h
similarity index 76%
rename from level_1/fl_strings/data/build/dependencies
rename to level_1/fl_string/data/build/dependencies
index 41ae6af816518ca09c88f2bc973d5226c5012b42..67cdfae779406376b98306dd158995a4c90f3930 100644 (file)
@@ -1,5 +1,5 @@
 f_types
 f_errors
 f_memory
-f_strings
+f_string
 f_utf
similarity index 81%
rename from level_1/fl_strings/data/build/settings
rename to level_1/fl_string/data/build/settings
index 5bdbe19ea46408117e855449ed2aa4c2df40e2a9..d5e309361ce072ce017cc92f2121b14756f00566 100644 (file)
@@ -1,6 +1,6 @@
 # fss-0000
 
-project_name fl_strings
+project_name fl_string
 project_level 1
 
 version_major 0
@@ -11,9 +11,9 @@ build_compiler gcc
 build_linker ar
 build_libraries -lc
 build_libraries_fll -lf_memory -lf_utf
-build_sources_library strings.c
+build_sources_library string.c
 build_sources_program
-build_sources_headers strings.h
+build_sources_headers string.h
 build_sources_bash
 build_sources_settings
 build_shared yes
index e9415a3872a5ea8f4bc0bfd71f5269b06476cc77..df11da6ad868e6fa1ecabccf99375df27c76a0d4 100644 (file)
@@ -4,42 +4,6 @@
 extern "C" {
 #endif
 
-#ifndef _di_fl_rip_utf_string_
-  f_return_status fl_rip_utf_string(const f_utf_string_dynamic buffer, const f_utf_string_location location, f_utf_string_dynamic *result) {
-    #ifndef _di_level_1_parameter_checking_
-      if (location.start < 0) return f_status_set_error(f_invalid_parameter);
-      if (location.stop < location.start) return f_status_set_error(f_invalid_parameter);
-      if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
-      if (location.start >= buffer.used) return f_status_set_error(f_invalid_parameter);
-    #endif // _di_level_1_parameter_checking_
-
-    // the start and stop point are inclusive locations, and therefore start - stop is actually 1 too few locations
-    f_utf_string_length size = (location.stop - location.start) + 1;
-
-    if (size > 0) {
-      f_status status = f_none;
-
-      if (result == 0) {
-        f_macro_utf_string_new_dynamic(status, (*result), size);
-      }
-      else {
-        f_macro_utf_string_dynamic_resize(status, (*result), size);
-      }
-
-      if (f_status_is_error(status)) {
-        return status;
-      }
-
-      memcpy(result->string, buffer.string + location.start, sizeof(f_utf_character) * size);
-      result->used = size;
-
-      return f_none;
-    }
-
-    return f_no_data;
-  }
-#endif // _di_fl_rip_utf_string_
-
 #ifndef _di_fl_utf_seek_line_until_graph_
   f_return_status fl_utf_seek_line_until_graph(const f_utf_string_dynamic buffer, f_utf_string_location *location, const f_utf_character placeholder) {
     #ifndef _di_level_1_parameter_checking_
@@ -170,6 +134,42 @@ extern "C" {
   }
 #endif // _di_fl_utf_seek_line_to_character_
 
+#ifndef _di_fl_utf_string_rip_
+  f_return_status fl_utf_string_rip(const f_utf_string_dynamic buffer, const f_utf_string_location location, f_utf_string_dynamic *result) {
+    #ifndef _di_level_1_parameter_checking_
+      if (location.start < 0) return f_status_set_error(f_invalid_parameter);
+      if (location.stop < location.start) return f_status_set_error(f_invalid_parameter);
+      if (buffer.used <= 0) return f_status_set_error(f_invalid_parameter);
+      if (location.start >= buffer.used) return f_status_set_error(f_invalid_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    // the start and stop point are inclusive locations, and therefore start - stop is actually 1 too few locations
+    f_utf_string_length size = (location.stop - location.start) + 1;
+
+    if (size > 0) {
+      f_status status = f_none;
+
+      if (result == 0) {
+        f_macro_utf_string_dynamic_new(status, (*result), size);
+      }
+      else {
+        f_macro_utf_string_dynamic_resize(status, (*result), size);
+      }
+
+      if (f_status_is_error(status)) {
+        return status;
+      }
+
+      memcpy(result->string, buffer.string + location.start, sizeof(f_utf_character) * size);
+      result->used = size;
+
+      return f_none;
+    }
+
+    return f_no_data;
+  }
+#endif // _di_fl_utf_string_rip_
+
 #ifndef _di_fl_utf_string_seek_to_
   f_return_status fl_utf_string_seek_to(const f_utf_string_dynamic buffer, f_utf_string_location *location, const f_utf_character seek_to_this) {
     #ifndef _di_level_1_parameter_checking_
@@ -296,8 +296,8 @@ extern "C" {
   }
 #endif // _di_fl_utf_string_dynamic_compare_
 
-#ifndef _di_fl_compare_partial_dynamic_strings_
-  f_return_status fl_utf_string_compare_dynamic_partial(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_location offset1, const f_utf_string_location offset2) {
+#ifndef _di_fl_string_dynamic_partial_compare_
+  f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_location offset1, const f_utf_string_location offset2) {
     #ifndef _di_level_1_parameter_checking_
       if (string1.used <= 0) return f_status_set_error(f_invalid_parameter);
       if (string2.used <= 0) return f_status_set_error(f_invalid_parameter);
@@ -340,7 +340,7 @@ extern "C" {
 
     return f_equal_to;
   }
-#endif // _di_fl_compare_partial_dynamic_strings_
+#endif // _di_fl_string_dynamic_partial_compare_
 
 #ifdef __cplusplus
 } // extern "C"
index 9776e0ada15f1dc0e9f3722dcbe564b731a07bf9..708074f6b97c990a88ffb8a3c9264af53e2e4716 100644 (file)
@@ -7,8 +7,8 @@
  *
  * Provides UTF-8 character manipulation and processing capabilities.
  */
-#ifndef _FL_strings_h
-#define _FL_strings_h
+#ifndef _FL_string_h
+#define _FL_string_h
 
 // libc includes
 #include <ctype.h>
@@ -17,7 +17,7 @@
 // fll includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
@@ -26,27 +26,6 @@ extern "C" {
 #endif
 
 /**
- * Allocated a new UTF-8 string from the provided range in the buffer.
- *
- * @param buffer
- *   The buffer to rip from.
- * @param location
- *   A range within the buffer representing the string to rip.
- * @param result
- *   The new string, which will be allocated or reallocated as necessary.
- *
- * @return
- *   f_none on success.
- *   f_no_data if nothing to rip, no allocations or reallocations are performed.
- *   f_invalid_parameter (with error bit) if a parameter is invalid.
- *   f_allocation_error (with error bit) on memory allocation error.
- *   f_reallocation_error (with error bit) on memory reallocation error.
- */
-#ifndef _di_fl_rip_utf_string_
-  extern f_return_status fl_rip_utf_string(const f_utf_string_dynamic buffer, const f_utf_string_location location, f_utf_string_dynamic *result);
-#endif // _di_fl_rip_utf_string_
-
-/**
  * Increment buffer location until a graph character or an EOL is matched.
  *
  * This will ignore the UTF-8 BOM.
@@ -119,6 +98,27 @@ extern "C" {
 #endif // _di_fl_utf_seek_line_to_
 
 /**
+ * Allocated a new UTF-8 string from the provided range in the buffer.
+ *
+ * @param buffer
+ *   The buffer to rip from.
+ * @param location
+ *   A range within the buffer representing the string to rip.
+ * @param result
+ *   The new string, which will be allocated or reallocated as necessary.
+ *
+ * @return
+ *   f_none on success.
+ *   f_no_data if nothing to rip, no allocations or reallocations are performed.
+ *   f_invalid_parameter (with error bit) if a parameter is invalid.
+ *   f_allocation_error (with error bit) on memory allocation error.
+ *   f_reallocation_error (with error bit) on memory reallocation error.
+ */
+#ifndef _di_fl_utf_string_rip_
+  extern f_return_status fl_utf_string_rip(const f_utf_string_dynamic buffer, const f_utf_string_location location, f_utf_string_dynamic *result);
+#endif // _di_fl_utf_string_rip_
+
+/**
  * Seek the buffer location forward until the 1-byte wide character or EOL is reached.
  *
  * @param buffer
@@ -211,7 +211,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
  * @see fl_utf_string_dynamic_compare()
- * @see fl_utf_string_compare_dynamic_partial()
+ * @see fl_utf_string_dynamic_partial_compare()
  */
 #ifndef _di_fl_utf_string_compare_
   extern f_return_status fl_utf_string_compare(const f_utf_string string1, const f_utf_string string2, const f_utf_string_length length1, const f_utf_string_length length2);
@@ -234,7 +234,7 @@ extern "C" {
  *   f_invalid_parameter (with error bit) if a parameter is invalid.
  *
  * @see fl_utf_string_compare()
- * @see fl_utf_string_compare_dynamic_partial()
+ * @see fl_utf_string_dynamic_partial_compare()
  */
 #ifndef _di_fl_utf_string_dynamic_compare_
   extern f_return_status fl_utf_string_dynamic_compare(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2);
@@ -263,12 +263,12 @@ extern "C" {
  * @see fl_utf_string_compare()
  * @see fl_utf_string_dynamic_compare()
  */
-#ifndef _di_fl_utf_string_compare_dynamic_partial_
-  extern f_return_status fl_utf_string_compare_dynamic_partial(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_location offset1, const f_utf_string_location offset2);
-#endif // _di_fl_utf_string_compare_dynamic_partial_
+#ifndef _di_fl_utf_string_dynamic_partial_compare_
+  extern f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_dynamic string1, const f_utf_string_dynamic string2, const f_utf_string_location offset1, const f_utf_string_location offset2);
+#endif // _di_fl_utf_string_dynamic_partial_compare_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _FL_strings_h
+#endif // _FL_string_h
index 41ae6af816518ca09c88f2bc973d5226c5012b42..67cdfae779406376b98306dd158995a4c90f3930 100644 (file)
@@ -1,5 +1,5 @@
 f_types
 f_errors
 f_memory
-f_strings
+f_string
 f_utf
index 9a0586e72231f2d54884fc9efa6f2008e007579b..b36a1f7671bc5c6967fa3c96f6904aabb70a27fb 100644 (file)
@@ -16,7 +16,7 @@
 
 // fll-0 includes
 #include <level_0/colors.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
index 29d95a01e50de2bada8478c6103925ca5a48d379..cfb7483232ab5ceacf129112413462340d4ab130 100644 (file)
@@ -1,6 +1,6 @@
 f_types
 f_errors
-f_strings
+f_string
 f_colors
 f_memory
 fl_colors
index 5be2f94b06ea699228f6d98b5d8849fd998173af..3ed26cee7f6eef16f5772d774b0f15bf949837ca 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fll_execute_path_
-  f_return_status fll_execute_path(const f_string program_path, const f_dynamic_strings arguments, f_s_int *results) {
+  f_return_status fll_execute_path(const f_string program_path, const f_string_dynamics arguments, f_s_int *results) {
     #ifndef _di_level_2_parameter_checking_
       if (results == 0) return f_status_set_error(f_invalid_parameter);
 
@@ -31,7 +31,7 @@ extern "C" {
       name_size = strnlen(last_slash, PATH_MAX);
 
       if (name_size > 1) {
-        f_macro_strings_string_new(status, program_name, name_size + 1);
+        f_macro_string_new(status, program_name, name_size + 1);
 
         if (f_status_is_error(status)) return status;
 
@@ -44,29 +44,29 @@ extern "C" {
     }
 
     if (name_size == 0) {
-      fixed_arguments[0] = f_eos;
+      fixed_arguments[0] = f_string_eos;
     }
     else {
       fixed_arguments[0] = program_name;
     }
 
     for (f_string_length i = 0; i < arguments.used; i++) {
-      f_macro_strings_string_new(status, fixed_arguments[i + 1], arguments.array[i].used + 1);
+      f_macro_string_new(status, fixed_arguments[i + 1], arguments.array[i].used + 1);
 
       if (f_status_is_error(status)) {
         f_status status2 = f_none;
 
-        if (name_size > 0) f_macro_strings_string_delete(status, program_name, name_size);
+        if (name_size > 0) f_macro_string_delete(status, program_name, name_size);
 
         for (f_string_length j = 0; j < i; j++) {
-          f_macro_strings_string_delete(status2, fixed_arguments[i + 1], arguments.array[j].used + 1);
+          f_macro_string_delete(status2, fixed_arguments[i + 1], arguments.array[j].used + 1);
         }
 
         return status;
       }
 
       memcpy(fixed_arguments[i + 1], arguments.array[i].string, sizeof(char) * arguments.array[i].used);
-      fixed_arguments[i + 1][arguments.array[i].used] = f_eos;
+      fixed_arguments[i + 1][arguments.array[i].used] = f_string_eos;
     } // for
 
     // insert the required array terminated
@@ -80,10 +80,10 @@ extern "C" {
     if (process_id < 0) {
       f_status status2 = f_none;
 
-      if (name_size > 0) f_macro_strings_string_delete(status, program_name, name_size);
+      if (name_size > 0) f_macro_string_delete(status, program_name, name_size);
 
       for (f_string_length i = 0; i < arguments.used; i++) {
-        f_macro_strings_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
+        f_macro_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
       } // for
 
       return f_status_set_error(f_fork_failed);
@@ -100,13 +100,13 @@ extern "C" {
     // have the parent wait for the child process to finish
     waitpid(process_id, results, 0);
 
-    if (name_size > 0) f_macro_strings_string_delete(status, program_name, name_size);
+    if (name_size > 0) f_macro_string_delete(status, program_name, name_size);
 
     {
       f_status status2 = f_none;
 
       for (f_string_length i = 0; i < arguments.used; i++) {
-        f_macro_strings_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
+        f_macro_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
       } // for
     }
 
@@ -117,7 +117,7 @@ extern "C" {
 #endif // _di_fll_execute_path_
 
 #ifndef _di_fll_execute_program_
-  f_return_status fll_execute_program(const f_string program_name, const f_dynamic_strings arguments, f_s_int *results) {
+  f_return_status fll_execute_program(const f_string program_name, const f_string_dynamics arguments, f_s_int *results) {
     #ifndef _di_level_2_parameter_checking_
       if (results == 0) return f_status_set_error(f_invalid_parameter);
 
@@ -133,20 +133,20 @@ extern "C" {
 
     f_status status = f_none;
     for (f_string_length i = 0; i < arguments.used; i++) {
-      f_macro_strings_string_new(status, fixed_arguments[i + 1], arguments.array[i].used + 1);
+      f_macro_string_new(status, fixed_arguments[i + 1], arguments.array[i].used + 1);
 
       if (f_status_is_error(status)) {
         f_status status2 = f_none;
 
         for (f_string_length j = 0; j < i; j++) {
-          f_macro_strings_string_delete(status2, fixed_arguments[i + 1], arguments.array[j].used + 1);
+          f_macro_string_delete(status2, fixed_arguments[i + 1], arguments.array[j].used + 1);
         }
 
         return status;
       }
 
       memcpy(fixed_arguments[i + 1], arguments.array[i].string, sizeof(char) * arguments.array[i].used);
-      fixed_arguments[i + 1][arguments.array[i].used] = f_eos;
+      fixed_arguments[i + 1][arguments.array[i].used] = f_string_eos;
     } // for
 
     // insert the required array terminated
@@ -161,7 +161,7 @@ extern "C" {
       f_status status2 = f_none;
 
       for (f_string_length i = 0; i < arguments.used; i++) {
-        f_macro_strings_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
+        f_macro_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
       } // for
 
       return f_status_set_error(f_fork_failed);
@@ -182,7 +182,7 @@ extern "C" {
       f_status status2 = f_none;
 
       for (f_string_length i = 0; i < arguments.used; i++) {
-        f_macro_strings_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
+        f_macro_string_delete(status2, fixed_arguments[i + 1], arguments.array[i].used + 1);
       }
     }
 
index d448d60c6d1b5bc953838884a2dbbff85721cd73..a2314ce0e70ecb271482ecbfb0039936b420b006 100644 (file)
@@ -21,7 +21,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -34,14 +34,14 @@ extern "C" {
   /**
    * This will execute a program given some path + program name (such as "/bin/bash").
    */
-  extern f_return_status fll_execute_path(const f_string program_path, const f_dynamic_strings arguments, f_s_int *results);
+  extern f_return_status fll_execute_path(const f_string program_path, const f_string_dynamics arguments, f_s_int *results);
 #endif // _di_fll_execute_path_
 
 #ifndef _di_fll_execute_program_
   /**
    * This will find the program based on PATH environment so that static paths do not have to be used as with f_execute_path.
    */
-  extern f_return_status fll_execute_program(const f_string program_name, const f_dynamic_strings arguments, f_s_int *results);
+  extern f_return_status fll_execute_program(const f_string program_name, const f_string_dynamics arguments, f_s_int *results);
 #endif // _di_fll_execute_program_
 
 #ifdef __cplusplus
index a2496a1fa0782112d706db7ae82285f16a225949..5e3048cb94d6d8fa85917c7a6adae14b20b15574 100644 (file)
@@ -1,4 +1,4 @@
 f_types
 f_errors
-f_strings
+f_string
 f_memory
index 6d18ed22d8e5ed5e713648306953c71d4c96bb05..3f3629bf809bce64d4955100cb6525b2a1dde723 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fll_fss_basic_read_
-  f_return_status fll_fss_basic_read(f_dynamic_string *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents) {
+  f_return_status fll_fss_basic_read(f_string_dynamic *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents) {
     #ifndef _di_level_2_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (objects == 0) return f_status_set_error(f_invalid_parameter);
@@ -134,7 +134,7 @@ extern "C" {
 #endif // _di_fll_fss_basic_read_
 
 #ifndef _di_fll_fss_basic_write_
-  f_return_status fll_fss_basic_write(const f_dynamic_string object, const f_dynamic_strings contents, f_dynamic_string *buffer) {
+  f_return_status fll_fss_basic_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer) {
     #ifndef _di_level_2_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (contents.used > contents.size) return f_status_set_error(f_invalid_parameter);
@@ -169,7 +169,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
         }
 
-        buffer->string[buffer->used] = f_eol;
+        buffer->string[buffer->used] = f_string_eol;
         buffer->used++;
       }
     }
index d8ece39ead9923c49763e128ac69edc436ba0245..e70b39fee67126d15e88229b0617a2c315352cbf 100644 (file)
@@ -14,7 +14,7 @@
 #include <level_0/status.h>
 #include <level_0/fss.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
@@ -32,14 +32,14 @@ extern "C" {
   /**
    * read an fss-0000 object and then content.
    */
-  extern f_return_status fll_fss_basic_read(f_dynamic_string *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents);
+  extern f_return_status fll_fss_basic_read(f_string_dynamic *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents);
 #endif // _di_fll_fss_basic_read_
 
 #ifndef _di_fll_fss_basic_write_
   /**
    * write an fss-0000 object and then content.
    */
-  extern f_return_status fll_fss_basic_write(const f_dynamic_string object, const f_dynamic_strings contents, f_dynamic_string *buffer);
+  extern f_return_status fll_fss_basic_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer);
 #endif // _di_fll_fss_basic_write_
 
 #ifdef __cplusplus
index 601939a4af53433ae2e6b3aac49f7cdd17a5b496..a05884cb2d08eb474bedf97b8bfa8adedd88e9ad 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fll_fss_basic_list_read_
-  f_return_status fll_fss_basic_list_read(f_dynamic_string *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents) {
+  f_return_status fll_fss_basic_list_read(f_string_dynamic *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents) {
     #ifndef _di_level_2_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (objects == 0) return f_status_set_error(f_invalid_parameter);
@@ -134,7 +134,7 @@ extern "C" {
 #endif // _di_fll_fss_basic_list_read_
 
 #ifndef _di_fll_fss_basic_list_write_
-  f_return_status fll_fss_basic_list_write(const f_dynamic_string object, const f_dynamic_strings contents, f_dynamic_string *buffer) {
+  f_return_status fll_fss_basic_list_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer) {
     #ifndef _di_level_2_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (contents.used > contents.size) return f_status_set_error(f_invalid_parameter);
@@ -169,7 +169,7 @@ extern "C" {
           if (f_status_is_error(status)) return status;
         }
 
-        buffer->string[buffer->used] = f_eol;
+        buffer->string[buffer->used] = f_string_eol;
         buffer->used++;
       }
     }
index 6e35569460b82eef4fe1ff307372e0707cc70497..b23914e9bb40b1865459065978e1d819e1af7124 100644 (file)
@@ -14,7 +14,7 @@
 #include <level_0/status.h>
 #include <level_0/fss.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -31,14 +31,14 @@ extern "C" {
   /**
    * read an fss-0002 object and then content.
    */
-  extern f_return_status fll_fss_basic_list_read(f_dynamic_string *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents);
+  extern f_return_status fll_fss_basic_list_read(f_string_dynamic *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents);
 #endif // _di_fll_fss_basic_list_read_
 
 #ifndef _di_fll_fss_basic_list_write_
   /**
    * write an fss-0000 object and then content.
    */
-  extern f_return_status fll_fss_basic_list_write(const f_dynamic_string object, const f_dynamic_strings contents, f_dynamic_string *buffer);
+  extern f_return_status fll_fss_basic_list_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer);
 #endif // _di_fll_fss_basic_list_write_
 
 #ifdef __cplusplus
index 862d67bc44e2f5d5b4b21a28dbbc45cedb238492..7a644b5a50212727f178195efa272e7db1a1e3bf 100644 (file)
@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 #ifndef _di_fll_fss_extended_read_
-  f_return_status fll_fss_extended_read(f_dynamic_string *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents) {
+  f_return_status fll_fss_extended_read(f_string_dynamic *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents) {
     #ifndef _di_level_2_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (objects == 0) return f_status_set_error(f_invalid_parameter);
@@ -133,7 +133,7 @@ extern "C" {
 #endif // _di_fll_fss_extended_read_
 
 #ifndef _di_fll_fss_extended_write_
-  f_return_status fll_fss_extended_write(const f_dynamic_string object, const f_dynamic_strings contents, f_dynamic_string *buffer) {
+  f_return_status fll_fss_extended_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer) {
     #ifndef _di_level_2_parameter_checking_
       if (buffer == 0) return f_status_set_error(f_invalid_parameter);
       if (contents.used > contents.size) return f_status_set_error(f_invalid_parameter);
@@ -166,7 +166,7 @@ extern "C" {
       } // while
 
       // extended always ends each call with a space, and so the last position should be replaced with an eol.
-      buffer->string[buffer->used - 1] = f_eol;
+      buffer->string[buffer->used - 1] = f_string_eol;
     }
 
     return f_none;
index e50feaa5cebf626dc962aaf5e862f736aca6046c..f99d0d97aa016bf43efe73cae1f9e565ac8e337a 100644 (file)
@@ -14,7 +14,7 @@
 #include <level_0/status.h>
 #include <level_0/fss.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -31,14 +31,14 @@ extern "C" {
   /**
    * read an fss-0001 object and then content.
    */
-  extern f_return_status fll_fss_extended_read(f_dynamic_string *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents);
+  extern f_return_status fll_fss_extended_read(f_string_dynamic *buffer, f_string_location *input, f_fss_objects *objects, f_fss_contents *contents);
 #endif // _di_fll_fss_extended_read_
 
 #ifndef _di_fll_fss_extended_write_
   /**
    * write an fss-0000 object and then content.
    */
-  extern f_return_status fll_fss_extended_write(const f_dynamic_string object, const f_dynamic_strings contents, f_dynamic_string *buffer);
+  extern f_return_status fll_fss_extended_write(const f_string_dynamic object, const f_string_dynamics contents, f_string_dynamic *buffer);
 #endif // _di_fll_fss_extended_write_
 
 #ifdef __cplusplus
index f452f879c2b0f15cce3aacba7352a6e991ddbd00..fe1313e5742d9920e2c35fa818934f7d42c2c45f 100644 (file)
@@ -27,67 +27,67 @@ extern "C" {
     }
 
     #ifndef _di_fll_fss_status_error_
-      if (fl_compare_strings(string, fll_fss_status_string_invalid_format, length, fll_fss_status_string_invalid_format_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_invalid_format, length, fll_fss_status_string_invalid_format_length) == f_equal_to) {
         *error = fl_fss_invalid_format;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_invalid_format_eos, length, fll_fss_status_string_invalid_format_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_invalid_format_eos, length, fll_fss_status_string_invalid_format_eos_length) == f_equal_to) {
         *error = fl_fss_invalid_format_eos;
         return f_none;
       }
     #endif // _di_fll_fss_status_error_
 
     #ifndef _di_fll_fss_status_warning_
-      if (fl_compare_strings(string, fll_fss_status_string_no_header, length, fll_fss_status_string_no_header_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_no_header, length, fll_fss_status_string_no_header_length) == f_equal_to) {
         *error = fl_fss_no_header;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_accepted_but_invalid, length, fll_fss_status_string_accepted_but_invalid_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_accepted_but_invalid, length, fll_fss_status_string_accepted_but_invalid_length) == f_equal_to) {
         *error = fl_fss_accepted_but_invalid;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_no_header_eos, length, fll_fss_status_string_no_header_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_no_header_eos, length, fll_fss_status_string_no_header_eos_length) == f_equal_to) {
         *error = fl_fss_no_header_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_accepted_but_invalid_eos, length, fll_fss_status_string_accepted_but_invalid_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_accepted_but_invalid_eos, length, fll_fss_status_string_accepted_but_invalid_eos_length) == f_equal_to) {
         *error = fl_fss_accepted_but_invalid_eos;
         return f_none;
       }
     #endif // _di_fll_fss_status_warning_
 
     #ifndef _di_fll_fss_status_success_
-      if (fl_compare_strings(string, fll_fss_status_string_found_object, length, fll_fss_status_string_found_object_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_found_object, length, fll_fss_status_string_found_object_length) == f_equal_to) {
         *error = fl_fss_found_object;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_found_content, length, fll_fss_status_string_found_content_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_found_content, length, fll_fss_status_string_found_content_length) == f_equal_to) {
         *error = fl_fss_found_content;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_found_no_object, length, fll_fss_status_string_found_no_object_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_found_no_object, length, fll_fss_status_string_found_no_object_length) == f_equal_to) {
         *error = fl_fss_found_no_object;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_found_no_content, length, fll_fss_status_string_found_no_content_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_found_no_content, length, fll_fss_status_string_found_no_content_length) == f_equal_to) {
         *error = fl_fss_found_no_content;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fll_fss_status_string_found_object_no_content, length, fll_fss_status_string_found_object_no_content_length) == f_equal_to) {
+      if (fl_string_compare(string, fll_fss_status_string_found_object_no_content, length, fll_fss_status_string_found_object_no_content_length) == f_equal_to) {
         *error = fl_fss_found_object_no_content;
         return f_none;
       }
     #endif // _di_fll_fss_status_success_
 
-    if (fl_compare_strings(string, fll_fss_status_string_last_error_code, length, fll_fss_status_string_last_error_code_length) == f_equal_to) {
+    if (fl_string_compare(string, fll_fss_status_string_last_error_code, length, fll_fss_status_string_last_error_code_length) == f_equal_to) {
       *error = f_last_status_code;
       return f_none;
     }
index c0f9fa5cb693416eaef238823283956adc4a301d..36de010a84b131f87b4e2f75241b2fbd51041ee5 100644 (file)
 #include <level_0/status.h>
 #include <level_0/fss.h>
 #include <level_0/memory.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
-#include <level_1/status.h>
 #include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>
-#include <level_1/strings.h>
+#include <level_1/status.h>
+#include <level_1/string.h>
 
 #ifdef __cplusplus
 extern "C" {
index 3078a1e65352fb185b13433e8c0f0cfd141b812d..6394c1d46147fc350bc99da0da91108c3225e304 100644 (file)
@@ -1,10 +1,10 @@
 f_types
 f_status
-f_strings
+f_string
 f_memory
 f_conversion
 f_utf
 f_fss
 fl_fss
 fl_status
-fl_strings
+fl_string
index 7710ded5942ea17e2144e9615daade794f4143b7..8df87556b4625041eb4767293faf0dc2c10fa8f7 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfl_status -lfl_strings -lfl_fss -lf_conversion -lf_file -lf_memory -lf_conversion -lf_utf
+build_libraries_fll -lfl_status -lfl_string -lfl_fss -lf_conversion -lf_file -lf_memory -lf_conversion -lf_utf
 build_sources_library fss_basic.c fss_basic_list.c fss_extended.c fss_status.c
 build_sources_program
 build_sources_headers fss_basic.h fss_basic_list.h fss_extended.h fss_status.h
index 27d5db0c403ef4814e2fc594ed1ff1f3955e968e..b8d2dacd379b4c79f1c244ff66005a3b5fde9f5a 100644 (file)
@@ -27,1081 +27,1081 @@ extern "C" {
     }
 
     #ifndef _di_fll_status_booleans_
-      if (fl_compare_strings(string, fl_status_string_false, length, fl_status_string_false_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_false, length, fl_status_string_false_length) == f_equal_to) {
         *code = f_false;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_true, length, fl_status_string_true_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_true, length, fl_status_string_true_length) == f_equal_to) {
         *code = f_true;
         return f_none;
       }
     #endif // _di_fll_status_booleans_
 
     #ifndef _di_fll_status_signals_
-      if (fl_compare_strings(string, fl_status_string_signal_hangup, length, fl_status_string_signal_hangup_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_hangup, length, fl_status_string_signal_hangup_length) == f_equal_to) {
         *code = f_signal_hangup;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_interrupt, length, fl_status_string_signal_interrupt_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_interrupt, length, fl_status_string_signal_interrupt_length) == f_equal_to) {
         *code = f_signal_interrupt;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_quit, length, fl_status_string_signal_quit_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_quit, length, fl_status_string_signal_quit_length) == f_equal_to) {
         *code = f_signal_quit;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_illegal, length, fl_status_string_signal_illegal_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_illegal, length, fl_status_string_signal_illegal_length) == f_equal_to) {
         *code = f_signal_illegal;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_trap, length, fl_status_string_signal_trap_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_trap, length, fl_status_string_signal_trap_length) == f_equal_to) {
         *code = f_signal_trap;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_abort, length, fl_status_string_signal_abort_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_abort, length, fl_status_string_signal_abort_length) == f_equal_to) {
         *code = f_signal_abort;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_bus_error, length, fl_status_string_signal_bus_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_bus_error, length, fl_status_string_signal_bus_error_length) == f_equal_to) {
         *code = f_signal_bus_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_floating_point_exception, length, fl_status_string_signal_floating_point_exception_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_floating_point_exception, length, fl_status_string_signal_floating_point_exception_length) == f_equal_to) {
         *code = f_signal_floating_point_exception;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_kill, length, fl_status_string_signal_kill_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_kill, length, fl_status_string_signal_kill_length) == f_equal_to) {
         *code = f_signal_kill;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_user_1, length, fl_status_string_signal_user_1_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_user_1, length, fl_status_string_signal_user_1_length) == f_equal_to) {
         *code = f_signal_user_1;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_segmentation_fault, length, fl_status_string_signal_segmentation_fault_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_segmentation_fault, length, fl_status_string_signal_segmentation_fault_length) == f_equal_to) {
         *code = f_signal_segmentation_fault;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_user_2, length, fl_status_string_signal_user_2_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_user_2, length, fl_status_string_signal_user_2_length) == f_equal_to) {
         *code = f_signal_user_2;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_broken_pipe, length, fl_status_string_signal_broken_pipe_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_broken_pipe, length, fl_status_string_signal_broken_pipe_length) == f_equal_to) {
         *code = f_signal_broken_pipe;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_alarm_clock, length, fl_status_string_signal_alarm_clock_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_alarm_clock, length, fl_status_string_signal_alarm_clock_length) == f_equal_to) {
         *code = f_signal_alarm_clock;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_termination, length, fl_status_string_signal_termination_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_termination, length, fl_status_string_signal_termination_length) == f_equal_to) {
         *code = f_signal_termination;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_stack_fault, length, fl_status_string_signal_stack_fault_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_stack_fault, length, fl_status_string_signal_stack_fault_length) == f_equal_to) {
         *code = f_signal_stack_fault;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_child, length, fl_status_string_signal_child_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_child, length, fl_status_string_signal_child_length) == f_equal_to) {
         *code = f_signal_child;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_continue, length, fl_status_string_signal_continue_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_continue, length, fl_status_string_signal_continue_length) == f_equal_to) {
         *code = f_signal_continue;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_stop, length, fl_status_string_signal_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_stop, length, fl_status_string_signal_stop_length) == f_equal_to) {
         *code = f_signal_stop;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_keyboard_stop, length, fl_status_string_signal_keyboard_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_keyboard_stop, length, fl_status_string_signal_keyboard_stop_length) == f_equal_to) {
         *code = f_signal_keyboard_stop;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_tty_in, length, fl_status_string_signal_tty_in_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_tty_in, length, fl_status_string_signal_tty_in_length) == f_equal_to) {
         *code = f_signal_tty_in;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_tty_out, length, fl_status_string_signal_tty_out_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_tty_out, length, fl_status_string_signal_tty_out_length) == f_equal_to) {
         *code = f_signal_tty_out;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_urgent, length, fl_status_string_signal_urgent_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_urgent, length, fl_status_string_signal_urgent_length) == f_equal_to) {
         *code = f_signal_urgent;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_cpu_limit, length, fl_status_string_signal_cpu_limit_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_cpu_limit, length, fl_status_string_signal_cpu_limit_length) == f_equal_to) {
         *code = f_signal_cpu_limit;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_file_size_limit, length, fl_status_string_signal_file_size_limit_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_file_size_limit, length, fl_status_string_signal_file_size_limit_length) == f_equal_to) {
         *code = f_signal_file_size_limit;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_virtual_alarm_clock, length, fl_status_string_signal_virtual_alarm_clock_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_virtual_alarm_clock, length, fl_status_string_signal_virtual_alarm_clock_length) == f_equal_to) {
         *code = f_signal_virtual_alarm_clock;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_profile_alarm_clock, length, fl_status_string_signal_profile_alarm_clock_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_profile_alarm_clock, length, fl_status_string_signal_profile_alarm_clock_length) == f_equal_to) {
         *code = f_signal_profile_alarm_clock;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_window_size_change, length, fl_status_string_signal_window_size_change_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_window_size_change, length, fl_status_string_signal_window_size_change_length) == f_equal_to) {
         *code = f_signal_window_size_change;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_pollable_event, length, fl_status_string_signal_pollable_event_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_pollable_event, length, fl_status_string_signal_pollable_event_length) == f_equal_to) {
         *code = f_signal_pollable_event;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_power_failure, length, fl_status_string_signal_power_failure_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_power_failure, length, fl_status_string_signal_power_failure_length) == f_equal_to) {
         *code = f_signal_power_failure;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_bad_system_call, length, fl_status_string_signal_bad_system_call_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_bad_system_call, length, fl_status_string_signal_bad_system_call_length) == f_equal_to) {
         *code = f_signal_bad_system_call;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_32, length, fl_status_string_signal_reserved_32_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_32, length, fl_status_string_signal_reserved_32_length) == f_equal_to) {
         *code = f_signal_reserved_32;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_33, length, fl_status_string_signal_reserved_33_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_33, length, fl_status_string_signal_reserved_33_length) == f_equal_to) {
         *code = f_signal_reserved_33;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_34, length, fl_status_string_signal_reserved_34_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_34, length, fl_status_string_signal_reserved_34_length) == f_equal_to) {
         *code = f_signal_reserved_34;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_35, length, fl_status_string_signal_reserved_35_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_35, length, fl_status_string_signal_reserved_35_length) == f_equal_to) {
         *code = f_signal_reserved_35;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_36, length, fl_status_string_signal_reserved_36_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_36, length, fl_status_string_signal_reserved_36_length) == f_equal_to) {
         *code = f_signal_reserved_36;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_37, length, fl_status_string_signal_reserved_37_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_37, length, fl_status_string_signal_reserved_37_length) == f_equal_to) {
         *code = f_signal_reserved_37;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_38, length, fl_status_string_signal_reserved_38_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_38, length, fl_status_string_signal_reserved_38_length) == f_equal_to) {
         *code = f_signal_reserved_38;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_39, length, fl_status_string_signal_reserved_39_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_39, length, fl_status_string_signal_reserved_39_length) == f_equal_to) {
         *code = f_signal_reserved_39;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_40, length, fl_status_string_signal_reserved_40_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_40, length, fl_status_string_signal_reserved_40_length) == f_equal_to) {
         *code = f_signal_reserved_40;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_41, length, fl_status_string_signal_reserved_41_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_41, length, fl_status_string_signal_reserved_41_length) == f_equal_to) {
         *code = f_signal_reserved_41;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_42, length, fl_status_string_signal_reserved_42_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_42, length, fl_status_string_signal_reserved_42_length) == f_equal_to) {
         *code = f_signal_reserved_42;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_43, length, fl_status_string_signal_reserved_43_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_43, length, fl_status_string_signal_reserved_43_length) == f_equal_to) {
         *code = f_signal_reserved_43;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_44, length, fl_status_string_signal_reserved_44_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_44, length, fl_status_string_signal_reserved_44_length) == f_equal_to) {
         *code = f_signal_reserved_44;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_45, length, fl_status_string_signal_reserved_45_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_45, length, fl_status_string_signal_reserved_45_length) == f_equal_to) {
         *code = f_signal_reserved_45;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_46, length, fl_status_string_signal_reserved_46_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_46, length, fl_status_string_signal_reserved_46_length) == f_equal_to) {
         *code = f_signal_reserved_46;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_47, length, fl_status_string_signal_reserved_47_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_47, length, fl_status_string_signal_reserved_47_length) == f_equal_to) {
         *code = f_signal_reserved_47;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_48, length, fl_status_string_signal_reserved_48_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_48, length, fl_status_string_signal_reserved_48_length) == f_equal_to) {
         *code = f_signal_reserved_48;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_49, length, fl_status_string_signal_reserved_49_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_49, length, fl_status_string_signal_reserved_49_length) == f_equal_to) {
         *code = f_signal_reserved_49;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_50, length, fl_status_string_signal_reserved_50_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_50, length, fl_status_string_signal_reserved_50_length) == f_equal_to) {
         *code = f_signal_reserved_50;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_51, length, fl_status_string_signal_reserved_51_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_51, length, fl_status_string_signal_reserved_51_length) == f_equal_to) {
         *code = f_signal_reserved_51;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_52, length, fl_status_string_signal_reserved_52_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_52, length, fl_status_string_signal_reserved_52_length) == f_equal_to) {
         *code = f_signal_reserved_52;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_53, length, fl_status_string_signal_reserved_53_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_53, length, fl_status_string_signal_reserved_53_length) == f_equal_to) {
         *code = f_signal_reserved_53;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_54, length, fl_status_string_signal_reserved_54_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_54, length, fl_status_string_signal_reserved_54_length) == f_equal_to) {
         *code = f_signal_reserved_54;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_55, length, fl_status_string_signal_reserved_55_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_55, length, fl_status_string_signal_reserved_55_length) == f_equal_to) {
         *code = f_signal_reserved_55;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_56, length, fl_status_string_signal_reserved_56_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_56, length, fl_status_string_signal_reserved_56_length) == f_equal_to) {
         *code = f_signal_reserved_56;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_57, length, fl_status_string_signal_reserved_57_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_57, length, fl_status_string_signal_reserved_57_length) == f_equal_to) {
         *code = f_signal_reserved_57;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_58, length, fl_status_string_signal_reserved_58_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_58, length, fl_status_string_signal_reserved_58_length) == f_equal_to) {
         *code = f_signal_reserved_58;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_59, length, fl_status_string_signal_reserved_59_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_59, length, fl_status_string_signal_reserved_59_length) == f_equal_to) {
         *code = f_signal_reserved_59;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_60, length, fl_status_string_signal_reserved_60_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_60, length, fl_status_string_signal_reserved_60_length) == f_equal_to) {
         *code = f_signal_reserved_60;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_61, length, fl_status_string_signal_reserved_61_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_61, length, fl_status_string_signal_reserved_61_length) == f_equal_to) {
         *code = f_signal_reserved_61;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_62, length, fl_status_string_signal_reserved_62_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_62, length, fl_status_string_signal_reserved_62_length) == f_equal_to) {
         *code = f_signal_reserved_62;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_63, length, fl_status_string_signal_reserved_63_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_63, length, fl_status_string_signal_reserved_63_length) == f_equal_to) {
         *code = f_signal_reserved_63;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_signal_reserved_64, length, fl_status_string_signal_reserved_64_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_signal_reserved_64, length, fl_status_string_signal_reserved_64_length) == f_equal_to) {
         *code = f_signal_reserved_64;
         return f_none;
       }
     #endif // _di_fll_status_signals_
 
     #ifndef _di_fll_status_basic_
-      if (fl_compare_strings(string, fl_status_string_none, length, fl_status_string_none_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_none, length, fl_status_string_none_length) == f_equal_to) {
         *code = f_none;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_maybe, length, fl_status_string_maybe_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_maybe, length, fl_status_string_maybe_length) == f_equal_to) {
         *code = f_maybe;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_dummy, length, fl_status_string_dummy_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_dummy, length, fl_status_string_dummy_length) == f_equal_to) {
         *code = f_dummy;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_warn, length, fl_status_string_warn_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_warn, length, fl_status_string_warn_length) == f_equal_to) {
         *code = f_warn;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_critical, length, fl_status_string_critical_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_critical, length, fl_status_string_critical_length) == f_equal_to) {
         *code = f_critical;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unknown, length, fl_status_string_unknown_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unknown, length, fl_status_string_unknown_length) == f_equal_to) {
         *code = f_unknown;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unsupported, length, fl_status_string_unsupported_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unsupported, length, fl_status_string_unsupported_length) == f_equal_to) {
         *code = f_unsupported;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_no_data, length, fl_status_string_no_data_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_no_data, length, fl_status_string_no_data_length) == f_equal_to) {
         *code = f_no_data;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_out_of_memory, length, fl_status_string_out_of_memory_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_out_of_memory, length, fl_status_string_out_of_memory_length) == f_equal_to) {
         *code = f_out_of_memory;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_input_error, length, fl_status_string_input_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_input_error, length, fl_status_string_input_error_length) == f_equal_to) {
         *code = f_input_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_output_error, length, fl_status_string_output_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_output_error, length, fl_status_string_output_error_length) == f_equal_to) {
         *code = f_output_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_input_output_error, length, fl_status_string_input_output_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_input_output_error, length, fl_status_string_input_output_error_length) == f_equal_to) {
         *code = f_input_output_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_does_not_exist, length, fl_status_string_does_not_exist_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_does_not_exist, length, fl_status_string_does_not_exist_length) == f_equal_to) {
         *code = f_does_not_exist;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_not_connected, length, fl_status_string_not_connected_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_not_connected, length, fl_status_string_not_connected_length) == f_equal_to) {
         *code = f_not_connected;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_failure, length, fl_status_string_failure_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_failure, length, fl_status_string_failure_length) == f_equal_to) {
         *code = f_failure;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_interrupted, length, fl_status_string_interrupted_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_interrupted, length, fl_status_string_interrupted_length) == f_equal_to) {
         *code = f_interrupted;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_loop, length, fl_status_string_loop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_loop, length, fl_status_string_loop_length) == f_equal_to) {
         *code = f_loop;
         return f_none;
       }
     #endif // _di_fll_status_basic_
 
     #ifndef _di_fll_status_invalid_
-      if (fl_compare_strings(string, fl_status_string_invalid, length, fl_status_string_invalid_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid, length, fl_status_string_invalid_length) == f_equal_to) {
         *code = f_invalid;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_parameter, length, fl_status_string_invalid_parameter_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_parameter, length, fl_status_string_invalid_parameter_length) == f_equal_to) {
         *code = f_invalid_parameter;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_syntax, length, fl_status_string_invalid_syntax_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_syntax, length, fl_status_string_invalid_syntax_length) == f_equal_to) {
         *code = f_invalid_syntax;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_data, length, fl_status_string_invalid_data_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_data, length, fl_status_string_invalid_data_length) == f_equal_to) {
         *code = f_invalid_data;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_file, length, fl_status_string_invalid_file_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_file, length, fl_status_string_invalid_file_length) == f_equal_to) {
         *code = f_invalid_file;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_directory, length, fl_status_string_invalid_directory_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_directory, length, fl_status_string_invalid_directory_length) == f_equal_to) {
         *code = f_invalid_directory;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_socket, length, fl_status_string_invalid_socket_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_socket, length, fl_status_string_invalid_socket_length) == f_equal_to) {
         *code = f_invalid_socket;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_device, length, fl_status_string_invalid_device_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_device, length, fl_status_string_invalid_device_length) == f_equal_to) {
         *code = f_invalid_device;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_link, length, fl_status_string_invalid_link_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_link, length, fl_status_string_invalid_link_length) == f_equal_to) {
         *code = f_invalid_link;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_pipe, length, fl_status_string_invalid_pipe_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_pipe, length, fl_status_string_invalid_pipe_length) == f_equal_to) {
         *code = f_invalid_pipe;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_address, length, fl_status_string_invalid_address_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_address, length, fl_status_string_invalid_address_length) == f_equal_to) {
         *code = f_invalid_address;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_port, length, fl_status_string_invalid_port_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_port, length, fl_status_string_invalid_port_length) == f_equal_to) {
         *code = f_invalid_port;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_value, length, fl_status_string_invalid_value_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_value, length, fl_status_string_invalid_value_length) == f_equal_to) {
         *code = f_invalid_value;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_buffer, length, fl_status_string_invalid_buffer_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_buffer, length, fl_status_string_invalid_buffer_length) == f_equal_to) {
         *code = f_invalid_buffer;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_process, length, fl_status_string_invalid_process_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_process, length, fl_status_string_invalid_process_length) == f_equal_to) {
         *code = f_invalid_process;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_utf, length, fl_status_string_invalid_utf_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_utf, length, fl_status_string_invalid_utf_length) == f_equal_to) {
         *code = f_invalid_utf;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_on_eof, length, fl_status_string_invalid_on_eof_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_on_eof, length, fl_status_string_invalid_on_eof_length) == f_equal_to) {
         *code = f_invalid_on_eof;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_on_eol, length, fl_status_string_invalid_on_eol_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_on_eol, length, fl_status_string_invalid_on_eol_length) == f_equal_to) {
         *code = f_invalid_on_eol;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_on_eos, length, fl_status_string_invalid_on_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_on_eos, length, fl_status_string_invalid_on_eos_length) == f_equal_to) {
         *code = f_invalid_on_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_invalid_on_stop, length, fl_status_string_invalid_on_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_invalid_on_stop, length, fl_status_string_invalid_on_stop_length) == f_equal_to) {
         *code = f_invalid_on_stop;
         return f_none;
       }
     #endif // _di_fll_status_invalid_
 
     #ifndef _di_fll_status_busy_
-      if (fl_compare_strings(string, fl_status_string_busy, length, fl_status_string_busy_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy, length, fl_status_string_busy_length) == f_equal_to) {
         *code = f_busy;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_busy_address, length, fl_status_string_busy_address_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy_address, length, fl_status_string_busy_address_length) == f_equal_to) {
         *code = f_busy_address;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_busy_port, length, fl_status_string_busy_port_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy_port, length, fl_status_string_busy_port_length) == f_equal_to) {
         *code = f_busy_port;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_busy_socket, length, fl_status_string_busy_socket_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy_socket, length, fl_status_string_busy_socket_length) == f_equal_to) {
         *code = f_busy_socket;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_busy_device, length, fl_status_string_busy_device_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy_device, length, fl_status_string_busy_device_length) == f_equal_to) {
         *code = f_busy_device;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_busy_pipe, length, fl_status_string_busy_pipe_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy_pipe, length, fl_status_string_busy_pipe_length) == f_equal_to) {
         *code = f_busy_pipe;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_busy_buffer, length, fl_status_string_busy_buffer_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy_buffer, length, fl_status_string_busy_buffer_length) == f_equal_to) {
         *code = f_busy_buffer;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_busy_process, length, fl_status_string_busy_process_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_busy_process, length, fl_status_string_busy_process_length) == f_equal_to) {
         *code = f_busy_process;
         return f_none;
       }
     #endif // _di_fll_status_busy_
 
     #ifndef _di_fll_status_unavailable_
-      if (fl_compare_strings(string, fl_status_string_unavailable, length, fl_status_string_unavailable_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable, length, fl_status_string_unavailable_length) == f_equal_to) {
         *code = f_unavailable;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unavailable_address, length, fl_status_string_unavailable_address_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable_address, length, fl_status_string_unavailable_address_length) == f_equal_to) {
         *code = f_unavailable_address;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unavailable_port, length, fl_status_string_unavailable_port_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable_port, length, fl_status_string_unavailable_port_length) == f_equal_to) {
         *code = f_unavailable_port;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unavailable_socket, length, fl_status_string_unavailable_socket_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable_socket, length, fl_status_string_unavailable_socket_length) == f_equal_to) {
         *code = f_unavailable_socket;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unavailable_device, length, fl_status_string_unavailable_device_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable_device, length, fl_status_string_unavailable_device_length) == f_equal_to) {
         *code = f_unavailable_device;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unavailable_pipe, length, fl_status_string_unavailable_pipe_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable_pipe, length, fl_status_string_unavailable_pipe_length) == f_equal_to) {
         *code = f_unavailable_pipe;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unavailable_buffer, length, fl_status_string_unavailable_buffer_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable_buffer, length, fl_status_string_unavailable_buffer_length) == f_equal_to) {
         *code = f_unavailable_buffer;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unavailable_process, length, fl_status_string_unavailable_process_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unavailable_process, length, fl_status_string_unavailable_process_length) == f_equal_to) {
         *code = f_unavailable_process;
         return f_none;
       }
     #endif // _di_fll_status_unavailable_
 
     #ifndef _di_fll_status_digits_
-      if (fl_compare_strings(string, fl_status_string_underflow, length, fl_status_string_underflow_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_underflow, length, fl_status_string_underflow_length) == f_equal_to) {
         *code = f_underflow;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_overflow, length, fl_status_string_overflow_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_overflow, length, fl_status_string_overflow_length) == f_equal_to) {
         *code = f_overflow;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_divide_by_zero, length, fl_status_string_divide_by_zero_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_divide_by_zero, length, fl_status_string_divide_by_zero_length) == f_equal_to) {
         *code = f_divide_by_zero;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_cannot_be_negative, length, fl_status_string_cannot_be_negative_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_cannot_be_negative, length, fl_status_string_cannot_be_negative_length) == f_equal_to) {
         *code = f_cannot_be_negative;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_cannot_be_positive, length, fl_status_string_cannot_be_positive_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_cannot_be_positive, length, fl_status_string_cannot_be_positive_length) == f_equal_to) {
         *code = f_cannot_be_positive;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_cannot_be_zero, length, fl_status_string_cannot_be_zero_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_cannot_be_zero, length, fl_status_string_cannot_be_zero_length) == f_equal_to) {
         *code = f_cannot_be_zero;
         return f_none;
       }
     #endif // _di_fll_status_digits_
 
     #ifndef _di_fll_status_buffers_
-      if (fl_compare_strings(string, fl_status_string_no_data_on_eof, length, fl_status_string_no_data_on_eof_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_no_data_on_eof, length, fl_status_string_no_data_on_eof_length) == f_equal_to) {
         *code = f_no_data_on_eof;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_no_data_on_eol, length, fl_status_string_no_data_on_eol_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_no_data_on_eol, length, fl_status_string_no_data_on_eol_length) == f_equal_to) {
         *code = f_no_data_on_eol;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_no_data_on_eos, length, fl_status_string_no_data_on_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_no_data_on_eos, length, fl_status_string_no_data_on_eos_length) == f_equal_to) {
         *code = f_no_data_on_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_no_data_on_stop, length, fl_status_string_no_data_on_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_no_data_on_stop, length, fl_status_string_no_data_on_stop_length) == f_equal_to) {
         *code = f_no_data_on_stop;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_none_on_eof, length, fl_status_string_none_on_eof_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_none_on_eof, length, fl_status_string_none_on_eof_length) == f_equal_to) {
         *code = f_none_on_eof;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_none_on_eol, length, fl_status_string_none_on_eol_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_none_on_eol, length, fl_status_string_none_on_eol_length) == f_equal_to) {
         *code = f_none_on_eol;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_none_on_eos, length, fl_status_string_none_on_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_none_on_eos, length, fl_status_string_none_on_eos_length) == f_equal_to) {
         *code = f_none_on_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_none_on_stop, length, fl_status_string_none_on_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_none_on_stop, length, fl_status_string_none_on_stop_length) == f_equal_to) {
         *code = f_none_on_stop;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_error_on_eof, length, fl_status_string_error_on_eof_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_error_on_eof, length, fl_status_string_error_on_eof_length) == f_equal_to) {
         *code = f_error_on_eof;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_error_on_eol, length, fl_status_string_error_on_eol_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_error_on_eol, length, fl_status_string_error_on_eol_length) == f_equal_to) {
         *code = f_error_on_eol;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_error_on_eos, length, fl_status_string_error_on_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_error_on_eos, length, fl_status_string_error_on_eos_length) == f_equal_to) {
         *code = f_error_on_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_error_on_stop, length, fl_status_string_error_on_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_error_on_stop, length, fl_status_string_error_on_stop_length) == f_equal_to) {
         *code = f_error_on_stop;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_buffer_too_small, length, fl_status_string_buffer_too_small_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_buffer_too_small, length, fl_status_string_buffer_too_small_length) == f_equal_to) {
         *code = f_buffer_too_small;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_buffer_too_large, length, fl_status_string_buffer_too_large_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_buffer_too_large, length, fl_status_string_buffer_too_large_length) == f_equal_to) {
         *code = f_buffer_too_large;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_string_too_small, length, fl_status_string_string_too_small_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_string_too_small, length, fl_status_string_string_too_small_length) == f_equal_to) {
         *code = f_string_too_small;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_string_too_large, length, fl_status_string_string_too_large_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_string_too_large, length, fl_status_string_string_too_large_length) == f_equal_to) {
         *code = f_string_too_large;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_nest, length, fl_status_string_unterminated_nest_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_nest, length, fl_status_string_unterminated_nest_length) == f_equal_to) {
         *code = f_unterminated_nest;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_nest_on_eof, length, fl_status_string_unterminated_nest_on_eof_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_nest_on_eof, length, fl_status_string_unterminated_nest_on_eof_length) == f_equal_to) {
         *code = f_unterminated_nest_on_eof;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_nest_on_eol, length, fl_status_string_unterminated_nest_on_eol_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_nest_on_eol, length, fl_status_string_unterminated_nest_on_eol_length) == f_equal_to) {
         *code = f_unterminated_nest_on_eol;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_nest_on_eos, length, fl_status_string_unterminated_nest_on_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_nest_on_eos, length, fl_status_string_unterminated_nest_on_eos_length) == f_equal_to) {
         *code = f_unterminated_nest_on_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_nest_on_stop, length, fl_status_string_unterminated_nest_on_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_nest_on_stop, length, fl_status_string_unterminated_nest_on_stop_length) == f_equal_to) {
         *code = f_unterminated_nest_on_stop;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_group, length, fl_status_string_unterminated_group_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_group, length, fl_status_string_unterminated_group_length) == f_equal_to) {
         *code = f_unterminated_group;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_group_on_eof, length, fl_status_string_unterminated_group_on_eof_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_group_on_eof, length, fl_status_string_unterminated_group_on_eof_length) == f_equal_to) {
         *code = f_unterminated_group_on_eof;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_group_on_eol, length, fl_status_string_unterminated_group_on_eol_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_group_on_eol, length, fl_status_string_unterminated_group_on_eol_length) == f_equal_to) {
         *code = f_unterminated_group_on_eol;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_group_on_eos, length, fl_status_string_unterminated_group_on_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_group_on_eos, length, fl_status_string_unterminated_group_on_eos_length) == f_equal_to) {
         *code = f_unterminated_group_on_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_unterminated_group_on_stop, length, fl_status_string_unterminated_group_on_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_unterminated_group_on_stop, length, fl_status_string_unterminated_group_on_stop_length) == f_equal_to) {
         *code = f_unterminated_group_on_stop;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_incomplete_utf, length, fl_status_string_incomplete_utf_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_incomplete_utf, length, fl_status_string_incomplete_utf_length) == f_equal_to) {
         *code = f_incomplete_utf;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_incomplete_utf_on_eof, length, fl_status_string_incomplete_utf_on_eof_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_incomplete_utf_on_eof, length, fl_status_string_incomplete_utf_on_eof_length) == f_equal_to) {
         *code = f_incomplete_utf_on_eof;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_incomplete_utf_on_eol, length, fl_status_string_incomplete_utf_on_eol_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_incomplete_utf_on_eol, length, fl_status_string_incomplete_utf_on_eol_length) == f_equal_to) {
         *code = f_incomplete_utf_on_eol;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_incomplete_utf_on_eos, length, fl_status_string_incomplete_utf_on_eos_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_incomplete_utf_on_eos, length, fl_status_string_incomplete_utf_on_eos_length) == f_equal_to) {
         *code = f_incomplete_utf_on_eos;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_incomplete_utf_on_stop, length, fl_status_string_incomplete_utf_on_stop_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_incomplete_utf_on_stop, length, fl_status_string_incomplete_utf_on_stop_length) == f_equal_to) {
         *code = f_incomplete_utf_on_stop;
         return f_none;
       }
     #endif // _di_fll_status_buffers_
 
     #ifndef _di_fll_status_allocation_
-      if (fl_compare_strings(string, fl_status_string_allocation_error, length, fl_status_string_allocation_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_allocation_error, length, fl_status_string_allocation_error_length) == f_equal_to) {
         *code = f_allocation_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_reallocation_error, length, fl_status_string_reallocation_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_reallocation_error, length, fl_status_string_reallocation_error_length) == f_equal_to) {
         *code = f_reallocation_error;
         return f_none;
       }
     #endif // _di_fll_status_allocation_
 
     #ifndef _di_fll_status_fork_
-      if (fl_compare_strings(string, fl_status_string_fork_failed, length, fl_status_string_fork_failed_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_fork_failed, length, fl_status_string_fork_failed_length) == f_equal_to) {
         *code = f_fork_failed;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_too_many_processes, length, fl_status_string_too_many_processes_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_too_many_processes, length, fl_status_string_too_many_processes_length) == f_equal_to) {
         *code = f_too_many_processes;
         return f_none;
       }
     #endif // _di_fll_status_fork_
 
     #ifndef _di_fll_status_file_
-      if (fl_compare_strings(string, fl_status_string_file_seek_error, length, fl_status_string_file_seek_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_seek_error, length, fl_status_string_file_seek_error_length) == f_equal_to) {
         *code = f_file_seek_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_read_error, length, fl_status_string_file_read_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_read_error, length, fl_status_string_file_read_error_length) == f_equal_to) {
         *code = f_file_read_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_write_error, length, fl_status_string_file_write_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_write_error, length, fl_status_string_file_write_error_length) == f_equal_to) {
         *code = f_file_write_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_flush_error, length, fl_status_string_file_flush_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_flush_error, length, fl_status_string_file_flush_error_length) == f_equal_to) {
         *code = f_file_flush_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_purge_error, length, fl_status_string_file_purge_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_purge_error, length, fl_status_string_file_purge_error_length) == f_equal_to) {
         *code = f_file_purge_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_open_error, length, fl_status_string_file_open_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_open_error, length, fl_status_string_file_open_error_length) == f_equal_to) {
         *code = f_file_open_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_close_error, length, fl_status_string_file_close_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_close_error, length, fl_status_string_file_close_error_length) == f_equal_to) {
         *code = f_file_close_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_synchronize_error, length, fl_status_string_file_synchronize_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_synchronize_error, length, fl_status_string_file_synchronize_error_length) == f_equal_to) {
         *code = f_file_synchronize_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_descriptor_error, length, fl_status_string_file_descriptor_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_descriptor_error, length, fl_status_string_file_descriptor_error_length) == f_equal_to) {
         *code = f_file_descriptor_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_not_found, length, fl_status_string_file_not_found_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_not_found, length, fl_status_string_file_not_found_length) == f_equal_to) {
         *code = f_file_not_found;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_found, length, fl_status_string_file_found_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_found, length, fl_status_string_file_found_length) == f_equal_to) {
         *code = f_file_found;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_is_empty, length, fl_status_string_file_is_empty_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_is_empty, length, fl_status_string_file_is_empty_length) == f_equal_to) {
         *code = f_file_is_empty;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_not_open, length, fl_status_string_file_not_open_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_not_open, length, fl_status_string_file_not_open_length) == f_equal_to) {
         *code = f_file_not_open;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_allocation_error, length, fl_status_string_file_allocation_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_allocation_error, length, fl_status_string_file_allocation_error_length) == f_equal_to) {
         *code = f_file_allocation_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_reallocation_error, length, fl_status_string_file_reallocation_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_reallocation_error, length, fl_status_string_file_reallocation_error_length) == f_equal_to) {
         *code = f_file_reallocation_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_stat_error, length, fl_status_string_file_stat_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_stat_error, length, fl_status_string_file_stat_error_length) == f_equal_to) {
         *code = f_file_stat_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_error, length, fl_status_string_file_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_error, length, fl_status_string_file_error_length) == f_equal_to) {
         *code = f_file_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_file_not_utf, length, fl_status_string_file_not_utf_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_file_not_utf, length, fl_status_string_file_not_utf_length) == f_equal_to) {
         *code = f_file_not_utf;
         return f_none;
       }
     #endif // _di_fll_status_file_
 
     #ifndef _di_fll_status_directory_
-      if (fl_compare_strings(string, fl_status_string_directory_read_error, length, fl_status_string_directory_read_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_read_error, length, fl_status_string_directory_read_error_length) == f_equal_to) {
         *code = f_directory_read_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_write_error, length, fl_status_string_directory_write_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_write_error, length, fl_status_string_directory_write_error_length) == f_equal_to) {
         *code = f_directory_write_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_flush_error, length, fl_status_string_directory_flush_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_flush_error, length, fl_status_string_directory_flush_error_length) == f_equal_to) {
         *code = f_directory_flush_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_purge_error, length, fl_status_string_directory_purge_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_purge_error, length, fl_status_string_directory_purge_error_length) == f_equal_to) {
         *code = f_directory_purge_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_open_error, length, fl_status_string_directory_open_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_open_error, length, fl_status_string_directory_open_error_length) == f_equal_to) {
         *code = f_directory_open_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_close_error, length, fl_status_string_directory_close_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_close_error, length, fl_status_string_directory_close_error_length) == f_equal_to) {
         *code = f_directory_close_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_synchronize_error, length, fl_status_string_directory_synchronize_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_synchronize_error, length, fl_status_string_directory_synchronize_error_length) == f_equal_to) {
         *code = f_directory_synchronize_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_descriptor_error, length, fl_status_string_directory_descriptor_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_descriptor_error, length, fl_status_string_directory_descriptor_error_length) == f_equal_to) {
         *code = f_directory_descriptor_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_not_found, length, fl_status_string_directory_not_found_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_not_found, length, fl_status_string_directory_not_found_length) == f_equal_to) {
         *code = f_directory_not_found;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_is_empty, length, fl_status_string_directory_is_empty_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_is_empty, length, fl_status_string_directory_is_empty_length) == f_equal_to) {
         *code = f_directory_is_empty;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_not_open, length, fl_status_string_directory_not_open_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_not_open, length, fl_status_string_directory_not_open_length) == f_equal_to) {
         *code = f_directory_not_open;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_allocation_error, length, fl_status_string_directory_allocation_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_allocation_error, length, fl_status_string_directory_allocation_error_length) == f_equal_to) {
         *code = f_directory_allocation_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_reallocation_error, length, fl_status_string_directory_reallocation_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_reallocation_error, length, fl_status_string_directory_reallocation_error_length) == f_equal_to) {
         *code = f_directory_reallocation_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_error, length, fl_status_string_directory_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_error, length, fl_status_string_directory_error_length) == f_equal_to) {
         *code = f_directory_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_directory_not_utf, length, fl_status_string_directory_not_utf_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_directory_not_utf, length, fl_status_string_directory_not_utf_length) == f_equal_to) {
         *code = f_directory_not_utf;
         return f_none;
       }
     #endif // _di_fll_status_directory_
 
     #ifndef _di_fll_status_socket_
-      if (fl_compare_strings(string, fl_status_string_socket_connection_client_error, length, fl_status_string_socket_connection_client_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_socket_connection_client_error, length, fl_status_string_socket_connection_client_error_length) == f_equal_to) {
         *code = f_socket_connection_client_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_socket_connection_target_error, length, fl_status_string_socket_connection_target_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_socket_connection_target_error, length, fl_status_string_socket_connection_target_error_length) == f_equal_to) {
         *code = f_socket_connection_target_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_socket_receive_error, length, fl_status_string_socket_receive_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_socket_receive_error, length, fl_status_string_socket_receive_error_length) == f_equal_to) {
         *code = f_socket_receive_error;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_socket_send_error, length, fl_status_string_socket_send_error_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_socket_send_error, length, fl_status_string_socket_send_error_length) == f_equal_to) {
         *code = f_socket_send_error;
         return f_none;
       }
     #endif // _di_fll_status_socket_
 
     #ifndef _di_fll_status_non_
-      if (fl_compare_strings(string, fl_status_string_less_than, length, fl_status_string_less_than_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_less_than, length, fl_status_string_less_than_length) == f_equal_to) {
         *code = f_less_than;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_equal_to, length, fl_status_string_equal_to_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_equal_to, length, fl_status_string_equal_to_length) == f_equal_to) {
         *code = f_equal_to;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_not_equal_to, length, fl_status_string_not_equal_to_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_not_equal_to, length, fl_status_string_not_equal_to_length) == f_equal_to) {
         *code = f_not_equal_to;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_greater_than, length, fl_status_string_greater_than_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_greater_than, length, fl_status_string_greater_than_length) == f_equal_to) {
         *code = f_greater_than;
         return f_none;
       }
     #endif // _di_fll_status_non_
 
     #ifndef _di_fll_status_access_denied_
-      if (fl_compare_strings(string, fl_status_string_access_denied, length, fl_status_string_access_denied_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied, length, fl_status_string_access_denied_length) == f_equal_to) {
         *code = f_access_denied;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_access_denied_user, length, fl_status_string_access_denied_user_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied_user, length, fl_status_string_access_denied_user_length) == f_equal_to) {
         *code = f_access_denied_user;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_access_denied_group, length, fl_status_string_access_denied_group_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied_group, length, fl_status_string_access_denied_group_length) == f_equal_to) {
         *code = f_access_denied_group;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_access_denied_world, length, fl_status_string_access_denied_world_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied_world, length, fl_status_string_access_denied_world_length) == f_equal_to) {
         *code = f_access_denied_world;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_access_denied_read, length, fl_status_string_access_denied_read_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied_read, length, fl_status_string_access_denied_read_length) == f_equal_to) {
         *code = f_access_denied_read;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_access_denied_write, length, fl_status_string_access_denied_write_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied_write, length, fl_status_string_access_denied_write_length) == f_equal_to) {
         *code = f_access_denied_write;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_access_denied_execute, length, fl_status_string_access_denied_execute_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied_execute, length, fl_status_string_access_denied_execute_length) == f_equal_to) {
         *code = f_access_denied_execute;
         return f_none;
       }
 
-      if (fl_compare_strings(string, fl_status_string_access_denied_super, length, fl_status_string_access_denied_super_length) == f_equal_to) {
+      if (fl_string_compare(string, fl_status_string_access_denied_super, length, fl_status_string_access_denied_super_length) == f_equal_to) {
         *code = f_access_denied_super;
         return f_none;
       }
     #endif // _di_fll_status_access_denied_
 
-    if (fl_compare_strings(string, fl_status_string_last_status_code, length, fl_status_string_last_error_code_length) == f_equal_to) {
+    if (fl_string_compare(string, fl_status_string_last_status_code, length, fl_status_string_last_error_code_length) == f_equal_to) {
       *code = f_last_status_code;
       return f_none;
     }
index da08e9867218755fd068749dd3d5431d7710d76c..2605d8f4d9ad7a7a3f833bfca02294c2acdb3941 100644 (file)
 // fll-0 includes
 #include <level_0/conversion.h>
 #include <level_0/status.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/utf.h>
 
 // fll-1 includes
-#include <level_1/strings.h>
+#include <level_1/string.h>
 #include <level_1/status.h>
 
 #ifdef __cplusplus
index 72e702ae54386e62cef3c192e30b22574cda3126..65d8c3e3419d8fb003a185279e08b06d9a190584 100644 (file)
@@ -2,7 +2,7 @@ f_types
 f_status
 f_memory
 f_conversion
-f_strings
+f_string
 f_utf
-fl_strings
+fl_string
 fl_status
index 3bd362b04dc57634eca2c56672df4186f85f8c47..526475477173a226281869156d08846a9a345372 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfl_status -lfl_strings -lf_memory -lf_conversion -lf_utf
+build_libraries_fll -lfl_status -lfl_string -lf_memory -lf_conversion -lf_utf
 build_sources_library status.c
 build_sources_program
 build_sources_headers status.h
index 8fb7f398b3d2ac815fbe0292db08dd2c7fb71600..93af85838cec2cbd910f967d050839654cdf142b 100644 (file)
@@ -226,7 +226,7 @@ extern "C" {
           f_bool show_mangle = f_true;
           f_bool show_ports = f_true;
 
-          f_dynamic_strings arguments = f_dynamic_strings_initialize;
+          f_string_dynamics arguments = f_string_dynamics_initialize;
           f_s_int results = 0;
 
           if (data->remaining.used > 0) {
@@ -418,8 +418,8 @@ extern "C" {
           f_string_length i = 0;
 
           for (; i < data->devices.used; i++) {
-            if (fl_compare_strings((f_string) firewall_device_loop, data->devices.array[i].string, firewall_device_loop_length + 1, data->devices.array[i].used) == f_equal_to) {
-              f_dynamic_string swap_string = data->devices.array[i];
+            if (fl_string_compare((f_string) firewall_device_loop, data->devices.array[i].string, firewall_device_loop_length + 1, data->devices.array[i].used) == f_equal_to) {
+              f_string_dynamic swap_string = data->devices.array[i];
 
               data->devices.used--;
 
@@ -448,11 +448,11 @@ extern "C" {
             for (; i < local.chain_objects.used; i++) {
               length = local.chain_objects.array[i].stop - local.chain_objects.array[i].start + 1;
 
-              if (!reserved.has_stop && fl_compare_strings((f_string) firewall_group_stop, local.buffer.string + local.chain_objects.array[i].start, firewall_group_stop_length, length) == f_equal_to) {
+              if (!reserved.has_stop && fl_string_compare((f_string) firewall_group_stop, local.buffer.string + local.chain_objects.array[i].start, firewall_group_stop_length, length) == f_equal_to) {
                 reserved.stop_at = i;
                 reserved.has_stop = f_true;
               }
-              else if (!reserved.has_lock && fl_compare_strings((f_string) firewall_group_lock, local.buffer.string + local.chain_objects.array[i].start, firewall_group_lock_length, length) == f_equal_to) {
+              else if (!reserved.has_lock && fl_string_compare((f_string) firewall_group_lock, local.buffer.string + local.chain_objects.array[i].start, firewall_group_lock_length, length) == f_equal_to) {
                 reserved.lock_at = i;
                 reserved.has_lock = f_true;
               }
@@ -600,7 +600,7 @@ extern "C" {
             local.device = i;
 
             {
-              f_dynamic_string file_path = f_dynamic_string_initialize;
+              f_string_dynamic file_path = f_string_dynamic_initialize;
 
               f_macro_string_dynamic_resize(status, file_path, network_path_length + data->devices.array[i].used + firewall_file_suffix_length + 1);
 
@@ -731,12 +731,12 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < firewall_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
     f_macro_string_dynamics_delete(status, data->chains);
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
     f_macro_string_dynamics_delete(status, data->devices);
 
     fl_delete_color_context(status, data->context);
index c712ce5bcce6d8a3d3c641e5edf916b54778ecfb..9d13c135565aa55dad69f66094dfeb6df4e487a5 100644 (file)
@@ -20,7 +20,7 @@
 #include <level_0/console.h>
 #include <level_0/file.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 #include <level_0/types_array.h>
 
@@ -30,7 +30,7 @@
 #include <level_1/directory.h>
 #include <level_1/file.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
@@ -274,9 +274,9 @@ extern "C" {
   typedef struct {
     f_console_parameter parameters[firewall_total_parameters];
 
-    f_dynamic_strings chains;
+    f_string_dynamics chains;
     f_string_lengths remaining;
-    f_dynamic_strings devices;
+    f_string_dynamics devices;
 
     fl_color_context context;
   } firewall_data;
@@ -284,9 +284,9 @@ extern "C" {
   #define firewall_data_initialize \
     { \
       f_console_parameter_initialize_firewall, \
-      f_dynamic_strings_initialize, \
+      f_string_dynamics_initialize, \
       f_string_lengths_initialize, \
-      f_dynamic_strings_initialize, \
+      f_string_dynamics_initialize, \
       fl_color_context_initialize, \
     }
 #endif // _di_firewall_data_
index 0ad51bf6a07beb0f22069b1606bbca0815ccf5f8..3cf0e0a88e52be5eebe5089c98d9a875771b1bc7 100644 (file)
@@ -6,14 +6,14 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
   f_status status2 = f_none;
 
   f_string_length i = 0;
-  f_dynamic_strings arguments = f_dynamic_strings_initialize;
-  f_dynamic_string argument = f_dynamic_string_initialize;
+  f_string_dynamics arguments = f_string_dynamics_initialize;
+  f_string_dynamic argument = f_string_dynamic_initialize;
 
   f_s_int results = 0;
   f_string_length length = 0;
   f_bool invalid = f_false;
   f_bool is_ip_list = f_false;
-  f_dynamic_string ip_list = f_dynamic_string_initialize;
+  f_string_dynamic ip_list = f_string_dynamic_initialize;
 
   // iptables command arguments
   f_bool device_all = f_false;
@@ -29,9 +29,9 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
   f_string_length current_tool_length = firewall_tool_iptables_length;
 
   f_string_length direction = firewall_direction_none_id;
-  f_dynamic_string device = f_dynamic_string_initialize;
+  f_string_dynamic device = f_string_dynamic_initialize;
   f_string_length action = firewall_action_append_id;
-  f_dynamic_string protocol = f_dynamic_string_initialize;
+  f_string_dynamic protocol = f_string_dynamic_initialize;
 
   if (local.is_global) {
     device_all = f_true;
@@ -66,7 +66,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
     f_macro_string_dynamic_delete(status2, ip_list);
 
     // process chain rule
-    if (length >= firewall_chain_length && fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_chain, length, firewall_chain_length) == f_equal_to) {
+    if (length >= firewall_chain_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_chain, length, firewall_chain_length) == f_equal_to) {
       if (chain == firewall_chain_custom_id) {
         // custom chains can only apply to themselves, so silently ignore chain commands specified within a custom chain.
         fprintf(f_standard_warning, "WARNING: At line %i, the chain option is meaningle ss inside of a custom chain.", i);
@@ -78,22 +78,22 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
         invalid = f_true;
       }
-      else if (length >= firewall_chain_input_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_input, length, firewall_chain_input_length) == f_equal_to) {
+      else if (length >= firewall_chain_input_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_input, length, firewall_chain_input_length) == f_equal_to) {
         chain = firewall_chain_input_id;
       }
-      else if (length >= firewall_chain_output_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_output, length, firewall_chain_output_length) == f_equal_to) {
+      else if (length >= firewall_chain_output_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_output, length, firewall_chain_output_length) == f_equal_to) {
         chain = firewall_chain_output_id;
       }
-      else if (length >= firewall_chain_forward_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_forward, length, firewall_chain_forward_length) == f_equal_to) {
+      else if (length >= firewall_chain_forward_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_forward, length, firewall_chain_forward_length) == f_equal_to) {
         chain = firewall_chain_forward_id;
       }
-      else if (length >= firewall_chain_postrouting_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_postrouting, length, firewall_chain_postrouting_length) == f_equal_to) {
+      else if (length >= firewall_chain_postrouting_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_postrouting, length, firewall_chain_postrouting_length) == f_equal_to) {
         chain = firewall_chain_postrouting_id;
       }
-      else if (length >= firewall_chain_prerouting_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_prerouting, length, firewall_chain_prerouting_length) == f_equal_to) {
+      else if (length >= firewall_chain_prerouting_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_prerouting, length, firewall_chain_prerouting_length) == f_equal_to) {
         chain = firewall_chain_prerouting_id;
       }
-      else if (length >= firewall_chain_none_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_none, length, firewall_chain_none_length) == f_equal_to) {
+      else if (length >= firewall_chain_none_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_chain_none, length, firewall_chain_none_length) == f_equal_to) {
         chain = firewall_chain_none_id;
       }
       else {
@@ -103,19 +103,19 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       if (!invalid) continue;
     }
     // process direction rule
-    else if (length >= firewall_direction_length && fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_direction, length, firewall_direction_length) == f_equal_to) {
+    else if (length >= firewall_direction_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_direction, length, firewall_direction_length) == f_equal_to) {
       length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
 
       if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
         invalid = f_true;
       }
-      else if (length >= firewall_direction_input_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_direction_input, length, firewall_direction_input_length) == f_equal_to) {
+      else if (length >= firewall_direction_input_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_direction_input, length, firewall_direction_input_length) == f_equal_to) {
         direction = firewall_direction_input_id;
       }
-      else if (length >= firewall_direction_output_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_direction_output, length, firewall_direction_output_length) == f_equal_to) {
+      else if (length >= firewall_direction_output_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_direction_output, length, firewall_direction_output_length) == f_equal_to) {
         direction = firewall_direction_output_id;
       }
-      else if (length >= firewall_direction_none_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_direction_none, length, firewall_direction_none_length) == f_equal_to) {
+      else if (length >= firewall_direction_none_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_direction_none, length, firewall_direction_none_length) == f_equal_to) {
         direction = firewall_direction_none_id;
       }
       else {
@@ -126,18 +126,18 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       if (!invalid) continue;
     }
     // process device rule.
-    else if (length >= firewall_device_length && fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_device, length, firewall_device_length) == f_equal_to) {
+    else if (length >= firewall_device_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_device, length, firewall_device_length) == f_equal_to) {
       length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
 
       if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
         invalid = f_true;
       }
-      else if (length >= firewall_device_all_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_device_all, length, firewall_device_all_length) == f_equal_to) {
+      else if (length >= firewall_device_all_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_device_all, length, firewall_device_all_length) == f_equal_to) {
         f_macro_string_dynamic_delete(status, device);
         device_all = f_true;
         continue;
       }
-      else if (length >= firewall_device_this_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_device_this, length, firewall_device_this_length) == f_equal_to) {
+      else if (length >= firewall_device_this_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_device_this, length, firewall_device_this_length) == f_equal_to) {
         if (data.devices.array[local.device].used > 0) {
           if (data.devices.array[local.device].used > device.size) {
             f_macro_string_dynamic_resize(status, device, data.devices.array[local.device].used);
@@ -177,22 +177,22 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       }
     }
     // process action rule.
-    else if (length >= firewall_action_length && fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_action, length, firewall_action_length) == f_equal_to) {
+    else if (length >= firewall_action_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_action, length, firewall_action_length) == f_equal_to) {
       length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
 
       if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
         invalid = f_true;
       }
-      else if (length >= firewall_action_append_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_append, length, firewall_action_append_length) == f_equal_to) {
+      else if (length >= firewall_action_append_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_append, length, firewall_action_append_length) == f_equal_to) {
         action = firewall_action_append_id;
       }
-      else if (length >= firewall_action_insert_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_insert, length, firewall_action_insert_length) == f_equal_to) {
+      else if (length >= firewall_action_insert_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_insert, length, firewall_action_insert_length) == f_equal_to) {
         action = firewall_action_insert_id;
       }
-      else if (length >= firewall_action_policy_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_policy, length, firewall_action_policy_length) == f_equal_to) {
+      else if (length >= firewall_action_policy_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_policy, length, firewall_action_policy_length) == f_equal_to) {
         action = firewall_action_policy_id;
       }
-      else if (length >= firewall_action_none_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_none, length, firewall_action_none_length) == f_equal_to) {
+      else if (length >= firewall_action_none_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_action_none, length, firewall_action_none_length) == f_equal_to) {
         action = firewall_action_none_id;
       }
       else {
@@ -202,28 +202,28 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       if (!invalid) continue;
     }
     // process ip_list rule.
-    else if (length >= firewall_ip_list_length && fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_ip_list, length, firewall_ip_list_length) == f_equal_to) {
+    else if (length >= firewall_ip_list_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_ip_list, length, firewall_ip_list_length) == f_equal_to) {
       length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
       is_ip_list = f_true;
 
-      if (length >= firewall_ip_list_source_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_ip_list_source, length, firewall_ip_list_source_length) == f_equal_to) {
+      if (length >= firewall_ip_list_source_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_ip_list_source, length, firewall_ip_list_source_length) == f_equal_to) {
         ip_list_direction = f_false;
       }
-      else if (length >= firewall_ip_list_destination_length && fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_ip_list_destination, length, firewall_ip_list_destination_length) == f_equal_to) {
+      else if (length >= firewall_ip_list_destination_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_ip_list_destination, length, firewall_ip_list_destination_length) == f_equal_to) {
         ip_list_direction = f_true;
       }
       else {
         invalid = f_true;
       }
     }
-    else if (length >= firewall_protocol_length && fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_protocol, length, firewall_protocol_length) == f_equal_to) {
+    else if (length >= firewall_protocol_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_protocol, length, firewall_protocol_length) == f_equal_to) {
       length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
 
       if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
         invalid = f_true;
       }
       else {
-        if (fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_protocol_none, length, firewall_protocol_none_length) == f_equal_to) {
+        if (fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_protocol_none, length, firewall_protocol_none_length) == f_equal_to) {
           use_protocol = f_false;
         }
         else if (length > 0) {
@@ -244,26 +244,26 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       }
     }
     // process tool rule.
-    else if (length >= firewall_tool_length && fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_tool, length, firewall_tool_length) == f_equal_to) {
+    else if (length >= firewall_tool_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_tool, length, firewall_tool_length) == f_equal_to) {
       length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
 
       if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
         invalid = f_true;
       }
       else {
-        if (fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_tool_iptables, length, firewall_tool_iptables_length) == f_equal_to) {
+        if (fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_tool_iptables, length, firewall_tool_iptables_length) == f_equal_to) {
           tool = firewall_program_iptables;
           current_tool = firewall_tool_iptables;
           current_tool_length = firewall_tool_iptables_length;
           repeat = 1;
         }
-        else if (fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_tool_ip6tables, length, firewall_tool_ip6tables_length) == f_equal_to) {
+        else if (fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_tool_ip6tables, length, firewall_tool_ip6tables_length) == f_equal_to) {
           tool = firewall_program_ip6tables;
           current_tool = firewall_tool_ip6tables;
           current_tool_length = firewall_tool_ip6tables_length;
           repeat = 1;
         }
-        else if (fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_tool_ip46tables, length, firewall_tool_ip46tables_length) == f_equal_to) {
+        else if (fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_tool_ip46tables, length, firewall_tool_ip46tables_length) == f_equal_to) {
           tool = firewall_program_ip46tables;
           current_tool = firewall_tool_iptables;
           current_tool_length = firewall_tool_iptables_length;
@@ -277,7 +277,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       }
     }
     // process rule rule, if the remaining rule does not match as firewall_rule, then it is an invalid rule.
-    else if (length < firewall_rule_length || fl_compare_strings(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_rule, length, firewall_rule_length) == f_not_equal_to) {
+    else if (length < firewall_rule_length || fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string) firewall_rule, length, firewall_rule_length) == f_not_equal_to) {
       if (length > 0) {
         fl_color_print_code(f_standard_warning, data.context.warning);
         fprintf(f_standard_warning, "WARNING: At line %i, the object '", i);
@@ -432,7 +432,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
 
       // add the device if and only if a non-none direction is specified.
       if (device.used > 0 && (direction == firewall_direction_input_id || direction == firewall_direction_output_id)) {
-        if (length < firewall_device_all_length || fl_compare_strings(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_device_all, length, firewall_device_all_length) == f_not_equal_to) {
+        if (length < firewall_device_all_length || fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string) firewall_device_all, length, firewall_device_all_length) == f_not_equal_to) {
           if (direction == firewall_direction_input_id) {
             f_macro_string_dynamic_new(status, argument, firewall_device_input_command_length);
             if (f_status_is_error(status)) break;
@@ -561,8 +561,8 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
       if (arguments.used > 1) {
         if (is_ip_list) {
           f_file file = f_file_initialize;
-          f_dynamic_string file_path = f_dynamic_string_initialize;
-          f_dynamic_string local_buffer = f_dynamic_string_initialize;
+          f_string_dynamic file_path = f_string_dynamic_initialize;
+          f_string_dynamic local_buffer = f_string_dynamic_initialize;
           f_file_position file_position = f_file_position_initialize;
 
           f_fss_objects basic_objects = f_fss_objects_initialize;
@@ -677,7 +677,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
               else {
                 f_string_length buffer_counter = 0;
                 f_string_length ip_length = 0;
-                f_dynamic_string ip_list_action = f_dynamic_string_initialize;
+                f_string_dynamic ip_list_action = f_string_dynamic_initialize;
 
                 if (ip_list_direction) {
                   f_macro_string_dynamic_resize(status, ip_list_action, firewall_ip_list_destination_action_length);
@@ -707,7 +707,7 @@ f_return_status firewall_perform_commands(const firewall_local_data local, const
                   f_macro_string_dynamic_delete(status2, ip_list_action);
                 }
                 else {
-                  f_dynamic_string ip_argument = f_dynamic_string_initialize;
+                  f_string_dynamic ip_argument = f_string_dynamic_initialize;
 
                   firewall_macro_append_argument_to_arguments(status, arguments, ip_list_action)
                   if (f_status_is_error(status)) {
@@ -866,9 +866,9 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
 
   f_string_length length = 0;
   f_string_location location = f_string_location_initialize;
-  f_dynamic_strings arguments = f_dynamic_strings_initialize;
+  f_string_dynamics arguments = f_string_dynamics_initialize;
 
-  f_dynamic_string fixed_string = f_dynamic_string_initialize;
+  f_string_dynamic fixed_string = f_string_dynamic_initialize;
 
   f_macro_types_array_lengths_delete(status, local->chain_ids);
   f_macro_types_array_lengths_new(status, local->chain_ids, local->chain_objects.used);
@@ -919,7 +919,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
     location.stop = firewall_group_main_length - 1;
     fixed_string.string = firewall_group_main;
     fixed_string.used = firewall_group_main_length;
-    if (fl_compare_dynamic_strings_partial(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
+    if (fl_string_dynamic_partial_compare(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
       new_chain = f_false;
       reserved->has_main = f_true;
       reserved->main_at = i;
@@ -930,7 +930,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
     location.stop = firewall_group_stop_length - 1;
     fixed_string.string = firewall_group_stop;
     fixed_string.used = firewall_group_stop_length;
-    if (fl_compare_dynamic_strings_partial(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
+    if (fl_string_dynamic_partial_compare(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
       new_chain = f_false;
       reserved->has_stop = f_true;
       reserved->stop_at = i;
@@ -941,7 +941,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
     location.stop = firewall_group_lock_length - 1;
     fixed_string.string = firewall_group_lock;
     fixed_string.used = firewall_group_lock_length;
-    if (fl_compare_dynamic_strings_partial(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
+    if (fl_string_dynamic_partial_compare(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
       new_chain = f_false;
       reserved->has_lock = f_true;
       reserved->lock_at = i;
@@ -952,18 +952,18 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
     location.stop = firewall_group_lock_length - 1;
     fixed_string.string = firewall_chain_none;
     fixed_string.used = firewall_chain_none_length;
-    if (fl_compare_dynamic_strings_partial(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
+    if (fl_string_dynamic_partial_compare(local->buffer, fixed_string, local->chain_objects.array[i], location) == f_equal_to) {
       new_chain = f_false;
     }
 
-    f_clear_dynamic_string(fixed_string);
+    f_clear_string_dynamic(fixed_string);
 
     if (new_chain) {
       while (j < data->chains.used) {
         location.start = 0;
         location.stop = data->chains.array[j].used - 1;
 
-        if (fl_compare_dynamic_strings_partial(local->buffer, data->chains.array[j], local->chain_objects.array[i], location) == f_equal_to) {
+        if (fl_string_dynamic_partial_compare(local->buffer, data->chains.array[j], local->chain_objects.array[i], location) == f_equal_to) {
           new_chain = f_false;
           local->chain_ids.array[i] = j;
 
@@ -1026,19 +1026,19 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
         j++;
       } // while
 
-      if (fl_compare_strings(arguments.array[1].string, firewall_chain_forward, arguments.array[1].used, firewall_chain_forward_length) == f_equal_to) {
+      if (fl_string_compare(arguments.array[1].string, firewall_chain_forward, arguments.array[1].used, firewall_chain_forward_length) == f_equal_to) {
         create_chain = f_false;
       }
-      else if (fl_compare_strings(arguments.array[1].string, firewall_chain_input, arguments.array[1].used, firewall_chain_input_length) == f_equal_to) {
+      else if (fl_string_compare(arguments.array[1].string, firewall_chain_input, arguments.array[1].used, firewall_chain_input_length) == f_equal_to) {
         create_chain = f_false;
       }
-      else if (fl_compare_strings(arguments.array[1].string, firewall_chain_output, arguments.array[1].used, firewall_chain_output_length) == f_equal_to) {
+      else if (fl_string_compare(arguments.array[1].string, firewall_chain_output, arguments.array[1].used, firewall_chain_output_length) == f_equal_to) {
         create_chain = f_false;
       }
-      else if (fl_compare_strings(arguments.array[1].string, firewall_chain_postrouting, arguments.array[1].used, firewall_chain_postrouting_length) == f_equal_to) {
+      else if (fl_string_compare(arguments.array[1].string, firewall_chain_postrouting, arguments.array[1].used, firewall_chain_postrouting_length) == f_equal_to) {
         create_chain = f_false;
       }
-      else if (fl_compare_strings(arguments.array[1].string, firewall_chain_prerouting, arguments.array[1].used, firewall_chain_prerouting_length) == f_equal_to) {
+      else if (fl_string_compare(arguments.array[1].string, firewall_chain_prerouting, arguments.array[1].used, firewall_chain_prerouting_length) == f_equal_to) {
         create_chain = f_false;
       }
 
@@ -1137,8 +1137,8 @@ f_return_status firewall_delete_chains(const firewall_data data) {
   f_status status = f_none;
 
   for (f_string_length i = 0; i < 2; i++) {
-    f_dynamic_strings arguments = f_dynamic_strings_initialize;
-    f_dynamic_string argument[1] = f_dynamic_string_initialize;
+    f_string_dynamics arguments = f_string_dynamics_initialize;
+    f_string_dynamic argument[1] = f_string_dynamic_initialize;
     f_s_int results = 0;
 
     argument[0].string = (f_string) "-F";
@@ -1195,8 +1195,8 @@ f_return_status firewall_delete_chains(const firewall_data data) {
   } // for
 
   for (f_string_length i = 0; i < 2; i++) {
-    f_dynamic_strings arguments = f_dynamic_strings_initialize;
-    f_dynamic_string argument[1] = f_dynamic_string_initialize;
+    f_string_dynamics arguments = f_string_dynamics_initialize;
+    f_string_dynamic argument[1] = f_string_dynamic_initialize;
     f_s_int results = 0;
 
     argument[0].string = (f_string) firewall_chain_delete_command;
@@ -1264,8 +1264,8 @@ f_return_status firewall_default_lock(const firewall_data data) {
   f_status status = f_none;
 
   for (f_string_length i = 0; i < 3; i++) {
-    f_dynamic_strings arguments = f_dynamic_strings_initialize;
-    f_dynamic_string argument[3];
+    f_string_dynamics arguments = f_string_dynamics_initialize;
+    f_string_dynamic argument[3];
 
     arguments.array = argument;
     arguments.used = 3;
index 8341f991410c5ac31cfe885f60f803c556b2b74c..4fce43dcbba7e95743799aca9c921bb0d9cf2107 100644 (file)
@@ -22,7 +22,7 @@ typedef struct {
 
   f_array_length device;
 
-  f_dynamic_string buffer;
+  f_string_dynamic buffer;
   f_array_length chain;
   f_array_lengths chain_ids;
   f_fss_objects chain_objects;
@@ -39,7 +39,7 @@ typedef struct {
     f_false, \
     f_file_position_initialize, \
     0, \
-    f_dynamic_string_initialize, \
+    f_string_dynamic_initialize, \
     0, \
     f_array_lengths_initialize, \
     f_fss_objects_initialize, \
@@ -80,7 +80,7 @@ typedef struct {
   local.rule_contents.array[index].used <= 0 || local.rule_contents.array[index].used > total_items
 
 // the buffer start to stop points are inclusive such that the size is ((stop - start) + 1).
-#define firewall_macro_dynamic_string_size(structure, index) \
+#define firewall_macro_string_dynamic_size(structure, index) \
   (structure.string[index].stop - structure.string[index].start) + 1
 
 // the buffer start to stop points are inclusive such that the size is ((stop - start) + 1).
@@ -101,7 +101,7 @@ typedef struct {
   arguments.array[arguments.used].used   = argument.used; \
   arguments.used++; \
   \
-  f_clear_dynamic_string(argument);
+  f_clear_string_dynamic(argument);
 
 /**
  * Perform commands.
index ef6a4686985c85f67a2d3e551a5a38678006cf23..4002beeda8a813ad2e1947be1a08f644ab67906d 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 f_utf
 fl_colors
@@ -13,7 +13,7 @@ fl_directory
 fl_file
 fl_fss
 fl_program
-fl_strings
+fl_string
 fl_status
 fll_colors
 fll_execute
index 3004e4fd6dcd6598c2fd38d96cfc3171460bd0cd..7a4a57c6eea1178e3ee2f4fca1438f984ed88ba8 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_strings -lfl_file -lfl_console -lfl_fss -lfl_program -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_string -lfl_file -lfl_console -lfl_fss -lfl_program -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library firewall.c private-firewall.c
index c2240d7fb80212ac0f2636831f587dec3986b045..d24705f253a1d349686f91da0c4d4535920217d5 100644 (file)
@@ -380,7 +380,7 @@ extern "C" {
                   f_string_length size    = 0;
 
                   for (; counter <= data->contents.array[current].array[0].stop; counter++) {
-                    if (data->buffer.string[counter] == f_eol) size++;
+                    if (data->buffer.string[counter] == f_string_eol) size++;
                   } // for
 
                   // the last newline is never present
@@ -409,7 +409,7 @@ extern "C" {
 
                       // explicit use of < instead of <= is done here so that the range.stop will always be accurate
                       for (; counter < data->contents.array[current].array[0].stop; counter++) {
-                        if (data->buffer.string[counter] == f_eol) {
+                        if (data->buffer.string[counter] == f_string_eol) {
                           break;
                         }
                       } // for
@@ -418,19 +418,19 @@ extern "C" {
                       break;
                     }
 
-                    if (data->buffer.string[counter] == f_eol) {
+                    if (data->buffer.string[counter] == f_string_eol) {
                       position++;
                     }
                   } // for
 
                   if (range.start <= range.stop) {
-                    f_print_partial_dynamic_string(f_standard_output, data->buffer, range);
+                    f_print_string_dynamic_partial(f_standard_output, data->buffer, range);
                   }
                 }
               }
               else {
                 if (data->contents.array[current].used > 0) {
-                  f_print_partial_dynamic_string(f_standard_output, data->buffer, data->contents.array[current].array[0]);
+                  f_print_string_dynamic_partial(f_standard_output, data->buffer, data->contents.array[current].array[0]);
                   fprintf(f_standard_output, "\n");
                 }
               }
@@ -449,7 +449,7 @@ extern "C" {
         else {
           for (; current < data->objects.used; current++) {
             if (data->parameters[fss_basic_list_read_parameter_count].result == f_console_result_none || (data->parameters[fss_basic_list_read_parameter_count].result == f_console_result_additional && found == target)) {
-              f_print_partial_dynamic_string(f_standard_output, data->buffer, data->objects.array[current]);
+              f_print_string_dynamic_partial(f_standard_output, data->buffer, data->objects.array[current]);
               fprintf(f_standard_output, "\n");
             }
 
@@ -479,7 +479,7 @@ extern "C" {
               name_length = data->objects.array[current].stop - data->objects.array[current].start + 1;
 
               if (name_length == argv_length) {
-                if (fl_compare_strings(data->buffer.string + data->objects.array[current].start, argv[data->parameters[fss_basic_list_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
+                if (fl_string_compare(data->buffer.string + data->objects.array[current].start, argv[data->parameters[fss_basic_list_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
 
                   if (data->parameters[fss_basic_list_read_parameter_size].result == f_console_result_found) {
                     if (data->contents.array[current].used > 0) {
@@ -487,7 +487,7 @@ extern "C" {
                       f_string_length size    = 0;
 
                       for (; counter <= data->contents.array[current].array[0].stop; counter++) {
-                        if (data->buffer.string[counter] == f_eol) size++;
+                        if (data->buffer.string[counter] == f_string_eol) size++;
                       } // for
 
                       // the last newline is never present
@@ -516,7 +516,7 @@ extern "C" {
 
                           // explicit use of < instead of <= is done here so that the range.stop will always be accurate
                           for (; counter < data->contents.array[current].array[0].stop; counter++) {
-                            if (data->buffer.string[counter] == f_eol) {
+                            if (data->buffer.string[counter] == f_string_eol) {
                               break;
                             }
                           } // for
@@ -525,13 +525,13 @@ extern "C" {
                           break;
                         }
 
-                        if (data->buffer.string[counter] == f_eol) {
+                        if (data->buffer.string[counter] == f_string_eol) {
                           position++;
                         }
                       } // for
 
                       if (range.start <= range.stop) {
-                        f_print_partial_dynamic_string(f_standard_output, data->buffer, range);
+                        f_print_string_dynamic_partial(f_standard_output, data->buffer, range);
                       }
                     }
                   }
@@ -542,7 +542,7 @@ extern "C" {
                       }
                       else {
                         if (data->contents.array[current].used > 0) {
-                          f_print_partial_dynamic_string(f_standard_output, data->buffer, data->contents.array[current].array[0]);
+                          f_print_string_dynamic_partial(f_standard_output, data->buffer, data->contents.array[current].array[0]);
                           fprintf(f_standard_output, "\n");
                         }
                       }
@@ -573,9 +573,9 @@ extern "C" {
                 name_length = data->contents.array[current].array[0].stop - data->contents.array[current].array[0].start + 1;
 
                 if (name_length == argv_length) {
-                  if (fl_compare_strings(data->buffer.string + data->contents.array[current].array[0].start, argv[data->parameters[fss_basic_list_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
+                  if (fl_string_compare(data->buffer.string + data->contents.array[current].array[0].start, argv[data->parameters[fss_basic_list_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
                     if (data->parameters[fss_basic_list_read_parameter_count].result == f_console_result_none || (data->parameters[fss_basic_list_read_parameter_count].result == f_console_result_additional && found == target)) {
-                      f_print_partial_dynamic_string(f_standard_output, data->buffer, data->objects.array[current]);
+                      f_print_string_dynamic_partial(f_standard_output, data->buffer, data->objects.array[current]);
                       fprintf(f_standard_output, "\n");
                     }
 
@@ -606,14 +606,14 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < fss_basic_list_read_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
     f_macro_fss_contents_delete(status, data->contents);
     f_macro_fss_objects_delete(status, data->objects);
     f_macro_string_dynamic_delete(status, data->buffer);
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
 
     fl_delete_color_context(status, data->context);
 
index 20d4c13647dc2b157ad79a2a5a21a4f72ee5badc..bfbe5e7d66355c087adb494155a6c6e4df273e58 100644 (file)
@@ -22,7 +22,7 @@
 #include <level_0/file.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -31,7 +31,7 @@
 #include <level_1/directory.h>
 #include <level_1/file.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
@@ -104,7 +104,7 @@ extern "C" {
   typedef struct {
     f_console_parameter parameters[fss_basic_list_read_total_parameters];
 
-    f_dynamic_string buffer;
+    f_string_dynamic buffer;
     f_fss_objects objects;
     f_fss_contents contents;
     f_file_position file_position;
@@ -117,7 +117,7 @@ extern "C" {
   #define fss_basic_list_read_data_initialize \
     { \
       f_console_parameter_initialize_fss_basic_list_read, \
-      f_dynamic_string_initialize, \
+      f_string_dynamic_initialize, \
       f_fss_objects_initialize, \
       f_fss_contents_initialize, \
       f_file_position_initialize, \
index 186deca387d089389ea14231f2f732fb1599ff8f..8d0a22d64f812f152a04ab82f7a9f35e39b068f0 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
@@ -13,7 +13,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_execute
 fll_fss
index b56848c27f65e11ab48adc220368dc39e1de31e2..98f79585dc0c6e65c8a7943e2dfa2d624201dcea 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_string -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library fss_basic_list_read.c
index e6319275273e80fe4b9fa618c347ee01cece92fb..aa288df7776a922a9f70d1e8fa7f620bb53f0cdb 100644 (file)
@@ -142,12 +142,12 @@ extern "C" {
       f_array_length counter = 0;
       f_bool object = (data->parameters[fss_basic_list_write_parameter_object].result == f_console_result_found);
 
-      f_dynamic_string buffer = f_dynamic_string_initialize;
+      f_string_dynamic buffer = f_string_dynamic_initialize;
       f_string_location location = f_string_location_initialize;
 
       if (data->process_pipe) {
         f_file file  = f_file_initialize;
-        f_dynamic_string input = f_dynamic_string_initialize;
+        f_string_dynamic input = f_string_dynamic_initialize;
 
         file.file = f_pipe;
 
@@ -198,7 +198,7 @@ extern "C" {
         f_macro_string_dynamic_delete(status, input);
       }
       else if (data->parameters[fss_basic_list_write_parameter_string].result == f_console_result_additional) {
-        f_dynamic_string input = f_dynamic_string_initialize;
+        f_string_dynamic input = f_string_dynamic_initialize;
 
         input.string = argv[data->parameters[fss_basic_list_write_parameter_string].additional.array[0]];
         input.used = strlen(input.string);
@@ -276,7 +276,7 @@ extern "C" {
         }
       }
       else {
-        f_print_dynamic_string(f_standard_output, buffer);
+        f_print_string_dynamic(f_standard_output, buffer);
       }
     }
 
@@ -291,11 +291,11 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < fss_basic_list_write_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
     fl_delete_color_context(status, data->context);
 
     return f_none;
index 293147a8de10d8247f3c1301db4d33d6747cb3d0..4731d0cb8c4b4289e19c7c62e526bb6f058b58df 100644 (file)
@@ -18,7 +18,7 @@
 #include <level_0/console.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -28,7 +28,7 @@
 #include <level_1/file.h>
 #include <level_1/fss_basic_list.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
index 186deca387d089389ea14231f2f732fb1599ff8f..8d0a22d64f812f152a04ab82f7a9f35e39b068f0 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
@@ -13,7 +13,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_execute
 fll_fss
index 2b067ef4b5ef6a05eacb1c8b4ab07b17875599cb..de7a17ea802df730ab230de7791b57153def52e4 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss  -lfl_fss -lfl_file -lfl_status -lfl_colors -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss  -lfl_fss -lfl_file -lfl_status -lfl_string -lfl_colors -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library fss_basic_list_write.c
index 81223c91d10c9a8d57e4e299b77c10ce8f0508cc..24b433587a579d771b526675bbc7cf11f630fc96 100644 (file)
@@ -368,7 +368,7 @@ extern "C" {
           for (; current < data->objects.used; current++) {
             if (data->parameters[fss_basic_read_parameter_count].result == f_console_result_none || (data->parameters[fss_basic_read_parameter_count].result == f_console_result_additional && found == target)) {
               if (data->contents.array[current].used > 0) {
-                f_print_partial_dynamic_string(f_standard_output, data->buffer, data->contents.array[current].array[0]);
+                f_print_string_dynamic_partial(f_standard_output, data->buffer, data->contents.array[current].array[0]);
                 fprintf(f_standard_output, "\n");
               }
               else {
@@ -390,7 +390,7 @@ extern "C" {
         else {
           for (; current < data->objects.used; current++) {
             if (data->parameters[fss_basic_read_parameter_count].result == f_console_result_none || (data->parameters[fss_basic_read_parameter_count].result == f_console_result_additional && found == target)) {
-              f_print_partial_dynamic_string(f_standard_output, data->buffer, data->objects.array[current]);
+              f_print_string_dynamic_partial(f_standard_output, data->buffer, data->objects.array[current]);
               fprintf(f_standard_output, "\n");
             }
 
@@ -420,7 +420,7 @@ extern "C" {
               name_length = data->objects.array[current].stop - data->objects.array[current].start + 1;
 
               if (name_length == argv_length) {
-                if (fl_compare_strings(data->buffer.string + data->objects.array[current].start, argv[data->parameters[fss_basic_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
+                if (fl_string_compare(data->buffer.string + data->objects.array[current].start, argv[data->parameters[fss_basic_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
 
                   if (data->parameters[fss_basic_read_parameter_count].result == f_console_result_none || (data->parameters[fss_basic_read_parameter_count].result == f_console_result_additional && found == target)) {
                     if (data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) {
@@ -428,7 +428,7 @@ extern "C" {
                     }
                     else {
                       if (data->contents.array[current].used > 0) {
-                        f_print_partial_dynamic_string(f_standard_output, data->buffer, data->contents.array[current].array[0]);
+                        f_print_string_dynamic_partial(f_standard_output, data->buffer, data->contents.array[current].array[0]);
                         fprintf(f_standard_output, "\n");
                       }
                       else {
@@ -462,9 +462,9 @@ extern "C" {
                 name_length = data->contents.array[current].array[0].stop - data->contents.array[current].array[0].start + 1;
 
                 if (name_length == argv_length) {
-                  if (fl_compare_strings(data->buffer.string + data->contents.array[current].array[0].start, argv[data->parameters[fss_basic_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
+                  if (fl_string_compare(data->buffer.string + data->contents.array[current].array[0].start, argv[data->parameters[fss_basic_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
                     if (data->parameters[fss_basic_read_parameter_count].result == f_console_result_none || (data->parameters[fss_basic_read_parameter_count].result == f_console_result_additional && found == target)) {
-                      f_print_partial_dynamic_string(f_standard_output, data->buffer, data->objects.array[current]);
+                      f_print_string_dynamic_partial(f_standard_output, data->buffer, data->objects.array[current]);
                       fprintf(f_standard_output, "\n");
                     }
 
@@ -495,14 +495,14 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < fss_basic_read_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
     f_macro_fss_contents_delete(status, data->contents);
     f_macro_fss_objects_delete(status, data->objects);
     f_macro_string_dynamic_delete(status, data->buffer);
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
 
     fl_delete_color_context(status, data->context);
 
index 12817fd5318636c35894170f326dc92b2b98d851..643ecdda1c7ac1939054c245fa6122673aecc1f2 100644 (file)
@@ -22,7 +22,7 @@
 #include <level_0/file.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -31,7 +31,7 @@
 #include <level_1/directory.h>
 #include <level_1/file.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
@@ -96,7 +96,7 @@ extern "C" {
   typedef struct {
     f_console_parameter parameters[fss_basic_read_total_parameters];
 
-    f_dynamic_string buffer;
+    f_string_dynamic buffer;
     f_fss_objects objects;
     f_fss_contents contents;
     f_file_position file_position;
@@ -109,7 +109,7 @@ extern "C" {
   #define fss_basic_read_data_initialize \
     { \
       f_console_parameter_initialize_fss_basic_read, \
-      f_dynamic_string_initialize, \
+      f_string_dynamic_initialize, \
       f_fss_objects_initialize, \
       f_fss_contents_initialize, \
       f_file_position_initialize, \
index 186deca387d089389ea14231f2f732fb1599ff8f..8d0a22d64f812f152a04ab82f7a9f35e39b068f0 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
@@ -13,7 +13,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_execute
 fll_fss
index 69cd2b2c1ff39d336a2db5d06ad4f6a859f7a1c4..7505e3feafdfff574eb9fbc4ac747c0f42ee7842 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_print -lf_file -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_string -lfl_file -lfl_console -lfl_program -lfl_fss -lf_print -lf_file -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library fss_basic_read.c
index f943c598d75aac521ba146967b674b5cc6a39b64..64d4ef4b3cb6e8ea385e91f91817653eef54db9b 100644 (file)
@@ -142,12 +142,12 @@ extern "C" {
       f_array_length counter = 0;
       f_bool object = (data->parameters[fss_basic_write_parameter_object].result == f_console_result_found);
 
-      f_dynamic_string buffer = f_dynamic_string_initialize;
+      f_string_dynamic buffer = f_string_dynamic_initialize;
       f_string_location location = f_string_location_initialize;
 
       if (data->process_pipe) {
         f_file file = f_file_initialize;
-        f_dynamic_string input = f_dynamic_string_initialize;
+        f_string_dynamic input = f_string_dynamic_initialize;
 
         file.file = f_pipe;
 
@@ -198,7 +198,7 @@ extern "C" {
         f_macro_string_dynamic_delete(status, input);
       }
       else if (data->parameters[fss_basic_write_parameter_string].result == f_console_result_additional) {
-        f_dynamic_string input = f_dynamic_string_initialize;
+        f_string_dynamic input = f_string_dynamic_initialize;
 
         input.string = argv[data->parameters[fss_basic_write_parameter_string].additional.array[0]];
         input.used = strlen(input.string);
@@ -276,7 +276,7 @@ extern "C" {
         }
       }
       else {
-        f_print_dynamic_string(f_standard_output, buffer);
+        f_print_string_dynamic(f_standard_output, buffer);
       }
     }
 
@@ -291,11 +291,11 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < fss_basic_write_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
     fl_delete_color_context(status, data->context);
 
     return f_none;
index 04f5fac4c8e0e8c502e8ac0d0a2a9f680467ee8c..a27cb1de11612e8808409e475eee49eb7ca459ed 100644 (file)
@@ -18,7 +18,7 @@
 #include <level_0/console.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -27,7 +27,7 @@
 #include <level_1/status.h>
 #include <level_1/file.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
index 186deca387d089389ea14231f2f732fb1599ff8f..8d0a22d64f812f152a04ab82f7a9f35e39b068f0 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
@@ -13,7 +13,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_execute
 fll_fss
index 924d4796592f2130dba3a42212e37109711ef8ff..b39c90ee1c78eba35e869bf4f7ed19434b7792a5 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_colors -lfl_status -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_colors -lfl_status -lfl_string -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library fss_basic_write.c
index 083f464c8deadcfbd1095033c603ef3b01a3094f..804d534d8f866adcc17ec4be0b86016e1758ff4d 100644 (file)
@@ -373,7 +373,7 @@ extern "C" {
           for (; current < data->objects.used; current++) {
             if (data->parameters[fss_extended_read_parameter_count].result == f_console_result_none || (data->parameters[fss_extended_read_parameter_count].result == f_console_result_additional && found == target)) {
               if (data->contents.array[current].used > select) {
-                f_print_partial_dynamic_string(f_standard_output, data->buffer, data->contents.array[current].array[select]);
+                f_print_string_dynamic_partial(f_standard_output, data->buffer, data->contents.array[current].array[select]);
                 fprintf(f_standard_output, "\n");
               }
               else {
@@ -395,7 +395,7 @@ extern "C" {
         else {
           for (; current < data->objects.used; current++) {
             if (data->parameters[fss_extended_read_parameter_count].result == f_console_result_none || (data->parameters[fss_extended_read_parameter_count].result == f_console_result_additional && found == target)) {
-              f_print_partial_dynamic_string(f_standard_output, data->buffer, data->objects.array[current]);
+              f_print_string_dynamic_partial(f_standard_output, data->buffer, data->objects.array[current]);
               fprintf(f_standard_output, "\n");
             }
 
@@ -424,7 +424,7 @@ extern "C" {
               name_length = data->objects.array[current].stop - data->objects.array[current].start + 1;
 
               if (name_length == argv_length) {
-                if (fl_compare_strings(data->buffer.string + data->objects.array[current].start, argv[data->parameters[fss_extended_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
+                if (fl_string_compare(data->buffer.string + data->objects.array[current].start, argv[data->parameters[fss_extended_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
 
                   if (data->parameters[fss_extended_read_parameter_count].result == f_console_result_none || (data->parameters[fss_extended_read_parameter_count].result == f_console_result_additional && found == target)) {
                     if (data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) {
@@ -432,7 +432,7 @@ extern "C" {
                     }
                     else {
                       if (data->contents.array[current].used > select) {
-                        f_print_partial_dynamic_string(f_standard_output, data->buffer, data->contents.array[current].array[select]);
+                        f_print_string_dynamic_partial(f_standard_output, data->buffer, data->contents.array[current].array[select]);
                         fprintf(f_standard_output, "\n");
                       }
                       else {
@@ -470,9 +470,9 @@ extern "C" {
                 name_length = data->contents.array[current].array[select].stop - data->contents.array[current].array[select].start + 1;
 
                 if (name_length == argv_length) {
-                  if (fl_compare_strings(data->buffer.string + data->contents.array[current].array[select].start, argv[data->parameters[fss_extended_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
+                  if (fl_string_compare(data->buffer.string + data->contents.array[current].array[select].start, argv[data->parameters[fss_extended_read_parameter_name].additional.array[0]], name_length, argv_length) == f_equal_to) {
                     if (data->parameters[fss_extended_read_parameter_count].result == f_console_result_none || (data->parameters[fss_extended_read_parameter_count].result == f_console_result_additional && found == target)) {
-                      f_print_partial_dynamic_string(f_standard_output, data->buffer, data->objects.array[current]);
+                      f_print_string_dynamic_partial(f_standard_output, data->buffer, data->objects.array[current]);
                       fprintf(f_standard_output, "\n");
                     }
 
@@ -503,14 +503,14 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < fss_extended_read_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
     f_macro_fss_contents_delete(status, data->contents);
     f_macro_fss_objects_delete(status, data->objects);
     f_macro_string_dynamic_delete(status, data->buffer);
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
 
     fl_delete_color_context(status, data->context);
 
index 2ca873c3b6b8e2f03a0e2a708e66bccb00966316..2822ebfcf7c25f6a8dd453602a750b95d1df7377 100644 (file)
@@ -22,7 +22,7 @@
 #include <level_0/file.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -31,7 +31,7 @@
 #include <level_1/directory.h>
 #include <level_1/file.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
@@ -100,7 +100,7 @@ extern "C" {
   typedef struct {
     f_console_parameter parameters[fss_extended_read_total_parameters];
 
-    f_dynamic_string buffer;
+    f_string_dynamic buffer;
     f_fss_objects objects;
     f_fss_contents contents;
     f_file_position file_position;
@@ -113,7 +113,7 @@ extern "C" {
   #define fss_extended_read_data_initialize \
     { \
       f_console_parameter_initialize_fss_extended_read, \
-      f_dynamic_string_initialize, \
+      f_string_dynamic_initialize, \
       f_fss_objects_initialize, \
       f_fss_contents_initialize, \
       f_file_position_initialize, \
index 186deca387d089389ea14231f2f732fb1599ff8f..8d0a22d64f812f152a04ab82f7a9f35e39b068f0 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
@@ -13,7 +13,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_execute
 fll_fss
index 8a0c1ea9e3f3f156a2af1e82b493bc0a539d353b..3da6a02dcd6d3c349b088d6108a381314d9ad6e9 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_string -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library fss_extended_read.c
index 46507076d693f5a2a30f88535f3f4c07dd8fb28d..201ee7a6fd766ef798ec8f2b65ba84f27c2bf566 100644 (file)
@@ -149,12 +149,12 @@ extern "C" {
       f_array_length counter = 0;
       f_bool object = (data->parameters[fss_extended_write_parameter_object].result == f_console_result_found);
 
-      f_dynamic_string  buffer = f_dynamic_string_initialize;
+      f_string_dynamic  buffer = f_string_dynamic_initialize;
       f_string_location location = f_string_location_initialize;
 
       if (data->process_pipe) {
         f_file file = f_file_initialize;
-        f_dynamic_string input = f_dynamic_string_initialize;
+        f_string_dynamic input = f_string_dynamic_initialize;
 
         file.file = f_pipe;
 
@@ -218,7 +218,7 @@ extern "C" {
         f_macro_string_dynamic_delete(status, input);
       }
       else if (data->parameters[fss_extended_write_parameter_string].result == f_console_result_additional) {
-        f_dynamic_string input = f_dynamic_string_initialize;
+        f_string_dynamic input = f_string_dynamic_initialize;
 
         if (object) {
           input.string = argv[data->parameters[fss_extended_write_parameter_string].additional.array[0]];
@@ -321,7 +321,7 @@ extern "C" {
         }
       }
       else {
-        f_print_dynamic_string(f_standard_output, buffer);
+        f_print_string_dynamic(f_standard_output, buffer);
       }
     }
 
@@ -336,11 +336,11 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < fss_extended_write_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
     fl_delete_color_context(status, data->context);
 
     return f_none;
index 6093d77ea1bf44e401c01999a9639876b3a1adeb..b427e41f65766974aaf5f4467e0f2efce80bee1b 100644 (file)
@@ -18,7 +18,7 @@
 #include <level_0/console.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -28,7 +28,7 @@
 #include <level_1/file.h>
 #include <level_1/fss_extended.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
index 186deca387d089389ea14231f2f732fb1599ff8f..8d0a22d64f812f152a04ab82f7a9f35e39b068f0 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
@@ -13,7 +13,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_execute
 fll_fss
index eb589e645c3eef827ce5d1c4ecf9a2bf171f7c16..1910f6670cc44541e48fd8e5b7950abe69e4aceb 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_colors -lfl_status -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_colors -lfl_status -lfl_string -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library fss_extended_write.c
index 75afb6790648e24a8f1ac83082855a210a5bcf27..2ae675391cee25a96a08176a39c9d06cb82a43a7 100644 (file)
@@ -356,11 +356,11 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < fss_status_code_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
     fl_delete_color_context(status, data->context);
 
     return f_none;
index 66bd2938312a1edc019efa727554dc4d4f2be5ab..1f2eac0f56613ccfec23baf56ca8e69e730e5c88 100644 (file)
@@ -19,7 +19,7 @@
 #include <level_0/console.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -27,7 +27,7 @@
 #include <level_1/console.h>
 #include <level_1/status.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
index 1774cd7221faa390936d716be2b30acf4a8c58a4..ecf2e5b2a3dcbe85bd8681eadac3777dd788c399 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
@@ -13,7 +13,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_status
 fll_execute
index 6652966e536f07f7d4147c5061305213956ff27e..91bf2ab72081b3977f607f828d6c34e379d440c9 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_status -lfll_fss -lfl_fss -lfl_colors -lfl_status -lfl_console -lfl_program -lfl_strings -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_status -lfll_fss -lfl_fss -lfl_colors -lfl_status -lfl_string -lfl_console -lfl_program -lfl_string -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library fss_status_code.c
index fd4d38d283ca167dcfa3ac635cb47d66879183af..2d49edc582eafb889bf224249edac77c122fb8aa 100644 (file)
@@ -5,7 +5,7 @@
 #include "private-init.h"
 
 #ifndef _di_init_rule_buffer_
-  f_return_status init_rule_buffer(const f_string filename, f_dynamic_string *buffer, f_fss_objects *objects, f_fss_contents *contents) {
+  f_return_status init_rule_buffer(const f_string filename, f_string_dynamic *buffer, f_fss_objects *objects, f_fss_contents *contents) {
     f_file file = f_file_initialize;
     f_status status = f_none;
     f_file_position file_position = f_file_position_initialize;
 
       if (kernel_command_line_string) {
         f_status status_free = f_none;
-        f_macro_strings_string_delete(status_free, kernel_command_line_string, string_length);
+        f_macro_string_delete(status_free, kernel_command_line_string, string_length);
       }
     }
 
 #endif // _di_init_prepare_init_
 
 #ifndef _di_init_process_main_rule_
-  f_return_status init_process_main_rule(const init_argument argument, f_dynamic_string *buffer, init_data *data) {
+  f_return_status init_process_main_rule(const init_argument argument, f_string_dynamic *buffer, init_data *data) {
     f_status status = f_none;
-    f_dynamic_string buffer = f_dynamic_string_initialize;
+    f_string_dynamic buffer = f_string_dynamic_initialize;
     f_string_location location = f_string_location_initialize;
     f_fss_objects objects = f_fss_objects_initialize;
     f_fss_contents contents = f_fss_contents_initialize;
index 29e1bc5f502a56f30e9e27684389fd4090271687..1f58dd87008db59c362cbb9397b2d9eee08b70a3 100644 (file)
@@ -31,18 +31,18 @@ extern "C" {
 #ifndef _di_init_rule_
   // rule [directory] [filename (no-extension)] [require] [last] [asynchronous] = execute a rule located in [directory][filename].rule.
   typedef struct {
-    f_dynamic_string name;
-    f_dynamic_string directory;
-    f_dynamic_string file;
+    f_string_dynamic name;
+    f_string_dynamic directory;
+    f_string_dynamic file;
     f_bool require;
     f_bool asynchronous;
   } init_rule;
 
   #define init_rule_initialize \
     { \
-      f_dynamic_string_initialize,
-      f_dynamic_string_initialize,
-      f_dynamic_string_initialize,
+      f_string_dynamic_initialize,
+      f_string_dynamic_initialize,
+      f_string_dynamic_initialize,
       f_bool_initialize,
       f_bool_initialize,
     }
@@ -150,13 +150,13 @@ extern "C" {
 #ifndef _di_init_category_
   // category [name] = execute rules in the specified list called [name].
   typedef struct {
-    f_dynamic_string name;
+    f_string_dynamic name;
     init_rule last;
   } init_category;
 
   #define init_rule_initialize \
     { \
-      f_dynamic_string_initialize,
+      f_string_dynamic_initialize,
       init_rule_initialize,
     }
 
@@ -324,7 +324,7 @@ typedef struct {
 #define init_path_processes_mounts   init_paths_processes "mounts"
 
 #ifndef _di_init_rule_buffer_
-  f_return_status init_rule_buffer(const f_string filename, f_dynamic_string *buffer, f_fss_objects *objects, f_fss_contents *contents) f_gcc_attribute_visibility_internal;
+  f_return_status init_rule_buffer(const f_string filename, f_string_dynamic *buffer, f_fss_objects *objects, f_fss_contents *contents) f_gcc_attribute_visibility_internal;
 #endif // _di_init_rule_buffer_
 
 #ifndef _di_init_handler_child_services_
@@ -354,7 +354,7 @@ typedef struct {
 #endif // _di_init_prepare_init_
 
 #ifndef _di_init_process_main_rule_
-  f_return_status init_process_main_rule(const init_argument argument, f_dynamic_string *buffer, init_data *data) f_gcc_attribute_visibility_internal;
+  f_return_status init_process_main_rule(const init_argument argument, f_string_dynamic *buffer, init_data *data) f_gcc_attribute_visibility_internal;
 #endif // _di_init_process_main_rule_
 
 #ifdef __cplusplus
index 5f46742fd7b489d5e282a1e87cde11fac7ba63e2..82c8d7a643971198335e87c8494e3b8d3a60ce5c 100644 (file)
@@ -4,7 +4,7 @@ f_fss
 f_memory
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 f_utf
 fl_colors
@@ -14,7 +14,7 @@ fl_file
 fl_fss
 fl_program
 fl_status
-fl_strings
+fl_string
 fll_colors
 fll_execute
 fll_fss
index 278643d135fa361ae8277689033b034594de379c..9cbed997a26897d9a57c18def32a3cf49679258e 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_status -lfl_string -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library init.c private-init.c
index 3e18af014d41bb2549be314507ad29a2918a392e..b6a94428792ea948e333659eb35d2611e722bd0a 100644 (file)
@@ -355,11 +355,11 @@ extern "C" {
     f_string_length i = 0;
 
     while (i < status_code_total_parameters) {
-      f_macro_strings_string_lengths_delete(status, data->parameters[i].additional);
+      f_macro_string_lengths_delete(status, data->parameters[i].additional);
       i++;
     } // while
 
-    f_macro_strings_string_lengths_delete(status, data->remaining);
+    f_macro_string_lengths_delete(status, data->remaining);
     fl_delete_color_context(status, data->context);
 
     return f_none;
index 0a485db7ecd6ea2ac865f6cba837b031ddd09246..ae12cb76f3a7acaf69a54755c4d9001559ea3e23 100644 (file)
@@ -17,7 +17,7 @@
 #include <level_0/conversion.h>
 #include <level_0/pipe.h>
 #include <level_0/print.h>
-#include <level_0/strings.h>
+#include <level_0/string.h>
 #include <level_0/types.h>
 
 // fll-1 includes
@@ -25,7 +25,7 @@
 #include <level_1/console.h>
 #include <level_1/status.h>
 #include <level_1/program.h>
-#include <level_1/strings.h>
+#include <level_1/string.h>
 
 // fll-2 includes
 #include <level_2/colors.h>
index 16a54b7b01b0b823c1f85b31075505de59bba3e9..8142696247d8f7b88ac945082940ce4a85bdac0a 100644 (file)
@@ -3,13 +3,13 @@ f_conversion
 f_status
 f_pipe
 f_print
-f_strings
+f_string
 f_types
 fl_colors
 fl_console
 fl_file
 fl_program
-fl_strings
+fl_string
 fl_status
 fll_colors
 fll_status
index cebfc836dbe7158ce830af7cec14509460d84fc3..7a48e3988005324ddfbfa6e57b078d2dcddf8e1d 100644 (file)
@@ -10,7 +10,7 @@ version_micro 0
 build_compiler gcc
 build_linker ar
 build_libraries -lc
-build_libraries_fll -lfll_colors -lfll_status -lfl_colors -lfl_status -lfl_console -lfl_program -lfl_strings -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
+build_libraries_fll -lfll_colors -lfll_status -lfl_colors -lfl_status -lfl_console -lfl_program -lfl_string -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lf_utf
 #build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0
 #build_libraries_fll-monolithic -lfll
 build_sources_library status_code.c