]> Kevux Git Server - fll/commitdiff
Refactor: Relocate 'macro' prefix in names for macros.
authorKevin Day <thekevinday@gmail.com>
Sat, 1 May 2021 22:00:27 +0000 (17:00 -0500)
committerKevin Day <thekevinday@gmail.com>
Sat, 1 May 2021 22:00:27 +0000 (17:00 -0500)
Placing 'macro' after the project name, such as 'fll_' or 'fake_', is a good idea for keeping the function names consistent and contained within the project naming structure.
For short names like 'f_' and 'f_string_t' this is not a problem.
For complex and usually longer names, such as 'fake_' and 'fake_main_t', this becomes confusing quickly,

I have decided to favor the less consistent macro as a prefix to the project name, to make the code a bit more readable.
For example: 'fake_main_macro_delete' would become 'macro_fake_main_delete".

169 files changed:
level_0/f_account/c/account-common.h
level_0/f_account/c/account.c
level_0/f_account/c/private-account.c
level_0/f_account/c/private-account.h
level_0/f_color/c/color-common.c
level_0/f_color/c/color-common.h
level_0/f_color/c/color.c
level_0/f_color/c/color.h
level_0/f_console/c/console-common.h
level_0/f_console/c/console.c
level_0/f_control_group/c/control_group-common.h
level_0/f_conversion/c/conversion.c
level_0/f_directory/c/directory.c
level_0/f_directory/c/directory_type.h
level_0/f_environment/c/private-environment.c
level_0/f_execute/c/execute-common.h
level_0/f_file/c/file-common.c
level_0/f_file/c/file-common.h
level_0/f_file/c/file.c
level_0/f_file/c/private-file.c
level_0/f_fss/c/fss-common.h
level_0/f_fss/c/fss.c
level_0/f_fss/c/fss_comment.h
level_0/f_fss/c/fss_delimit.h
level_0/f_fss/c/fss_named.h
level_0/f_fss/c/fss_nest.h
level_0/f_fss/c/fss_quote.h
level_0/f_fss/c/fss_set.h
level_0/f_fss/c/private-fss.c
level_0/f_fss/c/private-fss.h
level_0/f_iki/c/iki-common.h
level_0/f_iki/c/iki.c
level_0/f_limit/c/limit-common.h
level_0/f_limit/c/limit.c
level_0/f_memory/c/memory-common.h
level_0/f_path/c/path.c
level_0/f_path/c/private-path.c
level_0/f_serialize/c/private-serialize.c
level_0/f_serialize/c/serialize.c
level_0/f_signal/c/signal-common.h
level_0/f_status/c/status_array.h
level_0/f_string/c/string-common.h
level_0/f_string/c/string_dynamic.c
level_0/f_string/c/string_dynamic.h
level_0/f_string/c/string_map.h
level_0/f_string/c/string_quantity.h
level_0/f_string/c/string_range.h
level_0/f_string/c/string_triple.h
level_0/f_thread/c/thread-common.h
level_0/f_type/c/type.h
level_0/f_type_array/c/type_array-common.h
level_0/f_utf/c/private-utf.c
level_0/f_utf/c/utf-common.h
level_0/f_utf/c/utf.c
level_0/f_utf/c/utf_dynamic.c
level_0/f_utf/c/utf_dynamic.h
level_0/f_utf/c/utf_map.h
level_0/f_utf/c/utf_quantity.h
level_0/f_utf/c/utf_range.h
level_0/f_utf/c/utf_triple.h
level_1/fl_console/c/console.c
level_1/fl_control_group/c/control_group.c
level_1/fl_conversion/c/conversion.c
level_1/fl_directory/c/directory.h
level_1/fl_directory/c/private-directory.c
level_1/fl_environment/c/environment.c
level_1/fl_execute/c/execute-common.h
level_1/fl_fss/c/fss_basic.c
level_1/fl_fss/c/fss_basic_list.c
level_1/fl_fss/c/fss_embedded_list.c
level_1/fl_fss/c/fss_extended.c
level_1/fl_fss/c/fss_extended_list.c
level_1/fl_fss/c/private-fss.c
level_1/fl_fss/c/private-fss_macro.h
level_1/fl_print/c/private-print.c
level_1/fl_string/c/private-string.c
level_1/fl_string/c/string.c
level_1/fl_utf/c/utf.c
level_1/fl_utf_file/c/private-utf_file.c
level_1/fl_utf_file/c/utf_file.c
level_2/fll_error/c/error-common.h
level_2/fll_execute/c/execute.c
level_2/fll_execute/c/execute.h
level_2/fll_execute/c/private-execute.c
level_2/fll_file/c/private-file.c
level_2/fll_fss/c/fss.c
level_2/fll_fss/c/fss_basic.c
level_2/fll_fss/c/fss_basic_list.c
level_2/fll_fss/c/fss_embedded_list.c
level_2/fll_fss/c/fss_extended.c
level_2/fll_fss/c/fss_extended_list.c
level_2/fll_iki/c/iki.c
level_2/fll_iki/c/iki.h
level_2/fll_iki/c/private-iki.c
level_2/fll_iki/c/private-iki.h
level_2/fll_program/c/program.c
level_3/byte_dump/c/byte_dump.c
level_3/byte_dump/c/byte_dump.h
level_3/byte_dump/c/private-byte_dump.c
level_3/control/c/control.c
level_3/control/c/control.h
level_3/controller/c/controller.c
level_3/controller/c/controller.h
level_3/controller/c/private-common.c
level_3/controller/c/private-common.h
level_3/controller/c/private-controller.c
level_3/controller/c/private-controller.h
level_3/controller/c/private-entry.c
level_3/controller/c/private-rule.c
level_3/controller/c/private-thread.c
level_3/fake/c/fake.c
level_3/fake/c/fake.h
level_3/fake/c/private-build.c
level_3/fake/c/private-build.h
level_3/fake/c/private-fake.c
level_3/fake/c/private-make.c
level_3/fake/c/private-make.h
level_3/fake/c/private-skeleton.c
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/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/c/private-fss_basic_list_read.c
level_3/fss_basic_list_read/c/private-fss_basic_list_read.h
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/c/private-fss_basic_list_write.c
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/c/private-fss_basic_read.c
level_3/fss_basic_read/c/private-fss_basic_read.h
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/c/private-fss_basic_write.c
level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c
level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.h
level_3/fss_embedded_list_write/c/fss_embedded_list_write.c
level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
level_3/fss_extended_list_read/c/fss_extended_list_read.c
level_3/fss_extended_list_read/c/fss_extended_list_read.h
level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
level_3/fss_extended_list_read/c/private-fss_extended_list_read.h
level_3/fss_extended_list_write/c/fss_extended_list_write.c
level_3/fss_extended_list_write/c/fss_extended_list_write.h
level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
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/c/private-fss_extended_read.c
level_3/fss_extended_read/c/private-fss_extended_read.h
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/c/private-fss_extended_write.c
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/c/private-fss_status_code.c
level_3/iki_read/c/iki_read.c
level_3/iki_read/c/iki_read.h
level_3/iki_read/c/private-iki_read.c
level_3/iki_write/c/iki_write.c
level_3/iki_write/c/iki_write.h
level_3/iki_write/c/private-iki_write.c
level_3/status_code/c/private-status_code.c
level_3/status_code/c/status_code.c
level_3/status_code/c/status_code.h

index 5a00b629b3d1f216509ba91bb72191e08cdf0533..88cdf066d9336c42d554a131b532c9f4de8b5f9b 100644 (file)
@@ -52,28 +52,28 @@ extern "C" {
 
   #define f_account_t_initialize { 0, 0, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize }
 
-  #define f_macro_account_t_clear(account) \
+  #define macro_f_account_t_clear(account) \
     account.id_user = 0; \
     account.id_group = 0; \
-    f_macro_account_t_clear(account.home); \
-    f_macro_account_t_clear(account.label); \
-    f_macro_account_t_clear(account.name); \
-    f_macro_account_t_clear(account.password); \
-    f_macro_account_t_clear(account.shell);
-
-  #define f_macro_account_t_delete_simple(account) \
-    f_macro_string_dynamic_t_delete_simple(account.home); \
-    f_macro_string_dynamic_t_delete_simple(account.label); \
-    f_macro_string_dynamic_t_delete_simple(account.name); \
-    f_macro_string_dynamic_t_delete_simple(account.password); \
-    f_macro_string_dynamic_t_delete_simple(account.shell);
-
-  #define f_macro_account_t_destroy_simple(account) \
-    f_macro_string_dynamic_t_destroy_simple(account.home); \
-    f_macro_string_dynamic_t_destroy_simple(account.label); \
-    f_macro_string_dynamic_t_destroy_simple(account.name); \
-    f_macro_string_dynamic_t_destroy_simple(account.password); \
-    f_macro_string_dynamic_t_destroy_simple(account.shell);
+    macro_f_account_t_clear(account.home); \
+    macro_f_account_t_clear(account.label); \
+    macro_f_account_t_clear(account.name); \
+    macro_f_account_t_clear(account.password); \
+    macro_f_account_t_clear(account.shell);
+
+  #define macro_f_account_t_delete_simple(account) \
+    macro_f_string_dynamic_t_delete_simple(account.home); \
+    macro_f_string_dynamic_t_delete_simple(account.label); \
+    macro_f_string_dynamic_t_delete_simple(account.name); \
+    macro_f_string_dynamic_t_delete_simple(account.password); \
+    macro_f_string_dynamic_t_delete_simple(account.shell);
+
+  #define macro_f_account_t_destroy_simple(account) \
+    macro_f_string_dynamic_t_destroy_simple(account.home); \
+    macro_f_string_dynamic_t_destroy_simple(account.label); \
+    macro_f_string_dynamic_t_destroy_simple(account.name); \
+    macro_f_string_dynamic_t_destroy_simple(account.password); \
+    macro_f_string_dynamic_t_destroy_simple(account.shell);
 #endif // _di_f_account_t_
 
 /**
@@ -93,18 +93,18 @@ extern "C" {
 
   #define f_accounts_t_initialize { 0, 0, 0 }
 
-  #define f_macro_accounts_t_clear(accounts) f_macro_memory_structure_clear(accounts)
+  #define macro_f_accounts_t_clear(accounts) macro_f_memory_structure_clear(accounts)
 
-  #define f_macro_string_accounts_t_resize(status, accounts, length) f_macro_memory_structure_resize(status, values, sizeof(f_account_t), length)
-  #define f_macro_string_accounts_t_adjust(status, accounts, length) f_macro_memory_structure_adjust(status, values, sizeof(f_account_t), length)
+  #define macro_f_string_accounts_t_resize(status, accounts, length) macro_f_memory_structure_resize(status, values, sizeof(f_account_t), length)
+  #define macro_f_string_accounts_t_adjust(status, accounts, length) macro_f_memory_structure_adjust(status, values, sizeof(f_account_t), length)
 
-  #define f_macro_string_accounts_t_delete_simple(accounts)  f_macro_memory_structure_delete_simple(values, sizeof(f_account_t), 0)
-  #define f_macro_string_accounts_t_destroy_simple(accounts) f_macro_memory_structure_destroy_simple(values, sizeof(f_account_t), 0)
+  #define macro_f_string_accounts_t_delete_simple(accounts)  macro_f_memory_structure_delete_simple(values, sizeof(f_account_t), 0)
+  #define macro_f_string_accounts_t_destroy_simple(accounts) macro_f_memory_structure_destroy_simple(values, sizeof(f_account_t), 0)
 
-  #define f_macro_string_accounts_t_increase(status, values)            f_macro_memory_structure_increase(status, values, f_account_t)
-  #define f_macro_string_accounts_t_increase_by(status, values, amount) f_macro_memory_structure_increase_by(status, values, f_account_t, amount)
-  #define f_macro_string_accounts_t_decrease_by(status, values, amount) f_macro_memory_structure_decrease_by(status, values, f_account_t, amount)
-  #define f_macro_string_accounts_t_decimate_by(status, values, amount) f_macro_memory_structure_decimate_by(status, values, f_account_t, amount)
+  #define macro_f_string_accounts_t_increase(status, values)            macro_f_memory_structure_increase(status, values, f_account_t)
+  #define macro_f_string_accounts_t_increase_by(status, values, amount) macro_f_memory_structure_increase_by(status, values, f_account_t, amount)
+  #define macro_f_string_accounts_t_decrease_by(status, values, amount) macro_f_memory_structure_decrease_by(status, values, f_account_t, amount)
+  #define macro_f_string_accounts_t_decimate_by(status, values, amount) macro_f_memory_structure_decimate_by(status, values, f_account_t, amount)
 #endif // _di_f_accounts_t_
 
 #ifdef __cplusplus
index ee90aff7a35686f31f1691a8b78d1d3d7a0c02f1..8704d3820e3ade82ef05a2090dc9355c79b2ccbf 100644 (file)
@@ -379,7 +379,7 @@ extern "C" {
 
         const f_array_length_t name_length = strnlen(password.pw_name, length);
 
-        f_macro_string_dynamic_t_resize(status, (*name), name_length + 1);
+        macro_f_string_dynamic_t_resize(status, (*name), name_length + 1);
         if (F_status_is_error(status)) return status;
 
         memcpy(name->string, password.pw_name, name_length);
@@ -414,7 +414,7 @@ extern "C" {
 
     const f_array_length_t name_length = strnlen(password.pw_name, length);
 
-    f_macro_string_dynamic_t_resize(status, (*name), name_length + 1);
+    macro_f_string_dynamic_t_resize(status, (*name), name_length + 1);
     if (F_status_is_error(status)) return status;
 
     memcpy(name->string, password.pw_name, name_length);
index d553ed114620747c698f2c465e7d66f8f1b724dd..84f332a46357c0a3950669acf5683c8923660037 100644 (file)
@@ -18,7 +18,7 @@ extern "C" {
     // account home directory.
     f_array_length_t string_length = strnlen(password.pw_dir, password_length);
 
-    f_macro_string_dynamic_t_resize(status, account->home, string_length + 1);
+    macro_f_string_dynamic_t_resize(status, account->home, string_length + 1);
     if (F_status_is_error(status)) return status;
 
     memcpy(account->home.string, password.pw_dir, string_length);
@@ -30,7 +30,7 @@ extern "C" {
     // account label (gecos).
     string_length = strnlen(password.pw_gecos, password_length);
 
-    f_macro_string_dynamic_t_resize(status, account->label, string_length + 1);
+    macro_f_string_dynamic_t_resize(status, account->label, string_length + 1);
     if (F_status_is_error(status)) return status;
 
     memcpy(account->label.string, password.pw_gecos, string_length);
@@ -42,7 +42,7 @@ extern "C" {
     // account name.
     string_length = strnlen(password.pw_name, password_length);
 
-    f_macro_string_dynamic_t_resize(status, account->name, string_length + 1);
+    macro_f_string_dynamic_t_resize(status, account->name, string_length + 1);
     if (F_status_is_error(status)) return status;
 
     memcpy(account->name.string, password.pw_name, string_length);
@@ -54,7 +54,7 @@ extern "C" {
     // account password directory.
     string_length = strnlen(password.pw_passwd, password_length);
 
-    f_macro_string_dynamic_t_resize(status, account->password, string_length + 1);
+    macro_f_string_dynamic_t_resize(status, account->password, string_length + 1);
     if (F_status_is_error(status)) return status;
 
     memcpy(account->password.string, password.pw_passwd, string_length);
@@ -66,7 +66,7 @@ extern "C" {
     // account shell directory.
     string_length = strnlen(password.pw_shell, password_length);
 
-    f_macro_string_dynamic_t_resize(status, account->shell, string_length + 1);
+    macro_f_string_dynamic_t_resize(status, account->shell, string_length + 1);
     if (F_status_is_error(status)) return status;
 
     memcpy(account->shell.string, password.pw_shell, string_length);
index 2f455286df86faef6c78846d7b334326e0c2dbdc..77374cfdeaf78b7e7d851b4f45e76157653b6170 100644 (file)
@@ -32,11 +32,11 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from f_macro_string_dynamic_t_resize().
+ *   Errors (with error bit) from macro_f_string_dynamic_t_resize().
  *
  * @see f_account_by_name()
  * @see f_account_by_id()
- * @see f_macro_string_dynamic_t_resize()
+ * @see macro_f_string_dynamic_t_resize()
  */
 #if !defined(_di_f_account_by_name_) || !defined(_di_f_account_by_id_)
   extern f_status_t private_f_account_from_passwd(const struct passwd password, const f_array_length_t password_length, f_account_t *account) f_attribute_visibility_internal;
index 2e064a8d0d510da29a85bc88273764ae0bbba996..38a24ed9ed35da167d50fc476a9442348d76060f 100644 (file)
@@ -50,7 +50,7 @@ extern "C" {
 #endif // _di_f_color_strings_s_
 
 #ifndef _di_f_color_set_string_empty_s_
-  const f_color_set_t f_color_set_empty_s = f_macro_color_set_t_initialize(&f_string_static_empty_s, &f_string_static_empty_s);
+  const f_color_set_t f_color_set_empty_s = macro_f_color_set_t_initialize(&f_string_static_empty_s, &f_string_static_empty_s);
 #endif // _di_f_color_set_string_empty_s_
 
 #ifdef __cplusplus
index c56a26a040448742dbffe412d65e5b2f1d8dc52d..3cfdc9fe6bceb2c7150857834fe0dfd1c2a26713 100644 (file)
@@ -103,17 +103,17 @@ extern "C" {
   #define f_color_format_t_initialize_linux     { f_color_string_begin_s, f_color_string_end_s, f_color_string_medium_s }
   #define f_color_format_t_initialize_xterminal { f_color_string_begin_s, f_color_string_end_s, f_color_string_medium_s }
 
-  #define f_macro_color_format_t_clear(format) \
+  #define macro_f_color_format_t_clear(format) \
     format.begin = 0; \
     format.end = 0; \
     format.medium = 0;
 
-  #define f_macro_color_format_t_set_linux(format) \
+  #define macro_f_color_format_t_set_linux(format) \
     format.begin = f_color_string_begin_s; \
     format.end = f_color_string_end_s; \
     format.medium = f_color_string_medium_s;
 
-  #define f_macro_color_format_t_set_xterminal(format) \
+  #define macro_f_color_format_t_set_xterminal(format) \
     format.begin = f_color_string_begin_s; \
     format.end = f_color_string_end_s; \
     format.medium = f_color_string_medium_s;
@@ -173,7 +173,7 @@ extern "C" {
   #define f_color_t_initialize_linux     { f_color_string_code_reset_s, f_color_string_code_bold_s, f_color_string_code_underline_s, f_color_string_code_blink_s, f_color_string_code_reverse_s, f_color_string_code_conceal_s, f_color_string_code_black_s, f_color_string_code_red_s, f_color_string_code_green_s, f_color_string_code_yellow_s, f_color_string_code_blue_s, f_color_string_code_purple_s, f_color_string_code_teal_s, f_color_string_code_white_s, f_color_string_code_black_bg_s, f_color_string_code_red_bg_s, f_color_string_code_green_bg_s, f_color_string_code_yellow_bg_s, f_color_string_code_blue_bg_s, f_color_string_code_purple_bg_s, f_color_string_code_teal_bg_s, f_color_string_code_white_bg_s, f_color_string_code_black_s, f_color_string_code_red_s, f_color_string_code_green_s, f_color_string_code_yellow_s, f_color_string_code_blue_s, f_color_string_code_purple_s, f_color_string_code_teal_s, f_color_string_code_white_s, f_color_string_code_black_bg_s, f_color_string_code_red_bg_s, f_color_string_code_green_bg_s, f_color_string_code_yellow_bg_s, f_color_string_code_blue_bg_s, f_color_string_code_purple_bg_s, f_color_string_code_teal_bg_s, f_color_string_code_white_bg_s }
   #define f_color_t_initialize_xterminal { f_color_string_code_reset_s, f_color_string_code_bold_s, f_color_string_code_underline_s, f_color_string_code_blink_s, f_color_string_code_reverse_s, f_color_string_code_conceal_s, f_color_string_code_black_s, f_color_string_code_red_s, f_color_string_code_green_s, f_color_string_code_yellow_s, f_color_string_code_blue_s, f_color_string_code_purple_s, f_color_string_code_teal_s, f_color_string_code_white_s, f_color_string_code_black_bg_s, f_color_string_code_red_bg_s, f_color_string_code_green_bg_s, f_color_string_code_yellow_bg_s, f_color_string_code_blue_bg_s, f_color_string_code_purple_bg_s, f_color_string_code_teal_bg_s, f_color_string_code_white_bg_s, f_color_string_code_bright_black_s, f_color_string_code_bright_red_s, f_color_string_code_bright_green_s, f_color_string_code_bright_yellow_s, f_color_string_code_bright_blue_s, f_color_string_code_bright_purple_s, f_color_string_code_bright_teal_s, f_color_string_code_bright_white_s, f_color_string_code_bright_black_bg_s, f_color_string_code_bright_red_bg_s, f_color_string_code_bright_green_bg_s, f_color_string_code_bright_yellow_bg_s, f_color_string_code_bright_blue_bg_s, f_color_string_code_bright_purple_bg_s, f_color_string_code_bright_teal_bg_s, f_color_string_code_bright_white_bg_s }
 
-  #define f_macro_color_t_clear(color) \
+  #define macro_f_color_t_clear(color) \
     color.reset = 0; \
     color.bold = 0; \
     color.underline = 0; \
@@ -213,7 +213,7 @@ extern "C" {
     color.bright_teal_bg = 0; \
     color.bright_white_bg = 0;
 
-  #define f_macro_color_t_set_linux(color) \
+  #define macro_f_color_t_set_linux(color) \
     color.reset = f_color_string_code_reset_s; \
     color.bold = f_color_string_code_bold_s; \
     color.underline = f_color_string_code_underline_s; \
@@ -253,7 +253,7 @@ extern "C" {
     color.bright_teal_bg = f_color_string_code_teal_bg_s; \
     color.bright_white_bg = f_color_string_code_white_bg_s;
 
-  #define f_macro_color_t_set_xterminal(color) \
+  #define macro_f_color_t_set_xterminal(color) \
     color.reset = f_color_string_code_reset_s; \
     color.bold = f_color_string_code_bold_s; \
     color.underline = f_color_string_code_underline_s; \
@@ -311,9 +311,9 @@ extern "C" {
 
   #define f_color_set_t_initialize { 0, 0 }
 
-  #define f_macro_color_set_t_initialize(before, after) { before, after }
+  #define macro_f_color_set_t_initialize(before, after) { before, after }
 
-  #define f_macro_color_set_t_clear(set) \
+  #define macro_f_color_set_t_clear(set) \
     set.before = 0; \
     set.after = 0;
 #endif // _di_f_color_set_t_
@@ -353,17 +353,17 @@ extern "C" {
 
   #define f_color_set_context_t_initialize { f_color_set_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize }
 
-  #define f_macro_color_set_context_t_initialize(warning, error, title, notable, important, standout, normal, normal_reset) { warning, error, title, notable, important, standout, normal, normal_reset }
+  #define macro_f_color_set_context_t_initialize(warning, error, title, notable, important, standout, normal, normal_reset) { warning, error, title, notable, important, standout, normal, normal_reset }
 
-  #define f_macro_color_set_context_t_clear(set) \
-    f_macro_color_set_t_clear(set.warning) \
-    f_macro_color_set_t_clear(set.error) \
-    f_macro_color_set_t_clear(set.title) \
-    f_macro_color_set_t_clear(set.notable) \
-    f_macro_color_set_t_clear(set.important) \
-    f_macro_color_set_t_clear(set.standout) \
-    f_macro_color_set_t_clear(set.normal) \
-    f_macro_color_set_t_clear(set.normal_reset)
+  #define macro_f_color_set_context_t_clear(set) \
+    macro_f_color_set_t_clear(set.warning) \
+    macro_f_color_set_t_clear(set.error) \
+    macro_f_color_set_t_clear(set.title) \
+    macro_f_color_set_t_clear(set.notable) \
+    macro_f_color_set_t_clear(set.important) \
+    macro_f_color_set_t_clear(set.standout) \
+    macro_f_color_set_t_clear(set.normal) \
+    macro_f_color_set_t_clear(set.normal_reset)
 
 #endif // _di_f_color_set_context_t_
 
@@ -404,53 +404,53 @@ extern "C" {
 
   #define f_color_context_t_initialize { f_color_t_initialize_linux, f_color_format_t_initialize_linux, f_color_mode_none, f_color_set_context_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize }
 
-  #define f_macro_color_context_t_clear(context) \
-    f_macro_color_t_clear(context.list) \
-    f_macro_color_format_t_clear(context.format) \
+  #define macro_f_color_context_t_clear(context) \
+    macro_f_color_t_clear(context.list) \
+    macro_f_color_format_t_clear(context.format) \
     context.mode = f_color_mode_none; \
-    f_macro_color_set_context_t_clear(context.set) \
-    f_macro_string_dynamic_t_clear(context.error) \
-    f_macro_string_dynamic_t_clear(context.title) \
-    f_macro_string_dynamic_t_clear(context.notable) \
-    f_macro_string_dynamic_t_clear(context.important) \
-    f_macro_string_dynamic_t_clear(context.standout) \
-    f_macro_string_dynamic_t_clear(context.normal) \
-    f_macro_string_dynamic_t_clear(context.normal_reset)
-
-  #define f_macro_color_context_t_new(status, context) \
-     f_macro_string_dynamic_t_resize(status, context.reset, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.warning, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.error, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.title, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.notable, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.important, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.standout, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.normal, f_color_max_size + 1) \
-    if (F_status_is_error_not(status)) f_macro_string_dynamic_t_resize(status, context.normal_reset, f_color_max_size + 1)
-
-  #define f_macro_color_context_t_delete_simple(context) \
-    f_macro_string_dynamic_t_delete_simple(context.reset) \
-    f_macro_string_dynamic_t_delete_simple(context.warning) \
-    f_macro_string_dynamic_t_delete_simple(context.error) \
-    f_macro_string_dynamic_t_delete_simple(context.title) \
-    f_macro_string_dynamic_t_delete_simple(context.notable) \
-    f_macro_string_dynamic_t_delete_simple(context.important) \
-    f_macro_string_dynamic_t_delete_simple(context.standout) \
-    f_macro_string_dynamic_t_delete_simple(context.normal) \
-    f_macro_string_dynamic_t_delete_simple(context.normal_reset) \
-    f_macro_color_context_t_clear(context)
-
-  #define f_macro_color_context_t_destroy_simple(context, size) \
-    f_macro_string_dynamic_t_destroy_simple(context.reset) \
-    f_macro_string_dynamic_t_destroy_simple(context.warning, size) \
-    f_macro_string_dynamic_t_destroy_simple(context.error, size) \
-    f_macro_string_dynamic_t_destroy_simple(context.title, size) \
-    f_macro_string_dynamic_t_destroy_simple(context.notable, size) \
-    f_macro_string_dynamic_t_destroy_simple(context.important, size) \
-    f_macro_string_dynamic_t_destroy_simple(context.standout, size) \
-    f_macro_string_dynamic_t_destroy_simple(context.normal) \
-    f_macro_string_dynamic_t_destroy_simple(context.normal_reset) \
-    f_macro_color_context_t_clear(context)
+    macro_f_color_set_context_t_clear(context.set) \
+    macro_f_string_dynamic_t_clear(context.error) \
+    macro_f_string_dynamic_t_clear(context.title) \
+    macro_f_string_dynamic_t_clear(context.notable) \
+    macro_f_string_dynamic_t_clear(context.important) \
+    macro_f_string_dynamic_t_clear(context.standout) \
+    macro_f_string_dynamic_t_clear(context.normal) \
+    macro_f_string_dynamic_t_clear(context.normal_reset)
+
+  #define macro_f_color_context_t_new(status, context) \
+     macro_f_string_dynamic_t_resize(status, context.reset, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.warning, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.error, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.title, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.notable, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.important, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.standout, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.normal, f_color_max_size + 1) \
+    if (F_status_is_error_not(status)) macro_f_string_dynamic_t_resize(status, context.normal_reset, f_color_max_size + 1)
+
+  #define macro_f_color_context_t_delete_simple(context) \
+    macro_f_string_dynamic_t_delete_simple(context.reset) \
+    macro_f_string_dynamic_t_delete_simple(context.warning) \
+    macro_f_string_dynamic_t_delete_simple(context.error) \
+    macro_f_string_dynamic_t_delete_simple(context.title) \
+    macro_f_string_dynamic_t_delete_simple(context.notable) \
+    macro_f_string_dynamic_t_delete_simple(context.important) \
+    macro_f_string_dynamic_t_delete_simple(context.standout) \
+    macro_f_string_dynamic_t_delete_simple(context.normal) \
+    macro_f_string_dynamic_t_delete_simple(context.normal_reset) \
+    macro_f_color_context_t_clear(context)
+
+  #define macro_f_color_context_t_destroy_simple(context, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.reset) \
+    macro_f_string_dynamic_t_destroy_simple(context.warning, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.error, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.title, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.notable, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.important, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.standout, size) \
+    macro_f_string_dynamic_t_destroy_simple(context.normal) \
+    macro_f_string_dynamic_t_destroy_simple(context.normal_reset) \
+    macro_f_color_context_t_clear(context)
 #endif // _di_f_color__context_t_
 
 #ifdef __cplusplus
index d2afcca57246ce7c35adf94cefd4b3b35f7be3db..1589a6cd69e35d36595474fd1357c8aec3568eb1 100644 (file)
@@ -72,7 +72,7 @@ extern "C" {
     if (buffer->size - buffer->used - 1 < string_size) {
       f_status_t status = F_none;
 
-      f_macro_string_dynamic_t_resize(status, (*buffer), buffer->used + string_size + 1); // the additional 1 is the EOS
+      macro_f_string_dynamic_t_resize(status, (*buffer), buffer->used + string_size + 1); // the additional 1 is the EOS
 
       if (F_status_is_error(status)) {
         return status;
@@ -304,38 +304,38 @@ extern "C" {
       char *environment = getenv("TERM");
 
       if (!environment || strncmp(environment, "linux", 6) == 0) {
-        f_macro_color_t_set_linux(context->list);
+        macro_f_color_t_set_linux(context->list);
       }
       else {
-        f_macro_color_t_set_xterminal(context->list);
+        macro_f_color_t_set_xterminal(context->list);
       }
     }
 
-    status = fl_macro_color_save_1(&context->reset, context->format, context->list.reset);
+    status = macro_fl_color_save_1(&context->reset, context->format, context->list.reset);
 
     if (F_status_is_error_not(status)) {
-      status = fl_macro_color_save_1(&context->warning, context->format, context->list.yellow);
+      status = macro_fl_color_save_1(&context->warning, context->format, context->list.yellow);
     }
 
     if (F_status_is_error_not(status)) {
-      status = fl_macro_color_save_2(&context->error, context->format, context->list.bold, context->list.red);
+      status = macro_fl_color_save_2(&context->error, context->format, context->list.bold, context->list.red);
     }
 
     if (F_status_is_error_not(status)) {
-      status = fl_macro_color_save_1(&context->notable, context->format, context->list.bold);
+      status = macro_fl_color_save_1(&context->notable, context->format, context->list.bold);
     }
 
     if (F_status_is_error_not(status)) {
-      status = fl_macro_color_save_1(&context->standout,  context->format, context->list.purple);
+      status = macro_fl_color_save_1(&context->standout,  context->format, context->list.purple);
     }
 
     if (use_light_colors) {
       if (F_status_is_error_not(status)) {
-        status = fl_macro_color_save_2(&context->title, context->format, context->list.bold, context->list.blue);
+        status = macro_fl_color_save_2(&context->title, context->format, context->list.bold, context->list.blue);
       }
 
       if (F_status_is_error_not(status)) {
-        status = fl_macro_color_save_1(&context->important, context->format, context->list.blue);
+        status = macro_fl_color_save_1(&context->important, context->format, context->list.blue);
       }
 
       if (F_status_is_error_not(status)) {
@@ -343,16 +343,16 @@ extern "C" {
       }
 
       if (F_status_is_error_not(status)) {
-        status = fl_macro_color_save_1(&context->standout,  context->format, context->list.purple);
+        status = macro_fl_color_save_1(&context->standout,  context->format, context->list.purple);
       }
     }
     else {
       if (F_status_is_error_not(status)) {
-        status = fl_macro_color_save_2(&context->title, context->format, context->list.bold, context->list.yellow);
+        status = macro_fl_color_save_2(&context->title, context->format, context->list.bold, context->list.yellow);
       }
 
       if (F_status_is_error_not(status)) {
-        status = fl_macro_color_save_2(&context->important, context->format, context->list.bold, context->list.green);
+        status = macro_fl_color_save_2(&context->important, context->format, context->list.bold, context->list.green);
       }
 
       if (F_status_is_error_not(status)) {
@@ -360,7 +360,7 @@ extern "C" {
       }
 
       if (F_status_is_error_not(status)) {
-        status = fl_macro_color_save_1(&context->standout,  context->format, context->list.green);
+        status = macro_fl_color_save_1(&context->standout,  context->format, context->list.green);
       }
     }
 
index d5406deeeb7dc8f3936a59511a7363e3adf9c0c2..622055c2eb1de691f7600c9c862fa3b6c7cc9710 100644 (file)
@@ -57,11 +57,11 @@ extern "C" {
 #ifndef _di_f_color_set_
   extern f_status_t f_color_set(FILE *stream, const f_color_format_t format, const char *color1, const char *color2, const char *color3, const char *color4, const char *color5);
 
-  #define fl_macro_color_set_1(stream, format, color1)                                 f_color_set(stream, format, color1, 0, 0, 0, 0);
-  #define fl_macro_color_set_2(stream, format, color1, color2)                         f_color_set(stream, format, color1, color2, 0, 0, 0);
-  #define fl_macro_color_set_3(stream, format, color1, color2, color3)                 f_color_set(stream, format, color1, color2, color3, 0, 0);
-  #define fl_macro_color_set_4(stream, format, color1, color2, color3, color4)         f_color_set(stream, format, color1, color2, color3, color4, 0);
-  #define fl_macro_color_set_5(stream, format, color1, color2, color3, color4, color5) f_color_set(stream, format, color1, color2, color3, color4, color5);
+  #define macro_fl_color_set_1(stream, format, color1)                                 f_color_set(stream, format, color1, 0, 0, 0, 0);
+  #define macro_fl_color_set_2(stream, format, color1, color2)                         f_color_set(stream, format, color1, color2, 0, 0, 0);
+  #define macro_fl_color_set_3(stream, format, color1, color2, color3)                 f_color_set(stream, format, color1, color2, color3, 0, 0);
+  #define macro_fl_color_set_4(stream, format, color1, color2, color3, color4)         f_color_set(stream, format, color1, color2, color3, color4, 0);
+  #define macro_fl_color_set_5(stream, format, color1, color2, color3, color4, color5) f_color_set(stream, format, color1, color2, color3, color4, color5);
 #endif // _di_f_color_set_
 
 /**
@@ -91,11 +91,11 @@ extern "C" {
 #ifndef _di_f_color_set_to_
   extern f_status_t f_color_set_to(const int id, const f_color_format_t format, const char *color1, const char *color2, const char *color3, const char *color4, const char *color5);
 
-  #define fl_macro_color_set_to_1(id, format, color1)                                 f_color_set_to(id, format, color1, 0, 0, 0, 0);
-  #define fl_macro_color_set_to_2(id, format, color1, color2)                         f_color_set_to(id, format, color1, color2, 0, 0, 0);
-  #define fl_macro_color_set_to_3(id, format, color1, color2, color3)                 f_color_set_to(id, format, color1, color2, color3, 0, 0);
-  #define fl_macro_color_set_to_4(id, format, color1, color2, color3, color4)         f_color_set_to(id, format, color1, color2, color3, color4, 0);
-  #define fl_macro_color_set_to_5(id, format, color1, color2, color3, color4, color5) f_color_set_to(id, format, color1, color2, color3, color4, color5);
+  #define macro_fl_color_set_to_1(id, format, color1)                                 f_color_set_to(id, format, color1, 0, 0, 0, 0);
+  #define macro_fl_color_set_to_2(id, format, color1, color2)                         f_color_set_to(id, format, color1, color2, 0, 0, 0);
+  #define macro_fl_color_set_to_3(id, format, color1, color2, color3)                 f_color_set_to(id, format, color1, color2, color3, 0, 0);
+  #define macro_fl_color_set_to_4(id, format, color1, color2, color3, color4)         f_color_set_to(id, format, color1, color2, color3, color4, 0);
+  #define macro_fl_color_set_to_5(id, format, color1, color2, color3, color4, color5) f_color_set_to(id, format, color1, color2, color3, color4, color5);
 #endif // _di_f_color_set_to_
 
 /**
@@ -126,11 +126,11 @@ extern "C" {
 #ifndef _di_f_color_save_
   extern f_status_t f_color_save(f_string_dynamic_t *buffer, const f_color_format_t 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)                                 f_color_save(buffer, format, color1, 0, 0, 0, 0);
-  #define fl_macro_color_save_2(buffer, format, color1, color2)                         f_color_save(buffer, format, color1, color2, 0, 0, 0);
-  #define fl_macro_color_save_3(buffer, format, color1, color2, color3)                 f_color_save(buffer, format, color1, color2, color3, 0, 0);
-  #define fl_macro_color_save_4(buffer, format, color1, color2, color3, color4)         f_color_save(buffer, format, color1, color2, color3, color4, 0);
-  #define fl_macro_color_save_5(buffer, format, color1, color2, color3, color4, color5) f_color_save(buffer, format, color1, color2, color3, color4, color5);
+  #define macro_fl_color_save_1(buffer, format, color1)                                 f_color_save(buffer, format, color1, 0, 0, 0, 0);
+  #define macro_fl_color_save_2(buffer, format, color1, color2)                         f_color_save(buffer, format, color1, color2, 0, 0, 0);
+  #define macro_fl_color_save_3(buffer, format, color1, color2, color3)                 f_color_save(buffer, format, color1, color2, color3, 0, 0);
+  #define macro_fl_color_save_4(buffer, format, color1, color2, color3, color4)         f_color_save(buffer, format, color1, color2, color3, color4, 0);
+  #define macro_fl_color_save_5(buffer, format, color1, color2, color3, color4, color5) f_color_save(buffer, format, color1, color2, color3, color4, color5);
 #endif // _di_f_color_save_
 
 /**
index 200399aa4cc472dc51635766ad851e09ea203a70..b0f8bb9178d9efaaf2cfb12f131cd30114fac337 100644 (file)
@@ -255,7 +255,7 @@ extern "C" {
 
   #define f_console_parameter_t_initialize(symbol_short, symbol_long, symbol_other, has_values, type_value) { symbol_short, symbol_long, symbol_other, has_values, type_value, f_console_result_none, 0, 0, f_array_lengths_t_initialize, f_array_lengths_t_initialize, f_array_lengths_t_initialize }
 
-  #define f_macro_console_parameter_t_initialize(symbol_short, symbol_long, symbol_other, has_values, type_value, result, location, location_sub, locations, locations_sub, values) { symbol_short, symbol_long, symbol_other, has_values, type_value, result, total, location, location_sub, locations, locations_sub, values }
+  #define macro_f_console_parameter_t_initialize(symbol_short, symbol_long, symbol_other, has_values, type_value, result, location, location_sub, locations, locations_sub, values) { symbol_short, symbol_long, symbol_other, has_values, type_value, result, total, location, location_sub, locations, locations_sub, values }
 #endif // _di_f_console_parameter_t_
 
 /**
@@ -276,7 +276,7 @@ extern "C" {
 
   #define f_console_parameters_t_initialize { 0, 0 }
 
-  #define f_macro_console_parameters_t_initialize(parameters, length) { parameters, length }
+  #define macro_f_console_parameters_t_initialize(parameters, length) { parameters, length }
 #endif // _di_f_console_parameters_t_
 
 /**
@@ -299,7 +299,7 @@ extern "C" {
 
   #define f_console_parameter_ids_t_initialize { 0, 0 }
 
-  #define f_macro_console_parameter_ids_t_initialize(id, used) { id, used }
+  #define macro_f_console_parameter_ids_t_initialize(id, used) { id, used }
 #endif // _di_f_console_parameter_id_t_
 
 /**
@@ -318,7 +318,7 @@ extern "C" {
 
   #define f_console_arguments_t_initialize { 0, 0 }
 
-  #define f_macro_console_arguments_t_initialize(argc, argv) { argc, argv }
+  #define macro_f_console_arguments_t_initialize(argc, argv) { argc, argv }
 #endif // _di_f_console_arguments_t_
 
 #ifdef __cplusplus
index 2b38dc642dfd930bddaae2c36713ffc95f775bcd..67745ab5f1f59215e87c3b3dff423d65b7874328 100644 (file)
@@ -81,10 +81,10 @@ extern "C" {
       if (needs_value.used > 0) {
         i = needs_value.array[0];
 
-        f_macro_array_lengths_t_increase(status, parameters.parameter[i].values)
+        macro_f_array_lengths_t_increase(status, parameters.parameter[i].values)
 
         if (F_status_is_error(status)) {
-          f_macro_array_lengths_t_delete_simple(needs_value);
+          macro_f_array_lengths_t_delete_simple(needs_value);
           return status;
         }
 
@@ -149,7 +149,7 @@ extern "C" {
             if (result == console_short) {
               if (!parameters.parameter[i].symbol_short) continue;
 
-              width = f_macro_utf_byte_width_is(arguments.argv[location][sub_location]);
+              width = macro_f_utf_byte_width_is(arguments.argv[location][sub_location]);
               if (width > 0) {
                 increment_by = width;
               }
@@ -165,7 +165,7 @@ extern "C" {
                 status = f_utf_char_to_character(arguments.argv[location] + sub_location, width_max, &character_argument_utf);
 
                 if (F_status_is_error(status)) {
-                  f_macro_array_lengths_t_delete_simple(needs_value);
+                  macro_f_array_lengths_t_delete_simple(needs_value);
                   return status;
                 }
 
@@ -174,7 +174,7 @@ extern "C" {
                 status = f_utf_char_to_character((f_string_t) parameters.parameter[i].symbol_short, width_max, &character_console_utf);
 
                 if (F_status_is_error(status)) {
-                  f_macro_array_lengths_t_delete_simple(needs_value);
+                  macro_f_array_lengths_t_delete_simple(needs_value);
                   return status;
                 }
 
@@ -196,17 +196,17 @@ extern "C" {
               continue;
             }
 
-            f_macro_array_lengths_t_increase(status, parameters.parameter[i].locations)
+            macro_f_array_lengths_t_increase(status, parameters.parameter[i].locations)
 
             if (F_status_is_error(status)) {
-              f_macro_array_lengths_t_delete_simple(needs_value);
+              macro_f_array_lengths_t_delete_simple(needs_value);
               return status;
             }
 
-            f_macro_array_lengths_t_increase(status, parameters.parameter[i].locations_sub)
+            macro_f_array_lengths_t_increase(status, parameters.parameter[i].locations_sub)
 
             if (F_status_is_error(status)) {
-              f_macro_array_lengths_t_delete_simple(needs_value);
+              macro_f_array_lengths_t_delete_simple(needs_value);
               return status;
             }
 
@@ -226,10 +226,10 @@ extern "C" {
 
             if (parameters.parameter[i].has_values) {
               if (needs_value.used + parameters.parameter[i].has_values > needs_value.size) {
-                f_macro_array_lengths_t_resize(status, needs_value, needs_value.used + parameters.parameter[i].has_values);
+                macro_f_array_lengths_t_resize(status, needs_value, needs_value.used + parameters.parameter[i].has_values);
 
                 if (F_status_is_error(status)) {
-                  f_macro_array_lengths_t_delete_simple(needs_value);
+                  macro_f_array_lengths_t_delete_simple(needs_value);
                   return status;
                 }
               }
@@ -256,17 +256,17 @@ extern "C" {
 
           if (strncmp(arguments.argv[location], parameters.parameter[i].symbol_other, argument_length + 1) != 0) continue;
 
-          f_macro_array_lengths_t_increase(status, parameters.parameter[i].locations)
+          macro_f_array_lengths_t_increase(status, parameters.parameter[i].locations)
 
           if (F_status_is_error(status)) {
-            f_macro_array_lengths_t_delete_simple(needs_value);
+            macro_f_array_lengths_t_delete_simple(needs_value);
             return status;
           }
 
-          f_macro_array_lengths_t_increase(status, parameters.parameter[i].locations_sub)
+          macro_f_array_lengths_t_increase(status, parameters.parameter[i].locations_sub)
 
           if (F_status_is_error(status)) {
-            f_macro_array_lengths_t_delete_simple(needs_value);
+            macro_f_array_lengths_t_delete_simple(needs_value);
             return status;
           }
 
@@ -279,10 +279,10 @@ extern "C" {
 
           if (parameters.parameter[i].has_values) {
             if (needs_value.used + parameters.parameter[i].has_values > needs_value.size) {
-              f_macro_array_lengths_t_resize(status, needs_value, needs_value.used + parameters.parameter[i].has_values);
+              macro_f_array_lengths_t_resize(status, needs_value, needs_value.used + parameters.parameter[i].has_values);
 
               if (F_status_is_error(status)) {
-                f_macro_array_lengths_t_delete_simple(needs_value);
+                macro_f_array_lengths_t_delete_simple(needs_value);
                 return status;
               }
             }
@@ -300,9 +300,9 @@ extern "C" {
 
           // populate list of remaining parameters.parameter not associated with anything.
           if (remaining->used == remaining->size) {
-            f_macro_memory_structure_macro_increment(status, (*remaining), 1, f_memory_default_allocation_step, f_macro_array_lengths_t_resize, F_array_too_large);
+            macro_f_memory_structure_increment(status, (*remaining), 1, f_memory_default_allocation_step, macro_f_array_lengths_t_resize, F_array_too_large);
             if (F_status_is_error(status)) {
-              f_macro_array_lengths_t_delete_simple(needs_value);
+              macro_f_array_lengths_t_delete_simple(needs_value);
               return status;
             }
           }
@@ -321,7 +321,7 @@ extern "C" {
       status = F_none;
     }
 
-    f_macro_array_lengths_t_delete_simple(needs_value);
+    macro_f_array_lengths_t_delete_simple(needs_value);
 
     return status;
   }
index 3c0e39088617257d127315b336ba630ef425c449..1859cdee0c71a7c60cd914c36fd1fbcb0d94da17 100644 (file)
@@ -52,18 +52,18 @@ extern "C" {
 
   #define f_control_group_t_initialize { F_false, f_string_dynamic_t_initialize, f_string_dynamics_t_initialize }
 
-  #define f_macro_control_group_t_clear(control) \
+  #define macro_f_control_group_t_clear(control) \
     control.as_new = F_false; \
-    f_macro_string_dynamic_t_clear(control.path); \
-    f_macro_string_dynamics_t_clear(control.groups);
+    macro_f_string_dynamic_t_clear(control.path); \
+    macro_f_string_dynamics_t_clear(control.groups);
 
-  #define f_macro_control_group_t_delete_simple(control) \
-    f_macro_string_dynamic_t_delete_simple(control.path); \
-    f_macro_string_dynamics_t_delete_simple(control.groups);
+  #define macro_f_control_group_t_delete_simple(control) \
+    macro_f_string_dynamic_t_delete_simple(control.path); \
+    macro_f_string_dynamics_t_delete_simple(control.groups);
 
-  #define f_macro_control_group_t_destroy_simple(control) \
-    f_macro_string_dynamic_t_destroy_simple(control.path); \
-    f_macro_string_dynamics_t_destroy_simple(control.groups);
+  #define macro_f_control_group_t_destroy_simple(control) \
+    macro_f_string_dynamic_t_destroy_simple(control.path); \
+    macro_f_string_dynamics_t_destroy_simple(control.groups);
 #endif // _di_f_control_group_t_
 
 #ifdef __cplusplus
index 51248aedc3cee153b680cfc6fd4cf0d2f8277b21..3b7f1fe15d15c8812d9a7fe40b67e7db954058af 100644 (file)
@@ -214,7 +214,7 @@ extern "C" {
     f_status_t status = F_none;
 
     if (!number) {
-      f_macro_string_dynamic_t_resize(status, (*destination), destination->used + 2);
+      macro_f_string_dynamic_t_resize(status, (*destination), destination->used + 2);
       if (F_status_is_error(status)) return status;
 
       destination->string[destination->used] = f_string_ascii_0_s[0];
@@ -239,10 +239,10 @@ extern "C" {
     } // for
 
     if (negative) {
-      f_macro_string_dynamic_t_resize(status, (*destination), destination->used + total + 2);
+      macro_f_string_dynamic_t_resize(status, (*destination), destination->used + total + 2);
     }
     else {
-      f_macro_string_dynamic_t_resize(status, (*destination), destination->used + total + 1);
+      macro_f_string_dynamic_t_resize(status, (*destination), destination->used + total + 1);
     }
 
     if (F_status_is_error(status)) return status;
@@ -335,7 +335,7 @@ extern "C" {
     f_status_t status = F_none;
 
     if (!number) {
-      f_macro_string_dynamic_t_resize(status, (*destination), destination->used + 2);
+      macro_f_string_dynamic_t_resize(status, (*destination), destination->used + 2);
       if (F_status_is_error(status)) return status;
 
       destination->string[destination->used] = f_string_ascii_0_s[0];
@@ -351,7 +351,7 @@ extern "C" {
       work /= base;
     } // for
 
-    f_macro_string_dynamic_t_resize(status, (*destination), destination->used + total + 1);
+    macro_f_string_dynamic_t_resize(status, (*destination), destination->used + total + 1);
     if (F_status_is_error(status)) return status;
 
     f_number_unsigned_t current = number;
index ddd2c66f990a171a35ee12faa29ffcab82aed668..7c94180e0210b899d48eea146a4d7bc73df4c7d5 100644 (file)
@@ -151,12 +151,12 @@ extern "C" {
       }
 
       if (names->used == names->size) {
-        f_macro_memory_structure_macro_increment(status, (*names), 1, f_directory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+        macro_f_memory_structure_increment(status, (*names), 1, f_directory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
         if (F_status_is_error(status)) break;
       }
 
-      f_macro_string_dynamic_t_clear(names->array[names->used])
-      f_macro_string_dynamic_t_resize(status, names->array[names->used], size);
+      macro_f_string_dynamic_t_clear(names->array[names->used])
+      macro_f_string_dynamic_t_resize(status, names->array[names->used], size);
       if (F_status_is_error(status)) break;
 
       memcpy(names->array[names->used].string, listing[i]->d_name, size);
index 6beb909c994417cc86b6499f4f3517d7f9c2823e..64b8302f37ba0fb37ded9afee191cdb6b6c88dc8 100644 (file)
@@ -48,25 +48,25 @@ extern "C" {
     f_string_dynamics_t_initialize, \
   }
 
-  #define f_macro_directory_listing_t_delete_simple(listing) \
-    f_macro_string_dynamics_t_delete_simple(listing.block) \
-    f_macro_string_dynamics_t_delete_simple(listing.character) \
-    f_macro_string_dynamics_t_delete_simple(listing.directory) \
-    f_macro_string_dynamics_t_delete_simple(listing.regular) \
-    f_macro_string_dynamics_t_delete_simple(listing.link) \
-    f_macro_string_dynamics_t_delete_simple(listing.fifo) \
-    f_macro_string_dynamics_t_delete_simple(listing.socket) \
-    f_macro_string_dynamics_t_delete_simple(listing.unknown)
-
-  #define f_macro_directory_listing_t_destroy_simple(listing) \
-    f_macro_string_dynamics_t_destroy_simple(listing.block) \
-    f_macro_string_dynamics_t_destroy_simple(listing.character) \
-    f_macro_string_dynamics_t_destroy_simple(listing.directory) \
-    f_macro_string_dynamics_t_destroy_simple(listing.regular) \
-    f_macro_string_dynamics_t_destroy_simple(listing.link) \
-    f_macro_string_dynamics_t_destroy_simple(listing.fifo) \
-    f_macro_string_dynamics_t_destroy_simple(listing.socket) \
-    f_macro_string_dynamics_t_destroy_simple(listing.unknown)
+  #define macro_f_directory_listing_t_delete_simple(listing) \
+    macro_f_string_dynamics_t_delete_simple(listing.block) \
+    macro_f_string_dynamics_t_delete_simple(listing.character) \
+    macro_f_string_dynamics_t_delete_simple(listing.directory) \
+    macro_f_string_dynamics_t_delete_simple(listing.regular) \
+    macro_f_string_dynamics_t_delete_simple(listing.link) \
+    macro_f_string_dynamics_t_delete_simple(listing.fifo) \
+    macro_f_string_dynamics_t_delete_simple(listing.socket) \
+    macro_f_string_dynamics_t_delete_simple(listing.unknown)
+
+  #define macro_f_directory_listing_t_destroy_simple(listing) \
+    macro_f_string_dynamics_t_destroy_simple(listing.block) \
+    macro_f_string_dynamics_t_destroy_simple(listing.character) \
+    macro_f_string_dynamics_t_destroy_simple(listing.directory) \
+    macro_f_string_dynamics_t_destroy_simple(listing.regular) \
+    macro_f_string_dynamics_t_destroy_simple(listing.link) \
+    macro_f_string_dynamics_t_destroy_simple(listing.fifo) \
+    macro_f_string_dynamics_t_destroy_simple(listing.socket) \
+    macro_f_string_dynamics_t_destroy_simple(listing.unknown)
 #endif // _di_f_directory_listing_t_
 
 /**
@@ -85,20 +85,20 @@ extern "C" {
 
   #define f_directory_status_t_initialize { 0, f_string_dynamic_t_initialize }
 
-  #define f_macro_directory_status_t_clear(directory) \
+  #define macro_f_directory_status_t_clear(directory) \
     directory.status = 0; \
-    f_macro_string_dynamic_t_clear(directory.path);
+    macro_f_string_dynamic_t_clear(directory.path);
 
-  #define f_macro_directory_status_t_resize(status, statuses, new_length) f_macro_string_dynamic_t_resize(status, statuses.path, new_length)
-  #define f_macro_directory_status_t_adjust(status, statuses, new_length) f_macro_string_dynamic_t_adjust(status, statuses.path, new_length)
+  #define macro_f_directory_status_t_resize(status, statuses, new_length) macro_f_string_dynamic_t_resize(status, statuses.path, new_length)
+  #define macro_f_directory_status_t_adjust(status, statuses, new_length) macro_f_string_dynamic_t_adjust(status, statuses.path, new_length)
 
-  #define f_macro_directory_status_t_delete_simple(statuses)  f_macro_string_dynamic_t_delete_simple(statuses.path)
-  #define f_macro_directory_status_t_destroy_simple(statuses) f_macro_string_dynamic_t_destroy_simple(statuses.path)
+  #define macro_f_directory_status_t_delete_simple(statuses)  macro_f_string_dynamic_t_delete_simple(statuses.path)
+  #define macro_f_directory_status_t_destroy_simple(statuses) macro_f_string_dynamic_t_destroy_simple(statuses.path)
 
-  #define f_macro_directory_status_t_increase(status, values)            f_macro_string_dynamic_t_increase(status, values)
-  #define f_macro_directory_status_t_increase_by(status, values, amount) f_macro_string_dynamic_t_increase_by(status, values, amount)
-  #define f_macro_directory_status_t_decrease_by(status, values, amount) f_macro_string_dynamic_t_decrease_by(status, values, amount)
-  #define f_macro_directory_status_t_decimate_by(status, values, amount) f_macro_string_dynamic_t_decimate_by(status, values, amount)
+  #define macro_f_directory_status_t_increase(status, values)            macro_f_string_dynamic_t_increase(status, values)
+  #define macro_f_directory_status_t_increase_by(status, values, amount) macro_f_string_dynamic_t_increase_by(status, values, amount)
+  #define macro_f_directory_status_t_decrease_by(status, values, amount) macro_f_string_dynamic_t_decrease_by(status, values, amount)
+  #define macro_f_directory_status_t_decimate_by(status, values, amount) macro_f_string_dynamic_t_decimate_by(status, values, amount)
 #endif // _di_f_directory_status_t_
 
 /**
@@ -117,13 +117,13 @@ extern "C" {
 
   #define f_directory_statuss_t_initialize { 0, 0, 0 }
 
-  #define f_macro_directory_statuss_t_clear(structures) f_macro_memory_structures_clear(structures)
+  #define macro_f_directory_statuss_t_clear(structures) macro_f_memory_structures_clear(structures)
 
-  #define f_macro_directory_statuss_t_resize(status, structures, new_length) \
+  #define macro_f_directory_statuss_t_resize(status, structures, new_length) \
     status = F_none; \
     if (new_length < structures.size) { \
       for (register f_array_length_t _macro__i = structures.size - new_length; _macro__i < structures.size; ++_macro__i) { \
-        f_macro_directory_status_t_resize(status, structures.array[_macro__i], 0); \
+        macro_f_directory_status_t_resize(status, structures.array[_macro__i], 0); \
         if (F_status_is_error(status)) break; \
       } \
     } \
@@ -133,11 +133,11 @@ extern "C" {
       if (structures.used > structures.size) structures.used = new_length; \
     }
 
-  #define f_macro_directory_statuss_t_adjust(status, structures, new_length) \
+  #define macro_f_directory_statuss_t_adjust(status, structures, new_length) \
     status = F_none; \
     if (new_length < structures.size) { \
       for (register f_array_length_t _macro__i = structures.size - new_length; _macro__i < structures.size; ++_macro__i) { \
-        f_macro_directory_status_t_adjust(status, structures.array[_macro__i], 0); \
+        macro_f_directory_status_t_adjust(status, structures.array[_macro__i], 0); \
         if (F_status_is_error(status)) break; \
       } \
     } \
@@ -147,11 +147,11 @@ extern "C" {
       if (structures.used > structures.size) structures.used = new_length; \
     }
 
-  #define f_macro_directory_statuss_t_delete_simple(structures) \
+  #define macro_f_directory_statuss_t_delete_simple(structures) \
     structures.used = structures.size; \
     while (structures.used > 0) { \
       structures.used--; \
-      f_macro_directory_status_t_delete_simple(structures.array[structures.used]); \
+      macro_f_directory_status_t_delete_simple(structures.array[structures.used]); \
     } \
     if (!structures.size) { \
       if (f_memory_resize(structures.size, 0, sizeof(f_directory_status_t), (void **) & structures.array)) { \
@@ -159,11 +159,11 @@ extern "C" {
       } \
     }
 
-  #define f_macro_directory_statuss_t_destroy_simple(structures) \
+  #define macro_f_directory_statuss_t_destroy_simple(structures) \
     structures.used = structures.size; \
     while (structures.used > 0) { \
       structures.used--; \
-      f_macro_directory_status_t_destroy_simple(structures.array[structures.used]); \
+      macro_f_directory_status_t_destroy_simple(structures.array[structures.used]); \
     } \
     if (!structures.size) { \
       if (f_memory_adjust(structures.size, 0, sizeof(f_directory_status_t), (void **) & structures.array)) { \
index 1d92b47daaa6396545528031d4f24bbbdede2ad4..23b6d18a6168b93d7fff53adfbc1c34fa1fcbfe7 100644 (file)
@@ -23,7 +23,7 @@ extern "C" {
       if (value->used + size > value->size) {
         f_status_t status = F_none;
 
-        f_macro_string_dynamic_t_resize(status, (*value), size);
+        macro_f_string_dynamic_t_resize(status, (*value), size);
         if (F_status_is_error(status)) return status;
       }
 
index 476a60727e9aa1ef9081d9b734386adf60d25d92..f2c1508e7b73973e8932985c35085ced53ac1b90 100644 (file)
@@ -32,7 +32,7 @@ extern "C" {
 
   #define f_execute_scheduler_t_initialize { 0, 0 }
 
-  #define f_macro_execute_scheduler_t_initialize(policy, priority) { policy, priority }
+  #define macro_f_execute_scheduler_t_initialize(policy, priority) { policy, priority }
 
   #define f_execute_scheduler_t_clear(scheduler) \
     scheduler.policy = 0; \
index bf3b27cc208d676b66d97888b16ab100b73326d1..1ce7e5ec71249d3794fa29fb790ffb702137fe07 100644 (file)
@@ -13,12 +13,12 @@ extern "C" {
   const f_string_t f_file_type_name_regular_s = f_file_type_name_regular;
   const f_string_t f_file_type_name_socket_s = f_file_type_name_socket;
 
-  const f_string_t f_file_open_mode_append_s = f_macro_file_open_mode_append;
-  const f_string_t f_file_open_mode_read_s = f_macro_file_open_mode_read;
-  const f_string_t f_file_open_mode_read_append_s = f_macro_file_open_mode_read_append;
-  const f_string_t f_file_open_mode_read_truncate_s = f_macro_file_open_mode_read_truncate;
-  const f_string_t f_file_open_mode_read_write_s = f_macro_file_open_mode_read_write;
-  const f_string_t f_file_open_mode_truncate_s = f_macro_file_open_mode_truncate;
+  const f_string_t f_file_open_mode_append_s = macro_f_file_open_mode_append;
+  const f_string_t f_file_open_mode_read_s = macro_f_file_open_mode_read;
+  const f_string_t f_file_open_mode_read_append_s = macro_f_file_open_mode_read_append;
+  const f_string_t f_file_open_mode_read_truncate_s = macro_f_file_open_mode_read_truncate;
+  const f_string_t f_file_open_mode_read_write_s = macro_f_file_open_mode_read_write;
+  const f_string_t f_file_open_mode_truncate_s = macro_f_file_open_mode_truncate;
 #endif // _di_f_file_type_
 
 #ifdef __cplusplus
index 63bbb10e68a3733bc2e2e8c112f5a01cebc9a173..0f3e3f97c9a6e04a9db505972fa12387c053f73b 100644 (file)
@@ -29,18 +29,18 @@ extern "C" {
  *
  * The fseek() function parameters can be confusing, so provide a hopefully more readibly code via these macros.
  *
- * The f_macro_file_seek_begin() sets the file pointer from this many bytes from the beginning of the file.
- * The f_macro_file_seek_data() sets the file pointer from this many bytes from the end of the file, relative to the next data.
- * The f_macro_file_seek_end() sets the file pointer from this many bytes from the end of the file.
- * The f_macro_file_seek_hole() sets the file pointer from this many bytes from the end of the file, relative to the next hole.
- * The f_macro_file_seek_to() sets the file pointer from this many bytes relative to the current position.
+ * The macro_f_file_seek_begin() sets the file pointer from this many bytes from the beginning of the file.
+ * The macro_f_file_seek_data() sets the file pointer from this many bytes from the end of the file, relative to the next data.
+ * The macro_f_file_seek_end() sets the file pointer from this many bytes from the end of the file.
+ * The macro_f_file_seek_hole() sets the file pointer from this many bytes from the end of the file, relative to the next hole.
+ * The macro_f_file_seek_to() sets the file pointer from this many bytes relative to the current position.
  */
 #ifndef _di_f_file_seeks_
-  #define f_macro_file_seek_begin(file, bytes) fseek(file, bytes, SEEK_SET)
-  #define f_macro_file_seek_data(file, bytes)  fseek(file, bytes, SEEK_DATA)
-  #define f_macro_file_seek_end(file)          fseek(file, bytes, SEEK_END)
-  #define f_macro_file_seek_hole(file, bytes)  fseek(file, bytes, SEEK_HOLE)
-  #define f_macro_file_seek_to(file, bytes)    fseek(file, bytes, SEEK_CUR)
+  #define macro_f_file_seek_begin(file, bytes) fseek(file, bytes, SEEK_SET)
+  #define macro_f_file_seek_data(file, bytes)  fseek(file, bytes, SEEK_DATA)
+  #define macro_f_file_seek_end(file)          fseek(file, bytes, SEEK_END)
+  #define macro_f_file_seek_hole(file, bytes)  fseek(file, bytes, SEEK_HOLE)
+  #define macro_f_file_seek_to(file, bytes)    fseek(file, bytes, SEEK_CUR)
 #endif // _di_f_file_seeks_
 
 /**
@@ -75,29 +75,29 @@ extern "C" {
   #define f_file_type_name_regular_length   7
   #define f_file_type_name_socket_length    6
 
-  #define f_macro_file_type_get(mode) (f_file_type_mask & mode)
-
-  #define f_macro_file_type_is_block(mode)     f_macro_file_type_get(mode) == f_file_type_block
-  #define f_macro_file_type_is_character(mode) f_macro_file_type_get(mode) == f_file_type_character
-  #define f_macro_file_type_is_directory(mode) f_macro_file_type_get(mode) == f_file_type_directory
-  #define f_macro_file_type_is_fifo(mode)      f_macro_file_type_get(mode) == f_file_type_fifo
-  #define f_macro_file_type_is_link(mode)      f_macro_file_type_get(mode) == f_file_type_link
-  #define f_macro_file_type_is_regular(mode)   f_macro_file_type_get(mode) == f_file_type_regular
-  #define f_macro_file_type_is_socket(mode)    f_macro_file_type_get(mode) == f_file_type_socket
-
-  #define f_macro_file_open_mode_append        "a"
-  #define f_macro_file_open_mode_read          "r"
-  #define f_macro_file_open_mode_read_append   "a+"
-  #define f_macro_file_open_mode_read_truncate "w+"
-  #define f_macro_file_open_mode_read_write    "r+"
-  #define f_macro_file_open_mode_truncate      "w"
-
-  #define f_macro_file_open_mode_append_length        1
-  #define f_macro_file_open_mode_read_length          1
-  #define f_macro_file_open_mode_read_append_length   2
-  #define f_macro_file_open_mode_read_truncate_length 2
-  #define f_macro_file_open_mode_read_write_length    2
-  #define f_macro_file_open_mode_truncate_length      1
+  #define macro_f_file_type_get(mode) (f_file_type_mask & mode)
+
+  #define macro_f_file_type_is_block(mode)     macro_f_file_type_get(mode) == f_file_type_block
+  #define macro_f_file_type_is_character(mode) macro_f_file_type_get(mode) == f_file_type_character
+  #define macro_f_file_type_is_directory(mode) macro_f_file_type_get(mode) == f_file_type_directory
+  #define macro_f_file_type_is_fifo(mode)      macro_f_file_type_get(mode) == f_file_type_fifo
+  #define macro_f_file_type_is_link(mode)      macro_f_file_type_get(mode) == f_file_type_link
+  #define macro_f_file_type_is_regular(mode)   macro_f_file_type_get(mode) == f_file_type_regular
+  #define macro_f_file_type_is_socket(mode)    macro_f_file_type_get(mode) == f_file_type_socket
+
+  #define macro_f_file_open_mode_append        "a"
+  #define macro_f_file_open_mode_read          "r"
+  #define macro_f_file_open_mode_read_append   "a+"
+  #define macro_f_file_open_mode_read_truncate "w+"
+  #define macro_f_file_open_mode_read_write    "r+"
+  #define macro_f_file_open_mode_truncate      "w"
+
+  #define macro_f_file_open_mode_append_length        1
+  #define macro_f_file_open_mode_read_length          1
+  #define macro_f_file_open_mode_read_append_length   2
+  #define macro_f_file_open_mode_read_truncate_length 2
+  #define macro_f_file_open_mode_read_write_length    2
+  #define macro_f_file_open_mode_truncate_length      1
 
   extern const f_string_t f_file_type_name_blocks;
   extern const f_string_t f_file_type_name_character_s;
@@ -134,17 +134,17 @@ extern "C" {
 
   #define f_file_t_initialize { 0, -1, f_file_flag_read_only, f_file_default_read_size, f_file_default_write_size }
 
-  #define f_macro_file_t_initialize(stream, id, flag, read_size, write_size) { stream, id, flag, read_size, write_size }
-  #define f_macro_file_t_initialize2(stream, id, flag) { stream, id, flag, f_file_default_read_size, f_file_default_write_size }
+  #define macro_f_file_t_initialize(stream, id, flag, read_size, write_size) { stream, id, flag, read_size, write_size }
+  #define macro_f_file_t_initialize2(stream, id, flag) { stream, id, flag, f_file_default_read_size, f_file_default_write_size }
 
-  #define f_macro_file_t_clear(file) \
+  #define macro_f_file_t_clear(file) \
     file.stream = 0; \
     file.id = -1; \
     file.flag = 0; \
     file.size_read = 0; \
     file.size_write = 0;
 
-  #define f_macro_file_t_reset(file) \
+  #define macro_f_file_t_reset(file) \
     file.stream = 0; \
     file.id = -1; \
     file.flag = f_file_flag_read_only; \
index 3ebbae5a0bb32fd521f1afed8dbfbac47b8995ed..d0e0b32c277b0c512b569f4961a1da5895141594 100644 (file)
@@ -43,7 +43,7 @@ extern "C" {
     status = private_f_file_stat(source, F_false, &source_stat);
     if (F_status_is_error(status)) return status;
 
-    if (f_macro_file_type_is_regular(source_stat.st_mode)) {
+    if (macro_f_file_type_is_regular(source_stat.st_mode)) {
       status = private_f_file_create(destination, source_stat.st_mode, exclusive);
       if (F_status_is_error(status)) return status;
 
@@ -59,7 +59,7 @@ extern "C" {
 
       return private_f_file_copy_content(source, destination, size_block == 0 ? f_file_default_read_size : size_block);
     }
-    else if (f_macro_file_type_is_link(source_stat.st_mode)) {
+    else if (macro_f_file_type_is_link(source_stat.st_mode)) {
       status = private_f_file_link(destination, source);
       if (F_status_set_fine(status) == F_file_found) {
         if (exclusive) return status;
@@ -110,7 +110,7 @@ extern "C" {
     status = private_f_file_stat(source, F_false, &source_stat);
     if (F_status_is_error(status)) return status;
 
-    if (f_macro_file_type_is_regular(source_stat.st_mode)) {
+    if (macro_f_file_type_is_regular(source_stat.st_mode)) {
 
       status = private_f_file_create(destination, (~f_file_type_mask) & mode.regular, exclusive);
       if (F_status_is_error(status)) return status;
@@ -122,7 +122,7 @@ extern "C" {
 
       return private_f_file_copy_content(source, destination, size_block == 0 ? f_file_default_read_size : size_block);
     }
-    else if (f_macro_file_type_is_directory(source_stat.st_mode)) {
+    else if (macro_f_file_type_is_directory(source_stat.st_mode)) {
       status = private_f_file_create_directory(destination, (~f_file_type_mask) & mode.directory);
 
       if (F_status_is_error(status)) {
@@ -136,18 +136,18 @@ extern "C" {
 
       return F_none;
     }
-    else if (f_macro_file_type_is_link(source_stat.st_mode)) {
+    else if (macro_f_file_type_is_link(source_stat.st_mode)) {
       f_string_dynamic_t target = f_string_dynamic_t_initialize;
 
       status = private_f_file_link_read(source, source_stat, &target);
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(target);
+        macro_f_string_dynamic_t_delete_simple(target);
         return status;
       }
 
       status = private_f_file_link(target.string, destination);
 
-      f_macro_string_dynamic_t_delete_simple(target);
+      macro_f_string_dynamic_t_delete_simple(target);
 
       if (F_status_is_error(status)) {
         if (F_status_set_fine(status) != F_file_found || exclusive) {
@@ -157,7 +157,7 @@ extern "C" {
 
       return F_none;
     }
-    else if (f_macro_file_type_is_fifo(source_stat.st_mode)) {
+    else if (macro_f_file_type_is_fifo(source_stat.st_mode)) {
       status = private_f_file_create_fifo(destination, (~f_file_type_mask) & mode.fifo);
 
       if (F_status_is_error(status)) {
@@ -171,8 +171,8 @@ extern "C" {
 
       return F_none;
     }
-    else if (f_macro_file_type_is_socket(source_stat.st_mode)) {
-      status = private_f_file_create_node(destination, f_macro_file_type_get(source_stat.st_mode) | ((~f_file_type_mask) & mode.socket), source_stat.st_rdev);
+    else if (macro_f_file_type_is_socket(source_stat.st_mode)) {
+      status = private_f_file_create_node(destination, macro_f_file_type_get(source_stat.st_mode) | ((~f_file_type_mask) & mode.socket), source_stat.st_rdev);
 
       if (F_status_is_error(status)) {
         if (F_status_set_fine(status) != F_file_found || exclusive) {
@@ -185,8 +185,8 @@ extern "C" {
 
       return F_none;
     }
-    else if (f_macro_file_type_is_block(source_stat.st_mode) || f_macro_file_type_is_character(source_stat.st_mode)) {
-      status = private_f_file_create_node(destination, f_macro_file_type_get(source_stat.st_mode) | ((~f_file_type_mask) & mode.block), source_stat.st_rdev);
+    else if (macro_f_file_type_is_block(source_stat.st_mode) || macro_f_file_type_is_character(source_stat.st_mode)) {
+      status = private_f_file_create_node(destination, macro_f_file_type_get(source_stat.st_mode) | ((~f_file_type_mask) & mode.block), source_stat.st_rdev);
 
       if (F_status_is_error(status)) {
         if (F_status_set_fine(status) != F_file_found || exclusive) {
@@ -231,7 +231,7 @@ extern "C" {
     #endif // _di_level_0_parameter_checking_
 
 
-    if (!f_macro_file_type_is_fifo(mode) && !f_macro_file_type_is_character(mode) && !f_macro_file_type_is_block(mode)) {
+    if (!macro_f_file_type_is_fifo(mode) && !macro_f_file_type_is_character(mode) && !macro_f_file_type_is_block(mode)) {
       return F_status_set_error(F_supported_not);
     }
 
@@ -247,7 +247,7 @@ extern "C" {
       if (!path) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!f_macro_file_type_is_fifo(mode) && !f_macro_file_type_is_character(mode) && !f_macro_file_type_is_block(mode)) {
+    if (!macro_f_file_type_is_fifo(mode) && !macro_f_file_type_is_character(mode) && !macro_f_file_type_is_block(mode)) {
       return F_status_set_error(F_supported_not);
     }
 
@@ -283,7 +283,7 @@ extern "C" {
       if (!path) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!f_macro_file_type_is_fifo(mode) && !f_macro_file_type_is_character(mode) && !f_macro_file_type_is_block(mode)) {
+    if (!macro_f_file_type_is_fifo(mode) && !macro_f_file_type_is_character(mode) && !macro_f_file_type_is_block(mode)) {
       return F_status_set_error(F_supported_not);
     }
 
@@ -297,7 +297,7 @@ extern "C" {
       if (!path) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    if (!f_macro_file_type_is_fifo(mode) && !f_macro_file_type_is_character(mode) && !f_macro_file_type_is_block(mode)) {
+    if (!macro_f_file_type_is_fifo(mode) && !macro_f_file_type_is_character(mode) && !macro_f_file_type_is_block(mode)) {
       return F_status_set_error(F_supported_not);
     }
 
@@ -404,7 +404,7 @@ extern "C" {
     f_status_t status = private_f_file_stat(path, dereference, &stat_file);
     if (F_status_is_error(status)) return status;
 
-    if (f_macro_file_type_get(stat_file.st_mode) == type) return F_true;
+    if (macro_f_file_type_get(stat_file.st_mode) == type) return F_true;
 
     return F_false;
   }
@@ -1310,7 +1310,7 @@ extern "C" {
 
       f_status_t status = F_none;
 
-      f_macro_string_dynamic_t_resize(status, (*name_base), name_base->used + size);
+      macro_f_string_dynamic_t_resize(status, (*name_base), name_base->used + size);
       if (F_status_is_error(status)) return status;
     }
 
@@ -1346,7 +1346,7 @@ extern "C" {
 
       f_status_t status = F_none;
 
-      f_macro_string_dynamic_t_resize(status, (*name_directory), name_directory->used + size);
+      macro_f_string_dynamic_t_resize(status, (*name_directory), name_directory->used + size);
       if (F_status_is_error(status)) return status;
     }
 
@@ -1419,7 +1419,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_string_dynamic_t_resize(status, (*buffer), buffer->size + file.size_read);
+        macro_f_string_dynamic_t_resize(status, (*buffer), buffer->size + file.size_read);
         if (F_status_is_error(status)) return status;
       }
 
@@ -1467,7 +1467,7 @@ extern "C" {
         return F_status_set_error(F_string_too_large);
       }
 
-      f_macro_string_dynamic_t_resize(status, (*buffer), buffer->size + file.size_read);
+      macro_f_string_dynamic_t_resize(status, (*buffer), buffer->size + file.size_read);
       if (F_status_is_error(status)) return status;
     }
 
@@ -1525,7 +1525,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_string_dynamic_t_resize(status, (*buffer), buffer->size + buffer_size);
+        macro_f_string_dynamic_t_resize(status, (*buffer), buffer->size + buffer_size);
         if (F_status_is_error(status)) return status;
       }
 
@@ -1980,7 +1980,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_string_dynamic_t_resize(status, (*buffer), buffer->size + file.size_read);
+        macro_f_string_dynamic_t_resize(status, (*buffer), buffer->size + file.size_read);
         if (F_status_is_error(status)) return status;
 
         memset(buffer->string + buffer->used, 0, sizeof(file.size_read));
@@ -2029,7 +2029,7 @@ extern "C" {
         return F_status_set_error(F_string_too_large);
       }
 
-      f_macro_string_dynamic_t_resize(status, (*buffer), buffer->size + buffer_size);
+      macro_f_string_dynamic_t_resize(status, (*buffer), buffer->size + buffer_size);
       if (F_status_is_error(status)) return status;
     }
 
@@ -2084,7 +2084,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_string_dynamic_t_resize(status, (*buffer), buffer->size + buffer_size);
+        macro_f_string_dynamic_t_resize(status, (*buffer), buffer->size + buffer_size);
         if (F_status_is_error(status)) return status;
       }
 
@@ -2441,7 +2441,7 @@ extern "C" {
       return F_status_set_error(F_file_stat);
     }
 
-    *type = f_macro_file_type_get(stat_file.st_mode);
+    *type = macro_f_file_type_get(stat_file.st_mode);
 
     return F_none;
   }
@@ -2472,7 +2472,7 @@ extern "C" {
       return F_status_set_error(F_file_stat);
     }
 
-    *type = f_macro_file_type_get(stat_file.st_mode);
+    *type = macro_f_file_type_get(stat_file.st_mode);
 
     return F_none;
   }
index b443cac7f6e5e76fcc1ea8a8e222411051b5dd8f..f9ed45ac805eae531d49838a10409bd2a19e559c 100644 (file)
@@ -392,7 +392,7 @@ extern "C" {
 
       f_status_t status = F_none;
 
-      f_macro_string_dynamic_t_resize(status, (*target), link_stat.st_size + 1);
+      macro_f_string_dynamic_t_resize(status, (*target), link_stat.st_size + 1);
       if (F_status_is_error(status)) return status;
     }
 
@@ -428,7 +428,7 @@ extern "C" {
 
       f_status_t status = F_none;
 
-      f_macro_string_dynamic_t_resize(status, (*target), link_stat.st_size + 1);
+      macro_f_string_dynamic_t_resize(status, (*target), link_stat.st_size + 1);
       if (F_status_is_error(status)) return status;
     }
 
index efe9bfcf60519515c81c94fe78e02607c0cccc67..b6be7faa2aaad530b80e4bc5b795d0e03c05c042 100644 (file)
@@ -182,18 +182,18 @@ extern "C" {
 
   #define f_fss_headers_t_initialize { 0, 0, 0 }
 
-  #define f_macro_fss_headers_t_clear(headers) f_macro_memory_structure_clear(headers)
+  #define macro_f_fss_headers_t_clear(headers) macro_f_memory_structure_clear(headers)
 
-  #define f_macro_fss_headers_t_resize(status, headers, length) f_macro_memory_structure_resize(status, headers, f_fss_header_t, length)
-  #define f_macro_fss_headers_t_adjust(status, headers, length) f_macro_memory_structure_adjust(status, headers, f_fss_header_t, length)
+  #define macro_f_fss_headers_t_resize(status, headers, length) macro_f_memory_structure_resize(status, headers, f_fss_header_t, length)
+  #define macro_f_fss_headers_t_adjust(status, headers, length) macro_f_memory_structure_adjust(status, headers, f_fss_header_t, length)
 
-  #define f_macro_fss_headers_t_delete_simple(headers)  f_macro_memory_structure_delete_simple(headers, f_fss_header_t)
-  #define f_macro_fss_headers_t_destroy_simple(headers) f_macro_memory_structure_destroy_simple(headers, f_fss_header_t)
+  #define macro_f_fss_headers_t_delete_simple(headers)  macro_f_memory_structure_delete_simple(headers, f_fss_header_t)
+  #define macro_f_fss_headers_t_destroy_simple(headers) macro_f_memory_structure_destroy_simple(headers, f_fss_header_t)
 
-  #define f_macro_fss_headers_t_increase(status, headers)            f_macro_memory_structure_increase(status, headers, f_fss_header_t)
-  #define f_macro_fss_headers_t_increase_by(status, headers, amount) f_macro_memory_structure_increase_by(status, headers, f_fss_header_t, amount)
-  #define f_macro_fss_headers_t_decrease_by(status, headers, amount) f_macro_memory_structure_decrease_by(status, headers, f_fss_header_t, amount)
-  #define f_macro_fss_headers_t_decimate_by(status, headers, amount) f_macro_memory_structure_decimate_by(status, headers, f_fss_header_t, amount)
+  #define macro_f_fss_headers_t_increase(status, headers)            macro_f_memory_structure_increase(status, headers, f_fss_header_t)
+  #define macro_f_fss_headers_t_increase_by(status, headers, amount) macro_f_memory_structure_increase_by(status, headers, f_fss_header_t, amount)
+  #define macro_f_fss_headers_t_decrease_by(status, headers, amount) macro_f_memory_structure_decrease_by(status, headers, f_fss_header_t, amount)
+  #define macro_f_fss_headers_t_decimate_by(status, headers, amount) macro_f_memory_structure_decimate_by(status, headers, f_fss_header_t, amount)
 #endif // _di_f_fss_headers_t_
 
 /**
@@ -204,7 +204,7 @@ extern "C" {
 
   #define f_fss_object_t_initialize f_string_range_t_initialize
 
-  #define f_macro_fss_object_t_clear(object) f_macro_string_range_t_clear(object)
+  #define macro_f_fss_object_t_clear(object) macro_f_string_range_t_clear(object)
 #endif // _di_fss_object_t_
 
 /**
@@ -219,18 +219,18 @@ extern "C" {
 
   #define f_fss_objects_t_initialize f_string_ranges_t_initialize
 
-  #define f_macro_fss_objects_t_clear(objects) f_macro_string_ranges_t_clear(objects)
+  #define macro_f_fss_objects_t_clear(objects) macro_f_string_ranges_t_clear(objects)
 
-  #define f_macro_fss_objects_t_resize(status, objects, length) f_macro_string_ranges_t_resize(status, objects, length)
-  #define f_macro_fss_objects_t_adjust(status, objects, length) f_macro_string_ranges_t_adjust(status, objects, length)
+  #define macro_f_fss_objects_t_resize(status, objects, length) macro_f_string_ranges_t_resize(status, objects, length)
+  #define macro_f_fss_objects_t_adjust(status, objects, length) macro_f_string_ranges_t_adjust(status, objects, length)
 
-  #define f_macro_fss_objects_t_delete_simple(objects)  f_macro_string_ranges_t_delete_simple(objects)
-  #define f_macro_fss_objects_t_destroy_simple(objects) f_macro_string_ranges_t_destroy_simple(objects)
+  #define macro_f_fss_objects_t_delete_simple(objects)  macro_f_string_ranges_t_delete_simple(objects)
+  #define macro_f_fss_objects_t_destroy_simple(objects) macro_f_string_ranges_t_destroy_simple(objects)
 
-  #define f_macro_fss_objects_t_increase(status, objects)            f_macro_string_ranges_t_increase(status, objects)
-  #define f_macro_fss_objects_t_increase_by(status, objects, amount) f_macro_string_ranges_t_increase_by(status, objects, amount)
-  #define f_macro_fss_objects_t_decrease_by(status, objects, amount) f_macro_string_ranges_t_decrease_by(status, objects, amount)
-  #define f_macro_fss_objects_t_decimate_by(status, objects, amount) f_macro_string_ranges_t_decimate_by(status, objects, amount)
+  #define macro_f_fss_objects_t_increase(status, objects)            macro_f_string_ranges_t_increase(status, objects)
+  #define macro_f_fss_objects_t_increase_by(status, objects, amount) macro_f_string_ranges_t_increase_by(status, objects, amount)
+  #define macro_f_fss_objects_t_decrease_by(status, objects, amount) macro_f_string_ranges_t_decrease_by(status, objects, amount)
+  #define macro_f_fss_objects_t_decimate_by(status, objects, amount) macro_f_string_ranges_t_decimate_by(status, objects, amount)
 #endif // _di_fss_objects_t_
 
 /**
@@ -247,18 +247,18 @@ extern "C" {
 
   #define f_fss_content_t_initialize f_string_ranges_t_initialize
 
-  #define f_macro_fss_content_t_clear(content) f_macro_string_ranges_t_clear(content)
+  #define macro_f_fss_content_t_clear(content) macro_f_string_ranges_t_clear(content)
 
-  #define f_macro_fss_content_t_resize(status, content, length) f_macro_string_ranges_t_resize(status, content, length)
-  #define f_macro_fss_content_t_adjust(status, content, length) f_macro_string_ranges_t_adjust(status, content, length)
+  #define macro_f_fss_content_t_resize(status, content, length) macro_f_string_ranges_t_resize(status, content, length)
+  #define macro_f_fss_content_t_adjust(status, content, length) macro_f_string_ranges_t_adjust(status, content, length)
 
-  #define f_macro_fss_content_t_delete_simple(content)  f_macro_string_ranges_t_delete_simple(content)
-  #define f_macro_fss_content_t_destroy_simple(content) f_macro_string_ranges_t_destroy_simple(content)
+  #define macro_f_fss_content_t_delete_simple(content)  macro_f_string_ranges_t_delete_simple(content)
+  #define macro_f_fss_content_t_destroy_simple(content) macro_f_string_ranges_t_destroy_simple(content)
 
-  #define f_macro_fss_content_t_increase(status, content)            f_macro_string_ranges_t_increase(status, content)
-  #define f_macro_fss_content_t_increase_by(status, content, amount) f_macro_string_ranges_t_increase_by(status, content, amount)
-  #define f_macro_fss_content_t_decrease_by(status, content, amount) f_macro_string_ranges_t_decrease_by(status, content, amount)
-  #define f_macro_fss_content_t_decimate_by(status, content, amount) f_macro_string_ranges_t_decimate_by(status, content, amount)
+  #define macro_f_fss_content_t_increase(status, content)            macro_f_string_ranges_t_increase(status, content)
+  #define macro_f_fss_content_t_increase_by(status, content, amount) macro_f_string_ranges_t_increase_by(status, content, amount)
+  #define macro_f_fss_content_t_decrease_by(status, content, amount) macro_f_string_ranges_t_decrease_by(status, content, amount)
+  #define macro_f_fss_content_t_decimate_by(status, content, amount) macro_f_string_ranges_t_decimate_by(status, content, amount)
 #endif // _di_fss_content_
 
 /**
@@ -273,18 +273,18 @@ extern "C" {
 
   #define f_fss_contents_t_initialize f_string_rangess_t_initialize
 
-  #define f_macro_fss_contents_t_clear(contents) f_macro_string_rangess_t_clear(contents)
+  #define macro_f_fss_contents_t_clear(contents) macro_f_string_rangess_t_clear(contents)
 
-  #define f_macro_fss_contents_t_resize(status, contents, length) f_macro_string_rangess_t_resize(status, contents, length)
-  #define f_macro_fss_contents_t_adjust(status, contents, length) f_macro_string_rangess_t_adjust(status, contents, length)
+  #define macro_f_fss_contents_t_resize(status, contents, length) macro_f_string_rangess_t_resize(status, contents, length)
+  #define macro_f_fss_contents_t_adjust(status, contents, length) macro_f_string_rangess_t_adjust(status, contents, length)
 
-  #define f_macro_fss_contents_t_delete_simple(contents)  f_macro_string_rangess_t_delete_simple(contents)
-  #define f_macro_fss_contents_t_destroy_simple(contents) f_macro_string_rangess_t_destroy_simple(contents)
+  #define macro_f_fss_contents_t_delete_simple(contents)  macro_f_string_rangess_t_delete_simple(contents)
+  #define macro_f_fss_contents_t_destroy_simple(contents) macro_f_string_rangess_t_destroy_simple(contents)
 
-  #define f_macro_fss_contents_t_increase(status, contents)            f_macro_string_rangess_t_increase(status, contents)
-  #define f_macro_fss_contents_t_increase_by(status, contents, amount) f_macro_string_rangess_t_increase_by(status, contents, amount)
-  #define f_macro_fss_contents_t_decrease_by(status, contents, amount) f_macro_string_rangess_t_decrease_by(status, contents, amount)
-  #define f_macro_fss_contents_t_decimate_by(status, contents, amount) f_macro_string_rangess_t_decimate_by(status, contents, amount)
+  #define macro_f_fss_contents_t_increase(status, contents)            macro_f_string_rangess_t_increase(status, contents)
+  #define macro_f_fss_contents_t_increase_by(status, contents, amount) macro_f_string_rangess_t_increase_by(status, contents, amount)
+  #define macro_f_fss_contents_t_decrease_by(status, contents, amount) macro_f_string_rangess_t_decrease_by(status, contents, amount)
+  #define macro_f_fss_contents_t_decimate_by(status, contents, amount) macro_f_string_rangess_t_decimate_by(status, contents, amount)
 #endif // _di_f_fss_contents_t_
 
 #ifdef __cplusplus
index c4a263b5f0ff9574a85ee7a206adee49685321ce..12ad940d3b9b3c5703a135cc6763d130c144ffb7 100644 (file)
@@ -212,7 +212,7 @@ extern "C" {
         break;
       }
 
-      utf_width = f_macro_utf_byte_width_is(buffer->string[position]);
+      utf_width = macro_f_utf_byte_width_is(buffer->string[position]);
 
       if (utf_width > 1) {
 
@@ -324,7 +324,7 @@ extern "C" {
         }
       }
 
-      width = f_macro_utf_byte_width_is(buffer.string[range->start]);
+      width = macro_f_utf_byte_width_is(buffer.string[range->start]);
 
       if (!width) {
         width = 1;
@@ -407,7 +407,7 @@ extern "C" {
             next_width_max = 0;
             next = range->start + 1;
 
-            for (; next < buffer.used && next <= range->stop; next += f_macro_utf_byte_width_is(buffer.string[next])) {
+            for (; next < buffer.used && next <= range->stop; next += macro_f_utf_byte_width_is(buffer.string[next])) {
               next_width_max = (range->stop - next) + 1;
 
               status = f_utf_is_graph(buffer.string + next, width_max);
@@ -453,7 +453,7 @@ extern "C" {
         }
       }
 
-      width = f_macro_utf_byte_width_is(buffer.string[range->start]);
+      width = macro_f_utf_byte_width_is(buffer.string[range->start]);
 
       if (!width) {
         width = 1;
index 882aa45f8054a02c7e94463a4abea34269ccfa7b..16b14fa8eb0a9f26e9ff56a38fb5724cdb0dac8f 100644 (file)
@@ -35,18 +35,18 @@ extern "C" {
 
   #define f_fss_comments_t_initialize f_string_ranges_t_initialize
 
-  #define f_fss_comments_t_clear(comments) f_macro_string_ranges_t_clear(comments)
+  #define f_fss_comments_t_clear(comments) macro_f_string_ranges_t_clear(comments)
 
-  #define f_macro_fss_comments_t_resize(status, comments, length) f_macro_string_ranges_t_resize(status, comments, length)
-  #define f_macro_fss_comments_t_adjust(status, comments, length) f_macro_string_ranges_t_adjust(status, comments, length)
+  #define macro_f_fss_comments_t_resize(status, comments, length) macro_f_string_ranges_t_resize(status, comments, length)
+  #define macro_f_fss_comments_t_adjust(status, comments, length) macro_f_string_ranges_t_adjust(status, comments, length)
 
-  #define f_macro_fss_comments_t_delete_simple(comments)  f_macro_string_ranges_t_delete_simple(comments)
-  #define f_macro_fss_comments_t_destroy_simple(comments) f_macro_string_ranges_t_destroy_simple(comments)
+  #define macro_f_fss_comments_t_delete_simple(comments)  macro_f_string_ranges_t_delete_simple(comments)
+  #define macro_f_fss_comments_t_destroy_simple(comments) macro_f_string_ranges_t_destroy_simple(comments)
 
-  #define f_macro_fss_comments_t_increase(status, comments)            f_macro_string_ranges_t_increase(status, comments)
-  #define f_macro_fss_comments_t_increase_by(status, comments, amount) f_macro_string_ranges_t_increase_by(status, comments, amount)
-  #define f_macro_fss_comments_t_decrease_by(status, comments, amount) f_macro_string_ranges_t_decrease_by(status, comments, amount)
-  #define f_macro_fss_comments_t_decimate_by(status, comments, amount) f_macro_string_ranges_t_decimate_by(status, comments, amount)
+  #define macro_f_fss_comments_t_increase(status, comments)            macro_f_string_ranges_t_increase(status, comments)
+  #define macro_f_fss_comments_t_increase_by(status, comments, amount) macro_f_string_ranges_t_increase_by(status, comments, amount)
+  #define macro_f_fss_comments_t_decrease_by(status, comments, amount) macro_f_string_ranges_t_decrease_by(status, comments, amount)
+  #define macro_f_fss_comments_t_decimate_by(status, comments, amount) macro_f_string_ranges_t_decimate_by(status, comments, amount)
 #endif // _di_f_fss_comments_t_
 
 /**
@@ -61,18 +61,18 @@ extern "C" {
 
   #define f_fss_commentss_t_initialize f_string_rangess_t_initialize
 
-  #define f_macro_fss_commentss_t_clear(commentss) f_macro_string_rangess_t_clear(commentss)
+  #define macro_f_fss_commentss_t_clear(commentss) macro_f_string_rangess_t_clear(commentss)
 
-  #define f_macro_fss_commentss_t_resize(status, commentss, length) f_macro_string_rangess_t_resize(status, commentss, length)
-  #define f_macro_fss_commentss_t_adjust(status, commentss, length) f_macro_string_rangess_t_adjust(status, commentss, length)
+  #define macro_f_fss_commentss_t_resize(status, commentss, length) macro_f_string_rangess_t_resize(status, commentss, length)
+  #define macro_f_fss_commentss_t_adjust(status, commentss, length) macro_f_string_rangess_t_adjust(status, commentss, length)
 
-  #define f_macro_fss_commentss_t_delete_simple(commentss)  f_macro_string_rangess_t_delete_simple(commentss)
-  #define f_macro_fss_commentss_t_destroy_simple(commentss) f_macro_string_rangess_t_destroy_simple(commentss)
+  #define macro_f_fss_commentss_t_delete_simple(commentss)  macro_f_string_rangess_t_delete_simple(commentss)
+  #define macro_f_fss_commentss_t_destroy_simple(commentss) macro_f_string_rangess_t_destroy_simple(commentss)
 
-  #define f_macro_fss_commentss_t_increase(status, commentss)            f_macro_string_rangess_t_increase(status, commentss)
-  #define f_macro_fss_commentss_t_increase_by(status, commentss, amount) f_macro_string_rangess_t_increase_by(status, commentss, amount)
-  #define f_macro_fss_commentss_t_decrease_by(status, commentss, amount) f_macro_string_rangess_t_decrease_by(status, commentss, amount)
-  #define f_macro_fss_commentss_t_decimate_by(status, commentss, amount) f_macro_string_rangess_t_decimate_by(status, commentss, amount)
+  #define macro_f_fss_commentss_t_increase(status, commentss)            macro_f_string_rangess_t_increase(status, commentss)
+  #define macro_f_fss_commentss_t_increase_by(status, commentss, amount) macro_f_string_rangess_t_increase_by(status, commentss, amount)
+  #define macro_f_fss_commentss_t_decrease_by(status, commentss, amount) macro_f_string_rangess_t_decrease_by(status, commentss, amount)
+  #define macro_f_fss_commentss_t_decimate_by(status, commentss, amount) macro_f_string_rangess_t_decimate_by(status, commentss, amount)
 #endif // _di_f_fss_commentss_t_
 
 #ifdef __cplusplus
index e6c6a5c172d5f468145aac8b4034f4c05ac5dd0a..a7dd549415773f88841b9eccc649a0891a1920af 100644 (file)
@@ -35,18 +35,18 @@ extern "C" {
 
   #define f_fss_delimits_t_initialize f_array_lengths_t_initialize
 
-  #define f_macro_fss_delimits_t_clear(delimits) f_macro_array_lengths_t_clear(delimits)
+  #define macro_f_fss_delimits_t_clear(delimits) macro_f_array_lengths_t_clear(delimits)
 
-  #define f_macro_fss_delimits_t_resize(status, delimits, length) f_macro_array_lengths_t_resize(status, delimits, length)
-  #define f_macro_fss_delimits_t_adjust(status, delimits, length) f_macro_array_lengths_t_adjust(status, delimits, length)
+  #define macro_f_fss_delimits_t_resize(status, delimits, length) macro_f_array_lengths_t_resize(status, delimits, length)
+  #define macro_f_fss_delimits_t_adjust(status, delimits, length) macro_f_array_lengths_t_adjust(status, delimits, length)
 
-  #define f_macro_fss_delimits_t_delete_simple(delimits)  f_macro_array_lengths_t_delete_simple(delimits)
-  #define f_macro_fss_delimits_t_destroy_simple(delimits) f_macro_array_lengths_t_destroy_simple(delimits)
+  #define macro_f_fss_delimits_t_delete_simple(delimits)  macro_f_array_lengths_t_delete_simple(delimits)
+  #define macro_f_fss_delimits_t_destroy_simple(delimits) macro_f_array_lengths_t_destroy_simple(delimits)
 
-  #define f_macro_fss_delimits_t_increase(status, delimits)            f_macro_array_lengths_t_increase(status, delimits)
-  #define f_macro_fss_delimits_t_increase_by(status, delimits, amount) f_macro_array_lengths_t_increase_by(status, delimits, amount)
-  #define f_macro_fss_delimits_t_decrease_by(status, delimits, amount) f_macro_array_lengths_t_decrease_by(status, delimits, amount)
-  #define f_macro_fss_delimits_t_decimate_by(status, delimits, amount) f_macro_array_lengths_t_decimate_by(status, delimits, amount)
+  #define macro_f_fss_delimits_t_increase(status, delimits)            macro_f_array_lengths_t_increase(status, delimits)
+  #define macro_f_fss_delimits_t_increase_by(status, delimits, amount) macro_f_array_lengths_t_increase_by(status, delimits, amount)
+  #define macro_f_fss_delimits_t_decrease_by(status, delimits, amount) macro_f_array_lengths_t_decrease_by(status, delimits, amount)
+  #define macro_f_fss_delimits_t_decimate_by(status, delimits, amount) macro_f_array_lengths_t_decimate_by(status, delimits, amount)
 #endif // _di_f_fss_delimits_t_
 
 /**
@@ -61,18 +61,18 @@ extern "C" {
 
   #define f_fss_delimitss_t_initialize f_array_lengthss_t_initialize
 
-  #define f_macro_fss_delimitss_t_clear(delimitss) f_macro_array_lengthss_t_clear(delimitss)
+  #define macro_f_fss_delimitss_t_clear(delimitss) macro_f_array_lengthss_t_clear(delimitss)
 
-  #define f_macro_fss_delimitss_t_resize(status, delimitss, length) f_macro_array_lengthss_t_resize(status, delimitss, length)
-  #define f_macro_fss_delimitss_t_adjust(status, delimitss, length) f_macro_array_lengthss_t_adjust(status, delimitss, length)
+  #define macro_f_fss_delimitss_t_resize(status, delimitss, length) macro_f_array_lengthss_t_resize(status, delimitss, length)
+  #define macro_f_fss_delimitss_t_adjust(status, delimitss, length) macro_f_array_lengthss_t_adjust(status, delimitss, length)
 
-  #define f_macro_fss_delimitss_t_delete_simple(delimitss)  f_macro_array_lengthss_t_delete_simple(delimitss)
-  #define f_macro_fss_delimitss_t_destroy_simple(delimitss) f_macro_array_lengthss_t_destroy_simple(delimitss)
+  #define macro_f_fss_delimitss_t_delete_simple(delimitss)  macro_f_array_lengthss_t_delete_simple(delimitss)
+  #define macro_f_fss_delimitss_t_destroy_simple(delimitss) macro_f_array_lengthss_t_destroy_simple(delimitss)
 
-  #define f_macro_fss_delimitss_t_increase(status, delimitss)            f_macro_array_lengthss_t_increase(status, delimitss)
-  #define f_macro_fss_delimitss_t_increase_by(status, delimitss, amount) f_macro_array_lengthss_t_increase_by(status, delimitss, amount)
-  #define f_macro_fss_delimitss_t_decrease_by(status, delimitss, amount) f_macro_array_lengthss_t_decrease_by(status, delimitss, amount)
-  #define f_macro_fss_delimitss_t_decimate_by(status, delimitss, amount) f_macro_array_lengthss_t_decimate_by(status, delimitss, amount)
+  #define macro_f_fss_delimitss_t_increase(status, delimitss)            macro_f_array_lengthss_t_increase(status, delimitss)
+  #define macro_f_fss_delimitss_t_increase_by(status, delimitss, amount) macro_f_array_lengthss_t_increase_by(status, delimitss, amount)
+  #define macro_f_fss_delimitss_t_decrease_by(status, delimitss, amount) macro_f_array_lengthss_t_decrease_by(status, delimitss, amount)
+  #define macro_f_fss_delimitss_t_decimate_by(status, delimitss, amount) macro_f_array_lengthss_t_decimate_by(status, delimitss, amount)
 #endif // _di_f_fss_delimitss_t_
 
 #ifdef __cplusplus
index a728c84463824e02455b62e17495ceb864254aaa..ff31315e6983ff55aedba504ce4c1ec948c28c44 100644 (file)
@@ -38,22 +38,22 @@ extern "C" {
 
   #define f_fss_named_t_initialize { f_fss_object_t_initialize, f_fss_objects_t_initialize, f_fss_contents_t_initialize, f_fss_quotess_t_initialize }
 
-  #define f_macro_fss_named_t_clear(named) \
-    f_macro_fss_object_t_clear(named.name) \
-    f_macro_fss_objects_t_clear(named.objects) \
-    f_macro_fss_contents_t_clear(named.contents) \
-    f_macro_fss_quotess_t_clear(named.quotess)
+  #define macro_f_fss_named_t_clear(named) \
+    macro_f_fss_object_t_clear(named.name) \
+    macro_f_fss_objects_t_clear(named.objects) \
+    macro_f_fss_contents_t_clear(named.contents) \
+    macro_f_fss_quotess_t_clear(named.quotess)
 
-  #define f_macro_fss_named_t_resize(status, named, length) status = f_fss_named_resize(length, &named);
-  #define f_macro_fss_named_t_adjust(status, named, length) status = f_fss_named_adjust(length, &named);
+  #define macro_f_fss_named_t_resize(status, named, length) status = f_fss_named_resize(length, &named);
+  #define macro_f_fss_named_t_adjust(status, named, length) status = f_fss_named_adjust(length, &named);
 
-  #define f_macro_fss_named_t_delete_simple(named)  f_fss_named_resize(0, &named);
-  #define f_macro_fss_named_t_destroy_simple(named) f_fss_named_adjust(0, &named);
+  #define macro_f_fss_named_t_delete_simple(named)  f_fss_named_resize(0, &named);
+  #define macro_f_fss_named_t_destroy_simple(named) f_fss_named_adjust(0, &named);
 
-  #define f_macro_fss_named_t_increase(status, named)            status = f_fss_named_increase(&named);
-  #define f_macro_fss_named_t_increase_by(status, named, amount) status = f_fss_named_increase_by(amount, &named);
-  #define f_macro_fss_named_t_decrease_by(status, named, amount) status = f_fss_named_decrease_by(amount, &named);
-  #define f_macro_fss_named_t_decimate_by(status, named, amount) status = f_fss_named_decimate_by(amount, &named);
+  #define macro_f_fss_named_t_increase(status, named)            status = f_fss_named_increase(&named);
+  #define macro_f_fss_named_t_increase_by(status, named, amount) status = f_fss_named_increase_by(amount, &named);
+  #define macro_f_fss_named_t_decrease_by(status, named, amount) status = f_fss_named_decrease_by(amount, &named);
+  #define macro_f_fss_named_t_decimate_by(status, named, amount) status = f_fss_named_decimate_by(amount, &named);
 #endif // _di_f_fss_named_t_
 
 /**
@@ -73,18 +73,18 @@ extern "C" {
 
   #define f_fss_nameds_t_initialize { 0, 0, 0 }
 
-  #define f_macro_fss_nameds_t_clear(nameds) f_macro_memory_structure_clear(nameds);
+  #define macro_f_fss_nameds_t_clear(nameds) macro_f_memory_structure_clear(nameds);
 
-  #define f_macro_fss_nameds_t_resize(status, nameds, length) status = f_fss_nameds_resize(length, &nameds);
-  #define f_macro_fss_nameds_t_adjust(status, nameds, length) status = f_fss_nameds_adjust(length, &nameds);
+  #define macro_f_fss_nameds_t_resize(status, nameds, length) status = f_fss_nameds_resize(length, &nameds);
+  #define macro_f_fss_nameds_t_adjust(status, nameds, length) status = f_fss_nameds_adjust(length, &nameds);
 
-  #define f_macro_fss_nameds_t_delete_simple(nameds)  f_fss_nameds_resize(0, &nameds);
-  #define f_macro_fss_nameds_t_destroy_simple(nameds) f_fss_nameds_adjust(0, &nameds);
+  #define macro_f_fss_nameds_t_delete_simple(nameds)  f_fss_nameds_resize(0, &nameds);
+  #define macro_f_fss_nameds_t_destroy_simple(nameds) f_fss_nameds_adjust(0, &nameds);
 
-  #define f_macro_fss_nameds_t_increase(status, nameds)            status = f_fss_nameds_increase(&nameds);
-  #define f_macro_fss_nameds_t_increase_by(status, nameds, amount) status = f_fss_nameds_increase_by(amount, &nameds);
-  #define f_macro_fss_nameds_t_decrease_by(status, nameds, amount) status = f_fss_nameds_decrease_by(amount, &nameds);
-  #define f_macro_fss_nameds_t_decimate_by(status, nameds, amount) status = f_fss_nameds_decimate_by(amount, &nameds);
+  #define macro_f_fss_nameds_t_increase(status, nameds)            status = f_fss_nameds_increase(&nameds);
+  #define macro_f_fss_nameds_t_increase_by(status, nameds, amount) status = f_fss_nameds_increase_by(amount, &nameds);
+  #define macro_f_fss_nameds_t_decrease_by(status, nameds, amount) status = f_fss_nameds_decrease_by(amount, &nameds);
+  #define macro_f_fss_nameds_t_decimate_by(status, nameds, amount) status = f_fss_nameds_decimate_by(amount, &nameds);
 #endif // _di_fss_nameds_t_
 
 /**
index 52ba7261f317645564b842204ce4fbc8005f0b57..dfde4f41dd10e3b141981cd43956a6b7220f0a2f 100644 (file)
@@ -41,21 +41,21 @@ extern "C" {
 
   #define f_fss_item_t_initialize { f_fss_object_t_initialize, f_fss_content_t_initialize, 0 }
 
-  #define f_macro_fss_item_t_clear(item) \
-    f_macro_fss_object_t_clear(item.object); \
-    f_macro_fss_content_t_clear(item.content); \
+  #define macro_f_fss_item_t_clear(item) \
+    macro_f_fss_object_t_clear(item.object); \
+    macro_f_fss_content_t_clear(item.content); \
     item.parent = 0;
 
-  #define f_macro_fss_item_t_resize(status, item, length) f_macro_fss_content_t_resize(status, item.content, length)
-  #define f_macro_fss_item_t_adjust(status, item, length) f_macro_fss_content_t_adjust(status, item.content, length)
+  #define macro_f_fss_item_t_resize(status, item, length) macro_f_fss_content_t_resize(status, item.content, length)
+  #define macro_f_fss_item_t_adjust(status, item, length) macro_f_fss_content_t_adjust(status, item.content, length)
 
-  #define f_macro_fss_item_t_delete_simple(item)  f_macro_fss_content_t_delete_simple(item.content)
-  #define f_macro_fss_item_t_destroy_simple(item) f_macro_fss_content_t_destroy_simple(item.content)
+  #define macro_f_fss_item_t_delete_simple(item)  macro_f_fss_content_t_delete_simple(item.content)
+  #define macro_f_fss_item_t_destroy_simple(item) macro_f_fss_content_t_destroy_simple(item.content)
 
-  #define f_macro_fss_item_t_increase(status, item)            f_macro_fss_content_t_increase(status, item.content)
-  #define f_macro_fss_item_t_increase_by(status, item, amount) f_macro_fss_content_t_increase_by(status, item.content, amount)
-  #define f_macro_fss_item_t_decrease_by(status, item, amount) f_macro_fss_content_t_decrease_by(status, item.content, amount)
-  #define f_macro_fss_item_t_decimate_by(status, item, amount) f_macro_fss_content_t_decimate_by(status, item.content, amount)
+  #define macro_f_fss_item_t_increase(status, item)            macro_f_fss_content_t_increase(status, item.content)
+  #define macro_f_fss_item_t_increase_by(status, item, amount) macro_f_fss_content_t_increase_by(status, item.content, amount)
+  #define macro_f_fss_item_t_decrease_by(status, item, amount) macro_f_fss_content_t_decrease_by(status, item.content, amount)
+  #define macro_f_fss_item_t_decimate_by(status, item, amount) macro_f_fss_content_t_decimate_by(status, item.content, amount)
 #endif // _di_fss_item_t_
 
 /**
@@ -96,18 +96,18 @@ extern "C" {
 
   #define f_fss_items_t_initialize { 0, 0, 0 }
 
-  #define f_macro_fss_items_t_clear(items) f_macro_memory_structure_clear(items)
+  #define macro_f_fss_items_t_clear(items) macro_f_memory_structure_clear(items)
 
-  #define f_macro_fss_items_t_resize(status, items, length) status = f_fss_items_resize(length, &items);
-  #define f_macro_fss_items_t_adjust(status, items, length) status = f_fss_items_adjust(length, &items);
+  #define macro_f_fss_items_t_resize(status, items, length) status = f_fss_items_resize(length, &items);
+  #define macro_f_fss_items_t_adjust(status, items, length) status = f_fss_items_adjust(length, &items);
 
-  #define f_macro_fss_items_t_delete_simple(items)  f_fss_items_resize(0, &items);
-  #define f_macro_fss_items_t_destroy_simple(items) f_fss_items_adjust(0, &items);
+  #define macro_f_fss_items_t_delete_simple(items)  f_fss_items_resize(0, &items);
+  #define macro_f_fss_items_t_destroy_simple(items) f_fss_items_adjust(0, &items);
 
-  #define f_macro_fss_items_t_increase(status, items)            status = f_fss_items_increase(&items);
-  #define f_macro_fss_items_t_increase_by(status, items, amount) status = f_fss_items_increase_by(amount, &items);
-  #define f_macro_fss_items_t_decrease_by(status, items, amount) status = f_fss_items_decrease_by(amount, &items);
-  #define f_macro_fss_items_t_decimate_by(status, items, amount) status = f_fss_items_decimate_by(amount, &items);
+  #define macro_f_fss_items_t_increase(status, items)            status = f_fss_items_increase(&items);
+  #define macro_f_fss_items_t_increase_by(status, items, amount) status = f_fss_items_increase_by(amount, &items);
+  #define macro_f_fss_items_t_decrease_by(status, items, amount) status = f_fss_items_decrease_by(amount, &items);
+  #define macro_f_fss_items_t_decimate_by(status, items, amount) status = f_fss_items_decimate_by(amount, &items);
 #endif // _di_fss_items_t_
 
 /**
@@ -132,18 +132,18 @@ extern "C" {
 
   #define f_fss_nest_t_initialize { 0, 0, 0 }
 
-  #define f_macro_fss_nest_t_clear(nest) f_macro_memory_structures_clear(nest)
+  #define macro_f_fss_nest_t_clear(nest) macro_f_memory_structures_clear(nest)
 
-  #define f_macro_fss_nest_t_resize(status, nest, length) status = f_fss_nest_resize(length, &nest);
-  #define f_macro_fss_nest_t_adjust(status, nest, length) status = f_fss_nest_adjust(length, &nest);
+  #define macro_f_fss_nest_t_resize(status, nest, length) status = f_fss_nest_resize(length, &nest);
+  #define macro_f_fss_nest_t_adjust(status, nest, length) status = f_fss_nest_adjust(length, &nest);
 
-  #define f_macro_fss_nest_t_delete_simple(nest)  f_fss_nest_resize(0, &nest);
-  #define f_macro_fss_nest_t_destroy_simple(nest) f_fss_nest_adjust(0, &nest);
+  #define macro_f_fss_nest_t_delete_simple(nest)  f_fss_nest_resize(0, &nest);
+  #define macro_f_fss_nest_t_destroy_simple(nest) f_fss_nest_adjust(0, &nest);
 
-  #define f_macro_fss_nest_t_increase(status, nest)            status = f_fss_nest_increase(&nest);
-  #define f_macro_fss_nest_t_increase_by(status, nest, amount) status = f_fss_nest_increase_by(amount, &nest);
-  #define f_macro_fss_nest_t_decrease_by(status, nest, amount) status = f_fss_nest_decrease_by(amount, &nest);
-  #define f_macro_fss_nest_t_decimate_by(status, nest, amount) status = f_fss_nest_decimate_by(amount, &nest);
+  #define macro_f_fss_nest_t_increase(status, nest)            status = f_fss_nest_increase(&nest);
+  #define macro_f_fss_nest_t_increase_by(status, nest, amount) status = f_fss_nest_increase_by(amount, &nest);
+  #define macro_f_fss_nest_t_decrease_by(status, nest, amount) status = f_fss_nest_decrease_by(amount, &nest);
+  #define macro_f_fss_nest_t_decimate_by(status, nest, amount) status = f_fss_nest_decimate_by(amount, &nest);
 #endif // _di_fss_nest_t_
 
 /**
@@ -163,18 +163,18 @@ extern "C" {
 
   #define f_fss_nests_t_initialize { 0, 0, 0 }
 
-  #define f_macro_fss_nests_t_clear(nests) f_macro_memory_structures_clear(nests)
+  #define macro_f_fss_nests_t_clear(nests) macro_f_memory_structures_clear(nests)
 
-  #define f_macro_fss_nests_t_resize(status, nests, length) status = f_fss_nests_resize(length, &nests);
-  #define f_macro_fss_nests_t_adjust(status, nests, length) status = f_fss_nests_adjust(length, &nests);
+  #define macro_f_fss_nests_t_resize(status, nests, length) status = f_fss_nests_resize(length, &nests);
+  #define macro_f_fss_nests_t_adjust(status, nests, length) status = f_fss_nests_adjust(length, &nests);
 
-  #define f_macro_fss_nests_t_delete_simple(nests)  f_fss_nests_resize(0, &nests);
-  #define f_macro_fss_nests_t_destroy_simple(nests) f_fss_nests_adjust(0, &nests);
+  #define macro_f_fss_nests_t_delete_simple(nests)  f_fss_nests_resize(0, &nests);
+  #define macro_f_fss_nests_t_destroy_simple(nests) f_fss_nests_adjust(0, &nests);
 
-  #define f_macro_fss_nests_t_increase(status, nests)            status = f_fss_nests_increase(&nests);
-  #define f_macro_fss_nests_t_increase_by(status, nests, amount) status = f_fss_nests_increase_by(amount, &nests);
-  #define f_macro_fss_nests_t_decrease_by(status, nests, amount) status = f_fss_nests_decrease_by(amount, &nests);
-  #define f_macro_fss_nests_t_decimate_by(status, nests, amount) status = f_fss_nests_decimate_by(amount, &nests);
+  #define macro_f_fss_nests_t_increase(status, nests)            status = f_fss_nests_increase(&nests);
+  #define macro_f_fss_nests_t_increase_by(status, nests, amount) status = f_fss_nests_increase_by(amount, &nests);
+  #define macro_f_fss_nests_t_decrease_by(status, nests, amount) status = f_fss_nests_decrease_by(amount, &nests);
+  #define macro_f_fss_nests_t_decimate_by(status, nests, amount) status = f_fss_nests_decimate_by(amount, &nests);
 #endif // _di_fss_nests_t_
 
 /**
index 87f35c60ce6aa03e904b0d1bd1f58d862c7b2317..21a1e9e42667fa3e77acd9ffd55acbedde62a439 100644 (file)
@@ -45,18 +45,18 @@ extern "C" {
 
   #define f_fss_quotes_t_initialize f_uint8s_t_initialize
 
-  #define f_macro_fss_quotes_t_clear(quotes) f_macro_uint8s_t_clear(quotes)
+  #define macro_f_fss_quotes_t_clear(quotes) macro_f_uint8s_t_clear(quotes)
 
-  #define f_macro_fss_quotes_t_resize(status, quotes, length) f_macro_uint8s_t_resize(status, quotes, length)
-  #define f_macro_fss_quotes_t_adjust(status, quotes, length) f_macro_uint8s_t_adjust(status, quotes, length)
+  #define macro_f_fss_quotes_t_resize(status, quotes, length) macro_f_uint8s_t_resize(status, quotes, length)
+  #define macro_f_fss_quotes_t_adjust(status, quotes, length) macro_f_uint8s_t_adjust(status, quotes, length)
 
-  #define f_macro_fss_quotes_t_delete_simple(quotes)  f_macro_uint8s_t_delete_simple(quotes)
-  #define f_macro_fss_quotes_t_destroy_simple(quotes) f_macro_uint8s_t_destroy_simple(quotes)
+  #define macro_f_fss_quotes_t_delete_simple(quotes)  macro_f_uint8s_t_delete_simple(quotes)
+  #define macro_f_fss_quotes_t_destroy_simple(quotes) macro_f_uint8s_t_destroy_simple(quotes)
 
-  #define f_macro_fss_quotes_t_increase(status, quotes)            f_macro_uint8s_t_increase(status, quotes)
-  #define f_macro_fss_quotes_t_increase_by(status, quotes, amount) f_macro_uint8s_t_increase_by(status, quotes, amount)
-  #define f_macro_fss_quotes_t_decrease_by(status, quotes, amount) f_macro_uint8s_t_decrease_by(status, quotes, amount)
-  #define f_macro_fss_quotes_t_decimate_by(status, quotes, amount) f_macro_uint8s_t_decimate_by(status, quotes, amount)
+  #define macro_f_fss_quotes_t_increase(status, quotes)            macro_f_uint8s_t_increase(status, quotes)
+  #define macro_f_fss_quotes_t_increase_by(status, quotes, amount) macro_f_uint8s_t_increase_by(status, quotes, amount)
+  #define macro_f_fss_quotes_t_decrease_by(status, quotes, amount) macro_f_uint8s_t_decrease_by(status, quotes, amount)
+  #define macro_f_fss_quotes_t_decimate_by(status, quotes, amount) macro_f_uint8s_t_decimate_by(status, quotes, amount)
 #endif // _di_f_fss_quotes_t_
 
 /**
@@ -71,18 +71,18 @@ extern "C" {
 
   #define f_fss_quotess_t_initialize f_uint8ss_t_initialize
 
-  #define f_macro_fss_quotess_t_clear(quotess) f_macro_uint8ss_t_clear(quotess)
+  #define macro_f_fss_quotess_t_clear(quotess) macro_f_uint8ss_t_clear(quotess)
 
-  #define f_macro_fss_quotess_t_resize(status, quotess, length) f_macro_uint8ss_t_resize(status, quotess, length)
-  #define f_macro_fss_quotess_t_adjust(status, quotess, length) f_macro_uint8ss_t_adjust(status, quotess, length)
+  #define macro_f_fss_quotess_t_resize(status, quotess, length) macro_f_uint8ss_t_resize(status, quotess, length)
+  #define macro_f_fss_quotess_t_adjust(status, quotess, length) macro_f_uint8ss_t_adjust(status, quotess, length)
 
-  #define f_macro_fss_quotess_t_delete_simple(quotess)  f_macro_uint8ss_t_delete_simple(quotess)
-  #define f_macro_fss_quotess_t_destroy_simple(quotess) f_macro_uint8ss_t_destroy_simple(quotess)
+  #define macro_f_fss_quotess_t_delete_simple(quotess)  macro_f_uint8ss_t_delete_simple(quotess)
+  #define macro_f_fss_quotess_t_destroy_simple(quotess) macro_f_uint8ss_t_destroy_simple(quotess)
 
-  #define f_macro_fss_quotess_t_increase(status, quotess)            f_macro_uint8ss_t_increase(status, quotess)
-  #define f_macro_fss_quotess_t_increase_by(status, quotess, amount) f_macro_uint8ss_t_increase_by(status, quotess, amount)
-  #define f_macro_fss_quotess_t_decrease_by(status, quotess, amount) f_macro_uint8ss_t_decrease_by(status, quotess, amount)
-  #define f_macro_fss_quotess_t_decimate_by(status, quotess, amount) f_macro_uint8ss_t_decimate_by(status, quotess, amount)
+  #define macro_f_fss_quotess_t_increase(status, quotess)            macro_f_uint8ss_t_increase(status, quotess)
+  #define macro_f_fss_quotess_t_increase_by(status, quotess, amount) macro_f_uint8ss_t_increase_by(status, quotess, amount)
+  #define macro_f_fss_quotess_t_decrease_by(status, quotess, amount) macro_f_uint8ss_t_decrease_by(status, quotess, amount)
+  #define macro_f_fss_quotess_t_decimate_by(status, quotess, amount) macro_f_uint8ss_t_decimate_by(status, quotess, amount)
 #endif // _di_f_fss_quotess_t_
 
 #ifdef __cplusplus
index 42419b7857759c41f1de09073087e903e833b550..58c806ade64b039053b146e7848b7fc8d76f053f 100644 (file)
@@ -33,20 +33,20 @@ extern "C" {
 
   #define f_fss_set_t_initialize { f_fss_objects_t_initialize, f_fss_contents_t_initialize }
 
-  #define f_macro_fss_set_t_clear(set) \
-    f_macro_fss_objects_t_clear(set.objects) \
-    f_macro_fss_contents_t_clear(set.contents)
+  #define macro_f_fss_set_t_clear(set) \
+    macro_f_fss_objects_t_clear(set.objects) \
+    macro_f_fss_contents_t_clear(set.contents)
 
-  #define f_macro_fss_set_t_resize(status, set, length) status = f_fss_set_resize(length, &set);
-  #define f_macro_fss_set_t_adjust(status, set, length) status = f_fss_set_adjust(length, &set);
+  #define macro_f_fss_set_t_resize(status, set, length) status = f_fss_set_resize(length, &set);
+  #define macro_f_fss_set_t_adjust(status, set, length) status = f_fss_set_adjust(length, &set);
 
-  #define f_macro_fss_set_t_delete_simple(set)  f_fss_set_resize(0, &set);
-  #define f_macro_fss_set_t_destroy_simple(set) f_fss_set_adjust(0, &set);
+  #define macro_f_fss_set_t_delete_simple(set)  f_fss_set_resize(0, &set);
+  #define macro_f_fss_set_t_destroy_simple(set) f_fss_set_adjust(0, &set);
 
-  #define f_macro_fss_set_t_increase(status, set)            status = f_fss_set_increase(&set);
-  #define f_macro_fss_set_t_increase_by(status, set, amount) status = f_fss_set_increase_by(amount, &set);
-  #define f_macro_fss_set_t_decrease_by(status, set, amount) status = f_fss_set_decrease_by(amount, &set);
-  #define f_macro_fss_set_t_decimate_by(status, set, amount) status = f_fss_set_decimate_by(amount, &set);
+  #define macro_f_fss_set_t_increase(status, set)            status = f_fss_set_increase(&set);
+  #define macro_f_fss_set_t_increase_by(status, set, amount) status = f_fss_set_increase_by(amount, &set);
+  #define macro_f_fss_set_t_decrease_by(status, set, amount) status = f_fss_set_decrease_by(amount, &set);
+  #define macro_f_fss_set_t_decimate_by(status, set, amount) status = f_fss_set_decimate_by(amount, &set);
 #endif // _di_f_fss_set_t_
 
 /**
@@ -66,18 +66,18 @@ extern "C" {
 
   #define f_fss_sets_t_initialize { 0, 0, 0 }
 
-  #define f_macro_fss_sets_t_clear(sets) f_macro_memory_structure_t_clear(set.objects)
+  #define macro_f_fss_sets_t_clear(sets) macro_f_memory_structure_t_clear(set.objects)
 
-  #define f_macro_fss_sets_t_resize(status, sets, length) status = f_fss_sets_resize(length, &sets);
-  #define f_macro_fss_sets_t_adjust(status, sets, length) status = f_fss_sets_adjust(length, &sets);
+  #define macro_f_fss_sets_t_resize(status, sets, length) status = f_fss_sets_resize(length, &sets);
+  #define macro_f_fss_sets_t_adjust(status, sets, length) status = f_fss_sets_adjust(length, &sets);
 
-  #define f_macro_fss_sets_t_delete_simple(sets)  f_fss_sets_resize(0, &sets);
-  #define f_macro_fss_sets_t_destroy_simple(sets) f_fss_sets_adjust(0, &sets);
+  #define macro_f_fss_sets_t_delete_simple(sets)  f_fss_sets_resize(0, &sets);
+  #define macro_f_fss_sets_t_destroy_simple(sets) f_fss_sets_adjust(0, &sets);
 
-  #define f_macro_fss_sets_t_increase(status, sets)            status = f_fss_sets_increase(&sets);
-  #define f_macro_fss_sets_t_increase_by(status, sets, amount) status = f_fss_sets_increase_by(amount, &sets);
-  #define f_macro_fss_sets_t_decrease_by(status, sets, amount) status = f_fss_sets_decrease_by(amount, &sets);
-  #define f_macro_fss_sets_t_decimate_by(status, sets, amount) status = f_fss_sets_decimate_by(amount, &sets);
+  #define macro_f_fss_sets_t_increase(status, sets)            status = f_fss_sets_increase(&sets);
+  #define macro_f_fss_sets_t_increase_by(status, sets, amount) status = f_fss_sets_increase_by(amount, &sets);
+  #define macro_f_fss_sets_t_decrease_by(status, sets, amount) status = f_fss_sets_decrease_by(amount, &sets);
+  #define macro_f_fss_sets_t_decimate_by(status, sets, amount) status = f_fss_sets_decimate_by(amount, &sets);
 #endif // _di_f_fss_sets_t_
 
 /**
@@ -102,22 +102,22 @@ extern "C" {
 
   #define f_fss_set_quote_t_initialize { f_fss_objects_t_initialize, f_fss_contents_t_initialize, f_fss_quotes_t_initialize, f_fss_quotess_t_initialize }
 
-  #define f_macro_fss_set_quote_t_clear(set) \
-    f_macro_fss_objects_t_clear(set.objects) \
-    f_macro_fss_contents_t_clear(set.contents) \
-    f_macro_fss_quotes_t_clear(set.objects_quote) \
-    f_macro_fss_quotess_t_clear(set.contents_quote)
+  #define macro_f_fss_set_quote_t_clear(set) \
+    macro_f_fss_objects_t_clear(set.objects) \
+    macro_f_fss_contents_t_clear(set.contents) \
+    macro_f_fss_quotes_t_clear(set.objects_quote) \
+    macro_f_fss_quotess_t_clear(set.contents_quote)
 
-  #define f_macro_fss_set_quote_t_resize(status, set_quote, length) status = f_fss_set_quote_resize(length, &set_quote);
-  #define f_macro_fss_set_quote_t_adjust(status, set_quote, length) status = f_fss_set_quote_adjust(length, &set_quote);
+  #define macro_f_fss_set_quote_t_resize(status, set_quote, length) status = f_fss_set_quote_resize(length, &set_quote);
+  #define macro_f_fss_set_quote_t_adjust(status, set_quote, length) status = f_fss_set_quote_adjust(length, &set_quote);
 
-  #define f_macro_fss_set_quote_t_delete_simple(set_quote)  f_fss_set_quote_resize(0, &set_quote);
-  #define f_macro_fss_set_quote_t_destroy_simple(set_quote) f_fss_set_quote_adjust(0, &set_quote);
+  #define macro_f_fss_set_quote_t_delete_simple(set_quote)  f_fss_set_quote_resize(0, &set_quote);
+  #define macro_f_fss_set_quote_t_destroy_simple(set_quote) f_fss_set_quote_adjust(0, &set_quote);
 
-  #define f_macro_fss_set_quote_t_increase(status, set_quote)            status = f_fss_set_quote_increase(&set_quote);
-  #define f_macro_fss_set_quote_t_increase_by(status, set_quote, amount) status = f_fss_set_quote_increase_by(amount, &set_quote);
-  #define f_macro_fss_set_quote_t_decrease_by(status, set_quote, amount) status = f_fss_set_quote_decrease_by(amount, &set_quote);
-  #define f_macro_fss_set_quote_t_decimate_by(status, set_quote, amount) status = f_fss_set_quote_decimate_by(amount, &set_quote);
+  #define macro_f_fss_set_quote_t_increase(status, set_quote)            status = f_fss_set_quote_increase(&set_quote);
+  #define macro_f_fss_set_quote_t_increase_by(status, set_quote, amount) status = f_fss_set_quote_increase_by(amount, &set_quote);
+  #define macro_f_fss_set_quote_t_decrease_by(status, set_quote, amount) status = f_fss_set_quote_decrease_by(amount, &set_quote);
+  #define macro_f_fss_set_quote_t_decimate_by(status, set_quote, amount) status = f_fss_set_quote_decimate_by(amount, &set_quote);
 #endif // _di_f_fss_set_quote_t_
 
 /**
@@ -137,18 +137,18 @@ extern "C" {
 
   #define f_fss_set_quotes_t_initialize { 0, 0, 0 }
 
-  #define f_macro_fss_set_quotes_t_clear(nameds) f_macro_memory_structure_clear(nameds)
+  #define macro_f_fss_set_quotes_t_clear(nameds) macro_f_memory_structure_clear(nameds)
 
-  #define f_macro_fss_set_quotes_t_resize(status, set_quotes, length) status = f_fss_set_quotes_resize(length, &set_quotes);
-  #define f_macro_fss_set_quotes_t_adjust(status, set_quotes, length) status = f_fss_set_quotes_adjust(length, &set_quotes);
+  #define macro_f_fss_set_quotes_t_resize(status, set_quotes, length) status = f_fss_set_quotes_resize(length, &set_quotes);
+  #define macro_f_fss_set_quotes_t_adjust(status, set_quotes, length) status = f_fss_set_quotes_adjust(length, &set_quotes);
 
-  #define f_macro_fss_set_quotes_t_delete_simple(set_quotes)  f_fss_set_quotes_resize(0, &set_quotes);
-  #define f_macro_fss_set_quotes_t_destroy_simple(set_quotes) f_fss_set_quotes_adjust(0, &set_quotes);
+  #define macro_f_fss_set_quotes_t_delete_simple(set_quotes)  f_fss_set_quotes_resize(0, &set_quotes);
+  #define macro_f_fss_set_quotes_t_destroy_simple(set_quotes) f_fss_set_quotes_adjust(0, &set_quotes);
 
-  #define f_macro_fss_set_quotes_t_increase(status, set_quotes)            status = f_fss_set_quotes_increase(&set_quotes);
-  #define f_macro_fss_set_quotes_t_increase_by(status, set_quotes, amount) status = f_fss_set_quotes_increase_by(amount, &set_quotes);
-  #define f_macro_fss_set_quotes_t_decrease_by(status, set_quotes, amount) status = f_fss_set_quotes_decrease_by(amount, &set_quotes);
-  #define f_macro_fss_set_quotes_t_decimate_by(status, set_quotes, amount) status = f_fss_set_quotes_decimate_by(amount, &set_quotes);
+  #define macro_f_fss_set_quotes_t_increase(status, set_quotes)            status = f_fss_set_quotes_increase(&set_quotes);
+  #define macro_f_fss_set_quotes_t_increase_by(status, set_quotes, amount) status = f_fss_set_quotes_increase_by(amount, &set_quotes);
+  #define macro_f_fss_set_quotes_t_decrease_by(status, set_quotes, amount) status = f_fss_set_quotes_decrease_by(amount, &set_quotes);
+  #define macro_f_fss_set_quotes_t_decimate_by(status, set_quotes, amount) status = f_fss_set_quotes_decimate_by(amount, &set_quotes);
 #endif // _di_fss_set_quotes_t_
 
 /**
index 0c64e2d4c89ebc5cbf3462f95c93bf43bf1fec4e..9db55c9267613ac1e00948ce27eb5584ca239ad5 100644 (file)
@@ -10,7 +10,7 @@ extern "C" {
     f_status_t status = F_none;
 
     for (f_array_length_t i = length; i < items->size; ++i) {
-      f_macro_fss_item_t_adjust(status, items->array[i], 0)
+      macro_f_fss_item_t_adjust(status, items->array[i], 0)
     } // for
 
     status = f_memory_adjust(items->size, length, sizeof(f_fss_item_t), (void **) & items->array);
@@ -32,7 +32,7 @@ extern "C" {
     f_status_t status = F_none;
 
     for (f_array_length_t i = length; i < items->size; ++i) {
-      f_macro_fss_item_t_resize(status, items->array[i], 0)
+      macro_f_fss_item_t_resize(status, items->array[i], 0)
     } // for
 
     status = f_memory_resize(items->size, length, sizeof(f_fss_item_t), (void **) & items->array);
@@ -53,13 +53,13 @@ extern "C" {
   f_status_t private_f_fss_named_adjust(const f_array_length_t length, f_fss_named_t *named) {
     f_status_t status = F_none;
 
-    f_macro_string_ranges_t_adjust(status, named->objects, length)
+    macro_f_string_ranges_t_adjust(status, named->objects, length)
     if (F_status_is_error(status)) return status;
 
-    f_macro_string_rangess_t_adjust(status, named->contents, length)
+    macro_f_string_rangess_t_adjust(status, named->contents, length)
     if (F_status_is_error(status)) return status;
 
-    f_macro_uint8ss_t_adjust(status, named->quotess, length)
+    macro_f_uint8ss_t_adjust(status, named->quotess, length)
 
     return status;
   }
@@ -69,13 +69,13 @@ extern "C" {
   f_status_t private_f_fss_named_resize(const f_array_length_t length, f_fss_named_t *named) {
     f_status_t status = F_none;
 
-    f_macro_string_ranges_t_resize(status, named->objects, length)
+    macro_f_string_ranges_t_resize(status, named->objects, length)
     if (F_status_is_error(status)) return status;
 
-    f_macro_string_rangess_t_resize(status, named->contents, length)
+    macro_f_string_rangess_t_resize(status, named->contents, length)
     if (F_status_is_error(status)) return status;
 
-    f_macro_uint8ss_t_resize(status, named->quotess, length)
+    macro_f_uint8ss_t_resize(status, named->quotess, length)
 
     return status;
   }
@@ -223,10 +223,10 @@ extern "C" {
   f_status_t private_f_fss_set_adjust(const f_array_length_t length, f_fss_set_t *set) {
     f_status_t status = F_none;
 
-    f_macro_fss_objects_t_adjust(status, set->objects, length);
+    macro_f_fss_objects_t_adjust(status, set->objects, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_contents_t_adjust(status, set->contents, length);
+    macro_f_fss_contents_t_adjust(status, set->contents, length);
 
     return status;
   }
@@ -236,10 +236,10 @@ extern "C" {
   f_status_t private_f_fss_set_resize(const f_array_length_t length, f_fss_set_t *set) {
     f_status_t status = F_none;
 
-    f_macro_fss_objects_t_resize(status, set->objects, length);
+    macro_f_fss_objects_t_resize(status, set->objects, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_contents_t_resize(status, set->contents, length);
+    macro_f_fss_contents_t_resize(status, set->contents, length);
 
     return status;
   }
@@ -249,16 +249,16 @@ extern "C" {
   f_status_t private_f_fss_set_quote_adjust(const f_array_length_t length, f_fss_set_quote_t *set_quote) {
     f_status_t status = F_none;
 
-    f_macro_fss_objects_t_adjust(status, set_quote->objects, length);
+    macro_f_fss_objects_t_adjust(status, set_quote->objects, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_contents_t_adjust(status, set_quote->contents, length);
+    macro_f_fss_contents_t_adjust(status, set_quote->contents, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_quotes_t_adjust(status, set_quote->objects_quote, length);
+    macro_f_fss_quotes_t_adjust(status, set_quote->objects_quote, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_quotess_t_adjust(status, set_quote->contents_quote, length);
+    macro_f_fss_quotess_t_adjust(status, set_quote->contents_quote, length);
 
     return status;
   }
@@ -268,16 +268,16 @@ extern "C" {
   f_status_t private_f_fss_set_quote_resize(const f_array_length_t length, f_fss_set_quote_t *set_quote) {
     f_status_t status = F_none;
 
-    f_macro_fss_objects_t_resize(status, set_quote->objects, length);
+    macro_f_fss_objects_t_resize(status, set_quote->objects, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_contents_t_resize(status, set_quote->contents, length);
+    macro_f_fss_contents_t_resize(status, set_quote->contents, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_quotes_t_resize(status, set_quote->objects_quote, length);
+    macro_f_fss_quotes_t_resize(status, set_quote->objects_quote, length);
     if (F_status_is_error(status)) return status;
 
-    f_macro_fss_quotess_t_resize(status, set_quote->contents_quote, length);
+    macro_f_fss_quotess_t_resize(status, set_quote->contents_quote, length);
 
     return status;
   }
@@ -289,16 +289,16 @@ extern "C" {
 
     for (f_array_length_t i = length; i < set_quotes->size; ++i) {
 
-      f_macro_fss_objects_t_adjust(status, set_quotes->array[i].objects, 0);
+      macro_f_fss_objects_t_adjust(status, set_quotes->array[i].objects, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_contents_t_adjust(status, set_quotes->array[i].contents, 0);
+      macro_f_fss_contents_t_adjust(status, set_quotes->array[i].contents, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_quotes_t_adjust(status, set_quotes->array[i].objects_quote, 0);
+      macro_f_fss_quotes_t_adjust(status, set_quotes->array[i].objects_quote, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_quotess_t_adjust(status, set_quotes->array[i].contents_quote, 0);
+      macro_f_fss_quotess_t_adjust(status, set_quotes->array[i].contents_quote, 0);
       if (F_status_is_error(status)) return status;
     } // for
 
@@ -322,16 +322,16 @@ extern "C" {
 
     for (f_array_length_t i = length; i < set_quotes->size; ++i) {
 
-      f_macro_fss_objects_t_resize(status, set_quotes->array[i].objects, 0);
+      macro_f_fss_objects_t_resize(status, set_quotes->array[i].objects, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_contents_t_resize(status, set_quotes->array[i].contents, 0);
+      macro_f_fss_contents_t_resize(status, set_quotes->array[i].contents, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_quotes_t_resize(status, set_quotes->array[i].objects_quote, 0);
+      macro_f_fss_quotes_t_resize(status, set_quotes->array[i].objects_quote, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_quotess_t_resize(status, set_quotes->array[i].contents_quote, 0);
+      macro_f_fss_quotess_t_resize(status, set_quotes->array[i].contents_quote, 0);
       if (F_status_is_error(status)) return status;
     } // for
 
@@ -355,10 +355,10 @@ extern "C" {
 
     for (f_array_length_t i = length; i < sets->size; ++i) {
 
-      f_macro_fss_objects_t_adjust(status, sets->array[i].objects, 0);
+      macro_f_fss_objects_t_adjust(status, sets->array[i].objects, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_contents_t_adjust(status, sets->array[i].contents, 0);
+      macro_f_fss_contents_t_adjust(status, sets->array[i].contents, 0);
       if (F_status_is_error(status)) return status;
     } // for
 
@@ -382,10 +382,10 @@ extern "C" {
 
     for (f_array_length_t i = length; i < sets->size; ++i) {
 
-      f_macro_fss_objects_t_resize(status, sets->array[i].objects, 0);
+      macro_f_fss_objects_t_resize(status, sets->array[i].objects, 0);
       if (F_status_is_error(status)) return status;
 
-      f_macro_fss_contents_t_resize(status, sets->array[i].contents, 0);
+      macro_f_fss_contents_t_resize(status, sets->array[i].contents, 0);
       if (F_status_is_error(status)) return status;
     } // for
 
index 02054783717b9044b3597a1501d481146a3569ec..ad16edaf362a2b4c7269988cb371a96d0cf0b471 100644 (file)
@@ -28,10 +28,10 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_item_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_item_t_adjust().
  *   Errors (with error bit) from: f_memory_adjust().
  *
- * @see f_macro_fss_item_t_adjust()
+ * @see macro_f_fss_item_t_adjust()
  *
  * @see f_fss_items_adjust()
  * @see f_fss_items_decimate_by()
@@ -54,10 +54,10 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_item_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_item_t_resize().
  *   Errors (with error bit) from: f_memory_resize().
  *
- * @see f_macro_fss_item_t_resize()
+ * @see macro_f_fss_item_t_resize()
  *
  * @see f_fss_items_decrease_by()
  * @see f_fss_items_increase()
@@ -82,13 +82,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_ranges_t_adjust().
- *   Errors (with error bit) from: f_macro_string_rangess_t_adjust().
- *   Errors (with error bit) from: f_macro_uint8ss_t_adjust().
+ *   Errors (with error bit) from: macro_f_string_ranges_t_adjust().
+ *   Errors (with error bit) from: macro_f_string_rangess_t_adjust().
+ *   Errors (with error bit) from: macro_f_uint8ss_t_adjust().
  *
- * @see f_macro_string_ranges_t_adjust()
- * @see f_macro_string_rangess_t_adjust()
- * @see f_macro_uint8ss_t_adjust()
+ * @see macro_f_string_ranges_t_adjust()
+ * @see macro_f_string_rangess_t_adjust()
+ * @see macro_f_uint8ss_t_adjust()
  *
  * @see f_fss_nameds_adjust()
  * @see f_fss_nameds_decimate_by()
@@ -110,13 +110,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_ranges_t_resize().
- *   Errors (with error bit) from: f_macro_string_rangess_t_resize().
- *   Errors (with error bit) from: f_macro_uint8ss_t_resize().
+ *   Errors (with error bit) from: macro_f_string_ranges_t_resize().
+ *   Errors (with error bit) from: macro_f_string_rangess_t_resize().
+ *   Errors (with error bit) from: macro_f_uint8ss_t_resize().
  *
- * @see f_macro_string_ranges_t_resize()
- * @see f_macro_string_rangess_t_resize()
- * @see f_macro_uint8ss_t_resize()
+ * @see macro_f_string_ranges_t_resize()
+ * @see macro_f_string_rangess_t_resize()
+ * @see macro_f_uint8ss_t_resize()
  *
  * @see f_fss_nameds_decrease_by()
  * @see f_fss_nameds_incease()
@@ -195,9 +195,9 @@ extern "C" {
  *   F_none on success.
  *
  *   Errors (with error bit) from: f_memory_adjust().
- *   Errors (with error bit) from: f_macro_fss_nest_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_nest_t_adjust().
  *
- * @see f_macro_fss_nest_t_adjust()
+ * @see macro_f_fss_nest_t_adjust()
  *
  * @see f_fss_nest_adjust()
  * @see f_fss_nest_decimate_by()
@@ -221,9 +221,9 @@ extern "C" {
  *   F_none on success.
  *
  *   Errors (with error bit) from: f_memory_resize().
- *   Errors (with error bit) from: f_macro_fss_nest_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_nest_t_resize().
  *
- * @see f_macro_fss_nest_t_resize()
+ * @see macro_f_fss_nest_t_resize()
  *
  * @see f_fss_nest_decrease_by()
  * @see f_fss_nest_increase()
@@ -249,9 +249,9 @@ extern "C" {
  *   F_none on success.
  *
  *   Errors (with error bit) from: f_memory_adjust().
- *   Errors (with error bit) from: f_macro_fss_nest_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_nest_t_adjust().
  *
- * @see f_macro_fss_nest_t_adjust()
+ * @see macro_f_fss_nest_t_adjust()
  *
  * @see f_fss_nests_adjust()
  * @see f_fss_nests_decimate_by()
@@ -275,9 +275,9 @@ extern "C" {
  *   F_none on success.
  *
  *   Errors (with error bit) from: f_memory_resize().
- *   Errors (with error bit) from: f_macro_fss_nest_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_nest_t_resize().
  *
- * @see f_macro_fss_nest_t_resize()
+ * @see macro_f_fss_nest_t_resize()
  *
  * @see f_fss_nests_decrease_by()
  * @see f_fss_nests_increase()
@@ -302,11 +302,11 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_objects_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_adjust().
  *
- * @see f_macro_fss_contents_t_adjust()
- * @see f_macro_fss_objects_t_adjust()
+ * @see macro_f_fss_contents_t_adjust()
+ * @see macro_f_fss_objects_t_adjust()
  *
  * @see f_fss_set_adjust()
  * @see f_fss_set_decimate_by()
@@ -328,11 +328,11 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_resize().
- *   Errors (with error bit) from: f_macro_fss_objects_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_resize().
  *
- * @see f_macro_fss_contents_t_resize()
- * @see f_macro_fss_objects_t_resize()
+ * @see macro_f_fss_contents_t_resize()
+ * @see macro_f_fss_objects_t_resize()
  *
  * @see f_fss_set_decrease_by()
  * @see f_fss_set_increase()
@@ -356,15 +356,15 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_objects_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_quotes_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_quotess_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_quotes_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_quotess_t_adjust().
  *
- * @see f_macro_fss_contents_t_adjust()
- * @see f_macro_fss_objects_t_adjust()
- * @see f_macro_fss_quotes_t_adjust()
- * @see f_macro_fss_quotess_t_adjust()
+ * @see macro_f_fss_contents_t_adjust()
+ * @see macro_f_fss_objects_t_adjust()
+ * @see macro_f_fss_quotes_t_adjust()
+ * @see macro_f_fss_quotess_t_adjust()
  *
  * @see f_fss_set_quote_adjust()
  * @see f_fss_set_quote_decimate_by()
@@ -386,15 +386,15 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_resize().
- *   Errors (with error bit) from: f_macro_fss_objects_t_resize().
- *   Errors (with error bit) from: f_macro_fss_quotes_t_resize().
- *   Errors (with error bit) from: f_macro_fss_quotess_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_quotes_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_quotess_t_resize().
  *
- * @see f_macro_fss_contents_t_resize()
- * @see f_macro_fss_objects_t_resize()
- * @see f_macro_fss_quotes_t_resize()
- * @see f_macro_fss_quotess_t_resize()
+ * @see macro_f_fss_contents_t_resize()
+ * @see macro_f_fss_objects_t_resize()
+ * @see macro_f_fss_quotes_t_resize()
+ * @see macro_f_fss_quotess_t_resize()
  *
  * @see f_fss_set_quote_decrease_by()
  * @see f_fss_set_quote_increase()
@@ -418,16 +418,16 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_objects_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_quotes_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_quotess_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_quotes_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_quotess_t_adjust().
  *   Errors (with error bit) from: f_memory_adjust().
  *
- * @see f_macro_fss_contents_t_adjust()
- * @see f_macro_fss_objects_t_adjust()
- * @see f_macro_fss_quotes_t_adjust()
- * @see f_macro_fss_quotess_t_adjust()
+ * @see macro_f_fss_contents_t_adjust()
+ * @see macro_f_fss_objects_t_adjust()
+ * @see macro_f_fss_quotes_t_adjust()
+ * @see macro_f_fss_quotess_t_adjust()
  *
  * @see f_fss_set_quotes_adjust()
  * @see f_fss_set_quotes_decimate_by()
@@ -450,16 +450,16 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_resize().
- *   Errors (with error bit) from: f_macro_fss_objects_t_resize().
- *   Errors (with error bit) from: f_macro_fss_quotes_t_resize().
- *   Errors (with error bit) from: f_macro_fss_quotess_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_quotes_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_quotess_t_resize().
  *   Errors (with error bit) from: f_memory_resize().
  *
- * @see f_macro_fss_contents_t_resize()
- * @see f_macro_fss_objects_t_resize()
- * @see f_macro_fss_quotes_t_resize()
- * @see f_macro_fss_quotess_t_resize()
+ * @see macro_f_fss_contents_t_resize()
+ * @see macro_f_fss_objects_t_resize()
+ * @see macro_f_fss_quotes_t_resize()
+ * @see macro_f_fss_quotess_t_resize()
  *
  * @see f_fss_set_quotes_decrease_by()
  * @see f_fss_set_quotes_increase()
@@ -484,12 +484,12 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_adjust().
- *   Errors (with error bit) from: f_macro_fss_objects_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_adjust().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_adjust().
  *   Errors (with error bit) from: f_memory_adjust().
  *
- * @see f_macro_fss_contents_t_adjust()
- * @see f_macro_fss_objects_t_adjust()
+ * @see macro_f_fss_contents_t_adjust()
+ * @see macro_f_fss_objects_t_adjust()
  *
  * @see f_fss_sets_adjust()
  * @see f_fss_sets_decimate_by()
@@ -512,12 +512,12 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_fss_contents_t_resize().
- *   Errors (with error bit) from: f_macro_fss_objects_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_contents_t_resize().
+ *   Errors (with error bit) from: macro_f_fss_objects_t_resize().
  *   Errors (with error bit) from: f_memory_resize().
  *
- * @see f_macro_fss_contents_t_resize()
- * @see f_macro_fss_objects_t_resize()
+ * @see macro_f_fss_contents_t_resize()
+ * @see macro_f_fss_objects_t_resize()
  *
  * @see f_fss_sets_decrease_by()
  * @see f_fss_sets_increase()
index 13b0cd556121da3e7cbd6ddc9fc20390c74805ec..f2e21045841456943e8e48103ac3622cfb2d0958 100644 (file)
@@ -87,13 +87,13 @@ extern "C" {
 
   #define f_iki_variable_t_initialize f_string_ranges_t_initialize
 
-  #define f_macro_iki_variable_t_clear(variable) f_macro_string_ranges_t_clear(variable)
+  #define macro_f_iki_variable_t_clear(variable) macro_f_string_ranges_t_clear(variable)
 
-  #define f_macro_iki_variable_t_resize(status, variable, new_length) f_macro_string_ranges_t_resize(status, variable, new_length)
-  #define f_macro_iki_variable_t_adjust(status, variable, new_length) f_macro_string_ranges_t_adjust(status, variable, new_length)
+  #define macro_f_iki_variable_t_resize(status, variable, new_length) macro_f_string_ranges_t_resize(status, variable, new_length)
+  #define macro_f_iki_variable_t_adjust(status, variable, new_length) macro_f_string_ranges_t_adjust(status, variable, new_length)
 
-  #define f_macro_iki_variable_t_delete_simple(variable)  f_macro_string_ranges_t_delete_simple(variable)
-  #define f_macro_iki_variable_t_destroy_simple(variable) f_macro_string_ranges_t_destroy_simple(variable)
+  #define macro_f_iki_variable_t_delete_simple(variable)  macro_f_string_ranges_t_delete_simple(variable)
+  #define macro_f_iki_variable_t_destroy_simple(variable) macro_f_string_ranges_t_destroy_simple(variable)
 #endif // _di_iki_variable_t_
 
 /**
@@ -108,13 +108,13 @@ extern "C" {
 
   #define f_iki_vocabulary_t_initialize f_string_ranges_t_initialize
 
-  #define f_macro_iki_vocabulary_t_clear(vocabulary) f_macro_string_ranges_t_clear(vocabulary)
+  #define macro_f_iki_vocabulary_t_clear(vocabulary) macro_f_string_ranges_t_clear(vocabulary)
 
-  #define f_macro_iki_vocabulary_t_resize(status, vocabulary, new_length) f_macro_string_ranges_t_resize(status, vocabulary, new_length)
-  #define f_macro_iki_vocabulary_t_adjust(status, vocabulary, new_length) f_macro_string_ranges_t_adjust(status, vocabulary, new_length)
+  #define macro_f_iki_vocabulary_t_resize(status, vocabulary, new_length) macro_f_string_ranges_t_resize(status, vocabulary, new_length)
+  #define macro_f_iki_vocabulary_t_adjust(status, vocabulary, new_length) macro_f_string_ranges_t_adjust(status, vocabulary, new_length)
 
-  #define f_macro_iki_vocabulary_t_delete_simple(vocabulary)  f_macro_string_ranges_t_delete_simple(vocabulary)
-  #define f_macro_iki_vocabulary_t_destroy_simple(vocabulary) f_macro_string_ranges_t_destroy_simple(vocabulary)
+  #define macro_f_iki_vocabulary_t_delete_simple(vocabulary)  macro_f_string_ranges_t_delete_simple(vocabulary)
+  #define macro_f_iki_vocabulary_t_destroy_simple(vocabulary) macro_f_string_ranges_t_destroy_simple(vocabulary)
 #endif // _di_iki_vocabulary_t_
 
 /**
@@ -129,13 +129,13 @@ extern "C" {
 
   #define f_iki_vocabularys_t_initialize f_string_rangess_t_initialize
 
-  #define f_macro_iki_vocabularys_t_clear(content) f_macro_string_rangess_t_clear(content)
+  #define macro_f_iki_vocabularys_t_clear(content) macro_f_string_rangess_t_clear(content)
 
-  #define f_macro_iki_vocabularys_t_resize(status, content, new_length) f_macro_string_rangess_t_resize(status, content, new_length)
-  #define f_macro_iki_vocabularys_t_adjust(status, content, new_length) f_macro_string_rangess_t_adjust(status, content, new_length)
+  #define macro_f_iki_vocabularys_t_resize(status, content, new_length) macro_f_string_rangess_t_resize(status, content, new_length)
+  #define macro_f_iki_vocabularys_t_adjust(status, content, new_length) macro_f_string_rangess_t_adjust(status, content, new_length)
 
-  #define f_macro_iki_vocabularys_t_delete_simple(content)  f_macro_string_rangess_t_delete_simple(content)
-  #define f_macro_iki_vocabularys_t_destroy_simple(content) f_macro_string_rangess_t_destroy_simple(content)
+  #define macro_f_iki_vocabularys_t_delete_simple(content)  macro_f_string_rangess_t_delete_simple(content)
+  #define macro_f_iki_vocabularys_t_destroy_simple(content) macro_f_string_rangess_t_destroy_simple(content)
 #endif // _di_iki_vocabularys_t_
 
 /**
@@ -152,13 +152,13 @@ extern "C" {
 
   #define f_iki_content_t_initialize f_string_ranges_t_initialize
 
-  #define f_macro_iki_content_t_clear(content) f_macro_string_ranges_t_clear(content)
+  #define macro_f_iki_content_t_clear(content) macro_f_string_ranges_t_clear(content)
 
-  #define f_macro_iki_content_t_resize(status, content, new_length) f_macro_string_ranges_t_resize(status, content, new_length)
-  #define f_macro_iki_content_t_adjust(status, content, new_length) f_macro_string_ranges_t_adjust(status, content, new_length)
+  #define macro_f_iki_content_t_resize(status, content, new_length) macro_f_string_ranges_t_resize(status, content, new_length)
+  #define macro_f_iki_content_t_adjust(status, content, new_length) macro_f_string_ranges_t_adjust(status, content, new_length)
 
-  #define f_macro_iki_content_t_delete_simple(content)  f_macro_string_ranges_t_delete_simple(content)
-  #define f_macro_iki_content_t_destroy_simple(content) f_macro_string_ranges_t_destroy_simple(content)
+  #define macro_f_iki_content_t_delete_simple(content)  macro_f_string_ranges_t_delete_simple(content)
+  #define macro_f_iki_content_t_destroy_simple(content) macro_f_string_ranges_t_destroy_simple(content)
 #endif // _di_iki_content_t_
 
 /**
@@ -173,13 +173,13 @@ extern "C" {
 
   #define f_iki_contents_t_initialize f_string_rangess_t_initialize
 
-  #define f_macro_iki_contents_t_clear(content) f_macro_string_rangess_t_clear(content)
+  #define macro_f_iki_contents_t_clear(content) macro_f_string_rangess_t_clear(content)
 
-  #define f_macro_iki_contents_t_resize(status, content, new_length) f_macro_string_rangess_t_resize(status, content, new_length)
-  #define f_macro_iki_contents_t_adjust(status, content, new_length) f_macro_string_rangess_t_adjust(status, content, new_length)
+  #define macro_f_iki_contents_t_resize(status, content, new_length) macro_f_string_rangess_t_resize(status, content, new_length)
+  #define macro_f_iki_contents_t_adjust(status, content, new_length) macro_f_string_rangess_t_adjust(status, content, new_length)
 
-  #define f_macro_iki_contents_t_delete_simple(content)  f_macro_string_rangess_t_delete_simple(content)
-  #define f_macro_iki_contents_t_destroy_simple(content) f_macro_string_rangess_t_destroy_simple(content)
+  #define macro_f_iki_contents_t_delete_simple(content)  macro_f_string_rangess_t_delete_simple(content)
+  #define macro_f_iki_contents_t_destroy_simple(content) macro_f_string_rangess_t_destroy_simple(content)
 #endif // _di_iki_contents_t_
 
 /**
@@ -197,8 +197,8 @@ extern "C" {
  * status:   The return status to use.
  * delimits: The delimit array to conditionally reallocate.
  */
-#ifndef _di_f_macro_iki_allocate_delimits_if_necessary_
-  #define f_macro_iki_allocate_delimits_if_necessary(status, delimits) \
+#ifndef _di_macro_f_iki_allocate_delimits_if_necessary_
+  #define macro_f_iki_allocate_delimits_if_necessary(status, delimits) \
     status = F_none; \
     if (delimits.used == delimits.size) { \
       if (delimits.used + f_iki_default_allocation_step > f_array_length_t_size) { \
@@ -206,14 +206,14 @@ extern "C" {
           status = F_status_set_error(F_string_too_large); \
         } \
         else { \
-          f_macro_array_lengths_t_resize(status, delimits, delimits.size + 1); \
+          macro_f_array_lengths_t_resize(status, delimits, delimits.size + 1); \
         } \
       } \
       else { \
-        f_macro_array_lengths_t_resize(status, delimits, delimits.size + f_iki_default_allocation_step); \
+        macro_f_array_lengths_t_resize(status, delimits, delimits.size + f_iki_default_allocation_step); \
       } \
     }
-#endif // _di_f_macro_iki_allocate_delimits_if_necessary_
+#endif // _di_macro_f_iki_allocate_delimits_if_necessary_
 
 /**
  * Reallocate delimits array if necessary for appending a new ranges.
@@ -221,8 +221,8 @@ extern "C" {
  * status: The return status to use.
  * ranges: The delimit array to conditionally reallocate.
  */
-#ifndef _di_f_macro_iki_allocate_ranges_if_necessary_
-  #define f_macro_iki_allocate_ranges_if_necessary(status, ranges) \
+#ifndef _di_macro_f_iki_allocate_ranges_if_necessary_
+  #define macro_f_iki_allocate_ranges_if_necessary(status, ranges) \
     status = F_none; \
     if (ranges.used == ranges.size) { \
       if (ranges.used + f_iki_default_allocation_step > f_array_length_t_size) { \
@@ -230,14 +230,14 @@ extern "C" {
           status = F_status_set_error(F_string_too_large); \
         } \
         else { \
-          f_macro_string_ranges_t_resize(status, ranges, ranges.size + 1); \
+          macro_f_string_ranges_t_resize(status, ranges, ranges.size + 1); \
         } \
       } \
       else { \
-        f_macro_string_ranges_t_resize(status, ranges, ranges.size + f_iki_default_allocation_step); \
+        macro_f_string_ranges_t_resize(status, ranges, ranges.size + f_iki_default_allocation_step); \
       } \
     }
-#endif // _di_f_macro_iki_allocate_ranges_if_necessary_
+#endif // _di_macro_f_iki_allocate_ranges_if_necessary_
 
 /**
  * Determine what the max width is based on the buffer and the range.
@@ -246,13 +246,13 @@ extern "C" {
  * range:     (A pointer) The range within that buffer to determine against.
  * width_max: The determined width max.
  */
-#ifndef _di_f_macro_iki_determine_width_max_
-  #define f_macro_iki_determine_width_max(buffer, range, width_max) \
+#ifndef _di_macro_f_iki_determine_width_max_
+  #define macro_f_iki_determine_width_max(buffer, range, width_max) \
     width_max = (range->stop - range->start) + 1; \
     if (width_max > buffer->used - range->start) { \
       width_max = buffer->used - range->start; \
     }
-#endif // _di_f_macro_iki_determine_width_max_
+#endif // _di_macro_f_iki_determine_width_max_
 
 /**
  * Seek until whitespace is found or not found.
@@ -265,21 +265,21 @@ extern "C" {
  * width_max: The width_max variable to use fo calculating width_max.
  * condition: Set to TRUE to seek until whitespace is found and FALSE to seek until non-whitespace.
  */
-#ifndef _di_f_macro_iki_seek_whitespace_
-  #define f_macro_iki_seek_whitespace(status, buffer, range, width_max, condition) \
+#ifndef _di_macro_f_iki_seek_whitespace_
+  #define macro_f_iki_seek_whitespace(status, buffer, range, width_max, condition) \
     while (range->start <= range->stop && range->start < buffer->used) { \
       if (buffer->string[range->start] == f_iki_syntax_placeholder) { \
         range->start++; \
         continue; \
       } \
-      f_macro_iki_determine_width_max(buffer, range, width_max); \
+      macro_f_iki_determine_width_max(buffer, range, width_max); \
       status = f_utf_is_whitespace(buffer->string + range->start, width_max); \
       if (status == condition) break; \
       else if (F_status_is_error(status)) break; \
       status = f_utf_buffer_increment(*buffer, range, 1); \
       if (F_status_is_error(status)) break; \
     }
-#endif // _di_f_macro_iki_seek_whitespace_
+#endif // _di_macro_f_iki_seek_whitespace_
 
 /**
  * Seek until a word, dash, or plus is found or not found.
@@ -292,21 +292,21 @@ extern "C" {
  * width_max: The width_max variable to use fo calculating width_max.
  * condition: Set to TRUE to seek until a word character, dash character, or plus character is found and FALSE to seek until the opposite is found.
  */
-#ifndef _di_f_macro_iki_seek_word_dash_plus_
-  #define f_macro_iki_seek_word_dash_plus(status, buffer, range, width_max, condition) \
+#ifndef _di_macro_f_iki_seek_word_dash_plus_
+  #define macro_f_iki_seek_word_dash_plus(status, buffer, range, width_max, condition) \
     while (range->start <= range->stop && range->start < buffer->used) { \
       if (buffer->string[range->start] == f_iki_syntax_placeholder) { \
         range->start++; \
         continue; \
       } \
-      f_macro_iki_determine_width_max(buffer, range, width_max); \
+      macro_f_iki_determine_width_max(buffer, range, width_max); \
       status = f_utf_is_word_dash_plus(buffer->string + range->start, width_max, F_false); \
       if (status == condition) break; \
       else if (F_status_is_error(status)) break; \
       status = f_utf_buffer_increment(*buffer, range, 1); \
       if (F_status_is_error(status)) break; \
     }
-#endif // _di_f_macro_iki_seek_word_dash_plus_
+#endif // _di_macro_f_iki_seek_word_dash_plus_
 
 #ifdef __cplusplus
 } // extern "C"
index a7e323089e75d4cfdefa94d3969bb2ba8a82bde0..a1613296925db6ea9d70b656f7aa041d3cc51d7c 100644 (file)
@@ -12,7 +12,7 @@ extern "C" {
       if (quote != f_iki_syntax_quote_single && quote != f_iki_syntax_quote_double) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const f_string_range_t range = f_macro_string_range_t_initialize(content.used);
+    const f_string_range_t range = macro_f_string_range_t_initialize(content.used);
 
     return private_f_iki_content_partial_is(content, range, quote);
   }
@@ -37,7 +37,7 @@ extern "C" {
       if (object.used > object.size) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const f_string_range_t range = f_macro_string_range_t_initialize(object.used);
+    const f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
     return private_f_iki_object_partial_is(object, range);
   }
@@ -86,7 +86,7 @@ extern "C" {
     }
 
     // skip past all initial non-word, non-dash, and non-plus.
-    f_macro_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
+    macro_f_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
 
     if (F_status_is_error(status)) {
       return status;
@@ -128,7 +128,7 @@ extern "C" {
             status = f_utf_buffer_increment(*buffer, range, 1);
 
             if (F_status_is_error(status)) {
-              f_macro_array_lengths_t_delete_simple(delimits);
+              macro_f_array_lengths_t_delete_simple(delimits);
               return status;
             }
 
@@ -143,7 +143,7 @@ extern "C" {
           } while (F_status_is_fine(status) && buffer->string[range->start] == f_iki_syntax_placeholder);
 
           if (F_status_is_error(status)) {
-            f_macro_array_lengths_t_delete_simple(delimits);
+            macro_f_array_lengths_t_delete_simple(delimits);
             return status;
           }
 
@@ -155,9 +155,9 @@ extern "C" {
           }
 
           // this is not a valid vocabulary name so seek until a non-word, non-dash, or non-plus character.
-          f_macro_iki_seek_word_dash_plus(status, buffer, range, width_max, F_false);
+          macro_f_iki_seek_word_dash_plus(status, buffer, range, width_max, F_false);
           if (F_status_is_error(status)) {
-            f_macro_array_lengths_t_delete_simple(delimits);
+            macro_f_array_lengths_t_delete_simple(delimits);
             return status;
           }
 
@@ -200,7 +200,7 @@ extern "C" {
             status = f_utf_buffer_increment(*buffer, range, 1);
 
             if (F_status_is_error(status)) {
-              f_macro_array_lengths_t_delete_simple(delimits);
+              macro_f_array_lengths_t_delete_simple(delimits);
               return status;
             }
           } // while
@@ -208,29 +208,29 @@ extern "C" {
           break;
         }
         else {
-          f_macro_iki_determine_width_max(buffer, range, width_max);
+          macro_f_iki_determine_width_max(buffer, range, width_max);
 
           status = f_utf_is_word_dash_plus(buffer->string + range->start, width_max, F_false);
 
           if (F_status_is_error(status)) {
-            f_macro_array_lengths_t_delete_simple(delimits);
+            macro_f_array_lengths_t_delete_simple(delimits);
             return status;
           }
 
           // current word-dash-plus block is not a valid variable name, try again.
           if (status == F_false) {
-            f_macro_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
+            macro_f_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
 
             if (F_status_is_error(status)) {
-              f_macro_array_lengths_t_delete_simple(delimits);
+              macro_f_array_lengths_t_delete_simple(delimits);
               return status;
             }
             else if (range->start > range->stop) {
-              f_macro_array_lengths_t_delete_simple(delimits);
+              macro_f_array_lengths_t_delete_simple(delimits);
               return F_data_not_stop;
             }
             else if (range->start >= buffer->used) {
-              f_macro_array_lengths_t_delete_simple(delimits);
+              macro_f_array_lengths_t_delete_simple(delimits);
               return F_data_not_eos;
             }
 
@@ -241,7 +241,7 @@ extern "C" {
         status = f_utf_buffer_increment(*buffer, range, 1);
 
         if (F_status_is_error(status)) {
-          f_macro_array_lengths_t_delete_simple(delimits);
+          macro_f_array_lengths_t_delete_simple(delimits);
           return status;
         }
       } // while
@@ -261,10 +261,10 @@ extern "C" {
 
             // this is a valid vocabulary name and content, but if it is delimited, save the delimit and ignore.
             if (vocabulary_delimited) {
-              f_macro_iki_allocate_delimits_if_necessary(status, delimits);
+              macro_f_iki_allocate_delimits_if_necessary(status, delimits);
 
               if (F_status_is_error(status)) {
-                f_macro_array_lengths_t_delete_simple(delimits);
+                macro_f_array_lengths_t_delete_simple(delimits);
                 return status;
               }
 
@@ -279,18 +279,18 @@ extern "C" {
               break;
             }
             else {
-              f_macro_iki_allocate_ranges_if_necessary(status, (*variable));
+              macro_f_iki_allocate_ranges_if_necessary(status, (*variable));
 
               if (F_status_is_fine(status)) {
-                f_macro_iki_allocate_ranges_if_necessary(status, (*vocabulary));
+                macro_f_iki_allocate_ranges_if_necessary(status, (*vocabulary));
               }
 
               if (F_status_is_fine(status)) {
-                f_macro_iki_allocate_ranges_if_necessary(status, (*content));
+                macro_f_iki_allocate_ranges_if_necessary(status, (*content));
               }
 
               if (F_status_is_error(status)) {
-                f_macro_array_lengths_t_delete_simple(delimits);
+                macro_f_array_lengths_t_delete_simple(delimits);
                 return status;
               }
 
@@ -310,7 +310,7 @@ extern "C" {
                 buffer->string[delimits.array[i]] = f_iki_syntax_placeholder;
               } // for
 
-              f_macro_array_lengths_t_delete_simple(delimits);
+              macro_f_array_lengths_t_delete_simple(delimits);
               if (F_status_is_error(status)) return status;
 
               range->start++;
@@ -351,11 +351,11 @@ extern "C" {
                     status = F_status_set_error(F_string_too_large);
                   }
                   else {
-                    f_macro_array_lengths_t_resize(status, delimits, delimits.used + content_slash_delimits);
+                    macro_f_array_lengths_t_resize(status, delimits, delimits.used + content_slash_delimits);
                   }
 
                   if (F_status_is_error(status)) {
-                    f_macro_array_lengths_t_delete_simple(delimits);
+                    macro_f_array_lengths_t_delete_simple(delimits);
                     return status;
                   }
                 }
@@ -375,7 +375,7 @@ extern "C" {
                   status = f_utf_buffer_increment(*buffer, (&content_range), 1);
 
                   if (F_status_is_error(status)) {
-                    f_macro_array_lengths_t_delete_simple(delimits);
+                    macro_f_array_lengths_t_delete_simple(delimits);
                     return status;
                   }
                 } // while
@@ -385,10 +385,10 @@ extern "C" {
 
                   // this is a valid vocabulary name and content, but if it is delimited, save the delimit and ignore.
                   if (vocabulary_delimited) {
-                    f_macro_iki_allocate_delimits_if_necessary(status, delimits);
+                    macro_f_iki_allocate_delimits_if_necessary(status, delimits);
 
                     if (F_status_is_error(status)) {
-                      f_macro_array_lengths_t_delete_simple(delimits);
+                      macro_f_array_lengths_t_delete_simple(delimits);
                       return status;
                     }
 
@@ -401,23 +401,23 @@ extern "C" {
                     range->start++;
 
                     // skip past all initial non-word, non-dash, and non-plus.
-                    f_macro_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
+                    macro_f_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
 
                     found_vocabulary.start = range->start;
                   }
                   else {
-                    f_macro_iki_allocate_ranges_if_necessary(status, (*variable));
+                    macro_f_iki_allocate_ranges_if_necessary(status, (*variable));
 
                     if (F_status_is_fine(status)) {
-                      f_macro_iki_allocate_ranges_if_necessary(status, (*vocabulary));
+                      macro_f_iki_allocate_ranges_if_necessary(status, (*vocabulary));
                     }
 
                     if (F_status_is_fine(status)) {
-                      f_macro_iki_allocate_ranges_if_necessary(status, (*content));
+                      macro_f_iki_allocate_ranges_if_necessary(status, (*content));
                     }
 
                     if (F_status_is_error(status)) {
-                      f_macro_array_lengths_t_delete_simple(delimits);
+                      macro_f_array_lengths_t_delete_simple(delimits);
                       return status;
                     }
 
@@ -437,7 +437,7 @@ extern "C" {
                       buffer->string[delimits.array[i]] = f_iki_syntax_placeholder;
                     } // for
 
-                    f_macro_array_lengths_t_delete_simple(delimits);
+                    macro_f_array_lengths_t_delete_simple(delimits);
                     if (F_status_is_error(status)) return status;
 
                     range->start++;
@@ -465,7 +465,7 @@ extern "C" {
               status = f_utf_buffer_increment(*buffer, range, 1);
 
               if (F_status_is_error(status)) {
-                f_macro_array_lengths_t_delete_simple(delimits);
+                macro_f_array_lengths_t_delete_simple(delimits);
                 return status;
               }
             } // while
@@ -474,7 +474,7 @@ extern "C" {
           status = f_utf_buffer_increment(*buffer, range, 1);
 
           if (F_status_is_error(status)) {
-            f_macro_array_lengths_t_delete_simple(delimits);
+            macro_f_array_lengths_t_delete_simple(delimits);
             return status;
           }
         } // while
@@ -485,7 +485,7 @@ extern "C" {
       }
 
       if (find_next) {
-        f_macro_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
+        macro_f_iki_seek_word_dash_plus(status, buffer, range, width_max, F_true);
 
         found_vocabulary.start = range->start;
         find_next = F_false;
@@ -496,7 +496,7 @@ extern "C" {
       buffer->string[delimits.array[i]] = f_iki_syntax_placeholder;
     } // for
 
-    f_macro_array_lengths_t_delete_simple(delimits);
+    macro_f_array_lengths_t_delete_simple(delimits);
     if (F_status_is_error(status)) return status;
 
     if (range->start > range->stop) {
index 94e85acf4a0f3192623142e39e61e62f66e1ca0d..58972e4de484910433ccb4f73d283fbc89ba5a51 100644 (file)
@@ -27,7 +27,7 @@ extern "C" {
 
   #define f_limit_value_t_initialize { 0, 0 }
 
-  #define f_macro_limit_value_t_clear(value) \
+  #define macro_f_limit_value_t_clear(value) \
     value.rlim_cur = 0; \
     value.rlim_max = 0;
 #endif // _di_f_limit_value_t_
@@ -49,18 +49,18 @@ extern "C" {
 
   #define f_limit_values_t_initialize { 0, 0, 0 }
 
-  #define f_macro_limit_values_t_clear(values) f_macro_memory_structure_clear(values)
+  #define macro_f_limit_values_t_clear(values) macro_f_memory_structure_clear(values)
 
-  #define f_macro_limit_values_t_resize(status, values, length) f_macro_memory_structure_resize(status, values, f_limit_value_t, length)
-  #define f_macro_limit_values_t_adjust(status, values, length) f_macro_memory_structure_adjust(status, values, f_limit_value_t, length)
+  #define macro_f_limit_values_t_resize(status, values, length) macro_f_memory_structure_resize(status, values, f_limit_value_t, length)
+  #define macro_f_limit_values_t_adjust(status, values, length) macro_f_memory_structure_adjust(status, values, f_limit_value_t, length)
 
-  #define f_macro_limit_values_t_delete_simple(values)  f_macro_memory_structure_delete_simple(values, f_limit_value_t)
-  #define f_macro_limit_values_t_destroy_simple(values) f_macro_memory_structure_destroy_simple(values, f_limit_value_t)
+  #define macro_f_limit_values_t_delete_simple(values)  macro_f_memory_structure_delete_simple(values, f_limit_value_t)
+  #define macro_f_limit_values_t_destroy_simple(values) macro_f_memory_structure_destroy_simple(values, f_limit_value_t)
 
-  #define f_macro_limit_values_t_increase(status, values)            f_macro_memory_structure_increase(status, values, f_limit_value_t)
-  #define f_macro_limit_values_t_increase_by(status, values, amount) f_macro_memory_structure_increase_by(status, values, f_limit_value_t, amount)
-  #define f_macro_limit_values_t_decrease_by(status, values, amount) f_macro_memory_structure_decrease_by(status, values, f_limit_value_t, amount)
-  #define f_macro_limit_values_t_decimate_by(status, values, amount) f_macro_memory_structure_decimate_by(status, values, f_limit_value_t, amount)
+  #define macro_f_limit_values_t_increase(status, values)            macro_f_memory_structure_increase(status, values, f_limit_value_t)
+  #define macro_f_limit_values_t_increase_by(status, values, amount) macro_f_memory_structure_increase_by(status, values, f_limit_value_t, amount)
+  #define macro_f_limit_values_t_decrease_by(status, values, amount) macro_f_memory_structure_decrease_by(status, values, f_limit_value_t, amount)
+  #define macro_f_limit_values_t_decimate_by(status, values, amount) macro_f_memory_structure_decimate_by(status, values, f_limit_value_t, amount)
 #endif // _di_f_limit_values_t_
 
 /**
@@ -77,7 +77,7 @@ extern "C" {
 
   #define f_limit_set_t_initialize { 0, 0 }
 
-  #define f_macro_limit_set_t_clear(set) \
+  #define macro_f_limit_set_t_clear(set) \
     set.type = 0; \
     set.value = 0;
 #endif // _di_f_limit_set_t_
@@ -99,18 +99,18 @@ extern "C" {
 
   #define f_limit_sets_t_initialize { 0, 0, 0 }
 
-  #define f_macro_limit_sets_t_clear(sets) f_macro_memory_structure_clear(sets)
+  #define macro_f_limit_sets_t_clear(sets) macro_f_memory_structure_clear(sets)
 
-  #define f_macro_limit_sets_t_resize(status, sets, length) f_macro_memory_structure_resize(status, sets, f_limit_set_t, length)
-  #define f_macro_limit_sets_t_adjust(status, sets, length) f_macro_memory_structure_adjust(status, sets, f_limit_set_t, length)
+  #define macro_f_limit_sets_t_resize(status, sets, length) macro_f_memory_structure_resize(status, sets, f_limit_set_t, length)
+  #define macro_f_limit_sets_t_adjust(status, sets, length) macro_f_memory_structure_adjust(status, sets, f_limit_set_t, length)
 
-  #define f_macro_limit_sets_t_delete_simple(sets)  f_macro_memory_structure_delete_simple(sets, f_limit_set_t)
-  #define f_macro_limit_sets_t_destroy_simple(sets) f_macro_memory_structure_destroy_simple(sets, f_limit_set_t)
+  #define macro_f_limit_sets_t_delete_simple(sets)  macro_f_memory_structure_delete_simple(sets, f_limit_set_t)
+  #define macro_f_limit_sets_t_destroy_simple(sets) macro_f_memory_structure_destroy_simple(sets, f_limit_set_t)
 
-  #define f_macro_limit_sets_t_increase(status, sets)            f_macro_memory_structure_increase(status, sets, f_limit_set_t)
-  #define f_macro_limit_sets_t_increase_by(status, sets, amount) f_macro_memory_structure_increase_by(status, sets, f_limit_set_t, amount)
-  #define f_macro_limit_sets_t_decrease_by(status, sets, amount) f_macro_memory_structure_decrease_by(status, sets, f_limit_set_t, amount)
-  #define f_macro_limit_sets_t_decimate_by(status, sets, amount) f_macro_memory_structure_decimate_by(status, sets, f_limit_set_t, amount)
+  #define macro_f_limit_sets_t_increase(status, sets)            macro_f_memory_structure_increase(status, sets, f_limit_set_t)
+  #define macro_f_limit_sets_t_increase_by(status, sets, amount) macro_f_memory_structure_increase_by(status, sets, f_limit_set_t, amount)
+  #define macro_f_limit_sets_t_decrease_by(status, sets, amount) macro_f_memory_structure_decrease_by(status, sets, f_limit_set_t, amount)
+  #define macro_f_limit_sets_t_decimate_by(status, sets, amount) macro_f_memory_structure_decimate_by(status, sets, f_limit_set_t, amount)
 #endif // _di_f_limit_sets_t_
 
 #ifdef __cplusplus
index e4e0494f2f3825ff922397f408ed40758da92a46..fd87ab95a93879d3e8f0813b4684c5d3cf2c612f 100644 (file)
@@ -34,7 +34,7 @@ extern "C" {
     if (source.used > destination->size) {
       f_status_t status = F_none;
 
-      f_macro_memory_structure_resize(status, (*destination), f_limit_set_t, source.used)
+      macro_f_memory_structure_resize(status, (*destination), f_limit_set_t, source.used)
       if (F_status_is_error(status)) return status;
     }
 
@@ -58,7 +58,7 @@ extern "C" {
     if (source.used > destination->size) {
       f_status_t status = F_none;
 
-      f_macro_memory_structure_resize(status, (*destination), f_limit_value_t, source.used)
+      macro_f_memory_structure_resize(status, (*destination), f_limit_value_t, source.used)
       if (F_status_is_error(status)) return status;
     }
 
index 9903240d503117f7f2feed134926a14fc8af8c02..760efc8e6b17a0ab4a5996d81a03dc5d72eedb57 100644 (file)
@@ -48,12 +48,12 @@ extern "C" {
  *
  * structure: the structure to operate on.
  */
-#ifndef _di_f_macro_memory_structure_clear_
-  #define f_macro_memory_structure_clear(structure) \
+#ifndef _di_macro_f_memory_structure_clear_
+  #define macro_f_memory_structure_clear(structure) \
     structure.array = 0; \
     structure.size = 0; \
     structure.used = 0;
-#endif // _di_f_macro_memory_structure_clear_
+#endif // _di_macro_f_memory_structure_clear_
 
 /**
  * Resize a generic memory structure.
@@ -63,10 +63,10 @@ extern "C" {
  * type:      the structure type.
  * length:    the new size of the array.
  */
-#ifndef _di_f_macro_memory_structure_resize_
-  #define f_macro_memory_structure_resize(status, structure, type, length) \
+#ifndef _di_macro_f_memory_structure_resize_
+  #define macro_f_memory_structure_resize(status, structure, type, length) \
     status = f_memory_structure_resize(length, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_resize_
+#endif // _di_macro_f_memory_structure_resize_
 
 /**
  * Adjust a generic memory structure.
@@ -76,10 +76,10 @@ extern "C" {
  * type:      the structure type.
  * length:    the new size of the array.
  */
-#ifndef _di_f_macro_memory_structure_adjust_
-  #define f_macro_memory_structure_adjust(status, structure, type, length) \
+#ifndef _di_macro_f_memory_structure_adjust_
+  #define macro_f_memory_structure_adjust(status, structure, type, length) \
     status = f_memory_structure_adjust(length, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_adjust_
+#endif // _di_macro_f_memory_structure_adjust_
 
 /**
  * Delete a generic memory structure.
@@ -88,10 +88,10 @@ extern "C" {
  * structure: the structure to operate on.
  * type:      the structure type.
  */
-#ifndef _di_f_macro_memory_structure_delete_
-  #define f_macro_memory_structure_delete(status, structure, type) \
+#ifndef _di_macro_f_memory_structure_delete_
+  #define macro_f_memory_structure_delete(status, structure, type) \
     status = f_memory_structure_resize(0, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_delete_
+#endif // _di_macro_f_memory_structure_delete_
 
 /**
  * Destroy a generic memory structure.
@@ -100,10 +100,10 @@ extern "C" {
  * structure: the structure to operate on.
  * type:      the structure type.
  */
-#ifndef _di_f_macro_memory_structure_destroy_
-  #define f_macro_memory_structure_destroy(status, structure, type) \
+#ifndef _di_macro_f_memory_structure_destroy_
+  #define macro_f_memory_structure_destroy(status, structure, type) \
     status = f_memory_structure_adjust(0, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_destroy_
+#endif // _di_macro_f_memory_structure_destroy_
 
 /**
  * Delete a generic memory structure.
@@ -111,10 +111,10 @@ extern "C" {
  * structure: the structure to operate on.
  * type:      the structure type.
  */
-#ifndef _di_f_macro_memory_structure_delete_simple_
-  #define f_macro_memory_structure_delete_simple(structure, type) \
+#ifndef _di_macro_f_memory_structure_delete_simple_
+  #define macro_f_memory_structure_delete_simple(structure, type) \
     f_memory_structure_resize(0, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_delete_simple_
+#endif // _di_macro_f_memory_structure_delete_simple_
 
 /**
  * Destroy a generic memory structure.
@@ -122,10 +122,10 @@ extern "C" {
  * structure: the structure to operate on.
  * type:      the structure type.
  */
-#ifndef _di_f_macro_memory_structure_destroy_simple_
-  #define f_macro_memory_structure_destroy_simple(structure, type) \
+#ifndef _di_macro_f_memory_structure_destroy_simple_
+  #define macro_f_memory_structure_destroy_simple(structure, type) \
     f_memory_structure_adjust(0, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_destroy_simple_
+#endif // _di_macro_f_memory_structure_destroy_simple_
 
 /**
  * Increase a generic memory structure.
@@ -134,10 +134,10 @@ extern "C" {
  * structure: the structure to operate on.
  * type:      the structure type.
  */
-#ifndef _di_f_macro_memory_structure_increase_
-  #define f_macro_memory_structure_increase(status, structure, type) \
+#ifndef _di_macro_f_memory_structure_increase_
+  #define macro_f_memory_structure_increase(status, structure, type) \
     status = f_memory_structure_increase(sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_increase_
+#endif // _di_macro_f_memory_structure_increase_
 
 /**
  * Increase a generic memory structure by some amount.
@@ -147,10 +147,10 @@ extern "C" {
  * type:      the structure type.
  * amount:    the amount to increase the size of the array by.
  */
-#ifndef _di_f_macro_memory_structure_increase_by_
-  #define f_macro_memory_structure_increase_by(status, structure, type, amount) \
+#ifndef _di_macro_f_memory_structure_increase_by_
+  #define macro_f_memory_structure_increase_by(status, structure, type, amount) \
     status = f_memory_structure_increase_by(amount, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_increase_by_
+#endif // _di_macro_f_memory_structure_increase_by_
 
 /**
  * Decrease a generic memory structure by some amount.
@@ -160,10 +160,10 @@ extern "C" {
  * type:      the structure type.
  * amount:    the amount to decrease the size of the array by.
  */
-#ifndef _di_f_macro_memory_structure_decrease_by_
-  #define f_macro_memory_structure_decrease_by(status, structure, type, amount) \
+#ifndef _di_macro_f_memory_structure_decrease_by_
+  #define macro_f_memory_structure_decrease_by(status, structure, type, amount) \
     status = f_memory_structure_decrease_by(amount, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_decrease_by_
+#endif // _di_macro_f_memory_structure_decrease_by_
 
 /**
  * Decimate a generic memory structure by some amount.
@@ -173,10 +173,10 @@ extern "C" {
  * type:      the structure type.
  * amount:    the amount to decimate the size of the array by.
  */
-#ifndef _di_f_macro_memory_structure_decimate_by_
-  #define f_macro_memory_structure_decimate_by(status, structure, type, amount) \
+#ifndef _di_macro_f_memory_structure_decimate_by_
+  #define macro_f_memory_structure_decimate_by(status, structure, type, amount) \
     status = f_memory_structure_decimate_by(amount, sizeof(type), (void **) &structure.array, &structure.used, &structure.size);
-#endif // _di_f_macro_memory_structure_decimate_by_
+#endif // _di_macro_f_memory_structure_decimate_by_
 
 /**
  * Reset a generic memory stuctures to 0 (clear all values).
@@ -185,12 +185,12 @@ extern "C" {
  *
  * structures: the structures to operate on.
  */
-#ifndef _di_f_macro_memory_structures_clear_
-  #define f_macro_memory_structures_clear(structures) \
+#ifndef _di_macro_f_memory_structures_clear_
+  #define macro_f_memory_structures_clear(structures) \
     structures.array = 0; \
     structures.size = 0; \
     structures.used = 0;
-#endif // _di_f_macro_memory_structures_clear_
+#endif // _di_macro_f_memory_structures_clear_
 
 /**
  * Resize a generic memory structures.
@@ -202,15 +202,15 @@ extern "C" {
  * length:         the new size of the array.
  * type_length:    the data type of the length variable type.
  */
-#ifndef _di_f_macro_memory_structures_resize_
-  #define f_macro_memory_structures_resize(status, structures, type_structure, type_structures, length, type_length) \
+#ifndef _di_macro_f_memory_structures_resize_
+  #define macro_f_memory_structures_resize(status, structures, type_structure, type_structures, length, type_length) \
     status = F_none; \
     for (register type_length _macro__i = length; _macro__i < structures.size; ++_macro__i) { \
       status = f_memory_structure_resize(0, sizeof(type_structure), (void **) &structures.array[_macro__i].array, &structures.array[_macro__i].used, &structures.array[_macro__i].size); \
       if (F_status_is_error(status)) break; \
     } \
     if (F_status_is_error_not(status)) status = f_memory_structure_resize(0, sizeof(type_structures), (void **) &structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_resize_
+#endif // _di_macro_f_memory_structures_resize_
 
 /**
  * Adjust a generic memory structures.
@@ -222,15 +222,15 @@ extern "C" {
  * length:         the new size of the array.
  * type_length:    the data type of the length variable type.
  */
-#ifndef _di_f_macro_memory_structures_adjust_
-  #define f_macro_memory_structures_adjust(status, structures, type_structure, type_structures, length, type_length) \
+#ifndef _di_macro_f_memory_structures_adjust_
+  #define macro_f_memory_structures_adjust(status, structures, type_structure, type_structures, length, type_length) \
     status = F_none; \
     for (register type_length _macro__i = length; _macro__i < structures.size; ++_macro__i) { \
       status = f_memory_structure_adjust(0, sizeof(type_structure), (void **) &structures.array[_macro__i].array, &structures.array[_macro__i].used, &structures.array[_macro__i].size); \
       if (F_status_is_error(status)) break; \
     } \
     if (F_status_is_error_not(status)) status = f_memory_structure_adjust(0, sizeof(type_structures), (void **) &structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_adjust_
+#endif // _di_macro_f_memory_structures_adjust_
 
 /**
  * Delete a generic memory structures.
@@ -240,8 +240,8 @@ extern "C" {
  * type_stucture:  the structure type.
  * type_stuctures: the structures type.
  */
-#ifndef _di_f_macro_memory_structures_delete_
-  #define f_macro_memory_structures_delete(status, structures, type_structure, type_structures) \
+#ifndef _di_macro_f_memory_structures_delete_
+  #define macro_f_memory_structures_delete(status, structures, type_structure, type_structures) \
     structures.used = structures.size; \
     while (structures.used) { \
       structures.used--; \
@@ -249,7 +249,7 @@ extern "C" {
       if (F_status_is_error(status)) break; \
     } \
     if (F_status_is_error_not(status)) status = f_memory_structure_resize(0, sizeof(type_structures), (void **) & structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_delete_
+#endif // _di_macro_f_memory_structures_delete_
 
 /**
  * Destroy a generic memory structures.
@@ -259,8 +259,8 @@ extern "C" {
  * type_stucture:  the structure type.
  * type_stuctures: the structures type.
  */
-#ifndef _di_f_macro_memory_structures_destroy_
-  #define f_macro_memory_structures_destroy(status, structures, type_structure, type_structures) \
+#ifndef _di_macro_f_memory_structures_destroy_
+  #define macro_f_memory_structures_destroy(status, structures, type_structure, type_structures) \
     structures.used = structures.size; \
     while (structures.used) { \
       structures.used--; \
@@ -268,7 +268,7 @@ extern "C" {
       if (F_status_is_error(status)) break; \
     } \
     if (F_status_is_error_not(status)) status = f_memory_structure_adjust(0, sizeof(type_structures), (void **) & structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_destroy_
+#endif // _di_macro_f_memory_structures_destroy_
 
 /**
  * Delete a generic memory structures.
@@ -277,15 +277,15 @@ extern "C" {
  * type_stucture:  the structure type.
  * type_stuctures: the structures type.
  */
-#ifndef _di_f_macro_memory_structures_delete_simple_
-  #define f_macro_memory_structures_delete_simple(structures, type_structure, type_structures) \
+#ifndef _di_macro_f_memory_structures_delete_simple_
+  #define macro_f_memory_structures_delete_simple(structures, type_structure, type_structures) \
     structures.used = structures.size; \
     while (structures.used) { \
       structures.used--; \
       f_memory_structure_resize(0, sizeof(type_structure), (void **) &structures.array[structures.used].array, &structures.array[structures.used].used, &structures.array[structures.used].size); \
     } \
     f_memory_structure_resize(0, sizeof(type_structures), (void **) & structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_delete_simple_
+#endif // _di_macro_f_memory_structures_delete_simple_
 
 /**
  * Destroy a generic memory structures.
@@ -294,15 +294,15 @@ extern "C" {
  * type_stucture:  the structure type.
  * type_stuctures: the structures type.
  */
-#ifndef _di_f_macro_memory_structures_destroy_simple_
-  #define f_macro_memory_structures_destroy_simple(structures, type_structure, type_structures) \
+#ifndef _di_macro_f_memory_structures_destroy_simple_
+  #define macro_f_memory_structures_destroy_simple(structures, type_structure, type_structures) \
     structures.used = structures.size; \
     while (structures.used) { \
       structures.used--; \
       f_memory_structure_adjust(0, sizeof(type_structure), (void **) &structures.array[structures.used].array, &structures.array[structures.used].used, &structures.array[structures.used].size); \
     } \
     f_memory_structure_adjust(0, sizeof(type_structures), (void **) & structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_destroy_simple_
+#endif // _di_macro_f_memory_structures_destroy_simple_
 
 /**
  * Increase a generic memory structures by 1.
@@ -314,10 +314,10 @@ extern "C" {
  * type_stuctures: the structures type.
  * type_length:    the data type of the length variable type.
  */
-#ifndef _di_f_macro_memory_structures_increase_
-  #define f_macro_memory_structures_increase(status, structures, type_structures, type_length) \
+#ifndef _di_macro_f_memory_structures_increase_
+  #define macro_f_memory_structures_increase(status, structures, type_structures, type_length) \
     status = f_memory_structure_increase(sizeof(type_structures), (void **) &structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_increase_
+#endif // _di_macro_f_memory_structures_increase_
 
 /**
  * Increase a generic memory structures by the given amount.
@@ -330,10 +330,10 @@ extern "C" {
  * type_length:    the data type of the length variable type.
  * amount:         the amount to increase by.
  */
-#ifndef _di_f_macro_memory_structures_increase_by_
-  #define f_macro_memory_structures_increase_by(status, structures, type_structures, type_length, amount) \
+#ifndef _di_macro_f_memory_structures_increase_by_
+  #define macro_f_memory_structures_increase_by(status, structures, type_structures, type_length, amount) \
     status = f_memory_structure_increase_by(amount, sizeof(type_structures), (void **) &structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_increase_by_
+#endif // _di_macro_f_memory_structures_increase_by_
 
 /**
  * Decrease a generic memory structures by the given amount.
@@ -345,13 +345,13 @@ extern "C" {
  * type_length:    the data type of the length variable type.
  * amount:         the amount to decrease by.
  */
-#ifndef _di_f_macro_memory_structures_decrease_by_
-  #define f_macro_memory_structures_decrease_by(status, structures, type_structure, type_structures, type_length, amount) \
+#ifndef _di_macro_f_memory_structures_decrease_by_
+  #define macro_f_memory_structures_decrease_by(status, structures, type_structure, type_structures, type_length, amount) \
     if (amount && structures.size) { \
-      f_macro_memory_structures_resize(status, structures, type_structure, type_structures, (amount < structures.size ? structures.size - amount : 0), type_length); \
+      macro_f_memory_structures_resize(status, structures, type_structure, type_structures, (amount < structures.size ? structures.size - amount : 0), type_length); \
     } \
     status = f_memory_structure_decrease_by(amount, sizeof(type_structures), (void **) &structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_decrease_by_
+#endif // _di_macro_f_memory_structures_decrease_by_
 
 /**
  * Decimate a generic memory structures by the given amount.
@@ -363,13 +363,13 @@ extern "C" {
  * type_length:    the data type of the length variable type.
  * amount:         the amount to decimate by.
  */
-#ifndef _di_f_macro_memory_structures_decimate_by_
-  #define f_macro_memory_structures_decimate_by(status, structures, type_structure, type_structures, type_length, amount) \
+#ifndef _di_macro_f_memory_structures_decimate_by_
+  #define macro_f_memory_structures_decimate_by(status, structures, type_structure, type_structures, type_length, amount) \
     if (amount && structures.size) { \
-      f_macro_memory_structures_adjust(status, structures, type_structure, type_structures, (amount < structures.size ? structures.size - amount : 0), type_length); \
+      macro_f_memory_structures_adjust(status, structures, type_structure, type_structures, (amount < structures.size ? structures.size - amount : 0), type_length); \
     } \
     status = f_memory_structure_decimate_by(amount, sizeof(type_structures), (void **) &structures.array, &structures.used, &structures.size);
-#endif // _di_f_macro_memory_structures_decimate_by_
+#endif // _di_macro_f_memory_structures_decimate_by_
 
 /**
  * Provide a macro for calling other macros for incrementing a buffer.
@@ -387,8 +387,8 @@ extern "C" {
  * macro_resize:    the resize structure macro to call that excepts the exact arguments: (status, structure, length).
  * error_too_large: the error status to return when f_array_length_t_size would be exceeded.
  */
-#ifndef _di_f_macro_memory_structure_macro_increment_
-  #define f_macro_memory_structure_macro_increment(status, structure, step, step_default, macro_resize, error_too_large) \
+#ifndef _di_macro_f_memory_structure_increment_
+  #define macro_f_memory_structure_increment(status, structure, step, step_default, macro_resize, error_too_large) \
     if (structure.used + step > structure.size) { \
       if (structure.used + step_default > f_array_length_t_size) { \
         if (structure.used + step > f_array_length_t_size) { \
@@ -402,7 +402,7 @@ extern "C" {
         macro_resize(status, structure, structure.size + step_default); \
       } \
     }
-#endif // _di_f_macro_memory_structure_macro_increment_
+#endif // _di_macro_f_memory_structure_increment_
 
 #ifdef __cplusplus
 } // extern "C"
index 59cbbd3162605be29c8df4308ddcc06ec9ddbc98..b75eb3c99fae81c9ca7d6de0712652fd10ffcc8a 100644 (file)
@@ -78,8 +78,8 @@ extern "C" {
     if (length + 1 > path->size) {
       f_status_t status = F_none;
 
-      f_macro_string_dynamic_t_clear((*path))
-      f_macro_string_dynamic_t_resize(status, (*path), length + 1)
+      macro_f_string_dynamic_t_clear((*path))
+      macro_f_string_dynamic_t_resize(status, (*path), length + 1)
       if (F_status_is_error(status)) return status;
     }
 
index a2b69ab505a786670e613b6d6c9ed0d991804976..d26edc4f2ad42c9d46f5d7c64839cf101456f7fe 100644 (file)
@@ -27,7 +27,7 @@ extern "C" {
     if (length + 1 > real->size) {
       f_status_t status = F_none;
 
-      f_macro_string_dynamic_t_resize(status, (*real), length + 1);
+      macro_f_string_dynamic_t_resize(status, (*real), length + 1);
       if (F_status_is_error(status)) return status;
     }
 
index 592ef026f499cfb2e168c561b8c3b689cfeba85a..a1e0b27a65e10bfbe3321d2b0dfb89de1557e5bf 100644 (file)
@@ -16,7 +16,7 @@ extern "C" {
     unsigned short width = 0;
 
     for (; i < serialize.used; i += width) {
-      width = f_macro_utf_byte_width(serialize.string[i]);
+      width = macro_f_utf_byte_width(serialize.string[i]);
 
       if (serialize.string[i] == f_serialize_simple_splitter_s[0]) {
         if (current == index) {
index 8749bc5b612e58140da5f27d40886a1ddcd92dd7..0be821b36b836148f2fd6b1b7e20a0eeaa5d5595 100644 (file)
@@ -14,7 +14,7 @@ extern "C" {
     f_status_t status = F_none;
 
     if (serialize->used + value.used + 1 >= serialize->size) {
-      f_macro_string_dynamic_t_resize(status, (*serialize), serialize->size + value.used + 1);
+      macro_f_string_dynamic_t_resize(status, (*serialize), serialize->size + value.used + 1);
       if (F_status_is_error(status)) return status;
     }
 
@@ -47,10 +47,10 @@ extern "C" {
     uint8_t width = 0;
 
     while (i < serialize.used) {
-      width = f_macro_utf_byte_width(serialize.string[i]);
+      width = macro_f_utf_byte_width(serialize.string[i]);
 
       if (serialize.string[i] == f_serialize_simple_splitter_s[0] || i + 1 >= serialize.used) {
-        f_macro_memory_structure_macro_increment(status, (*strings), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+        macro_f_memory_structure_increment(status, (*strings), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
         if (F_status_is_error(status)) return status;
 
         if (start == i) {
@@ -69,8 +69,8 @@ extern "C" {
           }
 
           if (total > strings->array[strings->used].size) {
-            f_macro_string_dynamic_t_clear(strings->array[strings->used])
-            f_macro_string_dynamic_t_resize(status, strings->array[strings->used], total)
+            macro_f_string_dynamic_t_clear(strings->array[strings->used])
+            macro_f_string_dynamic_t_resize(status, strings->array[strings->used], total)
             if (F_status_is_error(status)) return status;
 
             strings->array[strings->used].size = total;
@@ -114,10 +114,10 @@ extern "C" {
     uint8_t width = 0;
 
     for (; i < serialize.used; i += width) {
-      width = f_macro_utf_byte_width(serialize.string[i]);
+      width = macro_f_utf_byte_width(serialize.string[i]);
 
       if (serialize.string[i] == f_serialize_simple_splitter_s[0] || i + 1 >= serialize.used) {
-        f_macro_memory_structure_macro_increment(status, (*locations), 1, f_memory_default_allocation_step, f_macro_string_ranges_t_resize, F_array_too_large);
+        macro_f_memory_structure_increment(status, (*locations), 1, f_memory_default_allocation_step, macro_f_string_ranges_t_resize, F_array_too_large);
         if (F_status_is_error(status)) return status;
 
         if (start == i) {
@@ -185,7 +185,7 @@ extern "C" {
     if (total >= dynamic->size) {
       f_status_t status_allocation = F_none;
 
-      f_macro_string_dynamic_t_resize(status_allocation, (*dynamic), total);
+      macro_f_string_dynamic_t_resize(status_allocation, (*dynamic), total);
       if (F_status_is_error(status_allocation)) return status_allocation;
     }
 
index 6874c36ab7867f620aff78d25c6e9f2f07eeef86..8b914b389c94ab7e5b390a937e56a710738a8a91 100644 (file)
@@ -32,7 +32,7 @@ extern "C" {
 
   #define f_signal_t_initialize {0, 0, { 0 } }
 
-  #define f_macro_signal_t_initialize(flags, id, set) { flags, id, set }
+  #define macro_f_signal_t_initialize(flags, id, set) { flags, id, set }
 #endif // _di_f_signal_t_
 
 /**
@@ -49,7 +49,7 @@ extern "C" {
 
   #define f_signal_how_t_initialize { { 0 } , { 0 } }
 
-  #define f_macro_signal_how_t_initialize(block, block_not) { block, block_not }
+  #define macro_f_signal_how_t_initialize(block, block_not) { block, block_not }
 #endif // _di_f_signal_how_t_
 
 #ifdef __cplusplus
index 1eb1b6493488a6286f7be0943aea8bd8d110ff8d..8a69a74d8f0dc374f1e439e78e74b2f8596f75a3 100644 (file)
@@ -36,18 +36,18 @@ extern "C" {
 
   #define f_statuss_t_initialize { 0, 0, 0 }
 
-  #define f_macro_statuss_t_clear(statuss) f_macro_memory_structure_clear(statuss)
+  #define macro_f_statuss_t_clear(statuss) macro_f_memory_structure_clear(statuss)
 
-  #define f_macro_statuss_t_resize(status, statuss, length) f_macro_memory_structure_resize(status, statuss, f_status_t, length)
-  #define f_macro_statuss_t_adjust(status, statuss, length) f_macro_memory_structure_adjust(status, statuss, f_status_t, length)
+  #define macro_f_statuss_t_resize(status, statuss, length) macro_f_memory_structure_resize(status, statuss, f_status_t, length)
+  #define macro_f_statuss_t_adjust(status, statuss, length) macro_f_memory_structure_adjust(status, statuss, f_status_t, length)
 
-  #define f_macro_statuss_t_delete_simple(statuss)  f_macro_memory_structure_delete_simple(statuss, f_status_t)
-  #define f_macro_statuss_t_destroy_simple(statuss) f_macro_memory_structure_destroy_simple(statuss, f_status_t)
+  #define macro_f_statuss_t_delete_simple(statuss)  macro_f_memory_structure_delete_simple(statuss, f_status_t)
+  #define macro_f_statuss_t_destroy_simple(statuss) macro_f_memory_structure_destroy_simple(statuss, f_status_t)
 
-  #define f_macro_statuss_t_increase(status, statuss)            f_macro_memory_structure_increase(status, statuss, f_status_t)
-  #define f_macro_statuss_t_increase_by(status, statuss, amount) f_macro_memory_structure_increase_by(status, statuss, f_status_t, amount)
-  #define f_macro_statuss_t_decrease_by(status, statuss, amount) f_macro_memory_structure_decrease_by(status, statuss, f_status_t, amount)
-  #define f_macro_statuss_t_decimate_by(status, statuss, amount) f_macro_memory_structure_decimate_by(status, statuss, f_status_t, amount)
+  #define macro_f_statuss_t_increase(status, statuss)            macro_f_memory_structure_increase(status, statuss, f_status_t)
+  #define macro_f_statuss_t_increase_by(status, statuss, amount) macro_f_memory_structure_increase_by(status, statuss, f_status_t, amount)
+  #define macro_f_statuss_t_decrease_by(status, statuss, amount) macro_f_memory_structure_decrease_by(status, statuss, f_status_t, amount)
+  #define macro_f_statuss_t_decimate_by(status, statuss, amount) macro_f_memory_structure_decimate_by(status, statuss, f_status_t, amount)
 #endif // _di_f_statuss_t_
 
 #ifdef __cplusplus
index 87a9521730948c03c65a2f4035bf81105d47cbbd..795766e3db31f1c3830be7b8685c464bf9236776 100644 (file)
@@ -34,13 +34,13 @@ extern "C" {
 
   #define f_string_t_initialize 0
 
-  #define f_macro_string_t_clear(string) string = 0;
+  #define macro_f_string_t_clear(string) string = 0;
 
-  #define f_macro_string_t_resize(status, string, length_old, length_new) status = f_memory_resize(length_old, length_new, sizeof(f_string_t), (void **) & string);
-  #define f_macro_string_t_adjust(status, string, length_old, length_new) status = f_memory_adjust(length_old, length_new, sizeof(f_string_t), (void **) & string);
+  #define macro_f_string_t_resize(status, string, length_old, length_new) status = f_memory_resize(length_old, length_new, sizeof(f_string_t), (void **) & string);
+  #define macro_f_string_t_adjust(status, string, length_old, length_new) status = f_memory_adjust(length_old, length_new, sizeof(f_string_t), (void **) & string);
 
-  #define f_macro_string_t_delete_simple(string, length)  f_memory_resize(length, 0, sizeof(f_string_t), (void **) & string);
-  #define f_macro_string_t_destroy_simple(string, length) f_memory_adjust(length, 0, sizeof(f_string_t), (void **) & string);
+  #define macro_f_string_t_delete_simple(string, length)  f_memory_resize(length, 0, sizeof(f_string_t), (void **) & string);
+  #define macro_f_string_t_destroy_simple(string, length) f_memory_adjust(length, 0, sizeof(f_string_t), (void **) & string);
 #endif // _di_f_string_t_
 
 /**
@@ -61,7 +61,7 @@ extern "C" {
 
   #define f_string_constant_t_initialize 0
 
-  #define f_macro_string_constant_t_clear(string) string = 0;
+  #define macro_f_string_constant_t_clear(string) string = 0;
 #endif // _di_f_string_t_
 
 /**
index d1f5b008a794c69f66c2e3f3cee48de7bb000b23..c54b584824ad4b4a7b3c8bc634e9025e9b3d5843 100644 (file)
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 #ifndef _di_f_string_static_empty_s_
-  const f_string_static_t f_string_static_empty_s = f_macro_string_static_t_initialize("", 0);
+  const f_string_static_t f_string_static_empty_s = macro_f_string_static_t_initialize("", 0);
 #endif // _di_f_string_static_empty_s_
 
 #ifndef _di_f_string_dynamic_adjust_
index cc640f56c6ef71f5c64a9cbf2aca24dcec6c0036..c9e8cd2e66d0eaa3fd7fb935f69e293627ad2d64 100644 (file)
@@ -24,7 +24,7 @@ extern "C" {
  *
  * The f_string_static_t type should never be directly allocated or deallocated.
  *
- * A special f_macro_string_static_t_initialize() is provided for the special purpose of easily initialize a static string.
+ * A special macro_f_string_static_t_initialize() is provided for the special purpose of easily initialize a static string.
  *
  * string: the string.
  * size:   total amount of space available.
@@ -40,12 +40,12 @@ extern "C" {
 
   #define f_string_static_t_initialize { 0, 0, 0 }
 
-  #define f_macro_string_static_t_clear(string_static) \
+  #define macro_f_string_static_t_clear(string_static) \
     string_static.string = 0; \
     string_static.size = 0; \
     string_static.used = 0;
 
-  #define f_macro_string_static_t_initialize(string, length) { string, length, length }
+  #define macro_f_string_static_t_initialize(string, length) { string, length, length }
 #endif // _di_f_string_static_t_
 
 /**
@@ -65,18 +65,18 @@ extern "C" {
 
   #define f_string_dynamic_t_initialize f_string_static_t_initialize
 
-  #define f_macro_string_dynamic_t_clear(dynamic) f_macro_string_static_t_clear(dynamic)
+  #define macro_f_string_dynamic_t_clear(dynamic) macro_f_string_static_t_clear(dynamic)
 
-  #define f_macro_string_dynamic_t_resize(status, dynamic, length) status = f_string_dynamic_resize(length, &dynamic);
-  #define f_macro_string_dynamic_t_adjust(status, dynamic, length) status = f_string_dynamic_adjust(length, &dynamic);
+  #define macro_f_string_dynamic_t_resize(status, dynamic, length) status = f_string_dynamic_resize(length, &dynamic);
+  #define macro_f_string_dynamic_t_adjust(status, dynamic, length) status = f_string_dynamic_adjust(length, &dynamic);
 
-  #define f_macro_string_dynamic_t_delete_simple(dynamic)  f_string_dynamic_resize(0, &dynamic);
-  #define f_macro_string_dynamic_t_destroy_simple(dynamic) f_string_dynamic_adjust(0, &dynamic);
+  #define macro_f_string_dynamic_t_delete_simple(dynamic)  f_string_dynamic_resize(0, &dynamic);
+  #define macro_f_string_dynamic_t_destroy_simple(dynamic) f_string_dynamic_adjust(0, &dynamic);
 
-  #define f_macro_string_dynamic_t_increase(status, dynamic)            status = f_string_dynamic_increase(&dynamic);
-  #define f_macro_string_dynamic_t_increase_by(status, dynamic, amount) status = f_string_dynamic_increase_by(amount, &dynamic);
-  #define f_macro_string_dynamic_t_decrease_by(status, dynamic, amount) status = f_string_dynamic_decrease_by(amount, &dynamic);
-  #define f_macro_string_dynamic_t_decimate_by(status, dynamic, amount) status = f_string_dynamic_decimate_by(amount, &dynamic);
+  #define macro_f_string_dynamic_t_increase(status, dynamic)            status = f_string_dynamic_increase(&dynamic);
+  #define macro_f_string_dynamic_t_increase_by(status, dynamic, amount) status = f_string_dynamic_increase_by(amount, &dynamic);
+  #define macro_f_string_dynamic_t_decrease_by(status, dynamic, amount) status = f_string_dynamic_decrease_by(amount, &dynamic);
+  #define macro_f_string_dynamic_t_decimate_by(status, dynamic, amount) status = f_string_dynamic_decimate_by(amount, &dynamic);
 #endif // _di_f_string_dynamic_t_
 
 /**
@@ -96,7 +96,7 @@ extern "C" {
 
   #define f_string_statics_t_initialize { 0, 0, 0 }
 
-  #define f_macro_string_statics_t_clear(statics) \
+  #define macro_f_string_statics_t_clear(statics) \
     statics.array = 0; \
     statics.size = 0; \
     statics.used = 0;
@@ -114,18 +114,18 @@ extern "C" {
 
   #define f_string_dynamics_t_initialize f_string_statics_t_initialize
 
-  #define f_macro_string_dynamics_t_clear(dynamics) f_macro_string_statics_t_clear(dynamics)
+  #define macro_f_string_dynamics_t_clear(dynamics) macro_f_string_statics_t_clear(dynamics)
 
-  #define f_macro_string_dynamics_t_resize(status, dynamics, length) status = f_string_dynamics_resize(length, &dynamics);
-  #define f_macro_string_dynamics_t_adjust(status, dynamics, length) status = f_string_dynamics_adjust(length, &dynamics);
+  #define macro_f_string_dynamics_t_resize(status, dynamics, length) status = f_string_dynamics_resize(length, &dynamics);
+  #define macro_f_string_dynamics_t_adjust(status, dynamics, length) status = f_string_dynamics_adjust(length, &dynamics);
 
-  #define f_macro_string_dynamics_t_delete_simple(dynamics)  f_string_dynamics_resize(0, &dynamics);
-  #define f_macro_string_dynamics_t_destroy_simple(dynamics) f_string_dynamics_adjust(0, &dynamics);
+  #define macro_f_string_dynamics_t_delete_simple(dynamics)  f_string_dynamics_resize(0, &dynamics);
+  #define macro_f_string_dynamics_t_destroy_simple(dynamics) f_string_dynamics_adjust(0, &dynamics);
 
-  #define f_macro_string_dynamics_t_increase(status, dynamics)            status = f_string_dynamics_increase(&dynamics);
-  #define f_macro_string_dynamics_t_increase_by(status, dynamics, amount) status = f_string_dynamics_increase_by(amount, &dynamics);
-  #define f_macro_string_dynamics_t_decrease_by(status, dynamics, amount) status = f_string_dynamics_decrease_by(amount, &dynamics);
-  #define f_macro_string_dynamics_t_decimate_by(status, dynamics, amount) status = f_string_dynamics_decimate_by(amount, &dynamics);
+  #define macro_f_string_dynamics_t_increase(status, dynamics)            status = f_string_dynamics_increase(&dynamics);
+  #define macro_f_string_dynamics_t_increase_by(status, dynamics, amount) status = f_string_dynamics_increase_by(amount, &dynamics);
+  #define macro_f_string_dynamics_t_decrease_by(status, dynamics, amount) status = f_string_dynamics_decrease_by(amount, &dynamics);
+  #define macro_f_string_dynamics_t_decimate_by(status, dynamics, amount) status = f_string_dynamics_decimate_by(amount, &dynamics);
 #endif // _di_f_string_dynamics_t_
 
 #ifndef _di_f_string_static_empty_s_
index b441fb8d6ca61494a06709e58eff48218fda0896..3846b1f9f237c2e10bd803894f12831fd562ac60 100644 (file)
@@ -30,17 +30,17 @@ extern "C" {
 
   #define f_string_map_t_initialize { f_string_dynamic_t_initialize, f_string_dynamic_t_initialize }
 
-  #define f_macro_string_map_t_clear(map) \
-    f_macro_string_dynamic_t_clear(map.name) \
-    f_macro_string_dynamic_t_clear(map.value)
+  #define macro_f_string_map_t_clear(map) \
+    macro_f_string_dynamic_t_clear(map.name) \
+    macro_f_string_dynamic_t_clear(map.value)
 
-  #define f_macro_string_map_t_delete_simple(map) \
-    f_macro_string_dynamic_t_delete_simple(map.name) \
-    f_macro_string_dynamic_t_delete_simple(map.value)
+  #define macro_f_string_map_t_delete_simple(map) \
+    macro_f_string_dynamic_t_delete_simple(map.name) \
+    macro_f_string_dynamic_t_delete_simple(map.value)
 
-  #define f_macro_string_map_t_destroy_simple(map) \
-    f_macro_string_dynamic_t_destroy_simple(map.name) \
-    f_macro_string_dynamic_t_destroy_simple(map.value)
+  #define macro_f_string_map_t_destroy_simple(map) \
+    macro_f_string_dynamic_t_destroy_simple(map.name) \
+    macro_f_string_dynamic_t_destroy_simple(map.value)
 #endif // _di_f_string_map_t_
 
 /**
@@ -60,18 +60,18 @@ extern "C" {
 
   #define f_string_maps_t_initialize f_string_statics_t_initialize
 
-  #define f_macro_string_maps_t_clear(maps) f_macro_memory_structure_clear(maps)
+  #define macro_f_string_maps_t_clear(maps) macro_f_memory_structure_clear(maps)
 
-  #define f_macro_string_maps_t_resize(status, maps, length) status = f_string_maps_resize(length, &maps);
-  #define f_macro_string_maps_t_adjust(status, maps, length) status = f_string_maps_adjust(length, &maps);
+  #define macro_f_string_maps_t_resize(status, maps, length) status = f_string_maps_resize(length, &maps);
+  #define macro_f_string_maps_t_adjust(status, maps, length) status = f_string_maps_adjust(length, &maps);
 
-  #define f_macro_string_maps_t_delete_simple(maps)  f_string_maps_resize(0, &maps);
-  #define f_macro_string_maps_t_destroy_simple(maps) f_string_maps_adjust(0, &maps);
+  #define macro_f_string_maps_t_delete_simple(maps)  f_string_maps_resize(0, &maps);
+  #define macro_f_string_maps_t_destroy_simple(maps) f_string_maps_adjust(0, &maps);
 
-  #define f_macro_string_maps_t_increase(status, maps)            status = f_string_maps_increase(maps);
-  #define f_macro_string_maps_t_increase_by(status, maps, amount) status = f_string_maps_increase_by(amount, maps);
-  #define f_macro_string_maps_t_decrease_by(status, maps, amount) status = f_string_maps_decrease_by(amount, maps);
-  #define f_macro_string_maps_t_decimate_by(status, maps, amount) status = f_string_maps_decimate_by(amount, maps);
+  #define macro_f_string_maps_t_increase(status, maps)            status = f_string_maps_increase(maps);
+  #define macro_f_string_maps_t_increase_by(status, maps, amount) status = f_string_maps_increase_by(amount, maps);
+  #define macro_f_string_maps_t_decrease_by(status, maps, amount) status = f_string_maps_decrease_by(amount, maps);
+  #define macro_f_string_maps_t_decimate_by(status, maps, amount) status = f_string_maps_decimate_by(amount, maps);
 #endif // _di_f_string_maps_t_
 
 /**
@@ -88,17 +88,17 @@ extern "C" {
 
   #define f_string_map_multi_t_initialize { f_string_dynamic_t_initialize, f_string_dynamics_t_initialize }
 
-  #define f_macro_string_map_multi_t_clear(map) \
-    f_macro_string_dynamic_t_clear(map.name) \
-    f_macro_string_dynamics_t_clear(map.value)
+  #define macro_f_string_map_multi_t_clear(map) \
+    macro_f_string_dynamic_t_clear(map.name) \
+    macro_f_string_dynamics_t_clear(map.value)
 
-  #define f_macro_string_map_multi_t_delete_simple(map) \
-    f_macro_string_dynamic_t_delete_simple(map.name) \
-    f_macro_string_dynamics_t_delete_simple(map.value)
+  #define macro_f_string_map_multi_t_delete_simple(map) \
+    macro_f_string_dynamic_t_delete_simple(map.name) \
+    macro_f_string_dynamics_t_delete_simple(map.value)
 
-  #define f_macro_string_map_multi_t_destroy_simple(map) \
-    f_macro_string_dynamic_t_destroy_simple(map.name) \
-    f_macro_string_dynamics_t_destroy_simple(map.value)
+  #define macro_f_string_map_multi_t_destroy_simple(map) \
+    macro_f_string_dynamic_t_destroy_simple(map.name) \
+    macro_f_string_dynamics_t_destroy_simple(map.value)
 #endif // _di_f_string_map_multi_t_
 
 /**
@@ -118,18 +118,18 @@ extern "C" {
 
   #define f_string_map_multis_t_initialize f_string_statics_t_initialize
 
-  #define f_macro_string_map_multis_t_clear(map_multis) f_macro_memory_structure_clear(map_multis)
+  #define macro_f_string_map_multis_t_clear(map_multis) macro_f_memory_structure_clear(map_multis)
 
-  #define f_macro_string_map_multis_t_resize(status, map_multis, length) status = f_string_map_multis_resize(length, &map_multis);
-  #define f_macro_string_map_multis_t_adjust(status, map_multis, length) status = f_string_map_multis_adjust(length, &map_multis);
+  #define macro_f_string_map_multis_t_resize(status, map_multis, length) status = f_string_map_multis_resize(length, &map_multis);
+  #define macro_f_string_map_multis_t_adjust(status, map_multis, length) status = f_string_map_multis_adjust(length, &map_multis);
 
-  #define f_macro_string_map_multis_t_delete_simple(map_multis)  f_string_map_multis_resize(0, &map_multis);
-  #define f_macro_string_map_multis_t_destroy_simple(map_multis) f_string_map_multis_adjust(0, &map_multis);
+  #define macro_f_string_map_multis_t_delete_simple(map_multis)  f_string_map_multis_resize(0, &map_multis);
+  #define macro_f_string_map_multis_t_destroy_simple(map_multis) f_string_map_multis_adjust(0, &map_multis);
 
-  #define f_macro_string_map_multis_t_increase(status, map_multis)            status = f_string_map_multis_increase(&map_multis);
-  #define f_macro_string_map_multis_t_increase_by(status, map_multis, amount) status = f_string_map_multis_increase_by(amount, &map_multis);
-  #define f_macro_string_map_multis_t_decrease_by(status, map_multis, amount) status = f_string_map_multis_decrease_by(amount, &map_multis);
-  #define f_macro_string_map_multis_t_decimate_by(status, map_multis, amount) status = f_string_map_multis_decimate_by(amount, &map_multis);
+  #define macro_f_string_map_multis_t_increase(status, map_multis)            status = f_string_map_multis_increase(&map_multis);
+  #define macro_f_string_map_multis_t_increase_by(status, map_multis, amount) status = f_string_map_multis_increase_by(amount, &map_multis);
+  #define macro_f_string_map_multis_t_decrease_by(status, map_multis, amount) status = f_string_map_multis_decrease_by(amount, &map_multis);
+  #define macro_f_string_map_multis_t_decimate_by(status, map_multis, amount) status = f_string_map_multis_decimate_by(amount, &map_multis);
 #endif // _di_f_string_map_multis_t_
 
 /**
index 59446fbf39bdf1af60d178f1a62dde510bdb69b0..b875ba73b1927ef91b697f2d7b3419960fd69a5f 100644 (file)
@@ -54,18 +54,18 @@ extern "C" {
 
   #define f_string_quantitys_t_initialize { 0, 0, 0 }
 
-  #define f_macro_string_quantitys_t_clear(quantitys) f_macro_memory_structure_clear(quantitys)
+  #define macro_f_string_quantitys_t_clear(quantitys) macro_f_memory_structure_clear(quantitys)
 
-  #define f_macro_string_quantitys_t_resize(status, quantitys, length) status = f_string_quantitys_resize(length, &quantitys);
-  #define f_macro_string_quantitys_t_adjust(status, quantitys, length) status = f_string_quantitys_adjust(length, &quantitys);
+  #define macro_f_string_quantitys_t_resize(status, quantitys, length) status = f_string_quantitys_resize(length, &quantitys);
+  #define macro_f_string_quantitys_t_adjust(status, quantitys, length) status = f_string_quantitys_adjust(length, &quantitys);
 
-  #define f_macro_string_quantitys_t_delete_simple(quantitys)  f_string_quantitys_resize(0, &quantitys);
-  #define f_macro_string_quantitys_t_destroy_simple(quantitys) f_string_quantitys_adjust(0, &quantitys);
+  #define macro_f_string_quantitys_t_delete_simple(quantitys)  f_string_quantitys_resize(0, &quantitys);
+  #define macro_f_string_quantitys_t_destroy_simple(quantitys) f_string_quantitys_adjust(0, &quantitys);
 
-  #define f_macro_string_quantitys_t_increase(status, quantitys)            status = f_string_quantitys_increase(&quantitys);
-  #define f_macro_string_quantitys_t_increase_by(status, quantitys, amount) status = f_string_quantitys_increase_by(amount, &quantitys);
-  #define f_macro_string_quantitys_t_decrease_by(status, quantitys, amount) status = f_string_quantitys_decrease_by(amount, &quantitys);
-  #define f_macro_string_quantitys_t_decimate_by(status, quantitys, amount) status = f_string_quantitys_decimate_by(amount, &quantitys);
+  #define macro_f_string_quantitys_t_increase(status, quantitys)            status = f_string_quantitys_increase(&quantitys);
+  #define macro_f_string_quantitys_t_increase_by(status, quantitys, amount) status = f_string_quantitys_increase_by(amount, &quantitys);
+  #define macro_f_string_quantitys_t_decrease_by(status, quantitys, amount) status = f_string_quantitys_decrease_by(amount, &quantitys);
+  #define macro_f_string_quantitys_t_decimate_by(status, quantitys, amount) status = f_string_quantitys_decimate_by(amount, &quantitys);
 #endif // _di_f_string_quantitys_t_
 
 /**
@@ -85,18 +85,18 @@ extern "C" {
 
   #define f_string_quantityss_t_initialize { 0, 0, 0 }
 
-  #define f_macro_string_quantityss_t_clear(quantityss) f_macro_memory_structures_clear(quantityss)
+  #define macro_f_string_quantityss_t_clear(quantityss) macro_f_memory_structures_clear(quantityss)
 
-  #define f_macro_string_quantityss_t_resize(status, quantityss, length) status = f_string_quantityss_resize(length, &quantityss);
-  #define f_macro_string_quantityss_t_adjust(status, quantityss, length) status = f_string_quantityss_adjust(length, &quantityss);
+  #define macro_f_string_quantityss_t_resize(status, quantityss, length) status = f_string_quantityss_resize(length, &quantityss);
+  #define macro_f_string_quantityss_t_adjust(status, quantityss, length) status = f_string_quantityss_adjust(length, &quantityss);
 
-  #define f_macro_string_quantityss_t_delete_simple(quantityss)  f_string_quantityss_resize(0, &quantityss);
-  #define f_macro_string_quantityss_t_destroy_simple(quantityss) f_string_quantityss_adjust(0, &quantityss);
+  #define macro_f_string_quantityss_t_delete_simple(quantityss)  f_string_quantityss_resize(0, &quantityss);
+  #define macro_f_string_quantityss_t_destroy_simple(quantityss) f_string_quantityss_adjust(0, &quantityss);
 
-  #define f_macro_string_quantityss_t_increase(status, quantityss)            status = f_string_quantityss_increase(&quantityss);
-  #define f_macro_string_quantityss_t_increase_by(status, quantityss, amount) status = f_string_quantityss_increase_by(amount, &quantityss);
-  #define f_macro_string_quantityss_t_decrease_by(status, quantityss, amount) status = f_string_quantityss_decrease_by(amount, &quantityss);
-  #define f_macro_string_quantityss_t_decimate_by(status, quantityss, amount) status = f_string_quantityss_decimate_by(amount, &quantityss);
+  #define macro_f_string_quantityss_t_increase(status, quantityss)            status = f_string_quantityss_increase(&quantityss);
+  #define macro_f_string_quantityss_t_increase_by(status, quantityss, amount) status = f_string_quantityss_increase_by(amount, &quantityss);
+  #define macro_f_string_quantityss_t_decrease_by(status, quantityss, amount) status = f_string_quantityss_decrease_by(amount, &quantityss);
+  #define macro_f_string_quantityss_t_decimate_by(status, quantityss, amount) status = f_string_quantityss_decimate_by(amount, &quantityss);
 #endif // _di_f_string_quantityss_t_
 
 /**
index daf283d9eebe113593eef09324a4b9e60c31606b..2fd537940ef55e8b14099a3a33db2022668345b1 100644 (file)
@@ -23,7 +23,7 @@ extern "C" {
  * Therefore, a range from 0 to 0 would be include position 0.
  * Set start to some value larger than stop to designate that there is no range (such as start = 1, stop = 0).
  *
- * A special f_macro_string_range_t_initialize() is provided for the special purpose of easily initialize a static string range.
+ * A special macro_f_string_range_t_initialize() is provided for the special purpose of easily initialize a static string range.
  *
  * start: the start position.
  * stop:  the stop position.
@@ -36,9 +36,9 @@ extern "C" {
 
   #define f_string_range_t_initialize { 1, 0 }
 
-  #define f_macro_string_range_t_initialize(length) { length ? 0 : 1, length ? length - 1 : 0 }
+  #define macro_f_string_range_t_initialize(length) { length ? 0 : 1, length ? length - 1 : 0 }
 
-  #define f_macro_string_range_t_clear(range) \
+  #define macro_f_string_range_t_clear(range) \
     range.start = 1; \
     range.stop = 0;
 #endif // _di_f_string_range_t_
@@ -60,18 +60,18 @@ extern "C" {
 
   #define f_string_ranges_t_initialize { 0, 0, 0 }
 
-  #define f_macro_string_ranges_t_clear(ranges) f_macro_memory_structure_clear(ranges)
+  #define macro_f_string_ranges_t_clear(ranges) macro_f_memory_structure_clear(ranges)
 
-  #define f_macro_string_ranges_t_resize(status, ranges, length) status = f_string_ranges_resize(length, &ranges);
-  #define f_macro_string_ranges_t_adjust(status, ranges, length) status = f_string_ranges_adjust(length, &ranges);
+  #define macro_f_string_ranges_t_resize(status, ranges, length) status = f_string_ranges_resize(length, &ranges);
+  #define macro_f_string_ranges_t_adjust(status, ranges, length) status = f_string_ranges_adjust(length, &ranges);
 
-  #define f_macro_string_ranges_t_delete_simple(ranges)  f_string_ranges_resize(0, &ranges);
-  #define f_macro_string_ranges_t_destroy_simple(ranges) f_string_ranges_adjust(0, &ranges);
+  #define macro_f_string_ranges_t_delete_simple(ranges)  f_string_ranges_resize(0, &ranges);
+  #define macro_f_string_ranges_t_destroy_simple(ranges) f_string_ranges_adjust(0, &ranges);
 
-  #define f_macro_string_ranges_t_increase(status, ranges)            status = f_string_ranges_increase(&ranges);
-  #define f_macro_string_ranges_t_increase_by(status, ranges, amount) status = f_string_ranges_increase_by(amount, &ranges);
-  #define f_macro_string_ranges_t_decrease_by(status, ranges, amount) status = f_string_ranges_decrease_by(amount, &ranges);
-  #define f_macro_string_ranges_t_decimate_by(status, ranges, amount) status = f_string_ranges_decimate_by(amount, &ranges);
+  #define macro_f_string_ranges_t_increase(status, ranges)            status = f_string_ranges_increase(&ranges);
+  #define macro_f_string_ranges_t_increase_by(status, ranges, amount) status = f_string_ranges_increase_by(amount, &ranges);
+  #define macro_f_string_ranges_t_decrease_by(status, ranges, amount) status = f_string_ranges_decrease_by(amount, &ranges);
+  #define macro_f_string_ranges_t_decimate_by(status, ranges, amount) status = f_string_ranges_decimate_by(amount, &ranges);
 #endif // _di_f_string_ranges_t_
 
 /**
@@ -91,18 +91,18 @@ extern "C" {
 
   #define f_string_rangess_t_initialize { 0, 0, 0 }
 
-  #define f_macro_string_rangess_t_clear(rangess) f_macro_memory_structures_clear(rangess)
+  #define macro_f_string_rangess_t_clear(rangess) macro_f_memory_structures_clear(rangess)
 
-  #define f_macro_string_rangess_t_resize(status, rangess, length) status = f_string_rangess_resize(length, &rangess);
-  #define f_macro_string_rangess_t_adjust(status, rangess, length) status = f_string_rangess_adjust(length, &rangess);
+  #define macro_f_string_rangess_t_resize(status, rangess, length) status = f_string_rangess_resize(length, &rangess);
+  #define macro_f_string_rangess_t_adjust(status, rangess, length) status = f_string_rangess_adjust(length, &rangess);
 
-  #define f_macro_string_rangess_t_delete_simple(rangess)  f_string_rangess_resize(0, &rangess);
-  #define f_macro_string_rangess_t_destroy_simple(rangess) f_string_rangess_adjust(0, &rangess);
+  #define macro_f_string_rangess_t_delete_simple(rangess)  f_string_rangess_resize(0, &rangess);
+  #define macro_f_string_rangess_t_destroy_simple(rangess) f_string_rangess_adjust(0, &rangess);
 
-  #define f_macro_string_rangess_t_increase(status, rangess)            status = f_string_rangess_increase(&rangess);
-  #define f_macro_string_rangess_t_increase_by(status, rangess, amount) status = f_string_rangess_increase_by(amount, &rangess);
-  #define f_macro_string_rangess_t_decrease_by(status, rangess, amount) status = f_string_rangess_decrease_by(amount, &rangess);
-  #define f_macro_string_rangess_t_decimate_by(status, rangess, amount) status = f_string_rangess_decimate_by(amount, &rangess);
+  #define macro_f_string_rangess_t_increase(status, rangess)            status = f_string_rangess_increase(&rangess);
+  #define macro_f_string_rangess_t_increase_by(status, rangess, amount) status = f_string_rangess_increase_by(amount, &rangess);
+  #define macro_f_string_rangess_t_decrease_by(status, rangess, amount) status = f_string_rangess_decrease_by(amount, &rangess);
+  #define macro_f_string_rangess_t_decimate_by(status, rangess, amount) status = f_string_rangess_decimate_by(amount, &rangess);
 #endif // _di_f_string_rangess_t_
 
 /**
index cb98bf01263e492cd6ba812389f56d43e3a28dc3..c5e68cb031f632ff59bd62ef52645797ecbce4c9 100644 (file)
@@ -32,7 +32,7 @@ extern "C" {
 
   #define f_string_triple_t_initialize { f_string_dynamic_t_initialize, f_string_dynamic_t_initialize, f_string_dynamic_t_initialize }
 
-  #define f_macro_string_triple_t_clear(triple) \
+  #define macro_f_string_triple_t_clear(triple) \
     triple.one.array = 0; \
     triple.one.size = 0; \
     triple.one.used = 0; \
@@ -43,15 +43,15 @@ extern "C" {
     triple.three.size = 0; \
     triple.three.used = 0;
 
-  #define f_macro_string_triple_t_delete_simple(triple) \
-    f_macro_string_dynamic_t_delete_simple(triple.one) \
-    f_macro_string_dynamic_t_delete_simple(triple.two) \
-    f_macro_string_dynamic_t_delete_simple(triple.three)
+  #define macro_f_string_triple_t_delete_simple(triple) \
+    macro_f_string_dynamic_t_delete_simple(triple.one) \
+    macro_f_string_dynamic_t_delete_simple(triple.two) \
+    macro_f_string_dynamic_t_delete_simple(triple.three)
 
-  #define f_macro_string_triple_t_destroy_simple(triple) \
-    f_macro_string_dynamic_t_destroy_simple(triple.one) \
-    f_macro_string_dynamic_t_destroy_simple(triple.two) \
-    f_macro_string_dynamic_t_destroy_simple(triple.three)
+  #define macro_f_string_triple_t_destroy_simple(triple) \
+    macro_f_string_dynamic_t_destroy_simple(triple.one) \
+    macro_f_string_dynamic_t_destroy_simple(triple.two) \
+    macro_f_string_dynamic_t_destroy_simple(triple.three)
 #endif // _di_f_string_triple_t_
 
 /**
@@ -71,18 +71,18 @@ extern "C" {
 
   #define f_string_triples_t_initialize f_string_statics_t_initialize
 
-  #define f_macro_string_triples_t_clear(triples) f_macro_memory_structure_clear(triples)
+  #define macro_f_string_triples_t_clear(triples) macro_f_memory_structure_clear(triples)
 
-  #define f_macro_string_triples_t_resize(status, triples, length) status = f_string_triples_resize(length, &triples);
-  #define f_macro_string_triples_t_adjust(status, triples, length) status = f_string_triples_adjust(length, &triples);
+  #define macro_f_string_triples_t_resize(status, triples, length) status = f_string_triples_resize(length, &triples);
+  #define macro_f_string_triples_t_adjust(status, triples, length) status = f_string_triples_adjust(length, &triples);
 
-  #define f_macro_string_triples_t_delete_simple(triples)  f_string_triples_resize(0, &triples);
-  #define f_macro_string_triples_t_destroy_simple(triples) f_string_triples_adjust(0, &triples);
+  #define macro_f_string_triples_t_delete_simple(triples)  f_string_triples_resize(0, &triples);
+  #define macro_f_string_triples_t_destroy_simple(triples) f_string_triples_adjust(0, &triples);
 
-  #define f_macro_string_triples_t_increase(status, triples)            status = f_string_triples_increase(triples);
-  #define f_macro_string_triples_t_increase_by(status, triples, amount) status = f_string_triples_increase_by(amount, triples);
-  #define f_macro_string_triples_t_decrease_by(status, triples, amount) status = f_string_triples_decrease_by(amount, triples);
-  #define f_macro_string_triples_t_decimate_by(status, triples, amount) status = f_string_triples_decimate_by(amount, triples);
+  #define macro_f_string_triples_t_increase(status, triples)            status = f_string_triples_increase(triples);
+  #define macro_f_string_triples_t_increase_by(status, triples, amount) status = f_string_triples_increase_by(amount, triples);
+  #define macro_f_string_triples_t_decrease_by(status, triples, amount) status = f_string_triples_decrease_by(amount, triples);
+  #define macro_f_string_triples_t_decimate_by(status, triples, amount) status = f_string_triples_decimate_by(amount, triples);
 #endif // _di_f_string_triples_t_
 
 /**
index ebff43a3f5ae8777dd64c6dae45ce0a72933b310..edeecd6f38707e0b60f08e4969efc2e8e02bc8d7 100644 (file)
@@ -25,9 +25,9 @@ extern "C" {
   #define f_thread_attribute_t_initialize { 0 }
 
   // This does not clear the thread.attributes.__size array (may need to memset() against a sizeof(pthread_attr_t)).
-  #define f_macro_thread_attribute_t_clear(attribute) attribute.__align = 0;
+  #define macro_f_thread_attribute_t_clear(attribute) attribute.__align = 0;
 
-  #define f_macro_thread_attribute_t_delete_simple(attribute) f_thread_attribute_delete(&attribute);
+  #define macro_f_thread_attribute_t_delete_simple(attribute) f_thread_attribute_delete(&attribute);
 #endif // _di_f_thread_attribute_t_
 
 /**
@@ -47,18 +47,18 @@ extern "C" {
 
   #define f_thread_attributes_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_attributes_t_clear(attributes) f_macro_memory_structure_clear(attributes)
+  #define macro_f_thread_attributes_t_clear(attributes) macro_f_memory_structure_clear(attributes)
 
-  #define f_macro_thread_attributes_t_resize(status, attributes, length) status = f_thread_attributes_resize(length, &attributes);
-  #define f_macro_thread_attributes_t_adjust(status, attributes, length) status = f_thread_attributes_adjust(length, &attributes);
+  #define macro_f_thread_attributes_t_resize(status, attributes, length) status = f_thread_attributes_resize(length, &attributes);
+  #define macro_f_thread_attributes_t_adjust(status, attributes, length) status = f_thread_attributes_adjust(length, &attributes);
 
-  #define f_macro_thread_attributes_t_delete_simple(attributes)  f_thread_attributes_resize(0, &attributes);
-  #define f_macro_thread_attributes_t_destroy_simple(attributes) f_thread_attributes_adjust(0, &attributes);
+  #define macro_f_thread_attributes_t_delete_simple(attributes)  f_thread_attributes_resize(0, &attributes);
+  #define macro_f_thread_attributes_t_destroy_simple(attributes) f_thread_attributes_adjust(0, &attributes);
 
-  #define f_macro_thread_attributes_t_increase(status, attributes)            status = f_thread_attributes_increase(attributes);
-  #define f_macro_thread_attributes_t_increase_by(status, attributes, amount) status = f_thread_attributes_increase_by(amount, attributes);
-  #define f_macro_thread_attributes_t_decrease_by(status, attributes, amount) status = f_thread_attributes_decrease_by(amount, attributes);
-  #define f_macro_thread_attributes_t_decimate_by(status, attributes, amount) status = f_thread_attributes_decimate_by(amount, attributes);
+  #define macro_f_thread_attributes_t_increase(status, attributes)            status = f_thread_attributes_increase(attributes);
+  #define macro_f_thread_attributes_t_increase_by(status, attributes, amount) status = f_thread_attributes_increase_by(amount, attributes);
+  #define macro_f_thread_attributes_t_decrease_by(status, attributes, amount) status = f_thread_attributes_decrease_by(amount, attributes);
+  #define macro_f_thread_attributes_t_decimate_by(status, attributes, amount) status = f_thread_attributes_decimate_by(amount, attributes);
 #endif // _di_f_thread_attributes_t_
 
 /**
@@ -69,9 +69,9 @@ extern "C" {
 
   #define f_thread_barrier_t_initialize { 0 }
 
-  #define f_macro_thread_barrier_t_clear(barrier) barrier = 0;
+  #define macro_f_thread_barrier_t_clear(barrier) barrier = 0;
 
-  #define f_macro_thread_barrier_t_delete_simple(barrier) f_thread_barrier_delete(&barrier);
+  #define macro_f_thread_barrier_t_delete_simple(barrier) f_thread_barrier_delete(&barrier);
 #endif // _di_f_thread_barrier_t_
 
 /**
@@ -91,18 +91,18 @@ extern "C" {
 
   #define f_thread_barriers_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_barriers_t_clear(barriers) f_macro_memory_structure_clear(barriers)
+  #define macro_f_thread_barriers_t_clear(barriers) macro_f_memory_structure_clear(barriers)
 
-  #define f_macro_thread_barriers_t_resize(status, barriers, length) status = f_thread_barriers_resize(length, &barriers);
-  #define f_macro_thread_barriers_t_adjust(status, barriers, length) status = f_thread_barriers_adjust(length, &barriers);
+  #define macro_f_thread_barriers_t_resize(status, barriers, length) status = f_thread_barriers_resize(length, &barriers);
+  #define macro_f_thread_barriers_t_adjust(status, barriers, length) status = f_thread_barriers_adjust(length, &barriers);
 
-  #define f_macro_thread_barriers_t_delete_simple(barriers)  f_thread_barriers_resize(0, &barriers);
-  #define f_macro_thread_barriers_t_destroy_simple(barriers) f_thread_barriers_adjust(0, &barriers);
+  #define macro_f_thread_barriers_t_delete_simple(barriers)  f_thread_barriers_resize(0, &barriers);
+  #define macro_f_thread_barriers_t_destroy_simple(barriers) f_thread_barriers_adjust(0, &barriers);
 
-  #define f_macro_thread_barriers_t_increase(status, barriers)            status = f_thread_barriers_increase(barriers);
-  #define f_macro_thread_barriers_t_increase_by(status, barriers, amount) status = f_thread_barriers_increase_by(amount, barriers);
-  #define f_macro_thread_barriers_t_decrease_by(status, barriers, amount) status = f_thread_barriers_decrease_by(amount, barriers);
-  #define f_macro_thread_barriers_t_decimate_by(status, barriers, amount) status = f_thread_barriers_decimate_by(amount, barriers);
+  #define macro_f_thread_barriers_t_increase(status, barriers)            status = f_thread_barriers_increase(barriers);
+  #define macro_f_thread_barriers_t_increase_by(status, barriers, amount) status = f_thread_barriers_increase_by(amount, barriers);
+  #define macro_f_thread_barriers_t_decrease_by(status, barriers, amount) status = f_thread_barriers_decrease_by(amount, barriers);
+  #define macro_f_thread_barriers_t_decimate_by(status, barriers, amount) status = f_thread_barriers_decimate_by(amount, barriers);
 #endif // _di_f_thread_barriers_t_
 
 /**
@@ -114,9 +114,9 @@ extern "C" {
   #define f_thread_barrier_attribute_t_initialize { 0 }
 
   // This does not clear the thread.attributes.__size array (may need to memset() against a sizeof(pthread_attr_t)).
-  #define f_macro_thread_barrier_attribute_t_clear(attribute) attribute.__align = 0;
+  #define macro_f_thread_barrier_attribute_t_clear(attribute) attribute.__align = 0;
 
-  #define f_macro_thread_barrier_attribute_t_delete_simple(attribute) f_thread_barrier_attribute_delete(&attribute);
+  #define macro_f_thread_barrier_attribute_t_delete_simple(attribute) f_thread_barrier_attribute_delete(&attribute);
 #endif // _di_f_thread_barrier_attribute_t_
 
 /**
@@ -136,18 +136,18 @@ extern "C" {
 
   #define f_thread_barrier_attributes_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_barrier_attributes_t_clear(barrier_attributes) f_macro_memory_structure_clear(barrier_attributes)
+  #define macro_f_thread_barrier_attributes_t_clear(barrier_attributes) macro_f_memory_structure_clear(barrier_attributes)
 
-  #define f_macro_thread_barrier_attributes_t_resize(status, barrier_attributes, length) status = f_thread_barrier_attributes_resize(length, &barrier_attributes);
-  #define f_macro_thread_barrier_attributes_t_adjust(status, barrier_attributes, length) status = f_thread_barrier_attributes_adjust(length, &barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_resize(status, barrier_attributes, length) status = f_thread_barrier_attributes_resize(length, &barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_adjust(status, barrier_attributes, length) status = f_thread_barrier_attributes_adjust(length, &barrier_attributes);
 
-  #define f_macro_thread_barrier_attributes_t_delete_simple(barrier_attributes)  f_thread_barrier_attributes_resize(0, &barrier_attributes);
-  #define f_macro_thread_barrier_attributes_t_destroy_simple(barrier_attributes) f_thread_barrier_attributes_adjust(0, &barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_delete_simple(barrier_attributes)  f_thread_barrier_attributes_resize(0, &barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_destroy_simple(barrier_attributes) f_thread_barrier_attributes_adjust(0, &barrier_attributes);
 
-  #define f_macro_thread_barrier_attributes_t_increase(status, barrier_attributes)            status = f_thread_barrier_attributes_increase(barrier_attributes);
-  #define f_macro_thread_barrier_attributes_t_increase_by(status, barrier_attributes, amount) status = f_thread_barrier_attributes_increase_by(amount, barrier_attributes);
-  #define f_macro_thread_barrier_attributes_t_decrease_by(status, barrier_attributes, amount) status = f_thread_barrier_attributes_decrease_by(amount, barrier_attributes);
-  #define f_macro_thread_barrier_attributes_t_decimate_by(status, barrier_attributes, amount) status = f_thread_barrier_attributes_decimate_by(amount, barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_increase(status, barrier_attributes)            status = f_thread_barrier_attributes_increase(barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_increase_by(status, barrier_attributes, amount) status = f_thread_barrier_attributes_increase_by(amount, barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_decrease_by(status, barrier_attributes, amount) status = f_thread_barrier_attributes_decrease_by(amount, barrier_attributes);
+  #define macro_f_thread_barrier_attributes_t_decimate_by(status, barrier_attributes, amount) status = f_thread_barrier_attributes_decimate_by(amount, barrier_attributes);
 #endif // _di_f_thread_barrier_attributes_t_
 
 /**
@@ -161,7 +161,7 @@ extern "C" {
 
   #define f_thread_condition_t_initialize PTHREAD_COND_INITIALIZER
 
-  #define f_macro_thread_condition_t_delete_simple(condition) f_thread_condition_delete(&condition);
+  #define macro_f_thread_condition_t_delete_simple(condition) f_thread_condition_delete(&condition);
 #endif // _di_f_thread_condition_t_
 
 /**
@@ -181,18 +181,18 @@ extern "C" {
 
   #define f_thread_conditions_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_conditions_t_clear(conditions) f_macro_memory_structure_clear(conditions)
+  #define macro_f_thread_conditions_t_clear(conditions) macro_f_memory_structure_clear(conditions)
 
-  #define f_macro_thread_conditions_t_resize(status, conditions, length) status = f_thread_conditions_resize(length, &conditions);
-  #define f_macro_thread_conditions_t_adjust(status, conditions, length) status = f_thread_conditions_adjust(length, &conditions);
+  #define macro_f_thread_conditions_t_resize(status, conditions, length) status = f_thread_conditions_resize(length, &conditions);
+  #define macro_f_thread_conditions_t_adjust(status, conditions, length) status = f_thread_conditions_adjust(length, &conditions);
 
-  #define f_macro_thread_conditions_t_delete_simple(conditions)  f_thread_conditions_resize(0, &conditions);
-  #define f_macro_thread_conditions_t_destroy_simple(conditions) f_thread_conditions_adjust(0, &conditions);
+  #define macro_f_thread_conditions_t_delete_simple(conditions)  f_thread_conditions_resize(0, &conditions);
+  #define macro_f_thread_conditions_t_destroy_simple(conditions) f_thread_conditions_adjust(0, &conditions);
 
-  #define f_macro_thread_conditions_t_increase(status, conditions)            status = f_thread_conditions_increase(conditions);
-  #define f_macro_thread_conditions_t_increase_by(status, conditions, amount) status = f_thread_conditions_increase_by(amount, conditions);
-  #define f_macro_thread_conditions_t_decrease_by(status, conditions, amount) status = f_thread_conditions_decrease_by(amount, conditions);
-  #define f_macro_thread_conditions_t_decimate_by(status, conditions, amount) status = f_thread_conditions_decimate_by(amount, conditions);
+  #define macro_f_thread_conditions_t_increase(status, conditions)            status = f_thread_conditions_increase(conditions);
+  #define macro_f_thread_conditions_t_increase_by(status, conditions, amount) status = f_thread_conditions_increase_by(amount, conditions);
+  #define macro_f_thread_conditions_t_decrease_by(status, conditions, amount) status = f_thread_conditions_decrease_by(amount, conditions);
+  #define macro_f_thread_conditions_t_decimate_by(status, conditions, amount) status = f_thread_conditions_decimate_by(amount, conditions);
 #endif // _di_f_thread_conditions_t_
 
 /**
@@ -204,9 +204,9 @@ extern "C" {
   #define f_thread_condition_attribute_t_initialize { 0 };
 
   // This does not clear the thread.attributes.__size array (may need to memset() against a sizeof(pthread_attr_t)).
-  #define f_macro_thread_condition_attribute_t_clear(attribute) attribute.__align = 0;
+  #define macro_f_thread_condition_attribute_t_clear(attribute) attribute.__align = 0;
 
-  #define f_macro_thread_condition_attribute_t_delete_simple(attribute) f_thread_condition_attribute_delete(&attribute);
+  #define macro_f_thread_condition_attribute_t_delete_simple(attribute) f_thread_condition_attribute_delete(&attribute);
 #endif // _di_f_thread_condition_attribute_t_
 
 /**
@@ -226,18 +226,18 @@ extern "C" {
 
   #define f_thread_condition_attributes_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_condition_attributes_t_clear(attributes) f_macro_memory_structure_clear(attributes)
+  #define macro_f_thread_condition_attributes_t_clear(attributes) macro_f_memory_structure_clear(attributes)
 
-  #define f_macro_thread_condition_attributes_t_resize(status, attributes, length) status = f_thread_condition_attributes_resize(length, &attributes);
-  #define f_macro_thread_condition_attributes_t_adjust(status, attributes, length) status = f_thread_condition_attributes_adjust(length, &attributes);
+  #define macro_f_thread_condition_attributes_t_resize(status, attributes, length) status = f_thread_condition_attributes_resize(length, &attributes);
+  #define macro_f_thread_condition_attributes_t_adjust(status, attributes, length) status = f_thread_condition_attributes_adjust(length, &attributes);
 
-  #define f_macro_thread_condition_attributes_t_delete_simple(attributes)  f_thread_condition_attributes_resize(0, &condition_attributes);
-  #define f_macro_thread_condition_attributes_t_destroy_simple(attributes) f_thread_condition_attributes_adjust(0, &condition_attributes);
+  #define macro_f_thread_condition_attributes_t_delete_simple(attributes)  f_thread_condition_attributes_resize(0, &condition_attributes);
+  #define macro_f_thread_condition_attributes_t_destroy_simple(attributes) f_thread_condition_attributes_adjust(0, &condition_attributes);
 
-  #define f_macro_thread_condition_attributes_t_increase(status, attributes)            status = f_thread_condition_attributes_increase(attributes);
-  #define f_macro_thread_condition_attributes_t_increase_by(status, attributes, amount) status = f_thread_condition_attributes_increase_by(amount, attributes);
-  #define f_macro_thread_condition_attributes_t_decrease_by(status, attributes, amount) status = f_thread_condition_attributes_decrease_by(amount, attributes);
-  #define f_macro_thread_condition_attributes_t_decimate_by(status, attributes, amount) status = f_thread_condition_attributes_decimate_by(amount, attributes);
+  #define macro_f_thread_condition_attributes_t_increase(status, attributes)            status = f_thread_condition_attributes_increase(attributes);
+  #define macro_f_thread_condition_attributes_t_increase_by(status, attributes, amount) status = f_thread_condition_attributes_increase_by(amount, attributes);
+  #define macro_f_thread_condition_attributes_t_decrease_by(status, attributes, amount) status = f_thread_condition_attributes_decrease_by(amount, attributes);
+  #define macro_f_thread_condition_attributes_t_decimate_by(status, attributes, amount) status = f_thread_condition_attributes_decimate_by(amount, attributes);
 #endif // _di_f_thread_condition_attributes_t_
 
 /**
@@ -248,7 +248,7 @@ extern "C" {
 
   #define f_thread_id_t_initialize 0
 
-  #define f_macro_thread_id_t_clear(id) id = 0;
+  #define macro_f_thread_id_t_clear(id) id = 0;
 #endif // _di_f_thread_id_t_
 
 /**
@@ -268,16 +268,16 @@ extern "C" {
 
   #define f_thread_ids_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_ids_t_resize(status, ids, length) f_macro_memory_structure_resize(status, ids, f_thread_id_t, length)
-  #define f_macro_thread_ids_t_adjust(status, ids, length) f_macro_memory_structure_adjust(status, ids, f_thread_id_t, length)
+  #define macro_f_thread_ids_t_resize(status, ids, length) macro_f_memory_structure_resize(status, ids, f_thread_id_t, length)
+  #define macro_f_thread_ids_t_adjust(status, ids, length) macro_f_memory_structure_adjust(status, ids, f_thread_id_t, length)
 
-  #define f_macro_thread_ids_t_delete_simple(ids)  f_macro_memory_structure_delete_simple(ids, f_thread_id_t)
-  #define f_macro_thread_ids_t_destroy_simple(ids) f_macro_memory_structure_destroy_simple(ids, f_thread_id_t)
+  #define macro_f_thread_ids_t_delete_simple(ids)  macro_f_memory_structure_delete_simple(ids, f_thread_id_t)
+  #define macro_f_thread_ids_t_destroy_simple(ids) macro_f_memory_structure_destroy_simple(ids, f_thread_id_t)
 
-  #define f_macro_thread_ids_t_increase(status, ids)            f_macro_memory_structure_increase(status, ids, f_thread_id_t)
-  #define f_macro_thread_ids_t_increase_by(status, ids, amount) f_macro_memory_structure_increase_by(status, ids, f_thread_id_t, amount)
-  #define f_macro_thread_ids_t_decrease_by(status, ids, amount) f_macro_memory_structure_decrease_by(status, ids, f_thread_id_t, amount)
-  #define f_macro_thread_ids_t_decimate_by(status, ids, amount) f_macro_memory_structure_decimate_by(status, ids, f_thread_id_t, amount)
+  #define macro_f_thread_ids_t_increase(status, ids)            macro_f_memory_structure_increase(status, ids, f_thread_id_t)
+  #define macro_f_thread_ids_t_increase_by(status, ids, amount) macro_f_memory_structure_increase_by(status, ids, f_thread_id_t, amount)
+  #define macro_f_thread_ids_t_decrease_by(status, ids, amount) macro_f_memory_structure_decrease_by(status, ids, f_thread_id_t, amount)
+  #define macro_f_thread_ids_t_decimate_by(status, ids, amount) macro_f_memory_structure_decimate_by(status, ids, f_thread_id_t, amount)
 #endif // _di_f_thread_ids_t_
 
 /**
@@ -288,9 +288,9 @@ extern "C" {
 
   #define f_thread_key_t_initialize 0
 
-  #define f_macro_thread_key_t_clear(key) key = 0;
+  #define macro_f_thread_key_t_clear(key) key = 0;
 
-  #define f_macro_thread_key_t_delete_simple(key) f_thread_key_delete(&key);
+  #define macro_f_thread_key_t_delete_simple(key) f_thread_key_delete(&key);
 #endif // _di_f_thread_key_t_
 
 /**
@@ -310,18 +310,18 @@ extern "C" {
 
   #define f_thread_keys_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_keys_t_clear(keys) f_macro_memory_structure_clear(keys)
+  #define macro_f_thread_keys_t_clear(keys) macro_f_memory_structure_clear(keys)
 
-  #define f_macro_thread_keys_t_resize(status, keys, length) status = f_thread_keys_resize(length, &keys);
-  #define f_macro_thread_keys_t_adjust(status, keys, length) status = f_thread_keys_adjust(length, &keys);
+  #define macro_f_thread_keys_t_resize(status, keys, length) status = f_thread_keys_resize(length, &keys);
+  #define macro_f_thread_keys_t_adjust(status, keys, length) status = f_thread_keys_adjust(length, &keys);
 
-  #define f_macro_thread_keys_t_delete_simple(keys)  f_thread_keys_resize(0, &keys);
-  #define f_macro_thread_keys_t_destroy_simple(keys) f_thread_keys_adjust(0, &keys);
+  #define macro_f_thread_keys_t_delete_simple(keys)  f_thread_keys_resize(0, &keys);
+  #define macro_f_thread_keys_t_destroy_simple(keys) f_thread_keys_adjust(0, &keys);
 
-  #define f_macro_thread_keys_t_increase(status, keys)            status = f_thread_keys_increase(keys);
-  #define f_macro_thread_keys_t_increase_by(status, keys, amount) status = f_thread_keys_increase_by(amount, keys);
-  #define f_macro_thread_keys_t_decrease_by(status, keys, amount) status = f_thread_keys_decrease_by(amount, keys);
-  #define f_macro_thread_keys_t_decimate_by(status, keys, amount) status = f_thread_keys_decimate_by(amount, keys);
+  #define macro_f_thread_keys_t_increase(status, keys)            status = f_thread_keys_increase(keys);
+  #define macro_f_thread_keys_t_increase_by(status, keys, amount) status = f_thread_keys_increase_by(amount, keys);
+  #define macro_f_thread_keys_t_decrease_by(status, keys, amount) status = f_thread_keys_decrease_by(amount, keys);
+  #define macro_f_thread_keys_t_decimate_by(status, keys, amount) status = f_thread_keys_decimate_by(amount, keys);
 #endif // _di_f_thread_keys_t_
 
 /**
@@ -335,7 +335,7 @@ extern "C" {
 
   #define f_thread_lock_t_initialize PTHREAD_RWLOCK_INITIALIZER
 
-  #define f_macro_thread_lock_t_delete_simple(lock) f_thread_lock_delete(&lock);
+  #define macro_f_thread_lock_t_delete_simple(lock) f_thread_lock_delete(&lock);
 #endif // _di_f_thread_lock_t_
 
 /**
@@ -355,16 +355,16 @@ extern "C" {
 
   #define f_thread_locks_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_locks_t_resize(status, locks, length) f_macro_memory_structure_resize(status, locks, f_thread_lock_t, length)
-  #define f_macro_thread_locks_t_adjust(status, locks, length) f_macro_memory_structure_adjust(status, locks, f_thread_lock_t, length)
+  #define macro_f_thread_locks_t_resize(status, locks, length) macro_f_memory_structure_resize(status, locks, f_thread_lock_t, length)
+  #define macro_f_thread_locks_t_adjust(status, locks, length) macro_f_memory_structure_adjust(status, locks, f_thread_lock_t, length)
 
-  #define f_macro_thread_locks_t_delete_simple(locks)  f_macro_memory_structure_delete_simple(locks, f_thread_lock_t)
-  #define f_macro_thread_locks_t_destroy_simple(locks) f_macro_memory_structure_destroy_simple(locks, f_thread_lock_t)
+  #define macro_f_thread_locks_t_delete_simple(locks)  macro_f_memory_structure_delete_simple(locks, f_thread_lock_t)
+  #define macro_f_thread_locks_t_destroy_simple(locks) macro_f_memory_structure_destroy_simple(locks, f_thread_lock_t)
 
-  #define f_macro_thread_locks_t_increase(status, locks)            f_macro_memory_structure_increase(status, locks, f_thread_lock_t)
-  #define f_macro_thread_locks_t_increase_by(status, locks, amount) f_macro_memory_structure_increase_by(status, locks, f_thread_lock_t, amount)
-  #define f_macro_thread_locks_t_decrease_by(status, locks, amount) f_macro_memory_structure_decrease_by(status, locks, f_thread_lock_t, amount)
-  #define f_macro_thread_locks_t_decimate_by(status, locks, amount) f_macro_memory_structure_decimate_by(status, locks, f_thread_lock_t, amount)
+  #define macro_f_thread_locks_t_increase(status, locks)            macro_f_memory_structure_increase(status, locks, f_thread_lock_t)
+  #define macro_f_thread_locks_t_increase_by(status, locks, amount) macro_f_memory_structure_increase_by(status, locks, f_thread_lock_t, amount)
+  #define macro_f_thread_locks_t_decrease_by(status, locks, amount) macro_f_memory_structure_decrease_by(status, locks, f_thread_lock_t, amount)
+  #define macro_f_thread_locks_t_decimate_by(status, locks, amount) macro_f_memory_structure_decimate_by(status, locks, f_thread_lock_t, amount)
 #endif // _di_f_thread_locks_t_
 
 /**
@@ -376,9 +376,9 @@ extern "C" {
   #define f_thread_lock_attribute_t_initialize { 0 }
 
   // This does not clear the thread.attributes.__size array (may need to memset() against a sizeof(pthread_attr_t)).
-  #define f_macro_thread_lock_attribute_t_clear(attribute) attribute.__align = 0;
+  #define macro_f_thread_lock_attribute_t_clear(attribute) attribute.__align = 0;
 
-  #define f_macro_thread_lock_attribute_t_delete_simple(attribute) f_thread_lock_attribute_delete(&attribute);
+  #define macro_f_thread_lock_attribute_t_delete_simple(attribute) f_thread_lock_attribute_delete(&attribute);
 #endif // _di_f_thread_lock_attribute_t_
 
 /**
@@ -398,18 +398,18 @@ extern "C" {
 
   #define f_thread_lock_attributes_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_lock_attributes_t_clear(attributes) f_macro_memory_structure_clear(attributes)
+  #define macro_f_thread_lock_attributes_t_clear(attributes) macro_f_memory_structure_clear(attributes)
 
-  #define f_macro_thread_lock_attributes_t_resize(status, attributes, length) status = f_thread_lock_attributes_resize(length, &attributes);
-  #define f_macro_thread_lock_attributes_t_adjust(status, attributes, length) status = f_thread_lock_attributes_adjust(length, &attributes);
+  #define macro_f_thread_lock_attributes_t_resize(status, attributes, length) status = f_thread_lock_attributes_resize(length, &attributes);
+  #define macro_f_thread_lock_attributes_t_adjust(status, attributes, length) status = f_thread_lock_attributes_adjust(length, &attributes);
 
-  #define f_macro_thread_lock_attributes_t_delete_simple(attributes)  f_thread_lock_attributes_resize(0, &attributes);
-  #define f_macro_thread_lock_attributes_t_destroy_simple(attributes) f_thread_lock_attributes_adjust(0, &attributes);
+  #define macro_f_thread_lock_attributes_t_delete_simple(attributes)  f_thread_lock_attributes_resize(0, &attributes);
+  #define macro_f_thread_lock_attributes_t_destroy_simple(attributes) f_thread_lock_attributes_adjust(0, &attributes);
 
-  #define f_macro_thread_lock_attributes_t_increase(status, attributes)            status = f_thread_lock_attributes_increase(attributes);
-  #define f_macro_thread_lock_attributes_t_increase_by(status, attributes, amount) status = f_thread_lock_attributes_increase_by(amount, attributes);
-  #define f_macro_thread_lock_attributes_t_decrease_by(status, attributes, amount) status = f_thread_lock_attributes_decrease_by(amount, attributes);
-  #define f_macro_thread_lock_attributes_t_decimate_by(status, attributes, amount) status = f_thread_lock_attributes_decimate_by(amount, attributes);
+  #define macro_f_thread_lock_attributes_t_increase(status, attributes)            status = f_thread_lock_attributes_increase(attributes);
+  #define macro_f_thread_lock_attributes_t_increase_by(status, attributes, amount) status = f_thread_lock_attributes_increase_by(amount, attributes);
+  #define macro_f_thread_lock_attributes_t_decrease_by(status, attributes, amount) status = f_thread_lock_attributes_decrease_by(amount, attributes);
+  #define macro_f_thread_lock_attributes_t_decimate_by(status, attributes, amount) status = f_thread_lock_attributes_decimate_by(amount, attributes);
 #endif // _di_f_thread_lock_attributes_t_
 
 /**
@@ -425,7 +425,7 @@ extern "C" {
 
   #define f_thread_mutex_t_initialize PTHREAD_MUTEX_INITIALIZER
 
-  #define f_macro_thread_mutex_t_delete_simple(mutex) f_thread_mutex_delete(&mutex);
+  #define macro_f_thread_mutex_t_delete_simple(mutex) f_thread_mutex_delete(&mutex);
 #endif // _di_f_thread_mutex_t_
 
 /**
@@ -445,18 +445,18 @@ extern "C" {
 
   #define f_thread_mutexs_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_mutexs_t_clear(mutexs) f_macro_memory_structure_clear(mutexs)
+  #define macro_f_thread_mutexs_t_clear(mutexs) macro_f_memory_structure_clear(mutexs)
 
-  #define f_macro_thread_mutexs_t_resize(status, mutexs, length) status = f_thread_mutexs_resize(length, &mutexs);
-  #define f_macro_thread_mutexs_t_adjust(status, mutexs, length) status = f_thread_mutexs_adjust(length, &mutexs);
+  #define macro_f_thread_mutexs_t_resize(status, mutexs, length) status = f_thread_mutexs_resize(length, &mutexs);
+  #define macro_f_thread_mutexs_t_adjust(status, mutexs, length) status = f_thread_mutexs_adjust(length, &mutexs);
 
-  #define f_macro_thread_mutexs_t_delete_simple(mutexs)  f_thread_mutexs_resize(0, &mutexs);
-  #define f_macro_thread_mutexs_t_destroy_simple(mutexs) f_thread_mutexs_adjust(0, &mutexs);
+  #define macro_f_thread_mutexs_t_delete_simple(mutexs)  f_thread_mutexs_resize(0, &mutexs);
+  #define macro_f_thread_mutexs_t_destroy_simple(mutexs) f_thread_mutexs_adjust(0, &mutexs);
 
-  #define f_macro_thread_mutexs_t_increase(status, mutexs)            status = f_thread_mutexs_increase(mutexs);
-  #define f_macro_thread_mutexs_t_increase_by(status, mutexs, amount) status = f_thread_mutexs_increase_by(amount, mutexs);
-  #define f_macro_thread_mutexs_t_decrease_by(status, mutexs, amount) status = f_thread_mutexs_decrease_by(amount, mutexs);
-  #define f_macro_thread_mutexs_t_decimate_by(status, mutexs, amount) status = f_thread_mutexs_decimate_by(amount, mutexs);
+  #define macro_f_thread_mutexs_t_increase(status, mutexs)            status = f_thread_mutexs_increase(mutexs);
+  #define macro_f_thread_mutexs_t_increase_by(status, mutexs, amount) status = f_thread_mutexs_increase_by(amount, mutexs);
+  #define macro_f_thread_mutexs_t_decrease_by(status, mutexs, amount) status = f_thread_mutexs_decrease_by(amount, mutexs);
+  #define macro_f_thread_mutexs_t_decimate_by(status, mutexs, amount) status = f_thread_mutexs_decimate_by(amount, mutexs);
 #endif // _di_f_thread_mutexs_t_
 
 /**
@@ -468,9 +468,9 @@ extern "C" {
   #define f_thread_mutex_attribute_t_initialize { 0 }
 
   // This does not clear the thread.attributes.__size array (may need to memset() against a sizeof(pthread_attr_t)).
-  #define f_macro_thread_mutex_attribute_t_clear(attribute) attribute.__align = 0;
+  #define macro_f_thread_mutex_attribute_t_clear(attribute) attribute.__align = 0;
 
-  #define f_macro_thread_mutex_attribute_t_delete_simple(attribute) f_thread_mutex_attribute_delete(&attribute);
+  #define macro_f_thread_mutex_attribute_t_delete_simple(attribute) f_thread_mutex_attribute_delete(&attribute);
 #endif // _di_f_thread_mutex_attribute_t_
 
 /**
@@ -490,18 +490,18 @@ extern "C" {
 
   #define f_thread_mutex_attributes_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_mutex_attributes_t_clear(attributes) f_macro_memory_structure_clear(attributes)
+  #define macro_f_thread_mutex_attributes_t_clear(attributes) macro_f_memory_structure_clear(attributes)
 
-  #define f_macro_thread_mutex_attributes_t_resize(status, attributes, length) status = f_thread_mutex_attributes_resize(length, &attributes);
-  #define f_macro_thread_mutex_attributes_t_adjust(status, attributes, length) status = f_thread_mutex_attributes_adjust(length, &attributes);
+  #define macro_f_thread_mutex_attributes_t_resize(status, attributes, length) status = f_thread_mutex_attributes_resize(length, &attributes);
+  #define macro_f_thread_mutex_attributes_t_adjust(status, attributes, length) status = f_thread_mutex_attributes_adjust(length, &attributes);
 
-  #define f_macro_thread_mutex_attributes_t_delete_simple(attributes)  f_thread_mutex_attributes_resize(0, &attributes);
-  #define f_macro_thread_mutex_attributes_t_destroy_simple(attributes) f_thread_mutex_attributes_adjust(0, &attributes);
+  #define macro_f_thread_mutex_attributes_t_delete_simple(attributes)  f_thread_mutex_attributes_resize(0, &attributes);
+  #define macro_f_thread_mutex_attributes_t_destroy_simple(attributes) f_thread_mutex_attributes_adjust(0, &attributes);
 
-  #define f_macro_thread_mutex_attributes_t_increase(status, attributes)            status = f_thread_mutex_attributes_increase(attributes);
-  #define f_macro_thread_mutex_attributes_t_increase_by(status, attributes, amount) status = f_thread_mutex_attributes_increase_by(amount, attributes);
-  #define f_macro_thread_mutex_attributes_t_decrease_by(status, attributes, amount) status = f_thread_mutex_attributes_decrease_by(amount, attributes);
-  #define f_macro_thread_mutex_attributes_t_decimate_by(status, attributes, amount) status = f_thread_mutex_attributes_decimate_by(amount, attributes);
+  #define macro_f_thread_mutex_attributes_t_increase(status, attributes)            status = f_thread_mutex_attributes_increase(attributes);
+  #define macro_f_thread_mutex_attributes_t_increase_by(status, attributes, amount) status = f_thread_mutex_attributes_increase_by(amount, attributes);
+  #define macro_f_thread_mutex_attributes_t_decrease_by(status, attributes, amount) status = f_thread_mutex_attributes_decrease_by(amount, attributes);
+  #define macro_f_thread_mutex_attributes_t_decimate_by(status, attributes, amount) status = f_thread_mutex_attributes_decimate_by(amount, attributes);
 #endif // _di_f_thread_mutex_attributes_t_
 
 /**
@@ -532,16 +532,16 @@ extern "C" {
 
   #define f_thread_onces_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_onces_t_resize(status, onces, length) f_macro_memory_structure_resize(status, onces, f_thread_once_t, length)
-  #define f_macro_thread_onces_t_adjust(status, onces, length) f_macro_memory_structure_adjust(status, onces, f_thread_once_t, length)
+  #define macro_f_thread_onces_t_resize(status, onces, length) macro_f_memory_structure_resize(status, onces, f_thread_once_t, length)
+  #define macro_f_thread_onces_t_adjust(status, onces, length) macro_f_memory_structure_adjust(status, onces, f_thread_once_t, length)
 
-  #define f_macro_thread_onces_t_delete_simple(onces)  f_macro_memory_structure_delete_simple(onces, f_thread_once_t)
-  #define f_macro_thread_onces_t_destroy_simple(onces) f_macro_memory_structure_destroy_simple(onces, f_thread_once_t)
+  #define macro_f_thread_onces_t_delete_simple(onces)  macro_f_memory_structure_delete_simple(onces, f_thread_once_t)
+  #define macro_f_thread_onces_t_destroy_simple(onces) macro_f_memory_structure_destroy_simple(onces, f_thread_once_t)
 
-  #define f_macro_thread_onces_t_increase(status, onces)            f_macro_memory_structure_increase(status, onces, f_thread_once_t)
-  #define f_macro_thread_onces_t_increase_by(status, onces, amount) f_macro_memory_structure_increase_by(status, onces, f_thread_once_t, amount)
-  #define f_macro_thread_onces_t_decrease_by(status, onces, amount) f_macro_memory_structure_decrease_by(status, onces, f_thread_once_t, amount)
-  #define f_macro_thread_onces_t_decimate_by(status, onces, amount) f_macro_memory_structure_decimate_by(status, onces, f_thread_once_t, amount)
+  #define macro_f_thread_onces_t_increase(status, onces)            macro_f_memory_structure_increase(status, onces, f_thread_once_t)
+  #define macro_f_thread_onces_t_increase_by(status, onces, amount) macro_f_memory_structure_increase_by(status, onces, f_thread_once_t, amount)
+  #define macro_f_thread_onces_t_decrease_by(status, onces, amount) macro_f_memory_structure_decrease_by(status, onces, f_thread_once_t, amount)
+  #define macro_f_thread_onces_t_decimate_by(status, onces, amount) macro_f_memory_structure_decimate_by(status, onces, f_thread_once_t, amount)
 #endif // _di_f_thread_onces_t_
 
 /**
@@ -556,7 +556,7 @@ extern "C" {
 
   #define f_thread_semaphore_t_initialize 0
 
-  #define f_macro_thread_semaphore_t_delete_simple(semaphore) f_thread_semaphore_delete(&semaphore);
+  #define macro_f_thread_semaphore_t_delete_simple(semaphore) f_thread_semaphore_delete(&semaphore);
 #endif // _di_f_thread_semaphore_t_
 
 /**
@@ -576,18 +576,18 @@ extern "C" {
 
   #define f_thread_semaphores_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_semaphores_t_clear(semaphores) f_macro_memory_structure_clear(semaphores)
+  #define macro_f_thread_semaphores_t_clear(semaphores) macro_f_memory_structure_clear(semaphores)
 
-  #define f_macro_thread_semaphores_t_resize(status, semaphores, length) status = f_thread_semaphores_resize(length, &semaphores);
-  #define f_macro_thread_semaphores_t_adjust(status, semaphores, length) status = f_thread_semaphores_adjust(length, &semaphores);
+  #define macro_f_thread_semaphores_t_resize(status, semaphores, length) status = f_thread_semaphores_resize(length, &semaphores);
+  #define macro_f_thread_semaphores_t_adjust(status, semaphores, length) status = f_thread_semaphores_adjust(length, &semaphores);
 
-  #define f_macro_thread_semaphores_t_delete_simple(semaphores)  f_thread_semaphores_resize(0, &semaphores);
-  #define f_macro_thread_semaphores_t_destroy_simple(semaphores) f_thread_semaphores_adjust(0, &semaphores);
+  #define macro_f_thread_semaphores_t_delete_simple(semaphores)  f_thread_semaphores_resize(0, &semaphores);
+  #define macro_f_thread_semaphores_t_destroy_simple(semaphores) f_thread_semaphores_adjust(0, &semaphores);
 
-  #define f_macro_thread_semaphores_t_increase(status, semaphores)            status = f_thread_semaphores_increase(semaphores);
-  #define f_macro_thread_semaphores_t_increase_by(status, semaphores, amount) status = f_thread_semaphores_increase_by(amount, semaphores);
-  #define f_macro_thread_semaphores_t_decrease_by(status, semaphores, amount) status = f_thread_semaphores_decrease_by(amount, semaphores);
-  #define f_macro_thread_semaphores_t_decimate_by(status, semaphores, amount) status = f_thread_semaphores_decimate_by(amount, semaphores);
+  #define macro_f_thread_semaphores_t_increase(status, semaphores)            status = f_thread_semaphores_increase(semaphores);
+  #define macro_f_thread_semaphores_t_increase_by(status, semaphores, amount) status = f_thread_semaphores_increase_by(amount, semaphores);
+  #define macro_f_thread_semaphores_t_decrease_by(status, semaphores, amount) status = f_thread_semaphores_decrease_by(amount, semaphores);
+  #define macro_f_thread_semaphores_t_decimate_by(status, semaphores, amount) status = f_thread_semaphores_decimate_by(amount, semaphores);
 #endif // _di_f_thread_semaphores_t_
 
 /**
@@ -606,11 +606,11 @@ extern "C" {
 
   #define f_thread_set_t_initialize { f_thread_attribute_t_initialize, f_thread_id_t_initialize, 0 }
 
-  #define f_macro_thread_set_t_clear(thread) \
-    f_macro_thread_attribute_t_clear(thread.attribute) \
-    f_macro_thread_id_t_clear(thread.id)
+  #define macro_f_thread_set_t_clear(thread) \
+    macro_f_thread_attribute_t_clear(thread.attribute) \
+    macro_f_thread_id_t_clear(thread.id)
 
-  #define f_macro_thread_set_t_delete_simple(set) f_macro_thread_attribute_t_delete_simple(set.attribute)
+  #define macro_f_thread_set_t_delete_simple(set) macro_f_thread_attribute_t_delete_simple(set.attribute)
 #endif // _di_f_thread_set_t_
 
 /**
@@ -630,18 +630,18 @@ extern "C" {
 
   #define f_thread_sets_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_sets_t_clear(sets) f_macro_memory_structure_clear(sets)
+  #define macro_f_thread_sets_t_clear(sets) macro_f_memory_structure_clear(sets)
 
-  #define f_macro_thread_sets_t_resize(status, sets, length) status = f_thread_sets_resize(length, &sets);
-  #define f_macro_thread_sets_t_adjust(status, sets, length) status = f_thread_sets_adjust(length, &sets);
+  #define macro_f_thread_sets_t_resize(status, sets, length) status = f_thread_sets_resize(length, &sets);
+  #define macro_f_thread_sets_t_adjust(status, sets, length) status = f_thread_sets_adjust(length, &sets);
 
-  #define f_macro_thread_sets_t_delete_simple(sets)  f_thread_sets_resize(0, &sets);
-  #define f_macro_thread_sets_t_destroy_simple(sets) f_thread_sets_adjust(0, &sets);
+  #define macro_f_thread_sets_t_delete_simple(sets)  f_thread_sets_resize(0, &sets);
+  #define macro_f_thread_sets_t_destroy_simple(sets) f_thread_sets_adjust(0, &sets);
 
-  #define f_macro_thread_sets_t_increase(status, sets)            status = f_thread_sets_increase(sets);
-  #define f_macro_thread_sets_t_increase_by(status, sets, amount) status = f_thread_sets_increase_by(amount, sets);
-  #define f_macro_thread_sets_t_decrease_by(status, sets, amount) status = f_thread_sets_decrease_by(amount, sets);
-  #define f_macro_thread_sets_t_decimate_by(status, sets, amount) status = f_thread_sets_decimate_by(amount, sets);
+  #define macro_f_thread_sets_t_increase(status, sets)            status = f_thread_sets_increase(sets);
+  #define macro_f_thread_sets_t_increase_by(status, sets, amount) status = f_thread_sets_increase_by(amount, sets);
+  #define macro_f_thread_sets_t_decrease_by(status, sets, amount) status = f_thread_sets_decrease_by(amount, sets);
+  #define macro_f_thread_sets_t_decimate_by(status, sets, amount) status = f_thread_sets_decimate_by(amount, sets);
 #endif // _di_f_thread_sets_t_
 
 /**
@@ -654,7 +654,7 @@ extern "C" {
 
   #define f_thread_spin_t_initialize ((pthread_spinlock_t) 0xFFFFFFFF)
 
-  #define f_macro_thread_spin_t_delete_simple(spin) f_thread_spin_delete(&spin);
+  #define macro_f_thread_spin_t_delete_simple(spin) f_thread_spin_delete(&spin);
 #endif // _di_f_thread_spin_t_
 
 /**
@@ -674,18 +674,18 @@ extern "C" {
 
   #define f_thread_spins_t_initialize { 0, 0, 0 }
 
-  #define f_macro_thread_spins_t_clear(spins) f_macro_memory_structure_clear(spins)
+  #define macro_f_thread_spins_t_clear(spins) macro_f_memory_structure_clear(spins)
 
-  #define f_macro_thread_spins_t_resize(status, spins, length) status = f_thread_spins_resize(length, &spins);
-  #define f_macro_thread_spins_t_adjust(status, spins, length) status = f_thread_spins_adjust(length, &spins);
+  #define macro_f_thread_spins_t_resize(status, spins, length) status = f_thread_spins_resize(length, &spins);
+  #define macro_f_thread_spins_t_adjust(status, spins, length) status = f_thread_spins_adjust(length, &spins);
 
-  #define f_macro_thread_spins_t_delete_simple(spins)  f_thread_spins_resize(0, &spins);
-  #define f_macro_thread_spins_t_destroy_simple(spins) f_thread_spins_adjust(0, &spins);
+  #define macro_f_thread_spins_t_delete_simple(spins)  f_thread_spins_resize(0, &spins);
+  #define macro_f_thread_spins_t_destroy_simple(spins) f_thread_spins_adjust(0, &spins);
 
-  #define f_macro_thread_spins_t_increase(status, spins)            status = f_thread_spins_increase(spins);
-  #define f_macro_thread_spins_t_increase_by(status, spins, amount) status = f_thread_spins_increase_by(amount, spins);
-  #define f_macro_thread_spins_t_decrease_by(status, spins, amount) status = f_thread_spins_decrease_by(amount, spins);
-  #define f_macro_thread_spins_t_decimate_by(status, spins, amount) status = f_thread_spins_decimate_by(amount, spins);
+  #define macro_f_thread_spins_t_increase(status, spins)            status = f_thread_spins_increase(spins);
+  #define macro_f_thread_spins_t_increase_by(status, spins, amount) status = f_thread_spins_increase_by(amount, spins);
+  #define macro_f_thread_spins_t_decrease_by(status, spins, amount) status = f_thread_spins_decrease_by(amount, spins);
+  #define macro_f_thread_spins_t_decimate_by(status, spins, amount) status = f_thread_spins_decimate_by(amount, spins);
 #endif // _di_f_thread_spins_t_
 
 #ifdef __cplusplus
index 4b5b1863f72afb9102bf0468314c0e39b9ebdfbc..d301e0910ec77d58953ff1c9aad810b8bb97281f 100644 (file)
@@ -209,7 +209,7 @@ extern "C" {
 
   #define f_cell_t_initialize { 0, 0 }
 
-  #define f_macro_cell_t_clear(cell) \
+  #define macro_f_cell_t_clear(cell) \
     cell.row = 0; \
     cell.column = 0;
 #endif // _di_f_cell_t_
@@ -254,7 +254,7 @@ extern "C" {
     0, \
   }
 
-  #define f_macro_mode_t_set_default(mode) \
+  #define macro_f_mode_t_set_default(mode) \
     mode.block = f_file_mode_all_rw; \
     mode.character = f_file_mode_all_rw; \
     mode.directory = f_file_mode_all_rwx; \
@@ -264,7 +264,7 @@ extern "C" {
     mode.socket = f_file_mode_all_rw; \
     mode.unknown = f_file_mode_all_rw;
 
-  #define f_macro_mode_t_set_default_umask(mode, mask) \
+  #define macro_f_mode_t_set_default_umask(mode, mask) \
     mode.block = f_file_mode_all_rw & ~mask; \
     mode.character = f_file_mode_all_rw & ~mask; \
     mode.directory = f_file_mode_all_rwx & ~mask; \
@@ -274,7 +274,7 @@ extern "C" {
     mode.socket = f_file_mode_all_rw & ~mask; \
     mode.unknown = f_file_mode_all_rw & ~mask;
 
-  #define f_macro_mode_t_set_all(mode, value) \
+  #define macro_f_mode_t_set_all(mode, value) \
     mode.block = value; \
     mode.character = value; \
     mode.directory = value; \
@@ -284,12 +284,12 @@ extern "C" {
     mode.socket = value; \
     mode.unknown = value;
 
-  #define f_macro_mode_t_set_common(mode, value_directory, value_file, value_link) \
+  #define macro_f_mode_t_set_common(mode, value_directory, value_file, value_link) \
     mode.directory = value_directory; \
     mode.regular = value_file; \
     mode.link = value_link;
 
-  #define f_macro_mode_t_set_uncommon(mode, value_block, value_character, value_fifo, value_socket, value_unknown) \
+  #define macro_f_mode_t_set_uncommon(mode, value_block, value_character, value_fifo, value_socket, value_unknown) \
     mode.block = value_block; \
     mode.character = value_character; \
     mode.fifo = value_fifo; \
@@ -311,7 +311,7 @@ extern "C" {
 
   #define f_time_spec_t_initialize { 0, 0 }
 
-  #define f_macro_time_spec_t_clear(spec) \
+  #define macro_f_time_spec_t_clear(spec) \
     spec.seconds = 0; \
     spec.nanoseconds = 0;
 #endif // _di_f_time_spec_t_
@@ -363,7 +363,7 @@ extern "C" {
 
   #define f_date_t_initialize { 0, 0 }
 
-  #define f_macro_date_t_clear(date) \
+  #define macro_f_date_t_clear(date) \
     date.year = 0; \
     date.time = 0;
 #endif // _di_f_date_t_
index 6c44edfa1167b43ba462c44c859655448aa0e46b..6551bdb35f4cb3ab27ddd986408821ce91c24ddd 100644 (file)
@@ -20,432 +20,432 @@ extern "C" {
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_f_array_lengths_t_
-  #define f_macro_array_lengths_t_clear(lengths) f_macro_memory_structure_clear(lengths)
+  #define macro_f_array_lengths_t_clear(lengths) macro_f_memory_structure_clear(lengths)
 
-  #define f_macro_array_lengths_t_resize(status, lengths, length) f_macro_memory_structure_resize(status, lengths, f_array_length_t, length)
-  #define f_macro_array_lengths_t_adjust(status, lengths, length) f_macro_memory_structure_adjust(status, lengths, f_array_length_t, length)
+  #define macro_f_array_lengths_t_resize(status, lengths, length) macro_f_memory_structure_resize(status, lengths, f_array_length_t, length)
+  #define macro_f_array_lengths_t_adjust(status, lengths, length) macro_f_memory_structure_adjust(status, lengths, f_array_length_t, length)
 
-  #define f_macro_array_lengths_t_delete_simple(lengths)  f_macro_memory_structure_delete_simple(lengths, f_array_length_t)
-  #define f_macro_array_lengths_t_destroy_simple(lengths) f_macro_memory_structure_destroy_simple(lengths, f_array_length_t)
+  #define macro_f_array_lengths_t_delete_simple(lengths)  macro_f_memory_structure_delete_simple(lengths, f_array_length_t)
+  #define macro_f_array_lengths_t_destroy_simple(lengths) macro_f_memory_structure_destroy_simple(lengths, f_array_length_t)
 
-  #define f_macro_array_lengths_t_increase(status, lengths)            f_macro_memory_structure_increase(status, lengths, f_array_length_t)
-  #define f_macro_array_lengths_t_increase_by(status, lengths, amount) f_macro_memory_structure_increase_by(status, lengths, f_array_length_t, amount)
-  #define f_macro_array_lengths_t_decrease_by(status, lengths, amount) f_macro_memory_structure_decrease_by(status, lengths, f_array_length_t, amount)
-  #define f_macro_array_lengths_t_decimate_by(status, lengths, amount) f_macro_memory_structure_decimate_by(status, lengths, f_array_length_t, amount)
+  #define macro_f_array_lengths_t_increase(status, lengths)            macro_f_memory_structure_increase(status, lengths, f_array_length_t)
+  #define macro_f_array_lengths_t_increase_by(status, lengths, amount) macro_f_memory_structure_increase_by(status, lengths, f_array_length_t, amount)
+  #define macro_f_array_lengths_t_decrease_by(status, lengths, amount) macro_f_memory_structure_decrease_by(status, lengths, f_array_length_t, amount)
+  #define macro_f_array_lengths_t_decimate_by(status, lengths, amount) macro_f_memory_structure_decimate_by(status, lengths, f_array_length_t, amount)
 #endif // _di_f_array_lengths_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_f_array_lengthss_t_
-  #define f_macro_array_lengthss_t_clear(lengths) f_macro_memory_structures_clear(lengths)
+  #define macro_f_array_lengthss_t_clear(lengths) macro_f_memory_structures_clear(lengths)
 
-  #define f_macro_array_lengthss_t_resize(status, lengths, length) status = f_type_array_lengthss_resize(length, &lengths);
-  #define f_macro_array_lengthss_t_adjust(status, lengths, length) status = f_type_array_lengthss_adjust(length, &lengths);
+  #define macro_f_array_lengthss_t_resize(status, lengths, length) status = f_type_array_lengthss_resize(length, &lengths);
+  #define macro_f_array_lengthss_t_adjust(status, lengths, length) status = f_type_array_lengthss_adjust(length, &lengths);
 
-  #define f_macro_array_lengthss_t_delete_simple(lengths)  f_type_array_lengthss_resize(0, &lengths);
-  #define f_macro_array_lengthss_t_destroy_simple(lengths) f_type_array_lengthss_adjust(0, &lengths);
+  #define macro_f_array_lengthss_t_delete_simple(lengths)  f_type_array_lengthss_resize(0, &lengths);
+  #define macro_f_array_lengthss_t_destroy_simple(lengths) f_type_array_lengthss_adjust(0, &lengths);
 
-  #define f_macro_array_lengthss_t_increase(status, lengths)            status = f_type_array_lengthss_increase(&lengths);
-  #define f_macro_array_lengthss_t_increase_by(status, lengths, amount) status = f_type_array_lengthss_increase(amount, &lengths);
-  #define f_macro_array_lengthss_t_decrease_by(status, lengths, amount) status = f_type_array_lengthss_decrease_by(amount, &lengths);
-  #define f_macro_array_lengthss_t_decimate_by(status, lengths, amount) status = f_type_array_lengthss_decimate_by(amount, &lengths);
+  #define macro_f_array_lengthss_t_increase(status, lengths)            status = f_type_array_lengthss_increase(&lengths);
+  #define macro_f_array_lengthss_t_increase_by(status, lengths, amount) status = f_type_array_lengthss_increase(amount, &lengths);
+  #define macro_f_array_lengthss_t_decrease_by(status, lengths, amount) status = f_type_array_lengthss_decrease_by(amount, &lengths);
+  #define macro_f_array_lengthss_t_decimate_by(status, lengths, amount) status = f_type_array_lengthss_decimate_by(amount, &lengths);
 #endif // _di_f_array_lengthss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_f_cells_t_
-  #define f_macro_cells_t_clear(cells) f_macro_memory_structure_clear(cells)
+  #define macro_f_cells_t_clear(cells) macro_f_memory_structure_clear(cells)
 
-  #define f_macro_cells_t_resize(status, cells, length) f_macro_memory_structure_resize(status, cells, f_cell_t, length)
-  #define f_macro_cells_t_adjust(status, cells, length) f_macro_memory_structure_adjust(status, cells, f_cell_t, length)
+  #define macro_f_cells_t_resize(status, cells, length) macro_f_memory_structure_resize(status, cells, f_cell_t, length)
+  #define macro_f_cells_t_adjust(status, cells, length) macro_f_memory_structure_adjust(status, cells, f_cell_t, length)
 
-  #define f_macro_cells_t_delete_simple(cells)  f_macro_memory_structure_delete_simple(cells, f_cell_t)
-  #define f_macro_cells_t_destroy_simple(cells) f_macro_memory_structure_destroy_simple(cells, f_cell_t)
+  #define macro_f_cells_t_delete_simple(cells)  macro_f_memory_structure_delete_simple(cells, f_cell_t)
+  #define macro_f_cells_t_destroy_simple(cells) macro_f_memory_structure_destroy_simple(cells, f_cell_t)
 
-  #define f_macro_cells_t_increase(status, cells)            f_macro_memory_structure_increase(status, cells, f_cell_t)
-  #define f_macro_cells_t_increase_by(status, cells, amount) f_macro_memory_structure_increase_by(status, cells, f_cell_t, amount)
-  #define f_macro_cells_t_decrease_by(status, cells, amount) f_macro_memory_structure_decrease_by(status, cells, f_cell_t, amount)
-  #define f_macro_cells_t_decimate_by(status, cells, amount) f_macro_memory_structure_decimate_by(status, cells, f_cell_t, amount)
+  #define macro_f_cells_t_increase(status, cells)            macro_f_memory_structure_increase(status, cells, f_cell_t)
+  #define macro_f_cells_t_increase_by(status, cells, amount) macro_f_memory_structure_increase_by(status, cells, f_cell_t, amount)
+  #define macro_f_cells_t_decrease_by(status, cells, amount) macro_f_memory_structure_decrease_by(status, cells, f_cell_t, amount)
+  #define macro_f_cells_t_decimate_by(status, cells, amount) macro_f_memory_structure_decimate_by(status, cells, f_cell_t, amount)
 #endif // _di_f_cells_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_f_cellss_t_
-  #define f_macro_cellss_t_clear(rangess) f_macro_memory_structures_clear(rangess)
+  #define macro_f_cellss_t_clear(rangess) macro_f_memory_structures_clear(rangess)
 
-  #define f_macro_cellss_t_resize(status, cellss, length) status = f_type_cellss_resize(length, &cellss);
-  #define f_macro_cellss_t_adjust(status, cellss, length) status = f_type_cellss_adjust(length, &cellss);
+  #define macro_f_cellss_t_resize(status, cellss, length) status = f_type_cellss_resize(length, &cellss);
+  #define macro_f_cellss_t_adjust(status, cellss, length) status = f_type_cellss_adjust(length, &cellss);
 
-  #define f_macro_cellss_t_delete_simple(cellss)  f_type_cellss_resize(0, &cellss);
-  #define f_macro_cellss_t_destroy_simple(cellss) f_type_cellss_adjust(0, &cellss);
+  #define macro_f_cellss_t_delete_simple(cellss)  f_type_cellss_resize(0, &cellss);
+  #define macro_f_cellss_t_destroy_simple(cellss) f_type_cellss_adjust(0, &cellss);
 
-  #define f_macro_cellss_t_increase(status, cellss)            status = f_type_cellss_increase(&cellss);
-  #define f_macro_cellss_t_increase_by(status, cellss, amount) status = f_type_cellss_increase(amount, &cellss);
-  #define f_macro_cellss_t_decrease_by(status, cellss, amount) status = f_type_cellss_decrease_by(amount, &cellss);
-  #define f_macro_cellss_t_decimate_by(status, cellss, amount) status = f_type_cellss_decimate_by(amount, &cellss);
+  #define macro_f_cellss_t_increase(status, cellss)            status = f_type_cellss_increase(&cellss);
+  #define macro_f_cellss_t_increase_by(status, cellss, amount) status = f_type_cellss_increase(amount, &cellss);
+  #define macro_f_cellss_t_decrease_by(status, cellss, amount) status = f_type_cellss_decrease_by(amount, &cellss);
+  #define macro_f_cellss_t_decimate_by(status, cellss, amount) status = f_type_cellss_decimate_by(amount, &cellss);
 #endif // _di_f_cellss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_f_array_t_int8_t_
-  #define f_macro_int8s_t_clear(int8s) f_macro_memory_structure_clear(int8s)
+  #define macro_f_int8s_t_clear(int8s) macro_f_memory_structure_clear(int8s)
 
-  #define f_macro_int8s_t_resize(status, int8s, length) f_macro_memory_structure_resize(status, int8s, int8_t, length)
-  #define f_macro_int8s_t_adjust(status, int8s, length) f_macro_memory_structure_adjust(status, int8s, int8_t, length)
+  #define macro_f_int8s_t_resize(status, int8s, length) macro_f_memory_structure_resize(status, int8s, int8_t, length)
+  #define macro_f_int8s_t_adjust(status, int8s, length) macro_f_memory_structure_adjust(status, int8s, int8_t, length)
 
-  #define f_macro_int8s_t_delete_simple(int8s)  f_macro_memory_structure_delete_simple(int8s, int8_t)
-  #define f_macro_int8s_t_destroy_simple(int8s) f_macro_memory_structure_destroy_simple(int8s, int8_t)
+  #define macro_f_int8s_t_delete_simple(int8s)  macro_f_memory_structure_delete_simple(int8s, int8_t)
+  #define macro_f_int8s_t_destroy_simple(int8s) macro_f_memory_structure_destroy_simple(int8s, int8_t)
 
-  #define f_macro_int8s_t_increase(status, int8s)            f_macro_memory_structure_increase(status, int8s, int8_t)
-  #define f_macro_int8s_t_increase_by(status, int8s, amount) f_macro_memory_structure_increase_by(status, int8s, int8_t, amount)
-  #define f_macro_int8s_t_decrease_by(status, int8s, amount) f_macro_memory_structure_decrease_by(status, int8s, int8_t, amount)
-  #define f_macro_int8s_t_decimate_by(status, int8s, amount) f_macro_memory_structure_decimate_by(status, int8s, int8_t, amount)
+  #define macro_f_int8s_t_increase(status, int8s)            macro_f_memory_structure_increase(status, int8s, int8_t)
+  #define macro_f_int8s_t_increase_by(status, int8s, amount) macro_f_memory_structure_increase_by(status, int8s, int8_t, amount)
+  #define macro_f_int8s_t_decrease_by(status, int8s, amount) macro_f_memory_structure_decrease_by(status, int8s, int8_t, amount)
+  #define macro_f_int8s_t_decimate_by(status, int8s, amount) macro_f_memory_structure_decimate_by(status, int8s, int8_t, amount)
 #endif // _di_int8s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int8ss_t_
-  #define f_macro_int8ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_int8ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_int8ss_t_resize(status, int8ss, length) status = f_type_int8ss_resize(length, &int8ss);
-  #define f_macro_int8ss_t_adjust(status, int8ss, length) status = f_type_int8ss_adjust(length, &int8ss);
+  #define macro_f_int8ss_t_resize(status, int8ss, length) status = f_type_int8ss_resize(length, &int8ss);
+  #define macro_f_int8ss_t_adjust(status, int8ss, length) status = f_type_int8ss_adjust(length, &int8ss);
 
-  #define f_macro_int8ss_t_increase(status, int8ss)            status = f_type_int8ss_increase(&int8ss);
-  #define f_macro_int8ss_t_increase_by(status, int8ss, amount) status = f_type_int8ss_increase(amount, &int8ss);
-  #define f_macro_int8ss_t_decrease_by(status, int8ss, amount) status = f_type_int8ss_decrease_by(amount, &int8ss);
-  #define f_macro_int8ss_t_decimate_by(status, int8ss, amount) status = f_type_int8ss_decimate_by(amount, &int8ss);
+  #define macro_f_int8ss_t_increase(status, int8ss)            status = f_type_int8ss_increase(&int8ss);
+  #define macro_f_int8ss_t_increase_by(status, int8ss, amount) status = f_type_int8ss_increase(amount, &int8ss);
+  #define macro_f_int8ss_t_decrease_by(status, int8ss, amount) status = f_type_int8ss_decrease_by(amount, &int8ss);
+  #define macro_f_int8ss_t_decimate_by(status, int8ss, amount) status = f_type_int8ss_decimate_by(amount, &int8ss);
 
-  #define f_macro_int8ss_t_delete_simple(int8ss)  f_type_int8ss_resize(0, &int8ss);
-  #define f_macro_int8ss_t_destroy_simple(int8ss) f_type_int8ss_adjust(0, &int8ss);
+  #define macro_f_int8ss_t_delete_simple(int8ss)  f_type_int8ss_resize(0, &int8ss);
+  #define macro_f_int8ss_t_destroy_simple(int8ss) f_type_int8ss_adjust(0, &int8ss);
 #endif // _di_int8ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint8s_t_
-  #define f_macro_uint8s_t_clear(uint8s) f_macro_memory_structure_clear(uint8s)
+  #define macro_f_uint8s_t_clear(uint8s) macro_f_memory_structure_clear(uint8s)
 
-  #define f_macro_uint8s_t_resize(status, uint8s, length) f_macro_memory_structure_resize(status, uint8s, uint8_t, length)
-  #define f_macro_uint8s_t_adjust(status, uint8s, length) f_macro_memory_structure_adjust(status, uint8s, uint8_t, length)
+  #define macro_f_uint8s_t_resize(status, uint8s, length) macro_f_memory_structure_resize(status, uint8s, uint8_t, length)
+  #define macro_f_uint8s_t_adjust(status, uint8s, length) macro_f_memory_structure_adjust(status, uint8s, uint8_t, length)
 
-  #define f_macro_uint8s_t_increase(status, uint8s)            f_macro_memory_structure_increase(status, uint8s, uint8_t)
-  #define f_macro_uint8s_t_increase_by(status, uint8s, amount) f_macro_memory_structure_increase_by(status, uint8s, uint8_t, amount)
-  #define f_macro_uint8s_t_decrease_by(status, uint8s, amount) f_macro_memory_structure_decrease_by(status, uint8s, uint8_t, amount)
-  #define f_macro_uint8s_t_decimate_by(status, uint8s, amount) f_macro_memory_structure_decimate_by(status, uint8s, uint8_t, amount)
+  #define macro_f_uint8s_t_increase(status, uint8s)            macro_f_memory_structure_increase(status, uint8s, uint8_t)
+  #define macro_f_uint8s_t_increase_by(status, uint8s, amount) macro_f_memory_structure_increase_by(status, uint8s, uint8_t, amount)
+  #define macro_f_uint8s_t_decrease_by(status, uint8s, amount) macro_f_memory_structure_decrease_by(status, uint8s, uint8_t, amount)
+  #define macro_f_uint8s_t_decimate_by(status, uint8s, amount) macro_f_memory_structure_decimate_by(status, uint8s, uint8_t, amount)
 
-  #define f_macro_uint8s_t_delete_simple(uint8s)  f_macro_memory_structure_delete_simple(uint8s, uint8_t)
-  #define f_macro_uint8s_t_destroy_simple(uint8s) f_macro_memory_structure_destroy_simple(uint8s, uint8_t)
+  #define macro_f_uint8s_t_delete_simple(uint8s)  macro_f_memory_structure_delete_simple(uint8s, uint8_t)
+  #define macro_f_uint8s_t_destroy_simple(uint8s) macro_f_memory_structure_destroy_simple(uint8s, uint8_t)
 #endif // _di_uint8s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint8ss_t_
-  #define f_macro_uint8ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_uint8ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_uint8ss_t_resize(status, uint8ss, length) status = f_type_uint8ss_resize(length, &uint8ss);
-  #define f_macro_uint8ss_t_adjust(status, uint8ss, length) status = f_type_uint8ss_adjust(length, &uint8ss);
+  #define macro_f_uint8ss_t_resize(status, uint8ss, length) status = f_type_uint8ss_resize(length, &uint8ss);
+  #define macro_f_uint8ss_t_adjust(status, uint8ss, length) status = f_type_uint8ss_adjust(length, &uint8ss);
 
-  #define f_macro_uint8ss_t_delete_simple(uint8ss)  f_type_uint8ss_resize(0, &uint8ss);
-  #define f_macro_uint8ss_t_destroy_simple(uint8ss) f_type_uint8ss_adjust(0, &uint8ss);
+  #define macro_f_uint8ss_t_delete_simple(uint8ss)  f_type_uint8ss_resize(0, &uint8ss);
+  #define macro_f_uint8ss_t_destroy_simple(uint8ss) f_type_uint8ss_adjust(0, &uint8ss);
 
-  #define f_macro_uint8ss_t_increase(status, uint8ss)            status = f_type_uint8ss_increase(&uint8ss);
-  #define f_macro_uint8ss_t_increase_by(status, uint8ss, amount) status = f_type_uint8ss_increase(amount, &uint8ss);
-  #define f_macro_uint8ss_t_decrease_by(status, uint8ss, amount) status = f_type_uint8ss_decrease_by(amount, &uint8ss);
-  #define f_macro_uint8ss_t_decimate_by(status, uint8ss, amount) status = f_type_uint8ss_decimate_by(amount, &uint8ss);
+  #define macro_f_uint8ss_t_increase(status, uint8ss)            status = f_type_uint8ss_increase(&uint8ss);
+  #define macro_f_uint8ss_t_increase_by(status, uint8ss, amount) status = f_type_uint8ss_increase(amount, &uint8ss);
+  #define macro_f_uint8ss_t_decrease_by(status, uint8ss, amount) status = f_type_uint8ss_decrease_by(amount, &uint8ss);
+  #define macro_f_uint8ss_t_decimate_by(status, uint8ss, amount) status = f_type_uint8ss_decimate_by(amount, &uint8ss);
 #endif // _di_uint8ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int16s_t_
-  #define f_macro_int16s_t_clear(int16s) f_macro_memory_structure_clear(int16s)
+  #define macro_f_int16s_t_clear(int16s) macro_f_memory_structure_clear(int16s)
 
-  #define f_macro_int16s_t_resize(status, int16s, length) f_macro_memory_structure_resize(status, int16s, int16_t, length)
-  #define f_macro_int16s_t_adjust(status, int16s, length) f_macro_memory_structure_adjust(status, int16s, int16_t, length)
+  #define macro_f_int16s_t_resize(status, int16s, length) macro_f_memory_structure_resize(status, int16s, int16_t, length)
+  #define macro_f_int16s_t_adjust(status, int16s, length) macro_f_memory_structure_adjust(status, int16s, int16_t, length)
 
-  #define f_macro_int16s_t_delete_simple(int16s)  f_macro_memory_structure_delete_simple(int16s, int16_t)
-  #define f_macro_int16s_t_destroy_simple(int16s) f_macro_memory_structure_destroy_simple(int16s, int16_t)
+  #define macro_f_int16s_t_delete_simple(int16s)  macro_f_memory_structure_delete_simple(int16s, int16_t)
+  #define macro_f_int16s_t_destroy_simple(int16s) macro_f_memory_structure_destroy_simple(int16s, int16_t)
 
-  #define f_macro_int16s_t_increase(status, int16s)            f_macro_memory_structure_increase(status, int16s, int16_t)
-  #define f_macro_int16s_t_increase_by(status, int16s, amount) f_macro_memory_structure_increase_by(status, int16s, int16_t, amount)
-  #define f_macro_int16s_t_decrease_by(status, int16s, amount) f_macro_memory_structure_decrease_by(status, int16s, int16_t, amount)
-  #define f_macro_int16s_t_decimate_by(status, int16s, amount) f_macro_memory_structure_decimate_by(status, int16s, int16_t, amount)
+  #define macro_f_int16s_t_increase(status, int16s)            macro_f_memory_structure_increase(status, int16s, int16_t)
+  #define macro_f_int16s_t_increase_by(status, int16s, amount) macro_f_memory_structure_increase_by(status, int16s, int16_t, amount)
+  #define macro_f_int16s_t_decrease_by(status, int16s, amount) macro_f_memory_structure_decrease_by(status, int16s, int16_t, amount)
+  #define macro_f_int16s_t_decimate_by(status, int16s, amount) macro_f_memory_structure_decimate_by(status, int16s, int16_t, amount)
 #endif // _di_int16s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int16ss_t_
-  #define f_macro_int16ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_int16ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_int16ss_t_resize(status, int16ss, length) status = f_type_int16ss_resize(length, &int16ss);
-  #define f_macro_int16ss_t_adjust(status, int16ss, length) status = f_type_int16ss_adjust(length, &int16ss);
+  #define macro_f_int16ss_t_resize(status, int16ss, length) status = f_type_int16ss_resize(length, &int16ss);
+  #define macro_f_int16ss_t_adjust(status, int16ss, length) status = f_type_int16ss_adjust(length, &int16ss);
 
-  #define f_macro_int16ss_t_increase(status, int16ss)            status = f_type_int16ss_increase(&int16ss);
-  #define f_macro_int16ss_t_increase_by(status, int16ss, amount) status = f_type_int16ss_increase(amount, &int16ss);
-  #define f_macro_int16ss_t_decrease_by(status, int16ss, amount) status = f_type_int16ss_decrease_by(amount, &int16ss);
-  #define f_macro_int16ss_t_decimate_by(status, int16ss, amount) status = f_type_int16ss_decimate_by(amount, &int16ss);
+  #define macro_f_int16ss_t_increase(status, int16ss)            status = f_type_int16ss_increase(&int16ss);
+  #define macro_f_int16ss_t_increase_by(status, int16ss, amount) status = f_type_int16ss_increase(amount, &int16ss);
+  #define macro_f_int16ss_t_decrease_by(status, int16ss, amount) status = f_type_int16ss_decrease_by(amount, &int16ss);
+  #define macro_f_int16ss_t_decimate_by(status, int16ss, amount) status = f_type_int16ss_decimate_by(amount, &int16ss);
 
-  #define f_macro_int16ss_t_delete_simple(int16ss)  f_type_int16ss_resize(0, &int16ss);
-  #define f_macro_int16ss_t_destroy_simple(int16ss) f_type_int16ss_adjust(0, &int16ss);
+  #define macro_f_int16ss_t_delete_simple(int16ss)  f_type_int16ss_resize(0, &int16ss);
+  #define macro_f_int16ss_t_destroy_simple(int16ss) f_type_int16ss_adjust(0, &int16ss);
 #endif // _di_int16ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint16s_t_
-  #define f_macro_uint16s_t_clear(uint16s) f_macro_memory_structure_clear(uint16s)
+  #define macro_f_uint16s_t_clear(uint16s) macro_f_memory_structure_clear(uint16s)
 
-  #define f_macro_uint16s_t_resize(status, uint16s, length) f_macro_memory_structure_resize(status, uint16s, uint16_t, length)
-  #define f_macro_uint16s_t_adjust(status, uint16s, length) f_macro_memory_structure_adjust(status, uint16s, uint16_t, length)
+  #define macro_f_uint16s_t_resize(status, uint16s, length) macro_f_memory_structure_resize(status, uint16s, uint16_t, length)
+  #define macro_f_uint16s_t_adjust(status, uint16s, length) macro_f_memory_structure_adjust(status, uint16s, uint16_t, length)
 
-  #define f_macro_uint16s_t_delete_simple(uint16s)  f_macro_memory_structure_delete_simple(uint16s, uint16_t)
-  #define f_macro_uint16s_t_destroy_simple(uint16s) f_macro_memory_structure_destroy_simple(uint16s, uint16_t)
+  #define macro_f_uint16s_t_delete_simple(uint16s)  macro_f_memory_structure_delete_simple(uint16s, uint16_t)
+  #define macro_f_uint16s_t_destroy_simple(uint16s) macro_f_memory_structure_destroy_simple(uint16s, uint16_t)
 
-  #define f_macro_uint16s_t_increase(status, uint16s)            f_macro_memory_structure_increase(status, uint16s, uint16_t)
-  #define f_macro_uint16s_t_increase_by(status, uint16s, amount) f_macro_memory_structure_increase_by(status, uint16s, uint16_t, amount)
-  #define f_macro_uint16s_t_decrease_by(status, uint16s, amount) f_macro_memory_structure_decrease_by(status, uint16s, uint16_t, amount)
-  #define f_macro_uint16s_t_decimate_by(status, uint16s, amount) f_macro_memory_structure_decimate_by(status, uint16s, uint16_t, amount)
+  #define macro_f_uint16s_t_increase(status, uint16s)            macro_f_memory_structure_increase(status, uint16s, uint16_t)
+  #define macro_f_uint16s_t_increase_by(status, uint16s, amount) macro_f_memory_structure_increase_by(status, uint16s, uint16_t, amount)
+  #define macro_f_uint16s_t_decrease_by(status, uint16s, amount) macro_f_memory_structure_decrease_by(status, uint16s, uint16_t, amount)
+  #define macro_f_uint16s_t_decimate_by(status, uint16s, amount) macro_f_memory_structure_decimate_by(status, uint16s, uint16_t, amount)
 #endif // _di_uint16s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint16ss_t_
-  #define f_macro_uint16ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_uint16ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_uint16ss_t_resize(status, uint16ss, length) status = f_type_uint16ss_resize(length, &uint16ss);
-  #define f_macro_uint16ss_t_adjust(status, uint16ss, length) status = f_type_uint16ss_adjust(length, &uint16ss);
+  #define macro_f_uint16ss_t_resize(status, uint16ss, length) status = f_type_uint16ss_resize(length, &uint16ss);
+  #define macro_f_uint16ss_t_adjust(status, uint16ss, length) status = f_type_uint16ss_adjust(length, &uint16ss);
 
-  #define f_macro_uint16ss_t_delete_simple(uint16ss)  f_type_uint16ss_resize(0, &uint16ss);
-  #define f_macro_uint16ss_t_destroy_simple(uint16ss) f_type_uint16ss_adjust(0, &uint16ss);
+  #define macro_f_uint16ss_t_delete_simple(uint16ss)  f_type_uint16ss_resize(0, &uint16ss);
+  #define macro_f_uint16ss_t_destroy_simple(uint16ss) f_type_uint16ss_adjust(0, &uint16ss);
 
-  #define f_macro_uint16ss_t_increase(status, uint16ss)            status = f_type_uint16ss_increase(&uint16ss);
-  #define f_macro_uint16ss_t_increase_by(status, uint16ss, amount) status = f_type_uint16ss_increase(amount, &uint16ss);
-  #define f_macro_uint16ss_t_decrease_by(status, uint16ss, amount) status = f_type_uint16ss_decrease_by(amount, &uint16ss);
-  #define f_macro_uint16ss_t_decimate_by(status, uint16ss, amount) status = f_type_uint16ss_decimate_by(amount, &uint16ss);
+  #define macro_f_uint16ss_t_increase(status, uint16ss)            status = f_type_uint16ss_increase(&uint16ss);
+  #define macro_f_uint16ss_t_increase_by(status, uint16ss, amount) status = f_type_uint16ss_increase(amount, &uint16ss);
+  #define macro_f_uint16ss_t_decrease_by(status, uint16ss, amount) status = f_type_uint16ss_decrease_by(amount, &uint16ss);
+  #define macro_f_uint16ss_t_decimate_by(status, uint16ss, amount) status = f_type_uint16ss_decimate_by(amount, &uint16ss);
 #endif // _di_uint16ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int32s_t_
-  #define f_macro_int32s_t_clear(int32s) f_macro_memory_structure_clear(int32s)
+  #define macro_f_int32s_t_clear(int32s) macro_f_memory_structure_clear(int32s)
 
-  #define f_macro_int32s_t_resize(status, int32s, length) f_macro_memory_structure_resize(status, int32s, int32_t, length)
-  #define f_macro_int32s_t_adjust(status, int32s, length) f_macro_memory_structure_adjust(status, int32s, int32_t, length)
+  #define macro_f_int32s_t_resize(status, int32s, length) macro_f_memory_structure_resize(status, int32s, int32_t, length)
+  #define macro_f_int32s_t_adjust(status, int32s, length) macro_f_memory_structure_adjust(status, int32s, int32_t, length)
 
-  #define f_macro_int32s_t_delete_simple(int32s)  f_macro_memory_structure_delete_simple(int32s, int32_t)
-  #define f_macro_int32s_t_destroy_simple(int32s) f_macro_memory_structure_destroy_simple(int32s, int32_t)
+  #define macro_f_int32s_t_delete_simple(int32s)  macro_f_memory_structure_delete_simple(int32s, int32_t)
+  #define macro_f_int32s_t_destroy_simple(int32s) macro_f_memory_structure_destroy_simple(int32s, int32_t)
 
-  #define f_macro_int32s_t_increase(status, int32s)            f_macro_memory_structure_increase(status, int32s, int32_t)
-  #define f_macro_int32s_t_increase_by(status, int32s, amount) f_macro_memory_structure_increase_by(status, int32s, int32_t, amount)
-  #define f_macro_int32s_t_decrease_by(status, int32s, amount) f_macro_memory_structure_decrease_by(status, int32s, int32_t, amount)
-  #define f_macro_int32s_t_decimate_by(status, int32s, amount) f_macro_memory_structure_decimate_by(status, int32s, int32_t, amount)
+  #define macro_f_int32s_t_increase(status, int32s)            macro_f_memory_structure_increase(status, int32s, int32_t)
+  #define macro_f_int32s_t_increase_by(status, int32s, amount) macro_f_memory_structure_increase_by(status, int32s, int32_t, amount)
+  #define macro_f_int32s_t_decrease_by(status, int32s, amount) macro_f_memory_structure_decrease_by(status, int32s, int32_t, amount)
+  #define macro_f_int32s_t_decimate_by(status, int32s, amount) macro_f_memory_structure_decimate_by(status, int32s, int32_t, amount)
 #endif // _di_int32s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int32ss_t_
-  #define f_macro_int32ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_int32ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_int32ss_t_resize(status, int32ss, length) status = f_type_int32ss_resize(length, &int32ss);
-  #define f_macro_int32ss_t_adjust(status, int32ss, length) status = f_type_int32ss_adjust(length, &int32ss);
+  #define macro_f_int32ss_t_resize(status, int32ss, length) status = f_type_int32ss_resize(length, &int32ss);
+  #define macro_f_int32ss_t_adjust(status, int32ss, length) status = f_type_int32ss_adjust(length, &int32ss);
 
-  #define f_macro_int32ss_t_delete_simple(int32ss)  f_type_int32ss_resize(0, &int32ss);
-  #define f_macro_int32ss_t_destroy_simple(int32ss) f_type_int32ss_adjust(0, &int32ss);
+  #define macro_f_int32ss_t_delete_simple(int32ss)  f_type_int32ss_resize(0, &int32ss);
+  #define macro_f_int32ss_t_destroy_simple(int32ss) f_type_int32ss_adjust(0, &int32ss);
 
-  #define f_macro_int32ss_t_increase(status, int32ss)            status = f_type_int32ss_increase(&int32ss);
-  #define f_macro_int32ss_t_increase_by(status, int32ss, amount) status = f_type_int32ss_increase(amount, &int32ss);
-  #define f_macro_int32ss_t_decrease_by(status, int32ss, amount) status = f_type_int32ss_decrease_by(amount, &int32ss);
-  #define f_macro_int32ss_t_decimate_by(status, int32ss, amount) status = f_type_int32ss_decimate_by(amount, &int32ss);
+  #define macro_f_int32ss_t_increase(status, int32ss)            status = f_type_int32ss_increase(&int32ss);
+  #define macro_f_int32ss_t_increase_by(status, int32ss, amount) status = f_type_int32ss_increase(amount, &int32ss);
+  #define macro_f_int32ss_t_decrease_by(status, int32ss, amount) status = f_type_int32ss_decrease_by(amount, &int32ss);
+  #define macro_f_int32ss_t_decimate_by(status, int32ss, amount) status = f_type_int32ss_decimate_by(amount, &int32ss);
 #endif // _di_int32ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint32s_t_
-  #define f_macro_uint32s_t_clear(uint32s) f_macro_memory_structure_clear(uint32s)
+  #define macro_f_uint32s_t_clear(uint32s) macro_f_memory_structure_clear(uint32s)
 
-  #define f_macro_uint32s_t_resize(status, uint32s, length) f_macro_memory_structure_resize(status, uint32s, uint32_t, length)
-  #define f_macro_uint32s_t_adjust(status, uint32s, length) f_macro_memory_structure_adjust(status, uint32s, uint32_t, length)
+  #define macro_f_uint32s_t_resize(status, uint32s, length) macro_f_memory_structure_resize(status, uint32s, uint32_t, length)
+  #define macro_f_uint32s_t_adjust(status, uint32s, length) macro_f_memory_structure_adjust(status, uint32s, uint32_t, length)
 
-  #define f_macro_uint32s_t_delete_simple(uint32s)  f_macro_memory_structure_delete_simple(uint32s, uint32_t)
-  #define f_macro_uint32s_t_destroy_simple(uint32s) f_macro_memory_structure_destroy_simple(uint32s, uint32_t)
+  #define macro_f_uint32s_t_delete_simple(uint32s)  macro_f_memory_structure_delete_simple(uint32s, uint32_t)
+  #define macro_f_uint32s_t_destroy_simple(uint32s) macro_f_memory_structure_destroy_simple(uint32s, uint32_t)
 
-  #define f_macro_uint32s_t_increase(status, uint32s)            f_macro_memory_structure_increase(status, uint32s, uint32_t)
-  #define f_macro_uint32s_t_increase_by(status, uint32s, amount) f_macro_memory_structure_increase_by(status, uint32s, uint32_t, amount)
-  #define f_macro_uint32s_t_decrease_by(status, uint32s, amount) f_macro_memory_structure_decrease_by(status, uint32s, uint32_t, amount)
-  #define f_macro_uint32s_t_decimate_by(status, uint32s, amount) f_macro_memory_structure_decimate_by(status, uint32s, uint32_t, amount)
+  #define macro_f_uint32s_t_increase(status, uint32s)            macro_f_memory_structure_increase(status, uint32s, uint32_t)
+  #define macro_f_uint32s_t_increase_by(status, uint32s, amount) macro_f_memory_structure_increase_by(status, uint32s, uint32_t, amount)
+  #define macro_f_uint32s_t_decrease_by(status, uint32s, amount) macro_f_memory_structure_decrease_by(status, uint32s, uint32_t, amount)
+  #define macro_f_uint32s_t_decimate_by(status, uint32s, amount) macro_f_memory_structure_decimate_by(status, uint32s, uint32_t, amount)
 #endif // _di_uint32s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint32ss_t_
-  #define f_macro_uint32ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_uint32ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_uint32ss_t_resize(status, uint32ss, length) status = f_type_uint32ss_resize(length, &uint32ss);
-  #define f_macro_uint32ss_t_adjust(status, uint32ss, length) status = f_type_uint32ss_adjust(length, &uint32ss);
+  #define macro_f_uint32ss_t_resize(status, uint32ss, length) status = f_type_uint32ss_resize(length, &uint32ss);
+  #define macro_f_uint32ss_t_adjust(status, uint32ss, length) status = f_type_uint32ss_adjust(length, &uint32ss);
 
-  #define f_macro_uint32ss_t_delete_simple(uint32ss)  f_type_uint32ss_resize(0, &uint32ss);
-  #define f_macro_uint32ss_t_destroy_simple(uint32ss) f_type_uint32ss_adjust(0, &uint32ss);
+  #define macro_f_uint32ss_t_delete_simple(uint32ss)  f_type_uint32ss_resize(0, &uint32ss);
+  #define macro_f_uint32ss_t_destroy_simple(uint32ss) f_type_uint32ss_adjust(0, &uint32ss);
 
-  #define f_macro_uint32ss_t_increase(status, uint32ss)            status = f_type_uint32ss_increase(&uint32ss);
-  #define f_macro_uint32ss_t_increase_by(status, uint32ss, amount) status = f_type_uint32ss_increase(amount, &uint32ss);
-  #define f_macro_uint32ss_t_decrease_by(status, uint32ss, amount) status = f_type_uint32ss_decrease_by(amount, &uint32ss);
-  #define f_macro_uint32ss_t_decimate_by(status, uint32ss, amount) status = f_type_uint32ss_decimate_by(amount, &uint32ss);
+  #define macro_f_uint32ss_t_increase(status, uint32ss)            status = f_type_uint32ss_increase(&uint32ss);
+  #define macro_f_uint32ss_t_increase_by(status, uint32ss, amount) status = f_type_uint32ss_increase(amount, &uint32ss);
+  #define macro_f_uint32ss_t_decrease_by(status, uint32ss, amount) status = f_type_uint32ss_decrease_by(amount, &uint32ss);
+  #define macro_f_uint32ss_t_decimate_by(status, uint32ss, amount) status = f_type_uint32ss_decimate_by(amount, &uint32ss);
 #endif // _di_uint32ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int64s_t_
-  #define f_macro_int64s_t_clear(int64s) f_macro_memory_structure_clear(int64s)
+  #define macro_f_int64s_t_clear(int64s) macro_f_memory_structure_clear(int64s)
 
-  #define f_macro_int64s_t_adjust(status, int64s, length) f_macro_memory_structure_adjust(status, int64s, int64_t, length)
-  #define f_macro_int64s_t_resize(status, int64s, length) f_macro_memory_structure_resize(status, int64s, int64_t, length)
+  #define macro_f_int64s_t_adjust(status, int64s, length) macro_f_memory_structure_adjust(status, int64s, int64_t, length)
+  #define macro_f_int64s_t_resize(status, int64s, length) macro_f_memory_structure_resize(status, int64s, int64_t, length)
 
-  #define f_macro_int64s_t_delete_simple(int64s)  f_macro_memory_structure_delete_simple(int64s, int64_t)
-  #define f_macro_int64s_t_destroy_simple(int64s) f_macro_memory_structure_destroy_simple(int64s, int64_t)
+  #define macro_f_int64s_t_delete_simple(int64s)  macro_f_memory_structure_delete_simple(int64s, int64_t)
+  #define macro_f_int64s_t_destroy_simple(int64s) macro_f_memory_structure_destroy_simple(int64s, int64_t)
 
-  #define f_macro_int64s_t_increase(status, int64s)            f_macro_memory_structure_increase(status, int64s, int64_t)
-  #define f_macro_int64s_t_increase_by(status, int64s, amount) f_macro_memory_structure_increase_by(status, int64s, int64_t, amount)
-  #define f_macro_int64s_t_decrease_by(status, int64s, amount) f_macro_memory_structure_decrease_by(status, int64s, int64_t, amount)
-  #define f_macro_int64s_t_decimate_by(status, int64s, amount) f_macro_memory_structure_decimate_by(status, int64s, int64_t, amount)
+  #define macro_f_int64s_t_increase(status, int64s)            macro_f_memory_structure_increase(status, int64s, int64_t)
+  #define macro_f_int64s_t_increase_by(status, int64s, amount) macro_f_memory_structure_increase_by(status, int64s, int64_t, amount)
+  #define macro_f_int64s_t_decrease_by(status, int64s, amount) macro_f_memory_structure_decrease_by(status, int64s, int64_t, amount)
+  #define macro_f_int64s_t_decimate_by(status, int64s, amount) macro_f_memory_structure_decimate_by(status, int64s, int64_t, amount)
 #endif // _di_int64s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int64ss_t_
-  #define f_macro_int64ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_int64ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_int64ss_t_resize(status, int64ss, length) status = f_type_int64ss_resize(length, &int64ss);
-  #define f_macro_int64ss_t_adjust(status, int64ss, length) status = f_type_int64ss_adjust(length, &int64ss);
+  #define macro_f_int64ss_t_resize(status, int64ss, length) status = f_type_int64ss_resize(length, &int64ss);
+  #define macro_f_int64ss_t_adjust(status, int64ss, length) status = f_type_int64ss_adjust(length, &int64ss);
 
-  #define f_macro_int64ss_t_increase(status, int64ss)            status = f_type_int64ss_increase(&int64ss);
-  #define f_macro_int64ss_t_increase_by(status, int64ss, amount) status = f_type_int64ss_increase(amount, &int64ss);
-  #define f_macro_int64ss_t_decrease_by(status, int64ss, amount) status = f_type_int64ss_decrease_by(amount, &int64ss);
-  #define f_macro_int64ss_t_decimate_by(status, int64ss, amount) status = f_type_int64ss_decimate_by(amount, &int64ss);
+  #define macro_f_int64ss_t_increase(status, int64ss)            status = f_type_int64ss_increase(&int64ss);
+  #define macro_f_int64ss_t_increase_by(status, int64ss, amount) status = f_type_int64ss_increase(amount, &int64ss);
+  #define macro_f_int64ss_t_decrease_by(status, int64ss, amount) status = f_type_int64ss_decrease_by(amount, &int64ss);
+  #define macro_f_int64ss_t_decimate_by(status, int64ss, amount) status = f_type_int64ss_decimate_by(amount, &int64ss);
 
-  #define f_macro_int64ss_t_delete_simple(int64ss)  f_type_int64ss_resize(0, &int64ss);
-  #define f_macro_int64ss_t_destroy_simple(int64ss) f_type_int64ss_adjust(0, &int64ss);
+  #define macro_f_int64ss_t_delete_simple(int64ss)  f_type_int64ss_resize(0, &int64ss);
+  #define macro_f_int64ss_t_destroy_simple(int64ss) f_type_int64ss_adjust(0, &int64ss);
 #endif // _di_int64ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint64s_t_
-  #define f_macro_uint64s_t_clear(uint64s) f_macro_memory_structure_clear(uint64s)
+  #define macro_f_uint64s_t_clear(uint64s) macro_f_memory_structure_clear(uint64s)
 
-  #define f_macro_uint64s_t_adjust(status, uint64s, length) f_macro_memory_structure_adjust(status, uint64s, uint64_t, length)
-  #define f_macro_uint64s_t_resize(status, uint64s, length) f_macro_memory_structure_resize(status, uint64s, uint64_t, length)
+  #define macro_f_uint64s_t_adjust(status, uint64s, length) macro_f_memory_structure_adjust(status, uint64s, uint64_t, length)
+  #define macro_f_uint64s_t_resize(status, uint64s, length) macro_f_memory_structure_resize(status, uint64s, uint64_t, length)
 
-  #define f_macro_uint64s_t_delete_simple(uint64s)  f_macro_memory_structure_delete_simple(uint64s, uint64_t)
-  #define f_macro_uint64s_t_destroy_simple(uint64s) f_macro_memory_structure_destroy_simple(uint64s, uint64_t)
+  #define macro_f_uint64s_t_delete_simple(uint64s)  macro_f_memory_structure_delete_simple(uint64s, uint64_t)
+  #define macro_f_uint64s_t_destroy_simple(uint64s) macro_f_memory_structure_destroy_simple(uint64s, uint64_t)
 
-  #define f_macro_uint64s_t_increase(status, uint64s)            f_macro_memory_structure_increase(status, uint64s, uint64_t)
-  #define f_macro_uint64s_t_increase_by(status, uint64s, amount) f_macro_memory_structure_increase_by(status, uint64s, uint64_t, amount)
-  #define f_macro_uint64s_t_decrease_by(status, uint64s, amount) f_macro_memory_structure_decrease_by(status, uint64s, uint64_t, amount)
-  #define f_macro_uint64s_t_decimate_by(status, uint64s, amount) f_macro_memory_structure_decimate_by(status, uint64s, uint64_t, amount)
+  #define macro_f_uint64s_t_increase(status, uint64s)            macro_f_memory_structure_increase(status, uint64s, uint64_t)
+  #define macro_f_uint64s_t_increase_by(status, uint64s, amount) macro_f_memory_structure_increase_by(status, uint64s, uint64_t, amount)
+  #define macro_f_uint64s_t_decrease_by(status, uint64s, amount) macro_f_memory_structure_decrease_by(status, uint64s, uint64_t, amount)
+  #define macro_f_uint64s_t_decimate_by(status, uint64s, amount) macro_f_memory_structure_decimate_by(status, uint64s, uint64_t, amount)
 #endif // _di_uint64s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint64ss_t_
-  #define f_macro_uint64ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_uint64ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_uint64ss_t_resize(status, uint64ss, length) status = f_type_uint64ss_resize(length, &uint64ss);
-  #define f_macro_uint64ss_t_adjust(status, uint64ss, length) status = f_type_uint64ss_adjust(length, &uint64ss);
+  #define macro_f_uint64ss_t_resize(status, uint64ss, length) status = f_type_uint64ss_resize(length, &uint64ss);
+  #define macro_f_uint64ss_t_adjust(status, uint64ss, length) status = f_type_uint64ss_adjust(length, &uint64ss);
 
-  #define f_macro_uint64ss_t_increase(status, uint64ss)            status = f_type_uint64ss_increase(&uint64ss);
-  #define f_macro_uint64ss_t_increase_by(status, uint64ss, amount) status = f_type_uint64ss_increase(amount, &uint64ss);
-  #define f_macro_uint64ss_t_decrease_by(status, uint64ss, amount) status = f_type_uint64ss_decrease_by(amount, &uint64ss);
-  #define f_macro_uint64ss_t_decimate_by(status, uint64ss, amount) status = f_type_uint64ss_decimate_by(amount, &uint64ss);
+  #define macro_f_uint64ss_t_increase(status, uint64ss)            status = f_type_uint64ss_increase(&uint64ss);
+  #define macro_f_uint64ss_t_increase_by(status, uint64ss, amount) status = f_type_uint64ss_increase(amount, &uint64ss);
+  #define macro_f_uint64ss_t_decrease_by(status, uint64ss, amount) status = f_type_uint64ss_decrease_by(amount, &uint64ss);
+  #define macro_f_uint64ss_t_decimate_by(status, uint64ss, amount) status = f_type_uint64ss_decimate_by(amount, &uint64ss);
 
-  #define f_macro_uint64ss_t_delete_simple(uint64ss)  f_type_uint64ss_resize(0, &uint64ss);
-  #define f_macro_uint64ss_t_destroy_simple(uint64ss) f_type_uint64ss_adjust(0, &uint64ss);
+  #define macro_f_uint64ss_t_delete_simple(uint64ss)  f_type_uint64ss_resize(0, &uint64ss);
+  #define macro_f_uint64ss_t_destroy_simple(uint64ss) f_type_uint64ss_adjust(0, &uint64ss);
 #endif // _di_uint64ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int128s_t_
-  #define f_macro_int128s_t_clear(int128s) f_macro_memory_structure_clear(int128s)
+  #define macro_f_int128s_t_clear(int128s) macro_f_memory_structure_clear(int128s)
 
-  #define f_macro_int128s_t_adjust(status, int128s, length) f_macro_memory_structure_adjust(status, int128s, f_int128_t, length)
-  #define f_macro_int128s_t_resize(status, int128s, length) f_macro_memory_structure_resize(status, int128s, f_int128_t, length)
+  #define macro_f_int128s_t_adjust(status, int128s, length) macro_f_memory_structure_adjust(status, int128s, f_int128_t, length)
+  #define macro_f_int128s_t_resize(status, int128s, length) macro_f_memory_structure_resize(status, int128s, f_int128_t, length)
 
-  #define f_macro_int128s_t_delete_simple(int128s)  f_macro_memory_structure_delete_simple(int128s, f_int128_t)
-  #define f_macro_int128s_t_destroy_simple(int128s) f_macro_memory_structure_destroy_simple(int128s, f_int128_t)
+  #define macro_f_int128s_t_delete_simple(int128s)  macro_f_memory_structure_delete_simple(int128s, f_int128_t)
+  #define macro_f_int128s_t_destroy_simple(int128s) macro_f_memory_structure_destroy_simple(int128s, f_int128_t)
 
-  #define f_macro_int128s_t_increase(status, int128s)            f_macro_memory_structure_increase(status, int128s, f_int128_t)
-  #define f_macro_int128s_t_increase_by(status, int128s, amount) f_macro_memory_structure_increase_by(status, int128s, f_int128_t, amount)
-  #define f_macro_int128s_t_decrease_by(status, int128s, amount) f_macro_memory_structure_decrease_by(status, int128s, f_int128_t, amount)
-  #define f_macro_int128s_t_decimate_by(status, int128s, amount) f_macro_memory_structure_decimate_by(status, int128s, f_int128_t, amount)
+  #define macro_f_int128s_t_increase(status, int128s)            macro_f_memory_structure_increase(status, int128s, f_int128_t)
+  #define macro_f_int128s_t_increase_by(status, int128s, amount) macro_f_memory_structure_increase_by(status, int128s, f_int128_t, amount)
+  #define macro_f_int128s_t_decrease_by(status, int128s, amount) macro_f_memory_structure_decrease_by(status, int128s, f_int128_t, amount)
+  #define macro_f_int128s_t_decimate_by(status, int128s, amount) macro_f_memory_structure_decimate_by(status, int128s, f_int128_t, amount)
 #endif // _di_int128s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_int128ss_t_
-  #define f_macro_int128ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_int128ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_int128ss_t_resize(status, int128ss, length) status = f_type_int128ss_resize(length, &int128ss);
-  #define f_macro_int128ss_t_adjust(status, int128ss, length) status = f_type_int128ss_adjust(length, &int128ss);
+  #define macro_f_int128ss_t_resize(status, int128ss, length) status = f_type_int128ss_resize(length, &int128ss);
+  #define macro_f_int128ss_t_adjust(status, int128ss, length) status = f_type_int128ss_adjust(length, &int128ss);
 
-  #define f_macro_int128ss_t_delete_simple(int128ss)  f_type_int128ss_resize(0, &int128ss);
-  #define f_macro_int128ss_t_destroy_simple(int128ss) f_type_int128ss_adjust(0, &int128ss);
+  #define macro_f_int128ss_t_delete_simple(int128ss)  f_type_int128ss_resize(0, &int128ss);
+  #define macro_f_int128ss_t_destroy_simple(int128ss) f_type_int128ss_adjust(0, &int128ss);
 
-  #define f_macro_int128ss_t_increase(status, int128ss)            status = f_type_int128ss_increase(&int128ss);
-  #define f_macro_int128ss_t_increase_by(status, int128ss, amount) status = f_type_int128ss_increase(amount, &int128ss);
-  #define f_macro_int128ss_t_decrease_by(status, int128ss, amount) status = f_type_int128ss_decrease_by(amount, &int128ss);
-  #define f_macro_int128ss_t_decimate_by(status, int128ss, amount) status = f_type_int128ss_decimate_by(amount, &int128ss);
+  #define macro_f_int128ss_t_increase(status, int128ss)            status = f_type_int128ss_increase(&int128ss);
+  #define macro_f_int128ss_t_increase_by(status, int128ss, amount) status = f_type_int128ss_increase(amount, &int128ss);
+  #define macro_f_int128ss_t_decrease_by(status, int128ss, amount) status = f_type_int128ss_decrease_by(amount, &int128ss);
+  #define macro_f_int128ss_t_decimate_by(status, int128ss, amount) status = f_type_int128ss_decimate_by(amount, &int128ss);
 #endif // _di_int128ss_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint128s_t_
-  #define f_macro_uint128s_t_clear(uint128s) f_macro_memory_structure_clear(uint128s)
+  #define macro_f_uint128s_t_clear(uint128s) macro_f_memory_structure_clear(uint128s)
 
-  #define f_macro_uint128s_t_adjust(status, uint128s, length) f_macro_memory_structure_adjust(status, uint128s, f_uint128_t, length)
-  #define f_macro_uint128s_t_resize(status, uint128s, length) f_macro_memory_structure_resize(status, uint128s, f_uint128_t, length)
+  #define macro_f_uint128s_t_adjust(status, uint128s, length) macro_f_memory_structure_adjust(status, uint128s, f_uint128_t, length)
+  #define macro_f_uint128s_t_resize(status, uint128s, length) macro_f_memory_structure_resize(status, uint128s, f_uint128_t, length)
 
-  #define f_macro_uint128s_t_delete_simple(uint128s)  f_macro_memory_structure_delete_simple(uint128s, f_uint128_t)
-  #define f_macro_uint128s_t_destroy_simple(uint128s) f_macro_memory_structure_destroy_simple(uint128s, f_uint128_t)
+  #define macro_f_uint128s_t_delete_simple(uint128s)  macro_f_memory_structure_delete_simple(uint128s, f_uint128_t)
+  #define macro_f_uint128s_t_destroy_simple(uint128s) macro_f_memory_structure_destroy_simple(uint128s, f_uint128_t)
 
-  #define f_macro_uint128s_t_increase(status, uint128s)            f_macro_memory_structure_increase(status, uint128s, f_uint128_t)
-  #define f_macro_uint128s_t_increase_by(status, uint128s, amount) f_macro_memory_structure_increase_by(status, uint128s, f_uint128_t, amount)
-  #define f_macro_uint128s_t_decrease_by(status, uint128s, amount) f_macro_memory_structure_decrease_by(status, uint128s, f_uint128_t, amount)
-  #define f_macro_uint128s_t_decimate_by(status, uint128s, amount) f_macro_memory_structure_decimate_by(status, uint128s, f_uint128_t, amount)
+  #define macro_f_uint128s_t_increase(status, uint128s)            macro_f_memory_structure_increase(status, uint128s, f_uint128_t)
+  #define macro_f_uint128s_t_increase_by(status, uint128s, amount) macro_f_memory_structure_increase_by(status, uint128s, f_uint128_t, amount)
+  #define macro_f_uint128s_t_decrease_by(status, uint128s, amount) macro_f_memory_structure_decrease_by(status, uint128s, f_uint128_t, amount)
+  #define macro_f_uint128s_t_decimate_by(status, uint128s, amount) macro_f_memory_structure_decimate_by(status, uint128s, f_uint128_t, amount)
 #endif // _di_uint128s_t_
 
 /**
  * Macros for f_array_lengths_t, see type.h for typedefs.
  */
 #ifndef _di_uint128ss_t_
-  #define f_macro_uint128ss_t_clear(numbers) f_macro_memory_structures_clear(numbers)
+  #define macro_f_uint128ss_t_clear(numbers) macro_f_memory_structures_clear(numbers)
 
-  #define f_macro_uint128ss_t_resize(status, uint128ss, length) status = f_type_uint128ss_resize(length, &uint128ss);
-  #define f_macro_uint128ss_t_adjust(status, uint128ss, length) status = f_type_uint128ss_adjust(length, &uint128ss);
+  #define macro_f_uint128ss_t_resize(status, uint128ss, length) status = f_type_uint128ss_resize(length, &uint128ss);
+  #define macro_f_uint128ss_t_adjust(status, uint128ss, length) status = f_type_uint128ss_adjust(length, &uint128ss);
 
-  #define f_macro_uint128ss_t_delete_simple(uint128ss)  f_type_uint128ss_resize(0, &uint128ss);
-  #define f_macro_uint128ss_t_destroy_simple(uint128ss) f_type_uint128ss_adjust(0, &uint128ss);
+  #define macro_f_uint128ss_t_delete_simple(uint128ss)  f_type_uint128ss_resize(0, &uint128ss);
+  #define macro_f_uint128ss_t_destroy_simple(uint128ss) f_type_uint128ss_adjust(0, &uint128ss);
 
-  #define f_macro_uint128ss_t_increase(status, uint128ss)            status = f_type_uint128ss_increase(&uint128ss);
-  #define f_macro_uint128ss_t_increase_by(status, uint128ss, amount) status = f_type_uint128ss_increase(amount, &uint128ss);
-  #define f_macro_uint128ss_t_decrease_by(status, uint128ss, amount) status = f_type_uint128ss_decrease_by(amount, &uint128ss);
-  #define f_macro_uint128ss_t_decimate_by(status, uint128ss, amount) status = f_type_uint128ss_decimate_by(amount, &uint128ss);
+  #define macro_f_uint128ss_t_increase(status, uint128ss)            status = f_type_uint128ss_increase(&uint128ss);
+  #define macro_f_uint128ss_t_increase_by(status, uint128ss, amount) status = f_type_uint128ss_increase(amount, &uint128ss);
+  #define macro_f_uint128ss_t_decrease_by(status, uint128ss, amount) status = f_type_uint128ss_decrease_by(amount, &uint128ss);
+  #define macro_f_uint128ss_t_decimate_by(status, uint128ss, amount) status = f_type_uint128ss_decimate_by(amount, &uint128ss);
 #endif // _di_uint128ss_t_
 
 #ifdef __cplusplus
index 9536dee55d0d468f5b31a643da400abb69e862ad..4bd0a9b548b89936d3ab3a2aa06b159bb0fb364f 100644 (file)
@@ -146,7 +146,7 @@ extern "C" {
   f_status_t private_f_utf_character_is_ascii(const f_utf_character_t character, const uint8_t width) {
 
     if (!width) {
-      const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+      const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
       if (byte_first >= 0x00 && byte_first <= 0x7f) {
         return F_true;
@@ -284,7 +284,7 @@ extern "C" {
     }
 
     // reduce the number of checks by grouping checks by first byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
     if (width == 3) {
       uint16_t bytes = (uint16_t) ((character & 0x00ffff00) >> 8);
@@ -467,7 +467,7 @@ extern "C" {
     }
 
     // reduce the number of checks by grouping checks by first byte.
-    const uint8_t byte_second = f_macro_utf_character_t_to_char_2(character);
+    const uint8_t byte_second = macro_f_utf_character_t_to_char_2(character);
 
     if (width == 4) {
       uint16_t bytes = (uint16_t) ((character & 0xffff0000) >> 16);
@@ -636,7 +636,7 @@ extern "C" {
   f_status_t private_f_utf_character_is_emoji(const f_utf_character_t character, const uint8_t width) {
 
     // reduce the number of checks by grouping checks by first byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
     if (width == 2) {
 
@@ -1182,9 +1182,9 @@ extern "C" {
     }
 
     // reduce the number of checks by grouping checks by byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
-    const uint8_t byte_second = f_macro_utf_character_t_to_char_2(character);
-    const uint8_t byte_third = f_macro_utf_character_t_to_char_3(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
+    const uint8_t byte_second = macro_f_utf_character_t_to_char_2(character);
+    const uint8_t byte_third = macro_f_utf_character_t_to_char_3(character);
 
     if (width == 3) {
       if (byte_first >= 0xe0 && byte_first <= 0xef) {
@@ -1200,7 +1200,7 @@ extern "C" {
       return F_false;
     }
 
-    const uint8_t byte_fourth = f_macro_utf_character_t_to_char_4(character);
+    const uint8_t byte_fourth = macro_f_utf_character_t_to_char_4(character);
 
     if (width == 4) {
       if (byte_first == 0xf3) {
@@ -1236,7 +1236,7 @@ extern "C" {
   f_status_t private_f_utf_character_is_punctuation(const f_utf_character_t character, const uint8_t width) {
 
     // reduce the number of checks by grouping checks by first byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
     if (width == 2) {
 
@@ -1661,7 +1661,7 @@ extern "C" {
       }
     }
     else if (width == 4) {
-      uint8_t byte_second = f_macro_utf_character_t_to_char_2(character);
+      uint8_t byte_second = macro_f_utf_character_t_to_char_2(character);
 
       if (byte_first == 0xf0) {
         if (byte_second == 0x90) {
@@ -1903,7 +1903,7 @@ extern "C" {
   f_status_t private_f_utf_character_is_symbol(const f_utf_character_t character, const uint8_t width) {
 
     // reduce the number of checks by grouping checks by first byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
     // @todo: handle all Unicode "symbol".
 
@@ -1915,7 +1915,7 @@ extern "C" {
   f_status_t private_f_utf_character_is_unassigned(const f_utf_character_t character, const uint8_t width) {
 
     // reduce the number of checks by grouping checks by first byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
     // @todo: Basic Multilingual Plane
     // @todo: handle all unassigned UTF-8 spaces.
@@ -1934,7 +1934,7 @@ extern "C" {
   f_status_t private_f_utf_character_is_valid(const f_utf_character_t character, const uint8_t width) {
 
     // reduce the number of checks by grouping checks by byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
     if (!width) {
       if (byte_first >= 0x00 && byte_first <= 0x7f) {
@@ -1944,7 +1944,7 @@ extern "C" {
       return F_false;
     }
 
-    const uint8_t byte_second = f_macro_utf_character_t_to_char_2(character);
+    const uint8_t byte_second = macro_f_utf_character_t_to_char_2(character);
 
     if (width == 2) {
       if (byte_first >= 0xc2 && byte_first <= 0xdf) {
@@ -1956,7 +1956,7 @@ extern "C" {
       return F_false;
     }
 
-    const uint8_t byte_third = f_macro_utf_character_t_to_char_3(character);
+    const uint8_t byte_third = macro_f_utf_character_t_to_char_3(character);
 
     if (width == 3) {
       if (byte_first == 0xe0) {
@@ -1990,7 +1990,7 @@ extern "C" {
       }
     }
 
-    const uint8_t byte_fourth = f_macro_utf_character_t_to_char_4(character);
+    const uint8_t byte_fourth = macro_f_utf_character_t_to_char_4(character);
 
     if (width == 4) {
       if (byte_first == 0xf0) {
@@ -2045,7 +2045,7 @@ extern "C" {
     else if (width == 3) {
 
       // reduce the number of checks by grouping checks by first byte.
-      const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+      const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
       if (byte_first == 0xe2) {
 
@@ -2109,7 +2109,7 @@ extern "C" {
     if (width == 3) {
 
       // reduce the number of checks by grouping checks by first byte.
-      const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+      const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
       if (byte_first == 0xe2) {
 
@@ -2184,7 +2184,7 @@ extern "C" {
 #if !defined(_di_f_utf_character_is_zero_width_) || !defined(_di_f_utf_is_zero_width_)
   f_status_t private_f_utf_character_is_zero_width(const f_utf_character_t character, const uint8_t width) {
     // reduce the number of checks by grouping checks by first byte.
-    const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character);
+    const uint8_t byte_first = macro_f_utf_character_t_to_char_1(character);
 
     if (byte_first == 0xe1) {
 
index af1cec1b1c2519958574c53ae8498bc239b3770c..9a3139c2d42d61957f5d5b046b52147b8d1f2738 100644 (file)
@@ -28,10 +28,10 @@ extern "C" {
  * The f_utf_byte_1 is specifically used only on UTF-8 fragments.
  * For example, with the 2-byte-wide UTF-8 character '1100x xxxx 10yy yyyy', the 8-byte block '10yy yyyy' would be a fragment.
  *
- * The f_macro_utf_byte_is_* macros are used to determine a width of the character (either 1, 2, 3, or 4, respectively).
+ * The macro_f_utf_byte_is_* macros are used to determine a width of the character (either 1, 2, 3, or 4, respectively).
  *
- * The f_macro_utf_byte_width macro determines a width of the character.
- * The f_macro_utf_byte_width_is is identical to f_macro_utf_byte_width, except it returns 0 when character is not UTF-8.
+ * The macro_f_utf_byte_width macro determines a width of the character.
+ * The macro_f_utf_byte_width_is is identical to macro_f_utf_byte_width, except it returns 0 when character is not UTF-8.
  */
 #ifndef _di_f_utf_byte_
   #define f_utf_byte_1 0x80 // 1000 0000
@@ -44,15 +44,15 @@ extern "C" {
   #define f_utf_byte_off_3 0xf0 // 1111 0000
   #define f_utf_byte_off_4 0xf8 // 1111 1000
 
-  #define f_macro_utf_byte_is(character) ((character) & f_utf_byte_1)
+  #define macro_f_utf_byte_is(character) ((character) & f_utf_byte_1)
 
-  #define f_macro_utf_byte_is_1(character) (((character) & f_utf_byte_off_1) == f_utf_byte_1) // (10xx xxxx & 1100 0000) == 1000 0000
-  #define f_macro_utf_byte_is_2(character) (((character) & f_utf_byte_off_2) == f_utf_byte_2) // (110x xxxx & 1110 0000) == 1100 0000
-  #define f_macro_utf_byte_is_3(character) (((character) & f_utf_byte_off_3) == f_utf_byte_3) // (1110 xxxx & 1111 0000) == 1110 0000
-  #define f_macro_utf_byte_is_4(character) (((character) & f_utf_byte_off_4) == f_utf_byte_4) // (1111 0xxx & 1111 1000) == 1111 0000
+  #define macro_f_utf_byte_is_1(character) (((character) & f_utf_byte_off_1) == f_utf_byte_1) // (10xx xxxx & 1100 0000) == 1000 0000
+  #define macro_f_utf_byte_is_2(character) (((character) & f_utf_byte_off_2) == f_utf_byte_2) // (110x xxxx & 1110 0000) == 1100 0000
+  #define macro_f_utf_byte_is_3(character) (((character) & f_utf_byte_off_3) == f_utf_byte_3) // (1110 xxxx & 1111 0000) == 1110 0000
+  #define macro_f_utf_byte_is_4(character) (((character) & f_utf_byte_off_4) == f_utf_byte_4) // (1111 0xxx & 1111 1000) == 1111 0000
 
-  #define f_macro_utf_byte_width(character)    ((!f_macro_utf_byte_is(character) || f_macro_utf_byte_is_1(character)) ? 1 : (f_macro_utf_byte_is_2(character) ? 2 : (f_macro_utf_byte_is_3(character) ? 3 : 4)))
-  #define f_macro_utf_byte_width_is(character) (f_macro_utf_byte_is(character) ? (f_macro_utf_byte_is_1(character) ? 1 : (f_macro_utf_byte_is_2(character) ? 2 : (f_macro_utf_byte_is_3(character) ? 3 : 4))) : 0)
+  #define macro_f_utf_byte_width(character)    ((!macro_f_utf_byte_is(character) || macro_f_utf_byte_is_1(character)) ? 1 : (macro_f_utf_byte_is_2(character) ? 2 : (macro_f_utf_byte_is_3(character) ? 3 : 4)))
+  #define macro_f_utf_byte_width_is(character) (macro_f_utf_byte_is(character) ? (macro_f_utf_byte_is_1(character) ? 1 : (macro_f_utf_byte_is_2(character) ? 2 : (macro_f_utf_byte_is_3(character) ? 3 : 4))) : 0)
 #endif // _di_f_utf_byte_
 
 /**
@@ -155,16 +155,16 @@ extern "C" {
  *
  * The byte structure is intended to be read left to right.
  *
- * The f_macro_utf_character_t_mask_byte_* are used to get the entire character set fo a given width.
+ * The macro_f_utf_character_t_mask_byte_* are used to get the entire character set fo a given width.
  *
- * The f_macro_utf_character_t_mask_char_* are used to get a specific UTF-8 block as a single character range.
+ * The macro_f_utf_character_t_mask_char_* are used to get a specific UTF-8 block as a single character range.
  *
- * The f_macro_utf_character_t_to_char_* are used to convert a f_utf_character_t into a uint8_t, for a given 8-bit block.
+ * The macro_f_utf_character_t_to_char_* are used to convert a f_utf_character_t into a uint8_t, for a given 8-bit block.
  *
- * The f_macro_utf_character_t_from_char_* are used to convert a uint8_t into part of a f_utf_character_t, for a given 8-bit block.
+ * The macro_f_utf_character_t_from_char_* are used to convert a uint8_t into part of a f_utf_character_t, for a given 8-bit block.
  *
- * The f_macro_utf_character_t_width is used to determine the width of the UTF-8 character based on f_macro_utf_byte_width.
- * The f_macro_utf_character_t_width_is is used to determine the width of the UTF-8 character based on f_macro_utf_byte_width_is.
+ * The macro_f_utf_character_t_width is used to determine the width of the UTF-8 character based on macro_f_utf_byte_width.
+ * The macro_f_utf_character_t_width_is is used to determine the width of the UTF-8 character based on macro_f_utf_byte_width_is.
  *
  * @see f_utf_is_big_endian()
  */
@@ -181,18 +181,18 @@ extern "C" {
   #define f_utf_character_mask_char_3 0x0000ff00 // 0000 0000, 0000 0000, 1111 1111, 0000 0000
   #define f_utf_character_mask_char_4 0x000000ff // 0000 0000, 0000 0000, 0000 0000, 1111 1111
 
-  #define f_macro_utf_character_t_to_char_1(character) (((character) & f_utf_character_mask_char_1) >> 24) // grab first byte.
-  #define f_macro_utf_character_t_to_char_2(character) (((character) & f_utf_character_mask_char_2) >> 16) // grab second byte.
-  #define f_macro_utf_character_t_to_char_3(character) (((character) & f_utf_character_mask_char_3) >> 8)  // grab third byte.
-  #define f_macro_utf_character_t_to_char_4(character) ((character) & f_utf_character_mask_char_4)         // grab fourth byte.
+  #define macro_f_utf_character_t_to_char_1(character) (((character) & f_utf_character_mask_char_1) >> 24) // grab first byte.
+  #define macro_f_utf_character_t_to_char_2(character) (((character) & f_utf_character_mask_char_2) >> 16) // grab second byte.
+  #define macro_f_utf_character_t_to_char_3(character) (((character) & f_utf_character_mask_char_3) >> 8)  // grab third byte.
+  #define macro_f_utf_character_t_to_char_4(character) ((character) & f_utf_character_mask_char_4)         // grab fourth byte.
 
-  #define f_macro_utf_character_t_from_char_1(character) (((character) << 24) & f_utf_character_mask_char_1) // shift to first byte.
-  #define f_macro_utf_character_t_from_char_2(character) (((character) << 16) & f_utf_character_mask_char_2) // shift to second byte.
-  #define f_macro_utf_character_t_from_char_3(character) (((character) << 8) & f_utf_character_mask_char_3)  // shift to third byte.
-  #define f_macro_utf_character_t_from_char_4(character) ((character) & f_utf_character_mask_char_4)         // shift to fourth byte.
+  #define macro_f_utf_character_t_from_char_1(character) (((character) << 24) & f_utf_character_mask_char_1) // shift to first byte.
+  #define macro_f_utf_character_t_from_char_2(character) (((character) << 16) & f_utf_character_mask_char_2) // shift to second byte.
+  #define macro_f_utf_character_t_from_char_3(character) (((character) << 8) & f_utf_character_mask_char_3)  // shift to third byte.
+  #define macro_f_utf_character_t_from_char_4(character) ((character) & f_utf_character_mask_char_4)         // shift to fourth byte.
 
-  #define f_macro_utf_character_t_width(character)    (f_macro_utf_byte_width(f_macro_utf_character_t_to_char_1(character)))
-  #define f_macro_utf_character_t_width_is(character) (f_macro_utf_byte_width_is(f_macro_utf_character_t_to_char_1(character)))
+  #define macro_f_utf_character_t_width(character)    (macro_f_utf_byte_width(macro_f_utf_character_t_to_char_1(character)))
+  #define macro_f_utf_character_t_width_is(character) (macro_f_utf_byte_width_is(macro_f_utf_character_t_to_char_1(character)))
 #endif // _di_f_utf_character_t_
 
 #ifndef _di_f_utf_character_t_codes_
@@ -211,13 +211,13 @@ extern "C" {
 
   #define f_utf_string_t_initialize 0
 
-  #define f_macro_utf_string_t_clear(string) string = 0;
+  #define macro_f_utf_string_t_clear(string) string = 0;
 
-  #define f_macro_utf_string_t_resize(status, string, length_old, length_new) status = f_memory_resize(length_old, length_new, sizeof(f_utf_string_t), (void **) & string);
-  #define f_macro_utf_string_t_adjust(status, string, length_old, length_new) status = f_memory_adjust(length_old, length_new, sizeof(f_utf_string_t), (void **) & string);
+  #define macro_f_utf_string_t_resize(status, string, length_old, length_new) status = f_memory_resize(length_old, length_new, sizeof(f_utf_string_t), (void **) & string);
+  #define macro_f_utf_string_t_adjust(status, string, length_old, length_new) status = f_memory_adjust(length_old, length_new, sizeof(f_utf_string_t), (void **) & string);
 
-  #define f_macro_utf_string_t_delete_simple(string, length)  f_memory_resize(length, 0, sizeof(f_utf_string_t), (void **) & string);
-  #define f_macro_utf_string_t_destroy_simple(string, length) f_memory_adjust(length, 0, sizeof(f_utf_string_t), (void **) & string);
+  #define macro_f_utf_string_t_delete_simple(string, length)  f_memory_resize(length, 0, sizeof(f_utf_string_t), (void **) & string);
+  #define macro_f_utf_string_t_destroy_simple(string, length) f_memory_adjust(length, 0, sizeof(f_utf_string_t), (void **) & string);
 #endif // _di_f_utf_string_t_
 
 #ifdef __cplusplus
index 268a9b0c74b56b58a1597f97ef6491a7ec234c49..8632f85d40d48f66e6473df05012f995ec174d52 100644 (file)
@@ -18,7 +18,7 @@ extern "C" {
     uint8_t width = 0;
 
     do {
-      width = f_macro_utf_byte_width(buffer.string[range->start - 1]);
+      width = macro_f_utf_byte_width(buffer.string[range->start - 1]);
 
       if (width > range->start) {
         if (width > 1) {
@@ -49,7 +49,7 @@ extern "C" {
     uint8_t width = 0;
 
     do {
-      width = f_macro_utf_byte_width(buffer.string[range->start]);
+      width = macro_f_utf_byte_width(buffer.string[range->start]);
 
       if (range->start + width > range->stop) {
         if (width > 1) {
@@ -83,10 +83,10 @@ extern "C" {
       if (!character_utf) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
-      *character_utf = f_macro_utf_character_t_from_char_1(character[0]);
+      *character_utf = macro_f_utf_character_t_from_char_1(character[0]);
       return F_none;
     }
     else if (width == 1) {
@@ -97,25 +97,25 @@ extern "C" {
       return F_status_set_error(F_failure);
     }
 
-    *character_utf = f_macro_utf_character_t_from_char_1(character[0]);
+    *character_utf = macro_f_utf_character_t_from_char_1(character[0]);
 
     if (width < 2) {
       return F_none;
     }
 
-    *character_utf |= f_macro_utf_character_t_from_char_2(character[1]);
+    *character_utf |= macro_f_utf_character_t_from_char_2(character[1]);
 
     if (width == 2) {
       return F_none;
     }
 
-    *character_utf |= f_macro_utf_character_t_from_char_3(character[2]);
+    *character_utf |= macro_f_utf_character_t_from_char_3(character[2]);
 
     if (width == 3) {
       return F_none;
     }
 
-    *character_utf |= f_macro_utf_character_t_from_char_4(character[3]);
+    *character_utf |= macro_f_utf_character_t_from_char_4(character[3]);
 
     return F_none;
   }
@@ -123,7 +123,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_
   f_status_t f_utf_character_is(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
       return F_false;
@@ -139,10 +139,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_alpha_
   f_status_t f_utf_character_is_alpha(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isalpha(f_macro_utf_character_t_to_char_1(character))) {
+      if (isalpha(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -159,10 +159,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_alpha_digit_
   f_status_t f_utf_character_is_alpha_digit(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isalnum(f_macro_utf_character_t_to_char_1(character))) {
+      if (isalnum(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -179,10 +179,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_alpha_numeric_
   f_status_t f_utf_character_is_alpha_numeric(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isalnum(f_macro_utf_character_t_to_char_1(character))) {
+      if (isalnum(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -199,7 +199,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_ascii_
   f_status_t f_utf_character_is_ascii(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (width == 1) {
       return F_status_is_error(F_utf);
@@ -211,7 +211,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_combining_
   f_status_t f_utf_character_is_combining(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
       // There are no combining characters in ASCII.
@@ -232,10 +232,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_control_
   f_status_t f_utf_character_is_control(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (iscntrl(f_macro_utf_character_t_to_char_1(character))) {
+      if (iscntrl(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -252,7 +252,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_control_picture_
   f_status_t f_utf_character_is_control_picture(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
 
@@ -274,10 +274,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_digit_
   f_status_t f_utf_character_is_digit(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isdigit(f_macro_utf_character_t_to_char_1(character))) {
+      if (isdigit(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -294,10 +294,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_emoji_
   f_status_t f_utf_character_is_emoji(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isdigit(f_macro_utf_character_t_to_char_1(character))) {
+      if (isdigit(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -314,7 +314,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_fragment_
   f_status_t f_utf_character_is_fragment(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (width == 1) return F_true;
 
@@ -324,10 +324,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_graph_
   f_status_t f_utf_character_is_graph(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isgraph(f_macro_utf_character_t_to_char_1(character))) {
+      if (isgraph(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -356,10 +356,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_numeric_
   f_status_t f_utf_character_is_numeric(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isdigit(f_macro_utf_character_t_to_char_1(character))) {
+      if (isdigit(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -376,7 +376,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_phonetic_
   f_status_t f_utf_character_is_phonetic(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
 
@@ -394,7 +394,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_private_
   f_status_t f_utf_character_is_private(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
 
@@ -412,7 +412,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_punctuation_
   f_status_t f_utf_character_is_punctuation(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
 
@@ -459,7 +459,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_symbol_
   f_status_t f_utf_character_is_symbol(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
 
@@ -491,7 +491,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_unassigned_
   f_status_t f_utf_character_is_unassigned(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width || width == 1) {
       return F_false;
@@ -503,7 +503,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_valid_
   f_status_t f_utf_character_is_valid(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (width == 1) {
       return F_false;
@@ -515,10 +515,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_whitespace_
   f_status_t f_utf_character_is_whitespace(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isspace(f_macro_utf_character_t_to_char_1(character))) {
+      if (isspace(macro_f_utf_character_t_to_char_1(character))) {
         return F_true;
       }
 
@@ -535,7 +535,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_whitespace_modifier_
   f_status_t f_utf_character_is_whitespace_modifier(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
       // There are no ASCII whitespace modifiers.
@@ -552,7 +552,7 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_whitespace_other_
   f_status_t f_utf_character_is_whitespace_other(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
 
@@ -570,10 +570,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_word_
   f_status_t f_utf_character_is_word(const f_utf_character_t character, const bool strict) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isalnum(f_macro_utf_character_t_to_char_1(character)) || character == '_') {
+      if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == '_') {
         return F_true;
       }
 
@@ -590,10 +590,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_word_dash_
   f_status_t f_utf_character_is_word_dash(const f_utf_character_t character, const bool strict) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isalnum(f_macro_utf_character_t_to_char_1(character)) || character == '_' || character == '-') {
+      if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == '_' || character == '-') {
         return F_true;
       }
 
@@ -610,10 +610,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_word_dash_plus_
   f_status_t f_utf_character_is_word_dash_plus(const f_utf_character_t character, const bool strict) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      if (isalnum(f_macro_utf_character_t_to_char_1(character)) || character == '_' || character == '-' || character == '+') {
+      if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == '_' || character == '-' || character == '+') {
         return F_true;
       }
 
@@ -630,10 +630,10 @@ extern "C" {
 
 #ifndef _di_f_utf_character_is_zero_width_
   f_status_t f_utf_character_is_zero_width(const f_utf_character_t character) {
-    const uint8_t width = f_macro_utf_character_t_width_is(character);
+    const uint8_t width = macro_f_utf_character_t_width_is(character);
 
     if (!width) {
-      const uint8_t ascii = f_macro_utf_character_t_to_char_1(character);
+      const uint8_t ascii = macro_f_utf_character_t_to_char_1(character);
 
       // These control characters are considered zero-width spaces.
       if (ascii >= 0x00 && ascii <= 0x08) {
@@ -671,11 +671,11 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    uint8_t width = f_macro_utf_character_t_width_is(utf_character);
+    uint8_t width = macro_f_utf_character_t_width_is(utf_character);
 
     if (!width_max) {
-      f_macro_string_t_clear((*character))
-      f_macro_string_t_resize(status, (*character), 0, width)
+      macro_f_string_t_clear((*character))
+      macro_f_string_t_resize(status, (*character), 0, width)
       if (F_status_is_error(status)) return status;
 
       width = 1;
@@ -697,16 +697,16 @@ extern "C" {
       uint32_t utf = 0;
 
       if (width == 1) {
-        utf = f_macro_utf_character_t_to_char_1(utf_character) << 24;
+        utf = macro_f_utf_character_t_to_char_1(utf_character) << 24;
       }
       else if (width == 2) {
-        utf = (f_macro_utf_character_t_to_char_2(utf_character) << 24) | (f_macro_utf_character_t_to_char_1(utf_character) << 16);
+        utf = (macro_f_utf_character_t_to_char_2(utf_character) << 24) | (macro_f_utf_character_t_to_char_1(utf_character) << 16);
       }
       else if (width == 3) {
-        utf = (f_macro_utf_character_t_to_char_3(utf_character) << 24) | (f_macro_utf_character_t_to_char_2(utf_character) << 16) | (f_macro_utf_character_t_to_char_1(utf_character) << 8);
+        utf = (macro_f_utf_character_t_to_char_3(utf_character) << 24) | (macro_f_utf_character_t_to_char_2(utf_character) << 16) | (macro_f_utf_character_t_to_char_1(utf_character) << 8);
       }
       else if (width == 4) {
-        utf = (f_macro_utf_character_t_to_char_4(utf_character) << 24) | (f_macro_utf_character_t_to_char_3(utf_character) << 16) | (f_macro_utf_character_t_to_char_2(utf_character) << 8) | f_macro_utf_character_t_to_char_1(utf_character);
+        utf = (macro_f_utf_character_t_to_char_4(utf_character) << 24) | (macro_f_utf_character_t_to_char_3(utf_character) << 16) | (macro_f_utf_character_t_to_char_2(utf_character) << 8) | macro_f_utf_character_t_to_char_1(utf_character);
       }
 
       memcpy(*character, &utf, width);
@@ -735,7 +735,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       return F_false;
@@ -755,7 +755,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isalpha(*character)) {
@@ -789,7 +789,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isalnum(*character)) {
@@ -823,7 +823,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isalnum(*character)) {
@@ -857,7 +857,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (width == 1) {
       return F_status_is_error(F_complete_not_utf);
@@ -883,7 +883,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     // There are no ASCII combining characters.
     if (!width) {
@@ -914,7 +914,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (iscntrl(*character)) {
@@ -948,7 +948,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     // There are no ASCII control pictures.
     if (!width) {
@@ -979,7 +979,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isdigit(*character)) {
@@ -1013,7 +1013,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isdigit(*character)) {
@@ -1047,7 +1047,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (width == 1) {
       return F_true;
@@ -1063,7 +1063,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isgraph(*character)) {
@@ -1110,7 +1110,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isdigit(*character)) {
@@ -1144,7 +1144,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       // There are no ASCII phonetic characters.
@@ -1175,7 +1175,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       // There are no ASCII private characters.
@@ -1206,7 +1206,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
 
@@ -1267,7 +1267,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
 
@@ -1313,7 +1313,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width || width == 1) {
       return F_false;
@@ -1339,7 +1339,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (width == 1) {
       return F_false;
@@ -1365,7 +1365,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isspace(*character)) {
@@ -1399,7 +1399,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
 
@@ -1431,7 +1431,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
 
@@ -1463,7 +1463,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isalnum(*character) || *character == '_') {
@@ -1497,7 +1497,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isalnum(*character) || *character == '_' || *character == '-') {
@@ -1531,7 +1531,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
       if (isalnum(*character) || *character == '_' || *character == '-' || *character == '+') {
@@ -1565,7 +1565,7 @@ extern "C" {
       if (width_max < 1) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const uint8_t width = f_macro_utf_byte_width_is(*character);
+    const uint8_t width = macro_f_utf_byte_width_is(*character);
 
     if (!width) {
 
@@ -1878,7 +1878,7 @@ extern "C" {
 
     while (string[range->start] != f_utf_character_t_eol) {
 
-      if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -1901,7 +1901,7 @@ extern "C" {
 
     while (string[range->start] != seek_to) {
 
-      if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -1926,7 +1926,7 @@ extern "C" {
 
     while (string[range->start] != seek_to) {
 
-      if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
index 134f597df70043bc4aff823a9156dfef6dd82ad5..c4a4e3b110052771d3c564b63a35fd388931432c 100644 (file)
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 #ifndef _di_f_utf_string_static_empty_s_
-  const f_utf_string_static_t f_utf_string_static_empty_s = f_macro_utf_string_static_t_initialize(0, 0);
+  const f_utf_string_static_t f_utf_string_static_empty_s = macro_f_utf_string_static_t_initialize(0, 0);
 #endif // _di_f_utf_string_static_empty_s_
 
 #ifndef _di_f_utf_string_dynamic_adjust_
@@ -672,7 +672,7 @@ extern "C" {
 
     while (buffer.string[range->start] != f_utf_character_t_eol) {
 
-      if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -697,7 +697,7 @@ extern "C" {
 
     while (buffer.string[range->start] != seek_to_this) {
 
-      if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -724,7 +724,7 @@ extern "C" {
 
     while (buffer.string[range->start] != seek_to_this) {
 
-      if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
index 9e98954538fdba5a4bf9740a80a7567582a12e4d..8a7eda4e52addec91f06aa908546c0ab870deb85 100644 (file)
@@ -24,7 +24,7 @@ extern "C" {
  *
  * The f_utf_string_static_t type should never be directly allocated or deallocated.
  *
- * A special f_macro_utf_string_static_t_initialize() is provided for the special purpose of easily initialize a static string.
+ * A special macro_f_utf_string_static_t_initialize() is provided for the special purpose of easily initialize a static string.
  *
  * string: the string.
  * size:   total amount of space available.
@@ -40,12 +40,12 @@ extern "C" {
 
   #define f_utf_string_static_t_initialize { 0, 0, 0 }
 
-  #define f_macro_utf_string_static_t_clear(string_static) \
+  #define macro_f_utf_string_static_t_clear(string_static) \
     string_static.string = 0; \
     string_static.size = 0; \
     string_static.used = 0;
 
-  #define f_macro_utf_string_static_t_initialize(string, length) { string, length, length }
+  #define macro_f_utf_string_static_t_initialize(string, length) { string, length, length }
 #endif // _di_f_utf_string_static_t_
 
 /**
@@ -65,18 +65,18 @@ extern "C" {
 
   #define f_utf_string_dynamic_t_initialize f_utf_string_static_t_initialize
 
-  #define f_macro_utf_string_dynamic_t_clear(dynamic) f_macro_utf_string_static_t_clear(dynamic)
+  #define macro_f_utf_string_dynamic_t_clear(dynamic) macro_f_utf_string_static_t_clear(dynamic)
 
-  #define f_macro_utf_string_dynamic_t_resize(status, dynamic, length) status = f_utf_string_dynamic_resize(length, &dynamic);
-  #define f_macro_utf_string_dynamic_t_adjust(status, dynamic, length) status = f_utf_string_dynamic_adjust(length, &dynamic);
+  #define macro_f_utf_string_dynamic_t_resize(status, dynamic, length) status = f_utf_string_dynamic_resize(length, &dynamic);
+  #define macro_f_utf_string_dynamic_t_adjust(status, dynamic, length) status = f_utf_string_dynamic_adjust(length, &dynamic);
 
-  #define f_macro_utf_string_dynamic_t_delete_simple(dynamic)  f_utf_string_dynamic_resize(0, &dynamic);
-  #define f_macro_utf_string_dynamic_t_destroy_simple(dynamic) f_utf_string_dynamic_adjust(0, &dynamic);
+  #define macro_f_utf_string_dynamic_t_delete_simple(dynamic)  f_utf_string_dynamic_resize(0, &dynamic);
+  #define macro_f_utf_string_dynamic_t_destroy_simple(dynamic) f_utf_string_dynamic_adjust(0, &dynamic);
 
-  #define f_macro_utf_string_dynamic_t_increase(status, dynamic)            status = f_utf_string_dynamic_increase(&dynamic);
-  #define f_macro_utf_string_dynamic_t_increase_by(status, dynamic, amount) status = f_utf_string_dynamic_increase_by(amount, &dynamic);
-  #define f_macro_utf_string_dynamic_t_decrease_by(status, dynamic, amount) status = f_utf_string_dynamic_decrease_by(amount, &dynamic);
-  #define f_macro_utf_string_dynamic_t_decimate_by(status, dynamic, amount) status = f_utf_string_dynamic_decimate_by(amount, &dynamic);
+  #define macro_f_utf_string_dynamic_t_increase(status, dynamic)            status = f_utf_string_dynamic_increase(&dynamic);
+  #define macro_f_utf_string_dynamic_t_increase_by(status, dynamic, amount) status = f_utf_string_dynamic_increase_by(amount, &dynamic);
+  #define macro_f_utf_string_dynamic_t_decrease_by(status, dynamic, amount) status = f_utf_string_dynamic_decrease_by(amount, &dynamic);
+  #define macro_f_utf_string_dynamic_t_decimate_by(status, dynamic, amount) status = f_utf_string_dynamic_decimate_by(amount, &dynamic);
 #endif // _di_f_utf_string_dynamic_t_
 
 /**
@@ -96,7 +96,7 @@ extern "C" {
 
   #define f_utf_string_statics_t_initialize { 0, 0, 0 }
 
-  #define f_macro_utf_string_statics_t_clear(statics) \
+  #define macro_f_utf_string_statics_t_clear(statics) \
     statics.array = 0; \
     statics.size = 0; \
     statics.used = 0;
@@ -114,18 +114,18 @@ extern "C" {
 
   #define f_utf_string_dynamics_t_initialize f_utf_string_statics_t_initialize
 
-  #define f_macro_utf_string_dynamics_t_clear(dynamics) f_macro_utf_string_statics_t_clear(dynamics)
+  #define macro_f_utf_string_dynamics_t_clear(dynamics) macro_f_utf_string_statics_t_clear(dynamics)
 
-  #define f_macro_utf_string_dynamics_t_resize(status, dynamics, length) status = f_utf_string_dynamics_resize(length, &dynamics);
-  #define f_macro_utf_string_dynamics_t_adjust(status, dynamics, length) status = f_utf_string_dynamics_adjust(length, &dynamics);
+  #define macro_f_utf_string_dynamics_t_resize(status, dynamics, length) status = f_utf_string_dynamics_resize(length, &dynamics);
+  #define macro_f_utf_string_dynamics_t_adjust(status, dynamics, length) status = f_utf_string_dynamics_adjust(length, &dynamics);
 
-  #define f_macro_utf_string_dynamics_t_delete_simple(dynamics)  f_utf_string_dynamics_resize(0, &dynamics);
-  #define f_macro_utf_string_dynamics_t_destroy_simple(dynamics) f_utf_string_dynamics_adjust(0, &dynamics);
+  #define macro_f_utf_string_dynamics_t_delete_simple(dynamics)  f_utf_string_dynamics_resize(0, &dynamics);
+  #define macro_f_utf_string_dynamics_t_destroy_simple(dynamics) f_utf_string_dynamics_adjust(0, &dynamics);
 
-  #define f_macro_utf_string_dynamics_t_increase(status, dynamics)            status = f_utf_string_dynamics_increase(&dynamics);
-  #define f_macro_utf_string_dynamics_t_increase_by(status, dynamics, amount) status = f_utf_string_dynamics_increase_by(amount, &dynamics);
-  #define f_macro_utf_string_dynamics_t_decrease_by(status, dynamics, amount) status = f_utf_string_dynamics_decrease_by(amount, &dynamics);
-  #define f_macro_utf_string_dynamics_t_decimate_by(status, dynamics, amount) status = f_utf_string_dynamics_decimate_by(amount, &dynamics);
+  #define macro_f_utf_string_dynamics_t_increase(status, dynamics)            status = f_utf_string_dynamics_increase(&dynamics);
+  #define macro_f_utf_string_dynamics_t_increase_by(status, dynamics, amount) status = f_utf_string_dynamics_increase_by(amount, &dynamics);
+  #define macro_f_utf_string_dynamics_t_decrease_by(status, dynamics, amount) status = f_utf_string_dynamics_decrease_by(amount, &dynamics);
+  #define macro_f_utf_string_dynamics_t_decimate_by(status, dynamics, amount) status = f_utf_string_dynamics_decimate_by(amount, &dynamics);
 #endif // _di_f_utf_string_dynamics_t_
 
 #ifndef _di_f_utf_string_static_empty_s_
index 9203536cfc4439f9c7ebb57857b4820632fb0d22..f2fca21b8dc510e881bc637b6be512ba0085ee44 100644 (file)
@@ -30,17 +30,17 @@ extern "C" {
 
   #define f_utf_string_map_t_initialize { f_utf_string_dynamic_t_initialize, f_utf_string_dynamic_t_initialize }
 
-  #define f_macro_utf_string_map_t_clear(map) \
-    f_macro_utf_string_dynamic_t_clear(map.name) \
-    f_macro_utf_string_dynamic_t_clear(map.value)
+  #define macro_f_utf_string_map_t_clear(map) \
+    macro_f_utf_string_dynamic_t_clear(map.name) \
+    macro_f_utf_string_dynamic_t_clear(map.value)
 
-  #define f_macro_utf_string_map_t_delete_simple(map) \
-    f_macro_utf_string_dynamic_t_delete_simple(map.name) \
-    f_macro_utf_string_dynamic_t_delete_simple(map.value)
+  #define macro_f_utf_string_map_t_delete_simple(map) \
+    macro_f_utf_string_dynamic_t_delete_simple(map.name) \
+    macro_f_utf_string_dynamic_t_delete_simple(map.value)
 
-  #define f_macro_utf_string_map_t_destroy_simple(map) \
-    f_macro_utf_string_dynamic_t_destroy_simple(map.name) \
-    f_macro_utf_string_dynamic_t_destroy_simple(map.value)
+  #define macro_f_utf_string_map_t_destroy_simple(map) \
+    macro_f_utf_string_dynamic_t_destroy_simple(map.name) \
+    macro_f_utf_string_dynamic_t_destroy_simple(map.value)
 #endif // _di_f_utf_string_map_t_
 
 /**
@@ -60,18 +60,18 @@ extern "C" {
 
   #define f_utf_string_maps_t_initialize f_utf_string_statics_t_initialize
 
-  #define f_macro_utf_string_maps_t_clear(maps) f_macro_memory_structure_clear(maps)
+  #define macro_f_utf_string_maps_t_clear(maps) macro_f_memory_structure_clear(maps)
 
-  #define f_macro_utf_string_maps_t_resize(status, maps, length) status = f_utf_string_maps_resize(length, &maps);
-  #define f_macro_utf_string_maps_t_adjust(status, maps, length) status = f_utf_string_maps_adjust(length, &maps);
+  #define macro_f_utf_string_maps_t_resize(status, maps, length) status = f_utf_string_maps_resize(length, &maps);
+  #define macro_f_utf_string_maps_t_adjust(status, maps, length) status = f_utf_string_maps_adjust(length, &maps);
 
-  #define f_macro_utf_string_maps_t_delete_simple(maps)  f_utf_string_maps_resize(0, &maps);
-  #define f_macro_utf_string_maps_t_destroy_simple(maps) f_utf_string_maps_adjust(0, &maps);
+  #define macro_f_utf_string_maps_t_delete_simple(maps)  f_utf_string_maps_resize(0, &maps);
+  #define macro_f_utf_string_maps_t_destroy_simple(maps) f_utf_string_maps_adjust(0, &maps);
 
-  #define f_macro_utf_string_maps_t_increase(status, maps)            status = f_utf_string_maps_increase(maps);
-  #define f_macro_utf_string_maps_t_increase_by(status, maps, amount) status = f_utf_string_maps_increase_by(amount, maps);
-  #define f_macro_utf_string_maps_t_decrease_by(status, maps, amount) status = f_utf_string_maps_decrease_by(amount, maps);
-  #define f_macro_utf_string_maps_t_decimate_by(status, maps, amount) status = f_utf_string_maps_decimate_by(amount, maps);
+  #define macro_f_utf_string_maps_t_increase(status, maps)            status = f_utf_string_maps_increase(maps);
+  #define macro_f_utf_string_maps_t_increase_by(status, maps, amount) status = f_utf_string_maps_increase_by(amount, maps);
+  #define macro_f_utf_string_maps_t_decrease_by(status, maps, amount) status = f_utf_string_maps_decrease_by(amount, maps);
+  #define macro_f_utf_string_maps_t_decimate_by(status, maps, amount) status = f_utf_string_maps_decimate_by(amount, maps);
 #endif // _di_f_utf_string_maps_t_
 
 /**
@@ -88,17 +88,17 @@ extern "C" {
 
   #define f_utf_string_map_multi_t_initialize { f_utf_string_dynamic_t_initialize, f_utf_string_dynamics_t_initialize }
 
-  #define f_macro_utf_string_map_multi_t_clear(map) \
-    f_macro_utf_string_dynamic_t_clear(map.name) \
-    f_macro_utf_string_dynamics_t_clear(map.value)
+  #define macro_f_utf_string_map_multi_t_clear(map) \
+    macro_f_utf_string_dynamic_t_clear(map.name) \
+    macro_f_utf_string_dynamics_t_clear(map.value)
 
-  #define f_macro_utf_string_map_multi_t_delete_simple(map) \
-    f_macro_utf_string_dynamic_t_delete_simple(map.name) \
-    f_macro_utf_string_dynamics_t_delete_simple(map.value)
+  #define macro_f_utf_string_map_multi_t_delete_simple(map) \
+    macro_f_utf_string_dynamic_t_delete_simple(map.name) \
+    macro_f_utf_string_dynamics_t_delete_simple(map.value)
 
-  #define f_macro_utf_string_map_multi_t_destroy_simple(map) \
-    f_macro_utf_string_dynamic_t_destroy_simple(map.name) \
-    f_macro_utf_string_dynamics_t_destroy_simple(map.value)
+  #define macro_f_utf_string_map_multi_t_destroy_simple(map) \
+    macro_f_utf_string_dynamic_t_destroy_simple(map.name) \
+    macro_f_utf_string_dynamics_t_destroy_simple(map.value)
 #endif // _di_f_utf_string_map_multi_t_
 
 /**
@@ -118,18 +118,18 @@ extern "C" {
 
   #define f_utf_string_map_multis_t_initialize f_utf_string_statics_t_initialize
 
-  #define f_macro_utf_string_map_multis_t_clear(map_multis) f_macro_memory_structure_clear(map_multis)
+  #define macro_f_utf_string_map_multis_t_clear(map_multis) macro_f_memory_structure_clear(map_multis)
 
-  #define f_macro_utf_string_map_multis_t_resize(status, map_multis, length) status = f_utf_string_map_multis_resize(length, &map_multis);
-  #define f_macro_utf_string_map_multis_t_adjust(status, map_multis, length) status = f_utf_string_map_multis_adjust(length, &map_multis);
+  #define macro_f_utf_string_map_multis_t_resize(status, map_multis, length) status = f_utf_string_map_multis_resize(length, &map_multis);
+  #define macro_f_utf_string_map_multis_t_adjust(status, map_multis, length) status = f_utf_string_map_multis_adjust(length, &map_multis);
 
-  #define f_macro_utf_string_map_multis_t_delete_simple(map_multis)  f_utf_string_map_multis_resize(0, &map_multis);
-  #define f_macro_utf_string_map_multis_t_destroy_simple(map_multis) f_utf_string_map_multis_adjust(0, &map_multis);
+  #define macro_f_utf_string_map_multis_t_delete_simple(map_multis)  f_utf_string_map_multis_resize(0, &map_multis);
+  #define macro_f_utf_string_map_multis_t_destroy_simple(map_multis) f_utf_string_map_multis_adjust(0, &map_multis);
 
-  #define f_macro_utf_string_map_multis_t_increase(status, map_multis)            status = f_utf_string_map_multis_increase(&map_multis);
-  #define f_macro_utf_string_map_multis_t_increase_by(status, map_multis, amount) status = f_utf_string_map_multis_increase_by(amount, &map_multis);
-  #define f_macro_utf_string_map_multis_t_decrease_by(status, map_multis, amount) status = f_utf_string_map_multis_decrease_by(amount, &map_multis);
-  #define f_macro_utf_string_map_multis_t_decimate_by(status, map_multis, amount) status = f_utf_string_map_multis_decimate_by(amount, &map_multis);
+  #define macro_f_utf_string_map_multis_t_increase(status, map_multis)            status = f_utf_string_map_multis_increase(&map_multis);
+  #define macro_f_utf_string_map_multis_t_increase_by(status, map_multis, amount) status = f_utf_string_map_multis_increase_by(amount, &map_multis);
+  #define macro_f_utf_string_map_multis_t_decrease_by(status, map_multis, amount) status = f_utf_string_map_multis_decrease_by(amount, &map_multis);
+  #define macro_f_utf_string_map_multis_t_decimate_by(status, map_multis, amount) status = f_utf_string_map_multis_decimate_by(amount, &map_multis);
 #endif // _di_f_utf_string_map_multis_t_
 
 /**
index f2e7ad934b83bcfad70adc4d5440f6d3b65d9c4f..da9778023f69fcd029771fe6254c6bb22ce69e15 100644 (file)
@@ -54,18 +54,18 @@ extern "C" {
 
   #define f_utf_string_quantitys_t_initialize { 0, 0, 0 }
 
-  #define f_macro_utf_string_quantitys_t_clear(quantitys) f_macro_memory_structure_clear(quantitys)
+  #define macro_f_utf_string_quantitys_t_clear(quantitys) macro_f_memory_structure_clear(quantitys)
 
-  #define f_macro_utf_string_quantitys_t_resize(status, quantitys, length) status = f_utf_string_quantitys_resize(length, &quantitys);
-  #define f_macro_utf_string_quantitys_t_adjust(status, quantitys, length) status = f_utf_string_quantitys_adjust(length, &quantitys);
+  #define macro_f_utf_string_quantitys_t_resize(status, quantitys, length) status = f_utf_string_quantitys_resize(length, &quantitys);
+  #define macro_f_utf_string_quantitys_t_adjust(status, quantitys, length) status = f_utf_string_quantitys_adjust(length, &quantitys);
 
-  #define f_macro_utf_string_quantitys_t_delete_simple(quantitys)  f_utf_string_quantitys_resize(0, &quantitys);
-  #define f_macro_utf_string_quantitys_t_destroy_simple(quantitys) f_utf_string_quantitys_adjust(0, &quantitys);
+  #define macro_f_utf_string_quantitys_t_delete_simple(quantitys)  f_utf_string_quantitys_resize(0, &quantitys);
+  #define macro_f_utf_string_quantitys_t_destroy_simple(quantitys) f_utf_string_quantitys_adjust(0, &quantitys);
 
-  #define f_macro_utf_string_quantitys_t_increase(status, quantitys)            status = f_utf_string_quantitys_increase(&quantitys);
-  #define f_macro_utf_string_quantitys_t_increase_by(status, quantitys, amount) status = f_utf_string_quantitys_increase_by(amount, &quantitys);
-  #define f_macro_utf_string_quantitys_t_decrease_by(status, quantitys, amount) status = f_utf_string_quantitys_decrease_by(amount, &quantitys);
-  #define f_macro_utf_string_quantitys_t_decimate_by(status, quantitys, amount) status = f_utf_string_quantitys_decimate_by(amount, &quantitys);
+  #define macro_f_utf_string_quantitys_t_increase(status, quantitys)            status = f_utf_string_quantitys_increase(&quantitys);
+  #define macro_f_utf_string_quantitys_t_increase_by(status, quantitys, amount) status = f_utf_string_quantitys_increase_by(amount, &quantitys);
+  #define macro_f_utf_string_quantitys_t_decrease_by(status, quantitys, amount) status = f_utf_string_quantitys_decrease_by(amount, &quantitys);
+  #define macro_f_utf_string_quantitys_t_decimate_by(status, quantitys, amount) status = f_utf_string_quantitys_decimate_by(amount, &quantitys);
 #endif // _di_f_utf_string_quantitys_t_
 
 /**
@@ -85,18 +85,18 @@ extern "C" {
 
   #define f_utf_string_quantityss_t_initialize { 0, 0, 0 }
 
-  #define f_macro_utf_string_quantityss_t_clear(quantityss) f_macro_memory_structures_clear(quantityss)
+  #define macro_f_utf_string_quantityss_t_clear(quantityss) macro_f_memory_structures_clear(quantityss)
 
-  #define f_macro_utf_string_quantityss_t_resize(status, quantityss, length) status = f_utf_string_quantityss_resize(length, &quantityss);
-  #define f_macro_utf_string_quantityss_t_adjust(status, quantityss, length) status = f_utf_string_quantityss_adjust(length, &quantityss);
+  #define macro_f_utf_string_quantityss_t_resize(status, quantityss, length) status = f_utf_string_quantityss_resize(length, &quantityss);
+  #define macro_f_utf_string_quantityss_t_adjust(status, quantityss, length) status = f_utf_string_quantityss_adjust(length, &quantityss);
 
-  #define f_macro_utf_string_quantityss_t_delete_simple(quantityss)  f_utf_string_quantityss_resize(0, &quantityss);
-  #define f_macro_utf_string_quantityss_t_destroy_simple(quantityss) f_utf_string_quantityss_adjust(0, &quantityss);
+  #define macro_f_utf_string_quantityss_t_delete_simple(quantityss)  f_utf_string_quantityss_resize(0, &quantityss);
+  #define macro_f_utf_string_quantityss_t_destroy_simple(quantityss) f_utf_string_quantityss_adjust(0, &quantityss);
 
-  #define f_macro_utf_string_quantityss_t_increase(status, quantityss)            status = f_utf_string_quantityss_increase(&quantityss);
-  #define f_macro_utf_string_quantityss_t_increase_by(status, quantityss, amount) status = f_utf_string_quantityss_increase_by(amount, &quantityss);
-  #define f_macro_utf_string_quantityss_t_decrease_by(status, quantityss, amount) status = f_utf_string_quantityss_decrease_by(amount, &quantityss);
-  #define f_macro_utf_string_quantityss_t_decimate_by(status, quantityss, amount) status = f_utf_string_quantityss_decimate_by(amount, &quantityss);
+  #define macro_f_utf_string_quantityss_t_increase(status, quantityss)            status = f_utf_string_quantityss_increase(&quantityss);
+  #define macro_f_utf_string_quantityss_t_increase_by(status, quantityss, amount) status = f_utf_string_quantityss_increase_by(amount, &quantityss);
+  #define macro_f_utf_string_quantityss_t_decrease_by(status, quantityss, amount) status = f_utf_string_quantityss_decrease_by(amount, &quantityss);
+  #define macro_f_utf_string_quantityss_t_decimate_by(status, quantityss, amount) status = f_utf_string_quantityss_decimate_by(amount, &quantityss);
 #endif // _di_f_utf_string_quantityss_t_
 
 /**
index 53b9766bd144d6555c6aadeaf623b00a0d561447..94e78dd78ccf3dfcfae82889515c1105f1a2e4da 100644 (file)
@@ -23,7 +23,7 @@ extern "C" {
  * Therefore, a range from 0 to 0 would be include position 0.
  * Set start to some value larger than stop to designate that there is no range (such as start = 1, stop = 0).
  *
- * A special f_macro_utf_string_range_t_initialize() is provided for the special purpose of easily initialize a static string range.
+ * A special macro_f_utf_string_range_t_initialize() is provided for the special purpose of easily initialize a static string range.
  *
  * start: the start position.
  * stop:  the stop position.
@@ -36,9 +36,9 @@ extern "C" {
 
   #define f_utf_string_range_t_initialize { 1, 0 }
 
-  #define f_macro_utf_string_range_t_initialize(length) { length ? 0 : 1, length ? length - 1 : 0 }
+  #define macro_f_utf_string_range_t_initialize(length) { length ? 0 : 1, length ? length - 1 : 0 }
 
-  #define f_macro_utf_string_range_t_clear(range) \
+  #define macro_f_utf_string_range_t_clear(range) \
     range.start = 1; \
     range.stop = 0;
 #endif // _di_f_utf_string_range_t_
@@ -60,18 +60,18 @@ extern "C" {
 
   #define f_utf_string_ranges_t_initialize { 0, 0, 0 }
 
-  #define f_macro_utf_string_ranges_t_clear(ranges) f_macro_memory_structure_clear(ranges)
+  #define macro_f_utf_string_ranges_t_clear(ranges) macro_f_memory_structure_clear(ranges)
 
-  #define f_macro_utf_string_ranges_t_resize(status, ranges, length) status = f_utf_string_ranges_resize(length, &ranges);
-  #define f_macro_utf_string_ranges_t_adjust(status, ranges, length) status = f_utf_string_ranges_adjust(length, &ranges);
+  #define macro_f_utf_string_ranges_t_resize(status, ranges, length) status = f_utf_string_ranges_resize(length, &ranges);
+  #define macro_f_utf_string_ranges_t_adjust(status, ranges, length) status = f_utf_string_ranges_adjust(length, &ranges);
 
-  #define f_macro_utf_string_ranges_t_delete_simple(ranges)  f_utf_string_ranges_resize(0, &ranges);
-  #define f_macro_utf_string_ranges_t_destroy_simple(ranges) f_utf_string_ranges_adjust(0, &ranges);
+  #define macro_f_utf_string_ranges_t_delete_simple(ranges)  f_utf_string_ranges_resize(0, &ranges);
+  #define macro_f_utf_string_ranges_t_destroy_simple(ranges) f_utf_string_ranges_adjust(0, &ranges);
 
-  #define f_macro_utf_string_ranges_t_increase(status, ranges)            status = f_utf_string_ranges_increase(&ranges);
-  #define f_macro_utf_string_ranges_t_increase_by(status, ranges, amount) status = f_utf_string_ranges_increase_by(amount, &ranges);
-  #define f_macro_utf_string_ranges_t_decrease_by(status, ranges, amount) status = f_utf_string_ranges_decrease_by(amount, &ranges);
-  #define f_macro_utf_string_ranges_t_decimate_by(status, ranges, amount) status = f_utf_string_ranges_decimate_by(amount, &ranges);
+  #define macro_f_utf_string_ranges_t_increase(status, ranges)            status = f_utf_string_ranges_increase(&ranges);
+  #define macro_f_utf_string_ranges_t_increase_by(status, ranges, amount) status = f_utf_string_ranges_increase_by(amount, &ranges);
+  #define macro_f_utf_string_ranges_t_decrease_by(status, ranges, amount) status = f_utf_string_ranges_decrease_by(amount, &ranges);
+  #define macro_f_utf_string_ranges_t_decimate_by(status, ranges, amount) status = f_utf_string_ranges_decimate_by(amount, &ranges);
 #endif // _di_f_utf_string_ranges_t_
 
 /**
@@ -91,18 +91,18 @@ extern "C" {
 
   #define f_utf_string_rangess_t_initialize { 0, 0, 0 }
 
-  #define f_macro_utf_string_rangess_t_clear(rangess) f_macro_memory_structures_clear(rangess)
+  #define macro_f_utf_string_rangess_t_clear(rangess) macro_f_memory_structures_clear(rangess)
 
-  #define f_macro_utf_string_rangess_t_resize(status, rangess, length) status = f_utf_string_rangess_resize(length, &rangess);
-  #define f_macro_utf_string_rangess_t_adjust(status, rangess, length) status = f_utf_string_rangess_adjust(length, &rangess);
+  #define macro_f_utf_string_rangess_t_resize(status, rangess, length) status = f_utf_string_rangess_resize(length, &rangess);
+  #define macro_f_utf_string_rangess_t_adjust(status, rangess, length) status = f_utf_string_rangess_adjust(length, &rangess);
 
-  #define f_macro_utf_string_rangess_t_delete_simple(rangess)  f_utf_string_rangess_resize(0, &rangess);
-  #define f_macro_utf_string_rangess_t_destroy_simple(rangess) f_utf_string_rangess_adjust(0, &rangess);
+  #define macro_f_utf_string_rangess_t_delete_simple(rangess)  f_utf_string_rangess_resize(0, &rangess);
+  #define macro_f_utf_string_rangess_t_destroy_simple(rangess) f_utf_string_rangess_adjust(0, &rangess);
 
-  #define f_macro_utf_string_rangess_t_increase(status, rangess)            status = f_utf_string_rangess_increase(&rangess);
-  #define f_macro_utf_string_rangess_t_increase_by(status, rangess, amount) status = f_utf_string_rangess_increase_by(amount, &rangess);
-  #define f_macro_utf_string_rangess_t_decrease_by(status, rangess, amount) status = f_utf_string_rangess_decrease_by(amount, &rangess);
-  #define f_macro_utf_string_rangess_t_decimate_by(status, rangess, amount) status = f_utf_string_rangess_decimate_by(amount, &rangess);
+  #define macro_f_utf_string_rangess_t_increase(status, rangess)            status = f_utf_string_rangess_increase(&rangess);
+  #define macro_f_utf_string_rangess_t_increase_by(status, rangess, amount) status = f_utf_string_rangess_increase_by(amount, &rangess);
+  #define macro_f_utf_string_rangess_t_decrease_by(status, rangess, amount) status = f_utf_string_rangess_decrease_by(amount, &rangess);
+  #define macro_f_utf_string_rangess_t_decimate_by(status, rangess, amount) status = f_utf_string_rangess_decimate_by(amount, &rangess);
 #endif // _di_f_utf_string_rangess_t_
 
 /**
index 86869429409a2bbc95379f1bd597b41c0ff9a595..ae068ed44d6a65a5f1f45f253a5cf4aead25328f 100644 (file)
@@ -32,7 +32,7 @@ extern "C" {
 
   #define f_utf_string_triple_t_initialize { f_utf_string_dynamic_t_initialize, f_utf_string_dynamic_t_initialize, f_utf_string_dynamic_t_initialize }
 
-  #define f_macro_utf_string_triple_t_clear(triple) \
+  #define macro_f_utf_string_triple_t_clear(triple) \
     triple.one.array = 0; \
     triple.one.size = 0; \
     triple.one.used = 0; \
@@ -43,15 +43,15 @@ extern "C" {
     triple.three.size = 0; \
     triple.three.used = 0;
 
-  #define f_macro_utf_string_triple_t_delete_simple(triple) \
-    f_macro_utf_string_dynamic_t_delete_simple(triple.one) \
-    f_macro_utf_string_dynamic_t_delete_simple(triple.two) \
-    f_macro_utf_string_dynamic_t_delete_simple(triple.three)
+  #define macro_f_utf_string_triple_t_delete_simple(triple) \
+    macro_f_utf_string_dynamic_t_delete_simple(triple.one) \
+    macro_f_utf_string_dynamic_t_delete_simple(triple.two) \
+    macro_f_utf_string_dynamic_t_delete_simple(triple.three)
 
-  #define f_macro_utf_string_triple_t_destroy_simple(triple) \
-    f_macro_utf_string_dynamic_t_destroy_simple(triple.one) \
-    f_macro_utf_string_dynamic_t_destroy_simple(triple.two) \
-    f_macro_utf_string_dynamic_t_destroy_simple(triple.three)
+  #define macro_f_utf_string_triple_t_destroy_simple(triple) \
+    macro_f_utf_string_dynamic_t_destroy_simple(triple.one) \
+    macro_f_utf_string_dynamic_t_destroy_simple(triple.two) \
+    macro_f_utf_string_dynamic_t_destroy_simple(triple.three)
 #endif // _di_f_utf_string_triple_t_
 
 /**
@@ -71,18 +71,18 @@ extern "C" {
 
   #define f_utf_string_triples_t_initialize f_utf_string_statics_t_initialize
 
-  #define f_macro_utf_string_triples_t_clear(triples) f_macro_memory_structure_clear(triples)
+  #define macro_f_utf_string_triples_t_clear(triples) macro_f_memory_structure_clear(triples)
 
-  #define f_macro_utf_string_triples_t_resize(status, triples, length) status = f_utf_string_triples_resize(length, &triples);
-  #define f_macro_utf_string_triples_t_adjust(status, triples, length) status = f_utf_string_triples_adjust(length, &triples);
+  #define macro_f_utf_string_triples_t_resize(status, triples, length) status = f_utf_string_triples_resize(length, &triples);
+  #define macro_f_utf_string_triples_t_adjust(status, triples, length) status = f_utf_string_triples_adjust(length, &triples);
 
-  #define f_macro_utf_string_triples_t_delete_simple(triples)  f_utf_string_triples_resize(0, &triples);
-  #define f_macro_utf_string_triples_t_destroy_simple(triples) f_utf_string_triples_adjust(0, &triples);
+  #define macro_f_utf_string_triples_t_delete_simple(triples)  f_utf_string_triples_resize(0, &triples);
+  #define macro_f_utf_string_triples_t_destroy_simple(triples) f_utf_string_triples_adjust(0, &triples);
 
-  #define f_macro_utf_string_triples_t_increase(status, triples)            status = f_utf_string_triples_increase(triples);
-  #define f_macro_utf_string_triples_t_increase_by(status, triples, amount) status = f_utf_string_triples_increase_by(amount, triples);
-  #define f_macro_utf_string_triples_t_decrease_by(status, triples, amount) status = f_utf_string_triples_decrease_by(amount, triples);
-  #define f_macro_utf_string_triples_t_decimate_by(status, triples, amount) status = f_utf_string_triples_decimate_by(amount, triples);
+  #define macro_f_utf_string_triples_t_increase(status, triples)            status = f_utf_string_triples_increase(triples);
+  #define macro_f_utf_string_triples_t_increase_by(status, triples, amount) status = f_utf_string_triples_increase_by(amount, triples);
+  #define macro_f_utf_string_triples_t_decrease_by(status, triples, amount) status = f_utf_string_triples_decrease_by(amount, triples);
+  #define macro_f_utf_string_triples_t_decimate_by(status, triples, amount) status = f_utf_string_triples_decimate_by(amount, triples);
 #endif // _di_f_utf_string_triples_t_
 
 /**
index 61b0c15fa570f65e18e60767b65daa117f3eeb3f..9166b13e10f9631e4d8aa8142d9c17643f00616d 100644 (file)
@@ -35,8 +35,8 @@ extern "C" {
         if (length > 0) {
           length += 2;
 
-          f_macro_string_dynamic_t_clear((*directory))
-          f_macro_string_dynamic_t_resize(status, (*directory), length)
+          macro_f_string_dynamic_t_clear((*directory))
+          macro_f_string_dynamic_t_resize(status, (*directory), length)
           if (F_status_is_error(status)) return status;
 
           memcpy(directory->string + 1, argument + begin, length - 2);
@@ -47,8 +47,8 @@ extern "C" {
           directory->string[length - 1] = f_path_separator_s[0];
         }
         else {
-          f_macro_string_dynamic_t_clear((*directory))
-          f_macro_string_dynamic_t_resize(status, (*directory), 1)
+          macro_f_string_dynamic_t_clear((*directory))
+          macro_f_string_dynamic_t_resize(status, (*directory), 1)
           if (F_status_is_error(status)) return status;
 
           directory->used = 1;
@@ -68,8 +68,8 @@ extern "C" {
         if (length > 0) {
           length += 4;
 
-          f_macro_string_dynamic_t_clear((*directory))
-          f_macro_string_dynamic_t_resize(status, (*directory), length);
+          macro_f_string_dynamic_t_clear((*directory))
+          macro_f_string_dynamic_t_resize(status, (*directory), length);
           if (F_status_is_error(status)) return status;
 
           memcpy(directory->string + 3, argument + begin, length - 4);
@@ -82,8 +82,8 @@ extern "C" {
           directory->string[length - 1] = f_path_separator_s[0];
         }
         else {
-          f_macro_string_dynamic_t_clear((*directory))
-          f_macro_string_dynamic_t_resize(status, (*directory), 3)
+          macro_f_string_dynamic_t_clear((*directory))
+          macro_f_string_dynamic_t_resize(status, (*directory), 3)
           if (F_status_is_error(status)) return status;
 
           directory->used = 3;
@@ -105,8 +105,8 @@ extern "C" {
         if (length > 0) {
           length += 3;
 
-          f_macro_string_dynamic_t_clear((*directory))
-          f_macro_string_dynamic_t_resize(status, (*directory), length)
+          macro_f_string_dynamic_t_clear((*directory))
+          macro_f_string_dynamic_t_resize(status, (*directory), length)
           if (F_status_is_error(status)) return status;
 
           memcpy(directory->string + 2, argument + begin, length - 3);
@@ -118,8 +118,8 @@ extern "C" {
           directory->string[length - 1] = f_path_separator_s[0];
         }
         else {
-          f_macro_string_dynamic_t_clear((*directory))
-          f_macro_string_dynamic_t_resize(status, (*directory), 2)
+          macro_f_string_dynamic_t_clear((*directory))
+          macro_f_string_dynamic_t_resize(status, (*directory), 2)
           if (F_status_is_error(status)) return status;
 
           directory->used = 2;
@@ -131,8 +131,8 @@ extern "C" {
       else {
         length++;
 
-        f_macro_string_dynamic_t_clear((*directory))
-        f_macro_string_dynamic_t_resize(status, (*directory), length)
+        macro_f_string_dynamic_t_clear((*directory))
+        macro_f_string_dynamic_t_resize(status, (*directory), length)
         if (F_status_is_error(status)) return status;
 
         memcpy(directory->string, argument, length - 1);
@@ -143,8 +143,8 @@ extern "C" {
       }
     }
     else if (argument[0] != f_path_separator_s[0]) {
-      f_macro_string_dynamic_t_clear((*directory))
-      f_macro_string_dynamic_t_resize(status, (*directory), 2)
+      macro_f_string_dynamic_t_clear((*directory))
+      macro_f_string_dynamic_t_resize(status, (*directory), 2)
       if (F_status_is_error(status)) return status;
 
       memcpy(directory->string, argument, 2);
@@ -154,8 +154,8 @@ extern "C" {
       directory->string[1] = f_path_separator_s[0];
     }
     else {
-      f_macro_string_dynamic_t_clear((*directory))
-      f_macro_string_dynamic_t_resize(status, (*directory), 1)
+      macro_f_string_dynamic_t_clear((*directory))
+      macro_f_string_dynamic_t_resize(status, (*directory), 1)
       if (F_status_is_error(status)) return status;
 
       memcpy(directory->string, argument, 1);
index 6a2276012ade3cc90cd3e74a1c3435351fbc68f9..edb09d5a5c74662dcf30bf14e9ae445eb85c113b 100644 (file)
@@ -21,7 +21,7 @@ extern "C" {
       }
     }
 
-    f_file_t file = f_macro_file_t_initialize2(0, -1, f_file_flag_write_only);
+    f_file_t file = macro_f_file_t_initialize2(0, -1, f_file_flag_write_only);
     f_status_t status = F_none;
     f_array_length_t length = 0;
 
index dad93088a5a6e97dd489db26871adcecd879046d..f9f47bc7a23ef8d1fd07d9d1d86ad05d73a99c0b 100644 (file)
@@ -577,7 +577,7 @@ extern "C" {
     f_status_t status = F_none;
 
     for (f_array_length_t i = range.start; i <= range.stop; i++) {
-      width = f_macro_utf_byte_width_is(string[i]);
+      width = macro_f_utf_byte_width_is(string[i]);
 
       if (!width) {
         if (isspace(string[i])) {
@@ -733,7 +733,7 @@ extern "C" {
     int8_t sign_found = 0;
 
     for (f_array_length_t i = range.start; i <= range.stop; i++) {
-      width = f_macro_utf_byte_width_is(string[i]);
+      width = macro_f_utf_byte_width_is(string[i]);
 
       if (!width) {
         if (isspace(string[i])) {
index 2f50b81be1251bf4fecb2c11bf2ac1c88ea92652..7eaac4964b655c1d78e13cc42ed72553d49a1f79 100644 (file)
@@ -83,7 +83,7 @@ extern "C" {
     f_directory_statuss_t *failures;
   } fl_directory_recurse_t;
 
-  #define fl_directory_recurse_t_initialize { fl_directory_recurse_depth_max, f_file_default_read_size, F_false, f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), 0, 0 }
+  #define fl_directory_recurse_t_initialize { fl_directory_recurse_depth_max, f_file_default_read_size, F_false, macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), 0, 0 }
 #endif // _di_fl_directory_recurse_t_
 
 /**
index bf11086c78cdef0b4034146a7c68f83a396b499d..04b921ce3869cfb91735220648f482dd0ad0a9cc 100644 (file)
@@ -13,7 +13,7 @@ extern "C" {
     status = private_fl_directory_list(source.string, 0, 0, F_false, &listing);
 
     if (F_status_is_error(status)) {
-      f_macro_directory_listing_t_delete_simple(listing);
+      macro_f_directory_listing_t_delete_simple(listing);
       return status;
     }
 
@@ -42,7 +42,7 @@ extern "C" {
           status = private_fl_directory_clone_file(list[i]->array[j], source, destination, role, recurse);
         } // for
 
-        f_macro_string_dynamics_t_delete_simple((*list[i]));
+        macro_f_string_dynamics_t_delete_simple((*list[i]));
       } // for
     }
 
@@ -122,7 +122,7 @@ extern "C" {
       }
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(listing.directory);
+    macro_f_string_dynamics_t_delete_simple(listing.directory);
 
     if (F_status_is_error(status)) return status;
 
@@ -158,7 +158,7 @@ extern "C" {
 
       const f_status_t status_failure = status;
 
-      f_macro_memory_structure_macro_increment(status, (*recurse.failures), 1, f_memory_default_allocation_step, f_macro_directory_statuss_t_resize, F_array_too_large);
+      macro_f_memory_structure_increment(status, (*recurse.failures), 1, f_memory_default_allocation_step, macro_f_directory_statuss_t_resize, F_array_too_large);
       if (F_status_is_error(status)) return status;
 
       f_directory_status_t failure = f_directory_status_t_initialize;
@@ -178,7 +178,7 @@ extern "C" {
           size = source.used + file.used + 1;
         }
 
-        f_macro_directory_status_t_resize(status, failure, size + 1);
+        macro_f_directory_status_t_resize(status, failure, size + 1);
         if (F_status_is_error(status)) return status;
 
         memcpy(failure.path.string, path_source, size);
@@ -192,7 +192,7 @@ extern "C" {
           size = destination.used + file.used + 1;
         }
 
-        f_macro_directory_status_t_resize(status, failure, size + 1);
+        macro_f_directory_status_t_resize(status, failure, size + 1);
         if (F_status_is_error(status)) return status;
 
         memcpy(failure.path.string, path_destination, size);
@@ -224,7 +224,7 @@ extern "C" {
     status = private_fl_directory_list(source.string, 0, 0, F_false, &listing);
 
     if (F_status_is_error(status)) {
-      f_macro_directory_listing_t_delete_simple(listing);
+      macro_f_directory_listing_t_delete_simple(listing);
       return status;
     }
 
@@ -252,7 +252,7 @@ extern "C" {
           status = private_fl_directory_copy_file(list[i]->array[j], source, destination, mode, recurse);
         } // for
 
-        f_macro_string_dynamics_t_delete_simple((*list[i]));
+        macro_f_string_dynamics_t_delete_simple((*list[i]));
       } // for
     }
 
@@ -318,7 +318,7 @@ extern "C" {
       }
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(listing.directory);
+    macro_f_string_dynamics_t_delete_simple(listing.directory);
 
     if (F_status_is_error(status)) return status;
 
@@ -354,7 +354,7 @@ extern "C" {
 
       const f_status_t status_failure = status;
 
-      f_macro_memory_structure_macro_increment(status, (*recurse.failures), 1, f_memory_default_allocation_step, f_macro_directory_statuss_t_resize, F_array_too_large);
+      macro_f_memory_structure_increment(status, (*recurse.failures), 1, f_memory_default_allocation_step, macro_f_directory_statuss_t_resize, F_array_too_large);
       if (F_status_is_error(status)) return status;
 
       f_directory_status_t failure = f_directory_status_t_initialize;
@@ -375,7 +375,7 @@ extern "C" {
           size = source.used + file.used + 1;
         }
 
-        f_macro_directory_status_t_resize(status, failure, size + 1);
+        macro_f_directory_status_t_resize(status, failure, size + 1);
         if (F_status_is_error(status)) return status;
 
         memcpy(failure.path.string, path_source, size);
@@ -389,7 +389,7 @@ extern "C" {
           size = destination.used + file.used + 1;
         }
 
-        f_macro_directory_status_t_resize(status, failure, size + 1);
+        macro_f_directory_status_t_resize(status, failure, size + 1);
         if (F_status_is_error(status)) return status;
 
         memcpy(failure.path.string, path_destination, size);
@@ -493,7 +493,7 @@ extern "C" {
       status = f_file_stat_at(parent_fd, entity[i]->d_name, dereference ? 0 : AT_SYMLINK_NOFOLLOW, &file_stat);
       if (F_status_is_error(status)) break;
 
-      mode = f_macro_file_type_get(file_stat.st_mode);
+      mode = macro_f_file_type_get(file_stat.st_mode);
 
       if (mode == f_file_type_block) {
         names = &listing->block;
@@ -521,12 +521,12 @@ extern "C" {
       }
 
       if (names->used == names->size) {
-        f_macro_string_dynamics_t_resize(status, (*names), names->size + f_directory_default_allocation_step);
+        macro_f_string_dynamics_t_resize(status, (*names), names->size + f_directory_default_allocation_step);
         if (F_status_is_error(status)) break;
       }
 
-      f_macro_string_dynamic_t_clear(names->array[names->used])
-      f_macro_string_dynamic_t_resize(status, names->array[names->used], size);
+      macro_f_string_dynamic_t_clear(names->array[names->used])
+      macro_f_string_dynamic_t_resize(status, names->array[names->used], size);
       if (F_status_is_error(status)) break;
 
       if (names->array[names->used].used > 0 && names->array[names->used].string[names->array[names->used].used - 1] != 0) {
@@ -539,7 +539,7 @@ extern "C" {
         if (total > names->array[names->used].size) {
           f_status_t status = F_none;
 
-          f_macro_string_dynamics_t_resize(status, (*names), total);
+          macro_f_string_dynamics_t_resize(status, (*names), total);
           if (F_status_is_error(status)) break;
         }
 
@@ -743,7 +743,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_string_dynamic_t_resize(status, (*destination), destination->used + total);
+        macro_f_string_dynamic_t_resize(status, (*destination), destination->used + total);
         if (F_status_is_error(status)) return status;
       }
     }
index 7ea91a4dd66a7ce238799a395ff4e6511c688152..37954aefe1d65b87f9be987cd0ea7db12b433add 100644 (file)
@@ -21,7 +21,7 @@ extern "C" {
     environment->array[environment->used].name.used = 0;
     environment->array[environment->used].value.used = 0;
 
-    const f_string_static_t name_string = f_macro_string_static_t_initialize(name, length);
+    const f_string_static_t name_string = macro_f_string_static_t_initialize(name, length);
 
     status = f_string_dynamic_append_nulless(name_string, &environment->array[environment->used].name);
     if (F_status_is_error(status)) return status;
@@ -98,10 +98,10 @@ extern "C" {
 
       // When PATH is "", this is actually a valid search path for PWD.
       // Append an equivalent representation of PWD (string used length is 0).
-      f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+      macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
       if (F_status_is_error(status)) return status;
 
-      f_macro_string_dynamic_t_clear(paths->array[paths->used]);
+      macro_f_string_dynamic_t_clear(paths->array[paths->used]);
       paths->used++;
 
       return F_none;
@@ -114,11 +114,11 @@ extern "C" {
     for (i = 0; i <= length; i++) {
 
       if (i == length || path[i] == f_path_separator_variable_s[0]) {
-        f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+        macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
         if (F_status_is_error(status)) return status;
 
         if (!i) {
-          f_macro_string_dynamic_t_clear(paths->array[paths->used]);
+          macro_f_string_dynamic_t_clear(paths->array[paths->used]);
           paths->used++;
 
           first = 1;
@@ -131,14 +131,14 @@ extern "C" {
 
         if (total > 0) {
           if (path[i - 1] == f_path_separator_s[0]) {
-            f_macro_string_dynamic_t_clear(part)
-            f_macro_string_dynamic_t_resize(status, part, total)
+            macro_f_string_dynamic_t_clear(part)
+            macro_f_string_dynamic_t_resize(status, part, total)
             if (F_status_is_error(status)) return status;
 
             part.used = total;
           }
           else {
-            f_macro_string_dynamic_t_resize(status, part, (total + 1))
+            macro_f_string_dynamic_t_resize(status, part, (total + 1))
             if (F_status_is_error(status)) return status;
 
             part.string[total] = f_path_separator_s[0];
@@ -174,10 +174,10 @@ extern "C" {
 
       // When PATH is "", this is actually a valid search path for PWD.
       // Therefore append an equivalent representation of PWD (string used length is 0).
-      f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+      macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
       if (F_status_is_error(status)) return status;
 
-      f_macro_string_dynamic_t_clear(paths->array[paths->used]);
+      macro_f_string_dynamic_t_clear(paths->array[paths->used]);
       paths->used++;
 
       return F_none;
@@ -193,11 +193,11 @@ extern "C" {
     for (i = 0; i <= path.used; i++) {
 
       if (i == path.used || path.string[i] == f_path_separator_variable_s[0]) {
-        f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+        macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
         if (F_status_is_error(status)) return status;
 
         if (!i) {
-          f_macro_string_dynamic_t_clear(paths->array[paths->used]);
+          macro_f_string_dynamic_t_clear(paths->array[paths->used]);
           paths->used++;
 
           first = 1;
@@ -207,8 +207,8 @@ extern "C" {
         total = i - first;
 
         if (total > 0) {
-          f_macro_string_dynamic_t_clear(part)
-          f_macro_string_dynamic_t_resize(status, part, total)
+          macro_f_string_dynamic_t_clear(part)
+          macro_f_string_dynamic_t_resize(status, part, total)
           if (F_status_is_error(status)) return status;
 
           for (j = 0; j < total; j++) {
@@ -219,7 +219,7 @@ extern "C" {
           } // for
 
           if (part.string[part.used - 1] != f_path_separator_s[0]) {
-            f_macro_string_dynamic_t_resize(status, part, (total + 1))
+            macro_f_string_dynamic_t_resize(status, part, (total + 1))
             if (F_status_is_error(status)) return status;
 
             part.string[part.used] = f_path_separator_s[0];
@@ -253,7 +253,7 @@ extern "C" {
 
       // When PATH is "", this is actually a valid search path for PWD.
       // Therefore append an equivalent representation of PWD (string used length is 0).
-      f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+      macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
       if (F_status_is_error(status)) return status;
 
       paths->array[paths->used].string = 0;
@@ -274,7 +274,7 @@ extern "C" {
       j--;
 
       if (!j || path[j] == f_path_separator_variable_s[0]) {
-        f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+        macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
         if (F_status_is_error(status)) return status;
 
         if (path[j] == f_path_separator_variable_s[0]) {
@@ -282,14 +282,14 @@ extern "C" {
 
           if (total > 0) {
             if (path[j + total] == f_path_separator_s[0]) {
-              f_macro_string_dynamic_t_clear(part)
-              f_macro_string_dynamic_t_resize(status, part, total)
+              macro_f_string_dynamic_t_clear(part)
+              macro_f_string_dynamic_t_resize(status, part, total)
               if (F_status_is_error(status)) return status;
 
               part.used = total;
             }
             else {
-              f_macro_string_dynamic_t_resize(status, part, (total + 1))
+              macro_f_string_dynamic_t_resize(status, part, (total + 1))
               if (F_status_is_error(status)) return status;
 
               part.string[total] = f_path_separator_s[0];
@@ -308,14 +308,14 @@ extern "C" {
 
           if (total > 0) {
             if (path[last - 1] == f_path_separator_s[0]) {
-              f_macro_string_dynamic_t_clear(part)
-              f_macro_string_dynamic_t_resize(status, part, total)
+              macro_f_string_dynamic_t_clear(part)
+              macro_f_string_dynamic_t_resize(status, part, total)
               if (F_status_is_error(status)) return status;
 
               part.used = total;
             }
             else {
-              f_macro_string_dynamic_t_resize(status, part, (total + 1))
+              macro_f_string_dynamic_t_resize(status, part, (total + 1))
               if (F_status_is_error(status)) return status;
 
               part.used = total + 1;
@@ -349,10 +349,10 @@ extern "C" {
     if (!path.used) {
       // When PATH is "", this is actually a valid search path for PWD.
       // Therefore append an equivalent representation of PWD (string used length is 0).
-      f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+      macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
       if (F_status_is_error(status)) return status;
 
-      f_macro_string_dynamic_t_clear(paths->array[paths->used]);
+      macro_f_string_dynamic_t_clear(paths->array[paths->used]);
       paths->used++;
 
       return F_none;
@@ -370,15 +370,15 @@ extern "C" {
       j--;
 
       if (!j || path.string[j] == f_path_separator_variable_s[0]) {
-        f_macro_memory_structure_macro_increment(status, (*paths), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+        macro_f_memory_structure_increment(status, (*paths), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
         if (F_status_is_error(status)) return status;
 
         if (path.string[j] == f_path_separator_variable_s[0]) {
           total = last - i;
 
           if (total > 0) {
-            f_macro_string_dynamic_t_clear(part)
-            f_macro_string_dynamic_t_resize(status, part, total)
+            macro_f_string_dynamic_t_clear(part)
+            macro_f_string_dynamic_t_resize(status, part, total)
             if (F_status_is_error(status)) return status;
 
             for (k = 0; k < total; k++) {
@@ -389,7 +389,7 @@ extern "C" {
             } // for
 
             if (part.string[part.used - 1] != f_path_separator_s[0]) {
-              f_macro_string_dynamic_t_resize(status, part, (total + 1))
+              macro_f_string_dynamic_t_resize(status, part, (total + 1))
               if (F_status_is_error(status)) return status;
 
               part.string[part.used] = f_path_separator_s[0];
@@ -403,8 +403,8 @@ extern "C" {
           // when j = 0, the total is actually the entire length to max.
           total = last - j;
 
-          f_macro_string_dynamic_t_clear(part)
-          f_macro_string_dynamic_t_resize(status, part, total)
+          macro_f_string_dynamic_t_clear(part)
+          macro_f_string_dynamic_t_resize(status, part, total)
           if (F_status_is_error(status)) return status;
 
           for (k = 0; k < total; k++) {
@@ -415,7 +415,7 @@ extern "C" {
           } // for
 
           if (part.string[part.used - 1] != f_path_separator_s[0]) {
-            f_macro_string_dynamic_t_resize(status, part, (total + 1))
+            macro_f_string_dynamic_t_resize(status, part, (total + 1))
             if (F_status_is_error(status)) return status;
 
             part.string[part.used - 1] = f_path_separator_s[0];
index deb4266deffb58a13c028b024f60b87da401d8ef..838c3e91dd12e982d71a273de8f56c1867d2c1ab 100644 (file)
@@ -50,9 +50,9 @@ extern "C" {
 
   #define fl_execute_parameter_t_initialize { 0, 0, 0, 0, 0 }
 
-  #define fl_macro_execute_parameter_t_initialize(option, wait, environment, signals, data) { option, wait, environment, signals, data }
+  #define macro_fl_execute_parameter_t_initialize(option, wait, environment, signals, data) { option, wait, environment, signals, data }
 
-  #define fl_macro_execute_parameter_t_clear(set) \
+  #define macro_fl_execute_parameter_t_clear(set) \
     set.option = 0; \
     set.wait = 0; \
     set.environment = 0; \
@@ -94,9 +94,9 @@ extern "C" {
 
   #define fl_execute_as_t_initialize { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
-  #define fl_macro_execute_as_t_initialize(nice, id_user, id_group, affinity, capability, control_group, id_groups, limits, scheduler) { nice, id_user, id_group, affinity, capability, control_group, id_groups, limits, scheduler }
+  #define macro_fl_execute_as_t_initialize(nice, id_user, id_group, affinity, capability, control_group, id_groups, limits, scheduler) { nice, id_user, id_group, affinity, capability, control_group, id_groups, limits, scheduler }
 
-  #define fl_macro_execute_as_t_clear(as) \
+  #define macro_fl_execute_as_t_clear(as) \
     as.nice = 0; \
     as.id_user = 0; \
     as.id_group = 0; \
index c199e7d7706871a60c4b6ced0dfc259a0c333caa..bc8ddf478fa0dc3a6e0b6095b320a87f611f06c2 100644 (file)
@@ -51,7 +51,7 @@ extern "C" {
       return F_data_not_stop;
     }
 
-    f_macro_fss_content_t_increase(status, (*found))
+    macro_f_fss_content_t_increase(status, (*found))
     if (F_status_is_error(status)) return status;
 
     found->array[found->used].start = range->start;
index 3ef5b55d1a246a18de05404fea19f3791cfce51b..b8cd77bad0afafc92736b1e0678e9e630654452b 100644 (file)
@@ -83,7 +83,7 @@ extern "C" {
           slash_count++;
         } // for
 
-        private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+        private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
         if (buffer.string[range->start] == f_fss_basic_list_open) {
           graph_first = F_false;
@@ -105,14 +105,14 @@ extern "C" {
             if (F_status_is_error(status)) break;
           } // while
 
-          private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+          private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
           if (buffer.string[range->start] == f_fss_eol) {
             start = range->start;
 
             range->start = slash_first;
 
-            f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
+            macro_f_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
             if (F_status_is_error(status)) break;
 
             if (slash_count % 2 == 0) {
@@ -149,7 +149,7 @@ extern "C" {
           graph_first = F_false;
 
           // comments may only have whitespace before the '#', therefore only the first slash needs to be delimited.
-          f_macro_fss_delimits_t_increase(status, (*delimits));
+          macro_f_fss_delimits_t_increase(status, (*delimits));
           if (F_status_is_error(status)) break;
 
           delimits->array[delimits->used++] = slash_first;
@@ -181,7 +181,7 @@ extern "C" {
           if (F_status_is_error(status)) break;
         } // while
 
-        private_fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+        private_macro_fl_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
         if (buffer.string[range->start] == f_fss_eol) {
           found->stop = stop;
@@ -245,9 +245,9 @@ extern "C" {
     f_status_t status = f_fss_skip_past_delimit(buffer, range);
     if (F_status_is_error(status)) return status;
 
-    private_fl_macro_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
+    private_macro_fl_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
 
-    f_macro_fss_content_t_increase(status, (*found))
+    macro_f_fss_content_t_increase(status, (*found))
     if (F_status_is_error(status)) return status;
 
     found->array[found->used].start = range->start;
@@ -265,7 +265,7 @@ extern "C" {
 
       if (buffer.string[range->start] == f_fss_eol) {
         if (graph_first == 0x2) {
-          f_macro_fss_delimits_t_increase(status, (*delimits));
+          macro_f_fss_delimits_t_increase(status, (*delimits));
           if (F_status_is_error(status)) break;
 
           delimits->array[delimits->used++] = comment_delimit;
@@ -324,7 +324,7 @@ extern "C" {
               return FL_fss_found_content;
             }
 
-            f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
+            macro_f_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
             if (F_status_is_error(status)) break;
 
             while (slash_count > 0) {
@@ -344,7 +344,7 @@ extern "C" {
             if (F_status_is_error(status)) break;
 
             if (graph_first == 0x2) {
-              f_macro_fss_delimits_t_increase(status, (*delimits));
+              macro_f_fss_delimits_t_increase(status, (*delimits));
               if (F_status_is_error(status)) break;
 
               delimits->array[delimits->used++] = comment_delimit;
@@ -401,7 +401,7 @@ extern "C" {
 
         if (buffer.string[range->start] == f_fss_eol) {
           if (graph_first == 0x2) {
-            f_macro_fss_delimits_t_increase(status, (*delimits));
+            macro_f_fss_delimits_t_increase(status, (*delimits));
             if (F_status_is_error(status)) break;
 
             delimits->array[delimits->used++] = comment_delimit;
@@ -420,7 +420,7 @@ extern "C" {
         status = f_fss_seek_to_eol(buffer, range);
         if (F_status_is_error(status)) break;
 
-        f_macro_fss_comments_t_increase(status, (*comments))
+        macro_f_fss_comments_t_increase(status, (*comments))
         if (F_status_is_error(status)) break;
 
         if (range->start > range->stop || range->start >= buffer.used) {
@@ -456,7 +456,7 @@ extern "C" {
 
     found->array[found->used++].stop = range->start - 1;
 
-    private_fl_macro_fss_content_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+    private_macro_fl_fss_content_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
     return FL_fss_found_content;
   }
@@ -533,7 +533,7 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (status == F_true) {
-          width = f_macro_utf_byte_width(object.string[range->start]);
+          width = macro_f_utf_byte_width(object.string[range->start]);
 
           status = f_string_dynamic_increase_by(width, destination);
           if (F_status_is_error(status)) break;
@@ -595,7 +595,7 @@ extern "C" {
           break;
         }
 
-        width = f_macro_utf_byte_width(object.string[range->start]);
+        width = macro_f_utf_byte_width(object.string[range->start]);
 
         status = f_string_dynamic_increase_by(width, destination);
         if (F_status_is_error(status)) break;
@@ -820,7 +820,7 @@ extern "C" {
           do_prepend = F_true;
         }
 
-        width = f_macro_utf_byte_width(content.string[range->start]);
+        width = macro_f_utf_byte_width(content.string[range->start]);
 
         status = f_string_dynamic_increase_by(width, destination);
         if (F_status_is_error(status)) break;
index acdc7df2dbd590a59ad8fbddc7194fce8b10faf7..9df8c1a765088bf8103ec739df5f097fae0ccb2f 100644 (file)
@@ -97,7 +97,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+        private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
         if (buffer.string[range->start] == f_fss_embedded_list_open) {
           graph_first = F_false;
@@ -117,14 +117,14 @@ extern "C" {
             if (F_status_is_error(status)) break;
           } // while
 
-          private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+          private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
           if (buffer.string[range->start] == f_fss_eol) {
             start = range->start;
 
             range->start = slash_first;
 
-            f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
+            macro_f_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
             if (F_status_is_error(status)) break;
 
             if (slash_count % 2 == 0) {
@@ -159,7 +159,7 @@ extern "C" {
           graph_first = F_false;
 
           // comments may only have whitespace before the '#', therefore only the first slash needs to be delimited.
-          f_macro_fss_delimits_t_increase(status, (*delimits));
+          macro_f_fss_delimits_t_increase(status, (*delimits));
           if (F_status_is_error(status)) break;
 
           delimits->array[delimits->used++] = slash_first;
@@ -193,7 +193,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        private_fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+        private_macro_fl_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
         if (buffer.string[range->start] == f_fss_eol) {
           found->stop = stop;
@@ -235,7 +235,7 @@ extern "C" {
       }
     } // while
 
-    private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+    private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
     status = f_utf_buffer_increment(buffer, range, 1);
 
@@ -266,22 +266,22 @@ extern "C" {
       return status;
     }
 
-    f_macro_fss_nest_t_increase(status, (*found));
+    macro_f_fss_nest_t_increase(status, (*found));
     if (F_status_is_error(status)) return status;
 
     f_array_lengths_t positions_start = f_array_lengths_t_initialize;
 
-    f_macro_array_lengths_t_clear(positions_start)
-    f_macro_array_lengths_t_resize(status, positions_start, f_fss_default_allocation_step)
+    macro_f_array_lengths_t_clear(positions_start)
+    macro_f_array_lengths_t_resize(status, positions_start, f_fss_default_allocation_step)
     if (F_status_is_error(status)) return status;
 
     f_fss_objects_t objects = f_fss_objects_t_initialize;
 
-    f_macro_fss_objects_t_clear(objects)
-    f_macro_fss_objects_t_resize(status, objects, f_fss_default_allocation_step)
+    macro_f_fss_objects_t_clear(objects)
+    macro_f_fss_objects_t_resize(status, objects, f_fss_default_allocation_step)
 
     if (F_status_is_error(status)) {
-      f_macro_array_lengths_t_delete_simple(positions_start);
+      macro_f_array_lengths_t_delete_simple(positions_start);
 
       return status;
     }
@@ -316,7 +316,7 @@ extern "C" {
 
       if (buffer.string[range->start] == f_fss_eol) {
         if (graph_first == 0x2) {
-          f_macro_fss_delimits_t_increase(status, (*delimits));
+          macro_f_fss_delimits_t_increase(status, (*delimits));
           if (F_status_is_error(status)) break;
 
           delimits->array[delimits->used++] = comment_delimit;
@@ -327,10 +327,10 @@ extern "C" {
         graph_first = 0x1;
 
         if (depth > 0) {
-          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          private_fl_macro_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop);
+          private_macro_fl_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop);
         }
 
         line_start = range->start;
@@ -361,10 +361,10 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (depth > 0) {
-          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+          private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
         }
 
         // All slashes for an open are delimited (because it could represent a slash in the object name).
@@ -374,7 +374,7 @@ extern "C" {
         // When slash is odd and a (delimited) valid open/close is found, then save delimited positions and continue.
         if (buffer.string[range->start] == f_fss_eol) {
           if (graph_first == 0x2) {
-            f_macro_fss_delimits_t_increase(status, (*delimits));
+            macro_f_fss_delimits_t_increase(status, (*delimits));
             if (F_status_is_error(status)) break;
 
             delimits->array[delimits->used++] = comment_delimit;
@@ -400,7 +400,7 @@ extern "C" {
 
             if (buffer.string[range->start] == f_fss_eol) {
               if (graph_first == 0x2) {
-                f_macro_fss_delimits_t_increase(status, (*delimits));
+                macro_f_fss_delimits_t_increase(status, (*delimits));
                 if (F_status_is_error(status)) break;
 
                 delimits->array[delimits->used++] = comment_delimit;
@@ -428,10 +428,10 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           if (depth > 0) {
-            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+            private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
           }
           else {
-            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+            private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
           }
 
           // this is a valid object open/close that has been delimited, save the slash delimit positions.
@@ -449,7 +449,7 @@ extern "C" {
 
               range->start = slash_first;
 
-              f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
+              macro_f_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
               if (F_status_is_error(status)) break;
 
               // apply slash delimits, only slashes and placeholders should be present.
@@ -474,7 +474,7 @@ extern "C" {
                 depth++;
 
                 if (depth > positions_start.size) {
-                  f_macro_array_lengths_t_resize(status, positions_start, positions_start.size + f_fss_default_allocation_step);
+                  macro_f_array_lengths_t_resize(status, positions_start, positions_start.size + f_fss_default_allocation_step);
                   if (F_status_is_error(status)) break;
                 }
 
@@ -489,7 +489,7 @@ extern "C" {
               }
             }
             else {
-              f_macro_fss_delimits_t_increase(status, (*delimits));
+              macro_f_fss_delimits_t_increase(status, (*delimits));
               if (F_status_is_error(status)) break;
 
               delimits->array[delimits->used++] = slash_last;
@@ -534,20 +534,20 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (depth > 0) {
-          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+          private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
         }
 
         if (buffer.string[range->start] == f_fss_eol) {
           depth++;
 
           if (depth >= positions_start.size) {
-            f_macro_array_lengths_t_resize(status, positions_start, positions_start.size + f_fss_default_allocation_step);
+            macro_f_array_lengths_t_resize(status, positions_start, positions_start.size + f_fss_default_allocation_step);
             if (F_status_is_error(status)) break;
 
-            f_macro_fss_objects_t_resize(status, objects, objects.size + f_fss_default_allocation_step);
+            macro_f_fss_objects_t_resize(status, objects, objects.size + f_fss_default_allocation_step);
             if (F_status_is_error(status)) break;
           }
 
@@ -561,7 +561,7 @@ extern "C" {
           objects.array[depth].stop = before_list_open;
 
           if (graph_first == 0x2) {
-            f_macro_fss_delimits_t_increase(status, (*delimits));
+            macro_f_fss_delimits_t_increase(status, (*delimits));
             if (F_status_is_error(status)) break;
 
             delimits->array[delimits->used++] = comment_delimit;
@@ -578,7 +578,7 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           if (graph_first == 0x2) {
-            f_macro_fss_delimits_t_increase(status, (*delimits));
+            macro_f_fss_delimits_t_increase(status, (*delimits));
             if (F_status_is_error(status)) break;
 
             delimits->array[delimits->used++] = comment_delimit;
@@ -605,10 +605,10 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           if (depth > 0) {
-            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+            private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
           }
           else {
-            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+            private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
           }
         }
       }
@@ -639,25 +639,25 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (depth > 0) {
-          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+          private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
         }
 
         if (buffer.string[range->start] == f_fss_eol) {
-          f_macro_fss_nest_t_increase(status, (*found));
+          macro_f_fss_nest_t_increase(status, (*found));
           if (F_status_is_error(status)) break;
 
           if (found->depth[depth].used == found->depth[depth].size) {
-            f_macro_fss_items_t_resize(status, found->depth[depth], found->depth[depth].size + f_fss_default_allocation_step);
+            macro_f_fss_items_t_resize(status, found->depth[depth], found->depth[depth].size + f_fss_default_allocation_step);
             if (F_status_is_error(status)) break;
           }
 
           position = found->depth[depth].used;
 
           if (found->depth[depth].array[position].content.size != 1) {
-            f_macro_fss_content_t_resize(status, found->depth[depth].array[position].content, 1);
+            macro_f_fss_content_t_resize(status, found->depth[depth].array[position].content, 1);
             if (F_status_is_error(status)) break;
           }
 
@@ -682,7 +682,7 @@ extern "C" {
           }
 
           if (graph_first == 0x2) {
-            f_macro_fss_delimits_t_increase(status, (*delimits));
+            macro_f_fss_delimits_t_increase(status, (*delimits));
             if (F_status_is_error(status)) break;
 
             delimits->array[delimits->used++] = comment_delimit;
@@ -696,10 +696,10 @@ extern "C" {
             status = f_utf_buffer_increment(buffer, range, 1);
             if (F_status_is_error(status)) break;
 
-            private_fl_macro_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop)
+            private_macro_fl_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop)
 
-            f_macro_array_lengths_t_delete_simple(positions_start);
-            f_macro_fss_objects_t_delete_simple(objects);
+            macro_f_array_lengths_t_delete_simple(positions_start);
+            macro_f_fss_objects_t_delete_simple(objects);
 
             return FL_fss_found_content;
           }
@@ -713,7 +713,7 @@ extern "C" {
 
             if (buffer.string[range->start] == f_fss_eol) {
               if (graph_first == 0x2) {
-                f_macro_fss_delimits_t_increase(status, (*delimits));
+                macro_f_fss_delimits_t_increase(status, (*delimits));
                 if (F_status_is_error(status)) break;
 
                 delimits->array[delimits->used++] = comment_delimit;
@@ -734,10 +734,10 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           if (depth > 0) {
-            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop)
+            private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop)
           }
           else {
-            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop)
+            private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop)
           }
         }
       }
@@ -747,7 +747,7 @@ extern "C" {
         status = f_fss_seek_to_eol(buffer, range);
         if (F_status_is_error(status)) break;
 
-        f_macro_fss_comments_t_increase(status, (*comments))
+        macro_f_fss_comments_t_increase(status, (*comments))
         if (F_status_is_error(status)) break;
 
         if (range->start > range->stop || range->start >= buffer.used) {
@@ -755,7 +755,7 @@ extern "C" {
         }
         else {
           if (graph_first == 0x2) {
-            f_macro_fss_delimits_t_increase(status, (*delimits));
+            macro_f_fss_delimits_t_increase(status, (*delimits));
             if (F_status_is_error(status)) break;
 
             delimits->array[delimits->used++] = comment_delimit;
@@ -797,8 +797,8 @@ extern "C" {
       if (F_status_is_error(status)) break;
     } // while
 
-    f_macro_array_lengths_t_delete_simple(positions_start);
-    f_macro_fss_objects_t_delete_simple(objects);
+    macro_f_array_lengths_t_delete_simple(positions_start);
+    macro_f_fss_objects_t_delete_simple(objects);
 
     delimits->used = delimits_used;
     comments->used = comments_used;
@@ -899,7 +899,7 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (status == F_true) {
-          width = f_macro_utf_byte_width(object.string[range->start]);
+          width = macro_f_utf_byte_width(object.string[range->start]);
 
           status = f_string_dynamic_increase_by(width, destination);
           if (F_status_is_error(status)) break;
@@ -967,7 +967,7 @@ extern "C" {
 
         ends_on_space = status == F_true;
 
-        width = f_macro_utf_byte_width(object.string[range->start]);
+        width = macro_f_utf_byte_width(object.string[range->start]);
 
         status = f_string_dynamic_increase_by(width, destination);
         if (F_status_is_error(status)) break;
@@ -1248,7 +1248,7 @@ extern "C" {
           ends_on_eol = F_false;
         }
 
-        width = f_macro_utf_byte_width(content.string[range->start]);
+        width = macro_f_utf_byte_width(content.string[range->start]);
 
         status = f_string_dynamic_increase_by(width, destination);
         if (F_status_is_error(status)) break;
index ccfff3a1c11e96f0b6412c1f9f37b04954bef95a..e48518014ac641f23670de8dab1d1b1376d12675 100644 (file)
@@ -72,10 +72,10 @@ extern "C" {
       if (status == FL_fss_found_object || status == FL_fss_found_object_content_not) {
 
         if (found->used + 1 > found->size) {
-          f_macro_string_ranges_t_increase(status_allocate, (*found));
+          macro_f_string_ranges_t_increase(status_allocate, (*found));
 
           if (F_status_is_fine(status_allocate) && quotes) {
-            f_macro_fss_quotes_t_resize(status_allocate, (*quotes), found->size);
+            macro_f_fss_quotes_t_resize(status_allocate, (*quotes), found->size);
           }
 
           if (F_status_is_error(status_allocate)) {
index 5ff84498a940af0b17a5820e12187aeebe6c3247..8ef9f8511b3a2842d0caa8432dcb4a3379121697 100644 (file)
@@ -97,7 +97,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+        private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
         if (buffer.string[range->start] == f_fss_extended_list_open) {
           graph_first = F_false;
@@ -117,14 +117,14 @@ extern "C" {
             if (F_status_is_error(status)) break;
           } // while
 
-          private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+          private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
           if (buffer.string[range->start] == f_fss_eol) {
             start = range->start;
 
             range->start = slash_first;
 
-            f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
+            macro_f_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
             if (F_status_is_error(status)) break;
 
             if (slash_count % 2 == 0) {
@@ -159,7 +159,7 @@ extern "C" {
           graph_first = F_false;
 
           // comments may only have whitespace before the '#', therefore only the first slash needs to be delimited.
-          f_macro_fss_delimits_t_increase(status, (*delimits));
+          macro_f_fss_delimits_t_increase(status, (*delimits));
           if (F_status_is_error(status)) break;
 
           delimits->array[delimits->used++] = slash_first;
@@ -193,7 +193,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        private_fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+        private_macro_fl_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
         if (buffer.string[range->start] == f_fss_eol) {
           found->stop = stop;
@@ -235,7 +235,7 @@ extern "C" {
       }
     } // while
 
-    private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+    private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
     status = f_utf_buffer_increment(buffer, range, 1);
 
@@ -263,9 +263,9 @@ extern "C" {
     f_status_t status = f_fss_skip_past_delimit(buffer, range);
     if (F_status_is_error(status)) return status;
 
-    private_fl_macro_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
+    private_macro_fl_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
 
-    f_macro_fss_content_t_increase(status, (*found))
+    macro_f_fss_content_t_increase(status, (*found))
     if (F_status_is_error(status)) return status;
 
     found->array[found->used].start = range->start;
@@ -326,7 +326,7 @@ extern "C" {
           if (range->start > range->stop || range->start >= buffer.used) break;
 
           if (buffer.string[range->start] == f_fss_eol) {
-            f_macro_fss_delimits_t_increase(status, (*delimits));
+            macro_f_fss_delimits_t_increase(status, (*delimits));
             if (F_status_is_error(status)) break;
 
             delimits->array[delimits->used++] = slash_first;
@@ -334,7 +334,7 @@ extern "C" {
           }
         }
         else if (buffer.string[range->start] == f_fss_comment) {
-          f_macro_fss_delimits_t_increase(status, (*delimits));
+          macro_f_fss_delimits_t_increase(status, (*delimits));
           if (F_status_is_error(status)) break;
 
           delimits->array[delimits->used++] = slash_first;
@@ -383,7 +383,7 @@ extern "C" {
         status = f_fss_seek_to_eol(buffer, range);
         if (F_status_is_error(status)) break;
 
-        f_macro_fss_comments_t_increase(status, (*comments))
+        macro_f_fss_comments_t_increase(status, (*comments))
         if (F_status_is_error(status)) break;
 
         if (range->start > range->stop || range->start >= buffer.used) {
@@ -489,7 +489,7 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (status == F_true) {
-          width = f_macro_utf_byte_width(object.string[range->start]);
+          width = macro_f_utf_byte_width(object.string[range->start]);
 
           status = f_string_dynamic_increase_by(width, destination);
           if (F_status_is_error(status)) break;
@@ -557,7 +557,7 @@ extern "C" {
 
         ends_on_space = status == F_true;
 
-        width = f_macro_utf_byte_width(object.string[range->start]);
+        width = macro_f_utf_byte_width(object.string[range->start]);
 
         status = f_string_dynamic_increase_by(width, destination);
         if (F_status_is_error(status)) break;
@@ -832,7 +832,7 @@ extern "C" {
           ends_on_eol = F_false;
         }
 
-        width = f_macro_utf_byte_width(content.string[range->start]);
+        width = macro_f_utf_byte_width(content.string[range->start]);
 
         status = f_string_dynamic_increase_by(width, destination);
         if (F_status_is_error(status)) break;
index 9b9b93a03e1fe0f1f38ceed2a610bf03f8f6eaf0..66021b4eb33a212e8352efc3c078edba95e98a9e 100644 (file)
@@ -9,7 +9,7 @@ extern "C" {
 #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_)
   f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_array_length_t used_start, f_string_dynamic_t *destination) {
     f_status_t status = F_none;
-    f_string_range_t destination_range = f_macro_string_range_t_initialize(destination->used);
+    f_string_range_t destination_range = macro_f_string_range_t_initialize(destination->used);
     f_array_length_t i = 0;
 
     uint8_t width = 0;
@@ -37,7 +37,7 @@ extern "C" {
 
         if (status == F_false) break;
 
-        width = f_macro_utf_byte_width(destination->string[destination_range.start]);
+        width = macro_f_utf_byte_width(destination->string[destination_range.start]);
 
         for (i = 0; i < width; i++) {
           destination->string[destination_range.start + i] = f_fss_delimit_placeholder;
@@ -72,7 +72,7 @@ extern "C" {
 
         if (status == F_false) break;
 
-        width = f_macro_utf_byte_width(destination->string[destination_range.start]);
+        width = macro_f_utf_byte_width(destination->string[destination_range.start]);
 
         for (i = 0; i < width; i++) {
           destination->string[destination_range.start + i] = f_fss_delimit_placeholder;
@@ -124,7 +124,7 @@ extern "C" {
 #if !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_)
   f_status_t private_fl_fss_basic_list_write_object_trim(const f_array_length_t used_start, f_string_dynamic_t *destination) {
     f_status_t status = F_none;
-    f_string_range_t destination_range = f_macro_string_range_t_initialize(destination->used);
+    f_string_range_t destination_range = macro_f_string_range_t_initialize(destination->used);
     f_array_length_t i = 0;
 
     uint8_t width = 0;
@@ -144,7 +144,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      width = f_macro_utf_byte_width(destination->string[destination_range.start]);
+      width = macro_f_utf_byte_width(destination->string[destination_range.start]);
 
       for (i = 0; i < width; i++) {
         destination->string[destination_range.start + i] = f_fss_delimit_placeholder;
@@ -170,7 +170,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      destination->used -= f_macro_utf_byte_width(destination->string[destination_range.start]);
+      destination->used -= macro_f_utf_byte_width(destination->string[destination_range.start]);
     } // for
 
     if (destination_range.start == 0) {
@@ -298,7 +298,7 @@ extern "C" {
 
         // only the first slash before a quoted needs to be escaped (or not) as once there is a slash before a quoted, this cannot ever be a quote object.
         // this simplifies the number of slashes needed.
-        f_macro_fss_delimits_t_increase(status, (*delimits));
+        macro_f_fss_delimits_t_increase(status, (*delimits));
         if (F_status_is_error(status)) return status;
 
         delimits->array[delimits->used] = first_slash;
@@ -428,7 +428,7 @@ extern "C" {
               range->start = first_slash;
 
               if (slash_count % 2 == 0) {
-                f_macro_fss_delimits_t_increase_by(status, (*delimits), slash_count / 2);
+                macro_f_fss_delimits_t_increase_by(status, (*delimits), slash_count / 2);
                 if (F_status_is_error(status)) return status;
 
                 while (slash_count > 0) {
@@ -499,7 +499,7 @@ extern "C" {
                 return FL_fss_found_object;
               }
               else {
-                f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
+                macro_f_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1);
                 if (F_status_is_error(status)) return status;
 
                 while (slash_count > 0) {
@@ -805,7 +805,7 @@ extern "C" {
             }
           }
 
-          width = f_macro_utf_byte_width(object.string[range->start]);
+          width = macro_f_utf_byte_width(object.string[range->start]);
 
           status = f_string_dynamic_increase_by(item_total + width + 1, destination);
           if (F_status_is_error(status)) break;
@@ -848,7 +848,7 @@ extern "C" {
             quoted = F_true;
           }
 
-          width = f_macro_utf_byte_width(object.string[range->start]);
+          width = macro_f_utf_byte_width(object.string[range->start]);
 
           status = f_string_dynamic_increase_by(item_total + width, destination);
           if (F_status_is_error(status)) break;
@@ -914,7 +914,7 @@ extern "C" {
           quoted = F_true;
         }
 
-        width = f_macro_utf_byte_width(object.string[range->start]);
+        width = macro_f_utf_byte_width(object.string[range->start]);
 
         status = f_string_dynamic_increase_by(1 + width, destination);
         if (F_status_is_error(status)) break;
@@ -939,7 +939,7 @@ extern "C" {
           }
         }
 
-        width = f_macro_utf_byte_width(object.string[range->start]);
+        width = macro_f_utf_byte_width(object.string[range->start]);
 
         status = f_string_dynamic_increase_by(width, destination);
         if (F_status_is_error(status)) break;
index 4449fdacfe0827b5b1c76e9eb3ee7a1c84fb1355..574b66723822c9d3101a55c5a5b68114234d0cfa 100644 (file)
@@ -14,8 +14,8 @@
 extern "C" {
 #endif
 
-#ifndef _di_fl_macro_fss_object_return_on_overflow_
-  #define private_fl_macro_fss_object_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
+#ifndef _di_macro_fl_fss_object_return_on_overflow_
+  #define private_macro_fl_fss_object_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       found.stop = buffer.used - 1; \
@@ -26,10 +26,10 @@ extern "C" {
       found.stop = range.stop; \
       return stop_status; \
     }
-#endif // _di_fl_macro_fss_object_return_on_overflow_
+#endif // _di_macro_fl_fss_object_return_on_overflow_
 
-#ifndef _di_fl_macro_fss_object_return_on_overflow_delimited_
-  #define private_fl_macro_fss_object_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
+#ifndef _di_macro_fl_fss_object_return_on_overflow_delimited_
+  #define private_macro_fl_fss_object_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       found.stop = buffer.used - 1; \
       return eos_status; \
@@ -38,10 +38,10 @@ extern "C" {
       found.stop = range.stop; \
       return stop_status; \
     }
-#endif // _di_fl_macro_fss_object_return_on_overflow_delimited_
+#endif // _di_macro_fl_fss_object_return_on_overflow_delimited_
 
-#ifndef _di_fl_macro_fss_content_return_on_overflow_
-  #define private_fl_macro_fss_content_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
+#ifndef _di_macro_fl_fss_content_return_on_overflow_
+  #define private_macro_fl_fss_content_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       found.array[found.used].stop = buffer.used - 1; \
@@ -52,10 +52,10 @@ extern "C" {
       found.array[found.used].stop = range.stop; \
       return stop_status; \
     }
-#endif // _di_fl_macro_fss_content_return_on_overflow_
+#endif // _di_macro_fl_fss_content_return_on_overflow_
 
-#ifndef _di_fl_macro_fss_content_with_comments_return_on_overflow_
-  #define private_fl_macro_fss_content_with_comments_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, eos_status, stop_status) \
+#ifndef _di_macro_fl_fss_content_with_comments_return_on_overflow_
+  #define private_macro_fl_fss_content_with_comments_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       comments.used = comments_used; \
@@ -68,10 +68,10 @@ extern "C" {
       found.array[found.used].stop = range.stop; \
       return stop_status; \
     }
-#endif // _di_fl_macro_fss_content_with_comments_return_on_overflow_
+#endif // _di_macro_fl_fss_content_with_comments_return_on_overflow_
 
-#ifndef _di_fl_macro_fss_content_return_on_overflow_delimited_
-  #define private_fl_macro_fss_content_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
+#ifndef _di_macro_fl_fss_content_return_on_overflow_delimited_
+  #define private_macro_fl_fss_content_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       found.array[found.used].stop = buffer.used - 1; \
       return eos_status; \
@@ -80,39 +80,39 @@ extern "C" {
       found.array[found.used].stop = range.stop; \
       return stop_status; \
     }
-#endif // _di_fl_macro_fss_content_return_on_overflow_delimited_
+#endif // _di_macro_fl_fss_content_return_on_overflow_delimited_
 
-#ifndef _di_fl_macro_fss_nest_return_on_overflow_
-  #define private_fl_macro_fss_nest_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, positions, objects, eos_status, stop_status) \
+#ifndef _di_macro_fl_fss_nest_return_on_overflow_
+  #define private_macro_fl_fss_nest_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, positions, objects, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       comments.used = comments_used; \
-      f_macro_array_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      macro_f_array_lengths_t_delete_simple(positions); \
+      macro_f_fss_objects_t_delete_simple(objects); \
       return eos_status; \
     } \
     else if (range.start > range.stop) { \
       delimits.used = delimits_used; \
       comments.used = comments_used; \
-      f_macro_array_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      macro_f_array_lengths_t_delete_simple(positions); \
+      macro_f_fss_objects_t_delete_simple(objects); \
       return stop_status; \
     }
-#endif // _di_fl_macro_fss_nest_return_on_overflow_
+#endif // _di_macro_fl_fss_nest_return_on_overflow_
 
-#ifndef _di_fl_macro_fss_nest_return_on_overflow_delimited_
-  #define private_fl_macro_fss_nest_return_on_overflow_delimited(buffer, range, found, positions, objects, eos_status, stop_status) \
+#ifndef _di_macro_fl_fss_nest_return_on_overflow_delimited_
+  #define private_macro_fl_fss_nest_return_on_overflow_delimited(buffer, range, found, positions, objects, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
-      f_macro_array_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      macro_f_array_lengths_t_delete_simple(positions); \
+      macro_f_fss_objects_t_delete_simple(objects); \
       return eos_status; \
     } \
     else if (range.start > range.stop) { \
-      f_macro_array_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      macro_f_array_lengths_t_delete_simple(positions); \
+      macro_f_fss_objects_t_delete_simple(objects); \
       return stop_status; \
     }
-#endif // _di_fl_macro_fss_nest_return_on_overflow_delimited_
+#endif // _di_macro_fl_fss_nest_return_on_overflow_delimited_
 
 #ifdef __cplusplus
 } // extern "C"
index 13df33d557cec8dc58deeb8d1b52c588b61d4b7d..c07c81663b91601840249db0b018992ac13dd577 100644 (file)
@@ -40,7 +40,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      i += f_macro_utf_byte_width(string[i]);
+      i += macro_f_utf_byte_width(string[i]);
     } // while
 
     while (i < stop) {
@@ -68,7 +68,7 @@ extern "C" {
       }
 
       if (status == F_true) {
-        j = i + f_macro_utf_byte_width(string[i]);
+        j = i + macro_f_utf_byte_width(string[i]);
 
         if (j == stop) return F_none;
 
@@ -113,7 +113,7 @@ extern "C" {
             break;
           }
 
-          j += f_macro_utf_byte_width(string[j]);
+          j += macro_f_utf_byte_width(string[j]);
         } // while
 
         if (status == F_true) break;
@@ -121,7 +121,7 @@ extern "C" {
 
       if (!fputc(string[i], output)) return F_status_set_error(F_output);
 
-      i += f_macro_utf_byte_width(string[i]);
+      i += macro_f_utf_byte_width(string[i]);
     } // while
 
     return F_none;
@@ -238,7 +238,7 @@ extern "C" {
     f_status_t status = F_none;
     uint8_t width_max = 0;
 
-    for (; i < length; i += f_macro_utf_byte_width(string[i])) {
+    for (; i < length; i += macro_f_utf_byte_width(string[i])) {
 
       width_max = (length - i) + 1;
       status = f_utf_is_whitespace(string + i, width_max);
@@ -254,7 +254,7 @@ extern "C" {
       if (status == F_false) break;
     } // for
 
-    for (; i < length; i += f_macro_utf_byte_width(string[i])) {
+    for (; i < length; i += macro_f_utf_byte_width(string[i])) {
       if (!string[i]) continue;
 
       width_max = (length - i) + 1;
@@ -269,11 +269,11 @@ extern "C" {
       }
 
       if (status == F_true) {
-        j = i + f_macro_utf_byte_width(string[i]);
+        j = i + macro_f_utf_byte_width(string[i]);
 
         if (j == length) return F_none;
 
-        for (; j < length; j += f_macro_utf_byte_width(string[j])) {
+        for (; j < length; j += macro_f_utf_byte_width(string[j])) {
 
           width_max = (length - j) + 1;
           status = f_utf_is_whitespace(string + j, width_max);
index 2a9ba116888caca90b56df757745ae0c4613779e..5e4b7b7a70e1b93d03232bd2bc6ba2bd10c4158a 100644 (file)
@@ -137,7 +137,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      width = f_macro_utf_byte_width(string1[i1]);
+      width = macro_f_utf_byte_width(string1[i1]);
     } // for
 
     // skip past leading whitespace in string2.
@@ -167,7 +167,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      width = f_macro_utf_byte_width(string2[i2]);
+      width = macro_f_utf_byte_width(string2[i2]);
     } // for
 
     f_array_length_t last1 = i1;
@@ -206,7 +206,7 @@ extern "C" {
           return status;
         }
 
-        width = f_macro_utf_byte_width(string1[j]);
+        width = macro_f_utf_byte_width(string1[j]);
 
         if (status == F_false) {
           last1 = j;
@@ -241,7 +241,7 @@ extern "C" {
           return status;
         }
 
-        width = f_macro_utf_byte_width(string2[j]);
+        width = macro_f_utf_byte_width(string2[j]);
 
         if (status == F_false) {
           last2 = j;
@@ -340,7 +340,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      width = f_macro_utf_byte_width(string1[i1]);
+      width = macro_f_utf_byte_width(string1[i1]);
     } // for
 
     // skip past leading whitespace in string2.
@@ -363,7 +363,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      width = f_macro_utf_byte_width(string2[i2]);
+      width = macro_f_utf_byte_width(string2[i2]);
     } // for
 
     f_array_length_t last1 = i1;
@@ -392,7 +392,7 @@ extern "C" {
           return status;
         }
 
-        width = f_macro_utf_byte_width(string1[j]);
+        width = macro_f_utf_byte_width(string1[j]);
 
         if (status == F_false) {
           last1 = j;
@@ -418,7 +418,7 @@ extern "C" {
           return status;
         }
 
-        width = f_macro_utf_byte_width(string2[j]);
+        width = macro_f_utf_byte_width(string2[j]);
 
         if (status == F_false) {
           last2 = j;
@@ -484,7 +484,7 @@ extern "C" {
 
       if (status == F_false) break;
 
-      width = f_macro_utf_byte_width(source[*start]);
+      width = macro_f_utf_byte_width(source[*start]);
     } // for
 
     for (; *stop > *start; (*stop)--) {
@@ -499,7 +499,7 @@ extern "C" {
       // go left until either width is 0 (ascii, or > 1) to determine the character.
       for (;;) {
 
-        width = f_macro_utf_byte_width_is(source[*stop]);
+        width = macro_f_utf_byte_width_is(source[*stop]);
 
         if (width == 1) {
           (*stop)--;
index fc0471ee3723bcd598cd21e065de35d1351b2fd9..650c88335d3e1202f74d9169b0c9050cb9c47a82 100644 (file)
@@ -262,7 +262,7 @@ extern "C" {
     if (!string) return F_data_not;
     if (range->start > range->stop) return F_data_not_stop;
 
-    const unsigned short seek_width = f_macro_utf_character_t_width(seek_to_this);
+    const unsigned short seek_width = macro_f_utf_character_t_width(seek_to_this);
 
     f_status_t status = F_none;
 
@@ -272,7 +272,7 @@ extern "C" {
 
     while (range->start <= range->stop) {
       width_max = (range->stop - range->start) + 1;
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
@@ -328,7 +328,7 @@ extern "C" {
       if (F_status_is_error(status)) return status;
       if (string[range->start] == f_string_eol_s[0]) return F_none_eol;
 
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
@@ -372,7 +372,7 @@ extern "C" {
       if (F_status_is_error(status)) return status;
       if (string[range->start] == f_string_eol_s[0]) return F_none_eol;
 
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
@@ -407,7 +407,7 @@ extern "C" {
     if (!string) return F_data_not;
     if (range->start > range->stop) return F_data_not_stop;
 
-    const unsigned short seek_width = f_macro_utf_character_t_width(seek_to_this);
+    const unsigned short seek_width = macro_f_utf_character_t_width(seek_to_this);
 
     f_status_t status = F_none;
 
@@ -417,7 +417,7 @@ extern "C" {
 
     while (range->start <= range->stop) {
       width_max = (range->stop - range->start) + 1;
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
@@ -499,7 +499,7 @@ extern "C" {
 
     if (range->start > range->stop) return F_data_not_stop;
 
-    const unsigned short seek_width = f_macro_utf_character_t_width(seek_to);
+    const unsigned short seek_width = macro_f_utf_character_t_width(seek_to);
 
     f_status_t status = F_none;
 
@@ -510,7 +510,7 @@ extern "C" {
     for (; range->start <= range->stop; range->start += width) {
       width_max = (range->stop - range->start) + 1;
 
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
@@ -559,7 +559,7 @@ extern "C" {
       if (F_status_is_error(status)) return status;
       if (string[range->start] == f_string_eol_s[0]) return F_none_eol;
 
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
@@ -605,7 +605,7 @@ extern "C" {
 
       if (string[range->start] == f_string_eol_s[0]) return F_none_eol;
 
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
@@ -639,7 +639,7 @@ extern "C" {
 
     if (range->start > range->stop) return F_data_not_stop;
 
-    const unsigned short seek_width = f_macro_utf_character_t_width(seek_to);
+    const unsigned short seek_width = macro_f_utf_character_t_width(seek_to);
 
     f_status_t status = F_none;
 
@@ -650,7 +650,7 @@ extern "C" {
     for (; range->start <= range->stop; range->start += width) {
       width_max = (range->stop - range->start) + 1;
 
-      width = f_macro_utf_byte_width_is(string[range->start]);
+      width = macro_f_utf_byte_width_is(string[range->start]);
 
       if (!width) {
         width = 1;
index 34f2dba62c60f9c3acf86169299ef348e489101e..9571db6b01cbc1287c017a722fcfe02bf98d6ddb 100644 (file)
@@ -93,7 +93,7 @@ extern "C" {
 
     f_utf_character_t seek_to_character = seek_to_this << 24;
 
-    if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+    if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
       return F_status_set_error(F_utf);
     }
 
@@ -105,7 +105,7 @@ extern "C" {
 
       range->start++;
 
-      if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -129,7 +129,7 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+    if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
       return F_status_set_error(F_utf);
     }
 
@@ -140,7 +140,7 @@ extern "C" {
 
       range->start++;
 
-      if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -166,7 +166,7 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+    if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
       return F_status_set_error(F_utf);
     }
 
@@ -177,7 +177,7 @@ extern "C" {
 
       range->start++;
 
-      if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -203,14 +203,14 @@ extern "C" {
 
     f_utf_character_t seek_to_character = seek_to_this << 24;
 
-    if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+    if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
       return F_status_set_error(F_utf);
     }
 
     while (buffer.string[range->start] != seek_to_character) {
       range->start++;
 
-      if (f_macro_utf_character_t_width_is(buffer.string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(buffer.string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -274,7 +274,7 @@ extern "C" {
 
     for (; range->start <= range->stop; range->start++) {
 
-      if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -296,7 +296,7 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+    if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
       return F_status_set_error(F_utf);
     }
 
@@ -307,7 +307,7 @@ extern "C" {
 
       range->start++;
 
-      if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -330,7 +330,7 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    if (f_macro_utf_character_t_width_is(string[range->start]) == 1) return F_status_set_error(F_utf);
+    if (macro_f_utf_character_t_width_is(string[range->start]) == 1) return F_status_set_error(F_utf);
 
     while (string[range->start] == placeholder || (status = f_utf_character_is_graph(string[range->start])) == F_true) {
 
@@ -339,7 +339,7 @@ extern "C" {
 
       range->start++;
 
-      if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
 
@@ -362,7 +362,7 @@ extern "C" {
 
     const f_utf_character_t seek_to_character = seek_to_this << 24;
 
-    if (f_macro_utf_character_t_width_is(string[0]) == 1) {
+    if (macro_f_utf_character_t_width_is(string[0]) == 1) {
       return F_status_set_error(F_utf);
     }
 
@@ -374,7 +374,7 @@ extern "C" {
 
       range->start++;
 
-      if (f_macro_utf_character_t_width_is(string[range->start]) == 1) {
+      if (macro_f_utf_character_t_width_is(string[range->start]) == 1) {
         return F_status_set_error(F_utf);
       }
     } // while
index 4816fdff8aff9eb68efe4dba0a35bc1484bb6141..811dddd7c9c21b498986845d3398ea93ddbae5a7 100644 (file)
@@ -15,7 +15,7 @@ extern "C" {
       increment_by = 0;
 
       if (!*width) {
-        *width = f_macro_utf_byte_width(buffer_read[i]);
+        *width = macro_f_utf_byte_width(buffer_read[i]);
         *width_last = -1;
       }
 
@@ -48,16 +48,16 @@ extern "C" {
       }
 
       if (*width_last == *width) {
-        buffer->string[buffer->used] = f_macro_utf_character_t_from_char_1((buffer_char[0]));
+        buffer->string[buffer->used] = macro_f_utf_character_t_from_char_1((buffer_char[0]));
 
         if (*width > 1) {
-          buffer->string[buffer->used] |= f_macro_utf_character_t_from_char_2((buffer_char[1]));
+          buffer->string[buffer->used] |= macro_f_utf_character_t_from_char_2((buffer_char[1]));
 
           if (*width > 2) {
-            buffer->string[buffer->used] |= f_macro_utf_character_t_from_char_3((buffer_char[2]));
+            buffer->string[buffer->used] |= macro_f_utf_character_t_from_char_3((buffer_char[2]));
 
             if (*width > 3) {
-              buffer->string[buffer->used] |= f_macro_utf_character_t_from_char_4((buffer_char[3]));
+              buffer->string[buffer->used] |= macro_f_utf_character_t_from_char_4((buffer_char[3]));
             }
           }
         }
@@ -99,19 +99,19 @@ extern "C" {
 
         if (width_written < width) {
           if (width_written < 2) {
-            buffer_write[used] = f_macro_utf_character_t_to_char_2(string[*written + i]);
+            buffer_write[used] = macro_f_utf_character_t_to_char_2(string[*written + i]);
             width_written++;
             used++;
           }
 
           if (width > 2 && width_written < 3) {
-            buffer_write[used + 1] = f_macro_utf_character_t_to_char_3(string[*written + i]);
+            buffer_write[used + 1] = macro_f_utf_character_t_to_char_3(string[*written + i]);
             width_written++;
             used++;
           }
 
           if (width == 4 && width_written < 4) {
-            buffer_write[used + 2] = f_macro_utf_character_t_to_char_4(string[*written + i]);
+            buffer_write[used + 2] = macro_f_utf_character_t_to_char_4(string[*written + i]);
             width_written++;
             used++;
           }
@@ -119,14 +119,14 @@ extern "C" {
           width = 0;
         }
         else {
-          width = f_macro_utf_character_t_width(string[*written + i]);
+          width = macro_f_utf_character_t_width(string[*written + i]);
           width_written = width;
 
           if (*written + width > write_max) {
             return F_complete_not_utf_stop;
           }
 
-          buffer_write[used] = f_macro_utf_character_t_to_char_1(string[*written + i]);
+          buffer_write[used] = macro_f_utf_character_t_to_char_1(string[*written + i]);
 
           if (width > 1) {
             if (used == write_size) {
@@ -135,7 +135,7 @@ extern "C" {
               break;
             }
 
-            buffer_write[used + 1] = f_macro_utf_character_t_to_char_2(string[*written + i]);
+            buffer_write[used + 1] = macro_f_utf_character_t_to_char_2(string[*written + i]);
 
             if (width > 2) {
               if (used + 2 > write_size) {
@@ -144,7 +144,7 @@ extern "C" {
                 break;
               }
 
-              buffer_write[used + 2] = f_macro_utf_character_t_to_char_3(string[*written + i]);
+              buffer_write[used + 2] = macro_f_utf_character_t_to_char_3(string[*written + i]);
 
               if (width == 4) {
                 if (used + 3 > write_size) {
@@ -153,7 +153,7 @@ extern "C" {
                   break;
                 }
 
-                buffer_write[used + 3] = f_macro_utf_character_t_to_char_4(string[*written + i]);
+                buffer_write[used + 3] = macro_f_utf_character_t_to_char_4(string[*written + i]);
               }
             }
           }
index 629505106d707528939923f614b3ea96cc6996ec..a04c71256d62bbf453056c159168da371427aeba 100644 (file)
@@ -33,7 +33,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_utf_string_dynamic_t_resize(status, (*buffer), buffer->size + size_read);
+        macro_f_utf_string_dynamic_t_resize(status, (*buffer), buffer->size + size_read);
         if (F_status_is_error(status)) return status;
       }
 
@@ -93,7 +93,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_utf_string_dynamic_t_resize(status, (*buffer), buffer->size + size_read);
+        macro_f_utf_string_dynamic_t_resize(status, (*buffer), buffer->size + size_read);
         if (F_status_is_error(status)) return status;
       }
 
@@ -161,7 +161,7 @@ extern "C" {
           return F_status_set_error(F_string_too_large);
         }
 
-        f_macro_utf_string_dynamic_t_resize(status, (*buffer), buffer->size + size_read);
+        macro_f_utf_string_dynamic_t_resize(status, (*buffer), buffer->size + size_read);
         if (F_status_is_error(status)) return status;
       }
 
index 08077bd589c18f76c6d8e7a092ee919cabeb99ba..d34f5bb1289ce200e9b14739a351f776bb3a76dd 100644 (file)
@@ -72,16 +72,16 @@ extern "C" {
   } fll_error_print_t;
 
   #define fll_error_print_t_initialize { \
-    f_macro_file_t_initialize2(f_type_error, f_type_descriptor_error, f_file_flag_write_only), \
+    macro_f_file_t_initialize2(f_type_error, f_type_descriptor_error, f_file_flag_write_only), \
     f_console_verbosity_normal, \
     fll_error_print_error_s, \
     f_color_set_t_initialize, \
     f_color_set_t_initialize, \
   }
 
-  #define fll_macro_error_print_t_initialize(to, verbosity, prefix, context, notable) { to, verbosity, prefix, context, notable }
-  #define fll_macro_error_print_t_initialize_debug() fll_macro_error_print_t_initialize(f_macro_file_t_initialize2(f_type_debug, f_type_descriptor_debug, f_file_flag_write_only), f_console_verbosity_normal, fll_error_print_debug_s, f_color_set_t_initialize, f_color_set_t_initialize)
-  #define fll_macro_error_print_t_initialize_warning() fll_macro_error_print_t_initialize(f_macro_file_t_initialize2(f_type_warning, f_type_descriptor_warning, f_file_flag_write_only), f_console_verbosity_normal, fll_error_print_warning_s, f_color_set_t_initialize, f_color_set_t_initialize)
+  #define macro_fll_error_print_t_initialize(to, verbosity, prefix, context, notable) { to, verbosity, prefix, context, notable }
+  #define macro_fll_error_print_t_initialize_debug() macro_fll_error_print_t_initialize(macro_f_file_t_initialize2(f_type_debug, f_type_descriptor_debug, f_file_flag_write_only), f_console_verbosity_normal, fll_error_print_debug_s, f_color_set_t_initialize, f_color_set_t_initialize)
+  #define macro_fll_error_print_t_initialize_warning() macro_fll_error_print_t_initialize(macro_f_file_t_initialize2(f_type_warning, f_type_descriptor_warning, f_file_flag_write_only), f_console_verbosity_normal, fll_error_print_warning_s, f_color_set_t_initialize, f_color_set_t_initialize)
 #endif // _di_fll_error_print_t_
 
 #ifdef __cplusplus
index 546bb196c2f91d79bae0a33c1f8d1b9d2c89a562..31814209001afcd2277f59aacfdacfc68b592422 100644 (file)
@@ -160,7 +160,7 @@ extern "C" {
         status = f_file_exists(program ? program : arguments.array[0].string);
 
         if (status != F_true) {
-          f_macro_string_dynamics_t_delete_simple(paths);
+          macro_f_string_dynamics_t_delete_simple(paths);
 
           return F_status_set_error(F_file_found_not);
         }
@@ -183,10 +183,10 @@ extern "C" {
           status = fl_environment_path_explode_dynamic(path, &paths);
         }
 
-        f_macro_string_dynamic_t_delete_simple(path);
+        macro_f_string_dynamic_t_delete_simple(path);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamics_t_delete_simple(paths);
+          macro_f_string_dynamics_t_delete_simple(paths);
 
           return status;
         }
@@ -225,14 +225,14 @@ extern "C" {
           }
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamics_t_delete_simple(paths);
+            macro_f_string_dynamics_t_delete_simple(paths);
 
             return status;
           }
         } // for
 
         if (!found) {
-          f_macro_string_dynamics_t_delete_simple(paths);
+          macro_f_string_dynamics_t_delete_simple(paths);
 
           return F_status_set_error(F_file_found_not);
         }
@@ -243,7 +243,7 @@ extern "C" {
 
       memcpy(&program_path, found->string, found->used);
 
-      status = f_macro_string_dynamics_t_delete_simple(paths);
+      status = macro_f_string_dynamics_t_delete_simple(paths);
       if (F_status_is_error(status)) return status;
 
       fixed_arguments[0] = program_path;
@@ -300,7 +300,7 @@ extern "C" {
         status = f_file_exists(program ? program : arguments.array[0].string);
 
         if (status != F_true) {
-          f_macro_string_dynamics_t_delete_simple(paths);
+          macro_f_string_dynamics_t_delete_simple(paths);
 
           return F_status_set_error(F_file_found_not);
         }
@@ -323,10 +323,10 @@ extern "C" {
           status = fl_environment_path_explode_dynamic(path, &paths);
         }
 
-        f_macro_string_dynamic_t_delete_simple(path);
+        macro_f_string_dynamic_t_delete_simple(path);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamics_t_delete_simple(paths);
+          macro_f_string_dynamics_t_delete_simple(paths);
 
           return status;
         }
@@ -365,14 +365,14 @@ extern "C" {
           }
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamics_t_delete_simple(paths);
+            macro_f_string_dynamics_t_delete_simple(paths);
 
             return status;
           }
         } // for
 
         if (!found) {
-          f_macro_string_dynamics_t_delete_simple(paths);
+          macro_f_string_dynamics_t_delete_simple(paths);
 
           return F_status_set_error(F_file_found_not);
         }
@@ -383,7 +383,7 @@ extern "C" {
 
       memcpy(&program_path, found->string, found->used);
 
-      status = f_macro_string_dynamics_t_delete_simple(paths);
+      status = macro_f_string_dynamics_t_delete_simple(paths);
       if (F_status_is_error(status)) return status;
 
       if (parameter && (parameter->option & fl_execute_parameter_option_path)) {
index 979019b2fc8ba0847b85975e8cef9677e14930ef..340cd4dc7fd3f59101fa4902dbf2b7c80bebd6b3 100644 (file)
@@ -71,13 +71,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
+ *   Errors (with error bit) from: macro_f_string_dynamics_t_resize().
  *   Errors (with error bit) from: f_string_append().
  *   Errors (with error bit) from: f_string_dynamic_delete().
  *   Errors (with error bit) from: f_string_dynamic_terminate().
  *   Errors (with error bit) from: f_string_dynamics_increase().
  *
- * @see f_macro_string_dynamics_t_resize()
+ * @see macro_f_string_dynamics_t_resize()
  * @see f_string_append()
  * @see f_string_dynamic_delete()
  * @see f_string_dynamic_terminate()
@@ -456,7 +456,7 @@ extern "C" {
  *   Errors (with error bit) from: f_environment_get().
  *   Errors (with error bit) from: f_file_exists().
  *   Errors (with error bit) from: f_limit_process().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_delete().
+ *   Errors (with error bit) from: macro_f_string_dynamics_t_delete().
  *   Errors (with error bit) from: f_signal_mask().
  *   Errors (with error bit) from: f_thread_signal_mask().
  *   Errors (with error bit) from: fl_environment_path_explode_dynamic().
index 9cfe844e964229a6dd43204697cfffa34cfc4d5a..4fa56315c8a5c8dca4ee9af5bd64b8b145872815 100644 (file)
@@ -17,7 +17,7 @@ extern "C" {
       status = f_string_append(source, length, &argument);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(argument);
+        macro_f_string_dynamic_t_delete_simple(argument);
         return status;
       }
     }
@@ -25,7 +25,7 @@ extern "C" {
     status = f_string_dynamic_terminate(&argument);
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(argument);
+      macro_f_string_dynamic_t_delete_simple(argument);
       return status;
     }
 
@@ -78,13 +78,13 @@ extern "C" {
     arguments->array[arguments->used].used = argument.used;
     arguments->array[arguments->used++].size = argument.size;
 
-    f_macro_string_dynamic_t_clear(argument);
+    macro_f_string_dynamic_t_clear(argument);
 
     if (value_length) {
       status = f_string_append(value, value_length, &argument);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(argument);
+        macro_f_string_dynamic_t_delete_simple(argument);
 
         return status;
       }
@@ -93,7 +93,7 @@ extern "C" {
     status = f_string_dynamic_terminate(&argument);
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(argument);
+      macro_f_string_dynamic_t_delete_simple(argument);
 
       return status;
     }
@@ -285,7 +285,7 @@ extern "C" {
         {
           char string_result[2] = { '0', 0 };
 
-          const f_file_t file = f_macro_file_t_initialize2(0, descriptors[1], f_file_flag_write_only);
+          const f_file_t file = macro_f_file_t_initialize2(0, descriptors[1], f_file_flag_write_only);
 
           f_string_static_t buffer = f_string_static_t_initialize;
 
@@ -345,7 +345,7 @@ extern "C" {
       response.used = 0;
       response.size = 2;
 
-      const f_file_t file = f_macro_file_t_initialize(0, descriptors[0], f_file_flag_read_only, 1, 1);
+      const f_file_t file = macro_f_file_t_initialize(0, descriptors[0], f_file_flag_read_only, 1, 1);
 
       f_file_read_block(file, &response);
 
@@ -446,7 +446,7 @@ extern "C" {
       {
         char string_result[2] = { '0', 0 };
 
-        const f_file_t file = f_macro_file_t_initialize2(0, descriptors[1], f_file_flag_write_only);
+        const f_file_t file = macro_f_file_t_initialize2(0, descriptors[1], f_file_flag_write_only);
 
         f_status_t status = F_none;
 
@@ -517,7 +517,7 @@ extern "C" {
       response.used = 0;
       response.size = 2;
 
-      const f_file_t file = f_macro_file_t_initialize(0, descriptors[0], f_file_flag_read_only, 1, 1);
+      const f_file_t file = macro_f_file_t_initialize(0, descriptors[0], f_file_flag_read_only, 1, 1);
 
       f_file_read_block(file, &response);
 
index 215ad9277deaf5365e6fb7de46fffa96480f3e59..93d7f61a8af0868e2940b4b6e35e961ab938e990 100644 (file)
@@ -21,7 +21,7 @@ extern "C" {
     status = fl_directory_list(path, 0, 0, F_false, &listing);
 
     if (F_status_is_error(status)) {
-      f_macro_directory_listing_t_delete_simple(listing);
+      macro_f_directory_listing_t_delete_simple(listing);
       return status;
     }
 
@@ -60,11 +60,11 @@ extern "C" {
           status = f_file_mode_set(path_sub, mode);
         } // for
 
-        f_macro_string_dynamics_t_delete_simple((*list[i]));
+        macro_f_string_dynamics_t_delete_simple((*list[i]));
       } // for
     }
 
-    f_macro_string_dynamics_t_delete_simple(listing.unknown);
+    macro_f_string_dynamics_t_delete_simple(listing.unknown);
 
     for (f_array_length_t i = 0; F_status_is_fine(status) && i < listing.directory.used; i++) {
 
@@ -92,7 +92,7 @@ extern "C" {
       }
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(listing.directory);
+    macro_f_string_dynamics_t_delete_simple(listing.directory);
 
     if (F_status_is_error(status)) {
       return status;
@@ -118,7 +118,7 @@ extern "C" {
     status = fl_directory_list(path, 0, 0, F_false, &listing);
 
     if (F_status_is_error(status)) {
-      f_macro_directory_listing_t_delete_simple(listing);
+      macro_f_directory_listing_t_delete_simple(listing);
       return status;
     }
 
@@ -157,7 +157,7 @@ extern "C" {
           status = f_file_role_change(path_sub, uid, gid, dereference);
         } // for
 
-        f_macro_string_dynamics_t_delete_simple((*list[i]));
+        macro_f_string_dynamics_t_delete_simple((*list[i]));
       } // for
     }
 
@@ -187,7 +187,7 @@ extern "C" {
       }
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(listing.directory);
+    macro_f_string_dynamics_t_delete_simple(listing.directory);
 
     if (F_status_is_error(status)) {
       return status;
index f31a9b972b2b0208bb495f188a93b4ce8bce69c4..591f20ea638ea24bbf8be56701743e522eab64e5 100644 (file)
@@ -36,7 +36,7 @@ extern "C" {
     f_status_t status = F_none;
     f_string_dynamic_t buffer = f_string_dynamic_t_initialize;
 
-    f_macro_string_dynamic_t_resize(status, buffer, f_fss_max_header_length + 1);
+    macro_f_string_dynamic_t_resize(status, buffer, f_fss_max_header_length + 1);
     if (F_status_is_error(status)) return status;
 
     status = f_file_read_until(*file, f_fss_max_header_length + 1, &buffer);
@@ -138,11 +138,11 @@ extern "C" {
             return F_status_set_error(F_array_too_large);
           }
 
-          f_macro_string_dynamics_t_resize(status, (*value), (values[j]->used + content->used));
+          macro_f_string_dynamics_t_resize(status, (*value), (values[j]->used + content->used));
           if (F_status_is_error(status)) return status;
 
           if (indexs) {
-            f_macro_array_lengths_t_resize(status, (*indexs[j]), (indexs[j]->used + content->used));
+            macro_f_array_lengths_t_resize(status, (*indexs[j]), (indexs[j]->used + content->used));
             if (F_status_is_error(status)) return status;
           }
         }
@@ -205,7 +205,7 @@ extern "C" {
         status = f_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[0], &name);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(name);
+          macro_f_string_dynamic_t_delete_simple(name);
           return status;
         }
 
@@ -217,14 +217,14 @@ extern "C" {
           status = fl_string_compare_trim(buffer.string + contents.array[i].array[0].start, values[j]->array[k].name.string, length_name, values[j]->array[k].name.used);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            macro_f_string_dynamic_t_delete_simple(name);
             return status;
           }
 
           if (status == F_equal_to) {
             matched = F_true;
 
-            f_macro_string_dynamic_t_delete_simple(name);
+            macro_f_string_dynamic_t_delete_simple(name);
             break;
           }
         } // for
@@ -237,32 +237,32 @@ extern "C" {
         if (values[j]->used == values[j]->size) {
           if (values[j]->used + f_fss_default_allocation_step > f_array_length_t_size) {
             if (values[j]->used == f_array_length_t_size) {
-              f_macro_string_dynamic_t_delete_simple(name);
+              macro_f_string_dynamic_t_delete_simple(name);
               return F_status_set_error(F_array_too_large);
             }
 
-            f_macro_string_maps_t_resize(status, (*values[j]), values[j]->used + 1);
+            macro_f_string_maps_t_resize(status, (*values[j]), values[j]->used + 1);
 
             if (F_status_is_error(status)) {
-              f_macro_string_dynamic_t_delete_simple(name);
+              macro_f_string_dynamic_t_delete_simple(name);
               return status;
             }
 
             if (indexs) {
-              f_macro_array_lengths_t_resize(status, (*indexs[j]), indexs[j]->used + 1);
+              macro_f_array_lengths_t_resize(status, (*indexs[j]), indexs[j]->used + 1);
               if (F_status_is_error(status)) return status;
             }
           }
           else {
-            f_macro_string_maps_t_resize(status, (*values[j]), values[j]->used + f_fss_default_allocation_step);
+            macro_f_string_maps_t_resize(status, (*values[j]), values[j]->used + f_fss_default_allocation_step);
 
             if (F_status_is_error(status)) {
-              f_macro_string_dynamic_t_delete_simple(name);
+              macro_f_string_dynamic_t_delete_simple(name);
               return status;
             }
 
             if (indexs) {
-              f_macro_array_lengths_t_resize(status, (*indexs[j]), indexs[j]->used + f_fss_default_allocation_step);
+              macro_f_array_lengths_t_resize(status, (*indexs[j]), indexs[j]->used + f_fss_default_allocation_step);
               if (F_status_is_error(status)) return status;
             }
           }
@@ -274,7 +274,7 @@ extern "C" {
           status = f_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[1], &map->value);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            macro_f_string_dynamic_t_delete_simple(name);
             return status;
           }
         }
@@ -290,11 +290,11 @@ extern "C" {
           indexs[j]->used++;
         }
 
-        f_macro_string_dynamic_t_clear(name);
+        macro_f_string_dynamic_t_clear(name);
       } // for
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(name);
+    macro_f_string_dynamic_t_delete_simple(name);
     return F_none;
   }
 #endif // _di_fll_fss_snatch_map_
@@ -336,7 +336,7 @@ extern "C" {
         if (F_status_is_error(status)) return status;
 
         if (indexs) {
-          f_macro_array_lengths_t_increase(status, (*indexs[j]));
+          macro_f_array_lengths_t_increase(status, (*indexs[j]));
           if (F_status_is_error(status)) return status;
         }
 
@@ -408,7 +408,7 @@ extern "C" {
         if (F_status_is_error(status)) return status;
 
         if (indexs) {
-          f_macro_array_lengths_t_increase(status, (*indexs[j]));
+          macro_f_array_lengths_t_increase(status, (*indexs[j]));
           if (F_status_is_error(status)) return status;
         }
 
@@ -476,7 +476,7 @@ extern "C" {
         status = f_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[0], &name);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(name);
+          macro_f_string_dynamic_t_delete_simple(name);
           return status;
         }
 
@@ -488,7 +488,7 @@ extern "C" {
           status = fl_string_compare_trim(buffer.string + contents.array[i].array[0].start, values[j]->array[k].name.string, length_name, values[j]->array[k].name.used);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            macro_f_string_dynamic_t_delete_simple(name);
             return status;
           }
 
@@ -510,7 +510,7 @@ extern "C" {
           if (F_status_is_error(status)) return status;
 
           if (indexs) {
-            f_macro_array_lengths_t_increase(status, (*indexs[j]));
+            macro_f_array_lengths_t_increase(status, (*indexs[j]));
             if (F_status_is_error(status)) return status;
           }
 
@@ -526,7 +526,7 @@ extern "C" {
             indexs[j]->used++;
           }
 
-          f_macro_string_dynamic_t_clear(name);
+          macro_f_string_dynamic_t_clear(name);
 
           if (contents.array[i].used == 1) continue;
         }
@@ -544,7 +544,7 @@ extern "C" {
       } // for
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(name);
+    macro_f_string_dynamic_t_delete_simple(name);
     return F_none;
   }
 #endif // _di_fll_fss_snatch_map_mash_apart_
@@ -588,7 +588,7 @@ extern "C" {
         status = f_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[0], &name);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(name);
+          macro_f_string_dynamic_t_delete_simple(name);
           return status;
         }
 
@@ -600,14 +600,14 @@ extern "C" {
           status = fl_string_compare_trim(buffer.string + contents.array[i].array[0].start, values[j]->array[k].name.string, length_name, values[j]->array[k].name.used);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            macro_f_string_dynamic_t_delete_simple(name);
             return status;
           }
 
           if (status == F_equal_to) {
             matched = F_true;
 
-            f_macro_string_dynamic_t_delete_simple(name);
+            macro_f_string_dynamic_t_delete_simple(name);
             break;
           }
         } // for
@@ -622,7 +622,7 @@ extern "C" {
           if (F_status_is_error(status)) return status;
 
           if (indexs) {
-            f_macro_array_lengths_t_increase(status, (*indexs[j]));
+            macro_f_array_lengths_t_increase(status, (*indexs[j]));
             if (F_status_is_error(status)) return status;
           }
 
@@ -639,21 +639,21 @@ extern "C" {
             indexs[j]->used++;
           }
 
-          f_macro_string_dynamic_t_clear(name);
+          macro_f_string_dynamic_t_clear(name);
         }
 
         if (contents.array[i].used > 1) {
           status = f_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[1], &map->value);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            macro_f_string_dynamic_t_delete_simple(name);
             return status;
           }
         }
       } // for
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(name);
+    macro_f_string_dynamic_t_delete_simple(name);
     return F_none;
   }
 #endif // _di_fll_fss_snatch_map_together_
@@ -745,7 +745,7 @@ extern "C" {
         if (F_status_is_error(status)) return status;
 
         if (indexs) {
-          f_macro_array_lengths_t_increase(status, (*indexs[j]));
+          macro_f_array_lengths_t_increase(status, (*indexs[j]));
           if (F_status_is_error(status)) return status;
         }
 
index ac840dd22ea37d045fa233bb4c157e8910481ff6..c37c228ede00df238a661cefb3722d57c9cf745f 100644 (file)
@@ -23,14 +23,14 @@ extern "C" {
 
     do {
       if (objects->used == objects->size) {
-        f_macro_fss_objects_t_increase(status2, (*objects))
+        macro_f_fss_objects_t_increase(status2, (*objects))
         if (F_status_is_error(status2)) return status2;
 
-        f_macro_fss_contents_t_increase(status2, (*contents))
+        macro_f_fss_contents_t_increase(status2, (*contents))
         if (F_status_is_error(status2)) return status2;
 
         if (objects_quoted) {
-          f_macro_fss_quotes_t_increase(status2, (*objects_quoted))
+          macro_f_fss_quotes_t_increase(status2, (*objects_quoted))
           if (F_status_is_error(status2)) return status2;
         }
       }
@@ -51,7 +51,7 @@ extern "C" {
               objects_quoted->used++;
             }
 
-            f_macro_fss_content_t_increase(status2, contents->array[contents->used])
+            macro_f_fss_content_t_increase(status2, contents->array[contents->used])
             if (F_status_is_error(status2)) return status2;
 
             contents->used++;
@@ -86,7 +86,7 @@ extern "C" {
         else if (status == FL_fss_found_object_content_not) {
           found_data = F_true;
 
-          f_macro_fss_content_t_increase(status2, contents->array[contents->used])
+          macro_f_fss_content_t_increase(status2, contents->array[contents->used])
           if (F_status_is_error(status2)) return status2;
 
           break;
@@ -154,7 +154,7 @@ extern "C" {
     #endif // _di_level_2_parameter_checking_
 
     f_status_t status = 0;
-    f_string_range_t range = f_macro_string_range_t_initialize(object.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
     status = fl_fss_basic_object_write_string(object, quote, f_fss_complete_full, &range, destination);
 
index a1e272212017dc0d2681a9700ccc776853121dd6..1953e17c6f904a1484db5a658624665c5dc09e6d 100644 (file)
@@ -21,10 +21,10 @@ extern "C" {
 
     do {
       if (objects->used == objects->size) {
-        f_macro_fss_objects_t_resize(status2, (*objects), objects->used + f_fss_default_allocation_step);
+        macro_f_fss_objects_t_resize(status2, (*objects), objects->used + f_fss_default_allocation_step);
         if (F_status_is_error(status)) return status;
 
-        f_macro_fss_contents_t_resize(status2, (*contents), contents->used + f_fss_default_allocation_step);
+        macro_f_fss_contents_t_resize(status2, (*contents), contents->used + f_fss_default_allocation_step);
         if (F_status_is_error(status)) return status;
       }
 
@@ -36,7 +36,7 @@ extern "C" {
           if (status == FL_fss_found_object || status == FL_fss_found_object_content_not) {
             objects->used++;
 
-            f_macro_fss_delimits_t_increase(status2, contents->array[contents->used])
+            macro_f_fss_delimits_t_increase(status2, contents->array[contents->used])
             if (F_status_is_error(status2)) return status2;
 
             contents->used++;
@@ -71,7 +71,7 @@ extern "C" {
         else if (status == FL_fss_found_object_content_not) {
           found_data = F_true;
 
-          f_macro_fss_content_t_increase(status2, contents->array[contents->used])
+          macro_f_fss_content_t_increase(status2, contents->array[contents->used])
           if (F_status_is_error(status2)) return status2;
 
           break;
@@ -132,7 +132,7 @@ extern "C" {
     #endif // _di_level_2_parameter_checking_
 
     f_status_t status = 0;
-    f_string_range_t range = f_macro_string_range_t_initialize(object.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
     status = fl_fss_basic_list_object_write_string(object, f_fss_complete_full, &range, destination);
 
index 9b79def1cf459a91ccf1d67e02e7280c0e1464a9..36ac201195949d5aa2b6994f288fda7e6bd56782 100644 (file)
@@ -20,7 +20,7 @@ extern "C" {
     bool found_data = F_false;
 
     if (!nest->used) {
-      f_macro_fss_nest_t_resize(status2, (*nest), f_fss_default_allocation_step);
+      macro_f_fss_nest_t_resize(status2, (*nest), f_fss_default_allocation_step);
       if (F_status_is_error(status2)) return status2;
     }
     else {
@@ -30,7 +30,7 @@ extern "C" {
     do {
       do {
         if (nest->depth[0].used == nest->depth[0].size) {
-          f_macro_fss_items_t_resize(status2, nest->depth[0], nest->depth[0].used + f_fss_default_allocation_step);
+          macro_f_fss_items_t_resize(status2, nest->depth[0], nest->depth[0].used + f_fss_default_allocation_step);
           if (F_status_is_error(status)) return status;
         }
 
@@ -120,7 +120,7 @@ extern "C" {
     #endif // _di_level_2_parameter_checking_
 
     f_status_t status = 0;
-    f_string_range_t range = f_macro_string_range_t_initialize(object.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
     status = fl_fss_embedded_list_object_write_string(object, f_fss_complete_full, &range, destination);
 
index 881b24689baaf97017913610e54d9f987a77a0a7..93511e285b18fa37ed64c40dad62924baec7cd61 100644 (file)
@@ -25,19 +25,19 @@ extern "C" {
     do {
 
       if (objects->used == objects->size) {
-        f_macro_fss_objects_t_increase(status2, (*objects));
+        macro_f_fss_objects_t_increase(status2, (*objects));
         if (F_status_is_error(status2)) return status2;
 
-        f_macro_fss_contents_t_increase(status2, (*contents));
+        macro_f_fss_contents_t_increase(status2, (*contents));
         if (F_status_is_error(status2)) return status2;
 
         if (objects_quoted) {
-          f_macro_fss_quotes_t_increase(status2, (*objects_quoted));
+          macro_f_fss_quotes_t_increase(status2, (*objects_quoted));
           if (F_status_is_error(status2)) return status2;
         }
 
         if (contents_quoted) {
-          f_macro_fss_quotess_t_increase(status2, (*contents_quoted));
+          macro_f_fss_quotess_t_increase(status2, (*contents_quoted));
           if (F_status_is_error(status2)) return status2;
         }
       }
@@ -59,13 +59,13 @@ extern "C" {
               objects_quoted->used++;
             }
 
-            f_macro_fss_content_t_increase(status2, contents->array[contents->used])
+            macro_f_fss_content_t_increase(status2, contents->array[contents->used])
             if (F_status_is_error(status2)) return status2;
 
             contents->used++;
 
             if (contents_quoted) {
-              f_macro_fss_quotes_t_increase(status2, contents_quoted->array[contents_quoted->used])
+              macro_f_fss_quotes_t_increase(status2, contents_quoted->array[contents_quoted->used])
               if (F_status_is_error(status2)) return status2;
 
               contents_quoted->used++;
@@ -93,7 +93,7 @@ extern "C" {
           found_data = F_true;
 
           if (contents_quoted) {
-            f_macro_fss_quotes_t_increase(status2, contents_quoted->array[contents_quoted->used])
+            macro_f_fss_quotes_t_increase(status2, contents_quoted->array[contents_quoted->used])
             if (F_status_is_error(status2)) return status2;
 
             quoted_content = &contents_quoted->array[contents_quoted->used];
@@ -193,7 +193,7 @@ extern "C" {
     #endif // _di_level_2_parameter_checking_
 
     f_status_t status = 0;
-    f_string_range_t range = f_macro_string_range_t_initialize(object.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
     status = fl_fss_extended_object_write_string(object, quote, f_fss_complete_full, &range, destination);
 
index b64ab68848aad27978fa4ebfc99d4d8ea68fcb9d..aeb057c60630a9b299204282a21a43730dd66548 100644 (file)
@@ -21,10 +21,10 @@ extern "C" {
 
     do {
       if (objects->used == objects->size) {
-        f_macro_fss_objects_t_resize(status2, (*objects), objects->used + f_fss_default_allocation_step);
+        macro_f_fss_objects_t_resize(status2, (*objects), objects->used + f_fss_default_allocation_step);
         if (F_status_is_error(status)) return status;
 
-        f_macro_fss_contents_t_resize(status2, (*contents), contents->used + f_fss_default_allocation_step);
+        macro_f_fss_contents_t_resize(status2, (*contents), contents->used + f_fss_default_allocation_step);
         if (F_status_is_error(status)) return status;
       }
 
@@ -36,7 +36,7 @@ extern "C" {
           if (status == FL_fss_found_object || status == FL_fss_found_object_content_not) {
             objects->used++;
 
-            f_macro_fss_content_t_increase(status2, contents->array[contents->used])
+            macro_f_fss_content_t_increase(status2, contents->array[contents->used])
             if (F_status_is_error(status2)) return status2;
 
             contents->used++;
@@ -71,7 +71,7 @@ extern "C" {
         else if (status == FL_fss_found_object_content_not) {
           found_data = F_true;
 
-          f_macro_fss_content_t_increase(status2, contents->array[contents->used])
+          macro_f_fss_content_t_increase(status2, contents->array[contents->used])
           if (F_status_is_error(status2)) return status2;
 
           break;
@@ -132,7 +132,7 @@ extern "C" {
     #endif // _di_level_2_parameter_checking_
 
     f_status_t status = 0;
-    f_string_range_t range = f_macro_string_range_t_initialize(object.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(object.used);
 
     status = fl_fss_extended_list_object_write_string(object, f_fss_complete_full, &range, destination);
 
index 08e19275c400b5a3f8525267a65bf0e22e9514f6..d8ed16bebba6183db951dddaa37c7b11bd0aafb7 100644 (file)
@@ -13,7 +13,7 @@ extern "C" {
       if (escaped->used > escaped->size) return F_status_set_error(F_parameter);
     #endif // _di_level_2_parameter_checking_
 
-    const f_string_range_t range = f_macro_string_range_t_initialize(content.used);
+    const f_string_range_t range = macro_f_string_range_t_initialize(content.used);
 
     return private_fll_iki_content_partial_escape(content, range, quote, escaped);
   }
@@ -41,7 +41,7 @@ extern "C" {
       if (unescaped->used > unescaped->size) return F_status_set_error(F_parameter);
     #endif // _di_level_2_parameter_checking_
 
-    const f_string_range_t range = f_macro_string_range_t_initialize(content.used);
+    const f_string_range_t range = macro_f_string_range_t_initialize(content.used);
 
     return private_fll_iki_content_partial_escape_un(content, range, quote, unescaped);
   }
index ae4ea10145bcd5ab4bf9aee682c0ec5f8a2e2f46..842122a4b0b81cc987a108062c2709a1db1471de 100644 (file)
@@ -52,7 +52,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *   Errors (with error bit) from: macro_f_string_dynamic_t_resize().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_iki_content_escape_
@@ -79,7 +79,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *   Errors (with error bit) from: macro_f_string_dynamic_t_resize().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_iki_content_partial_escape_
@@ -105,7 +105,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_syntax (with error bit) if the given string is invalid, such as having an undelimited quote.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *   Errors (with error bit) from: macro_f_string_dynamic_t_resize().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_iki_content_escape_un_
@@ -133,7 +133,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_syntax (with error bit) if the given string is invalid, such as having an undelimited quote.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *   Errors (with error bit) from: macro_f_string_dynamic_t_resize().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #ifndef _di_fll_iki_content_partial_escape_un_
index 8103d81ab6ee37691d7aa96f5393499f78e6e0c6..a1046d56556b76050e073a66a09c441f07b92d40 100644 (file)
@@ -11,7 +11,7 @@ extern "C" {
 
     // ensure escaped is at least the same size as content.
     if (content.used > escaped->size) {
-      f_macro_string_dynamic_t_resize(status, (*escaped), content.used);
+      macro_f_string_dynamic_t_resize(status, (*escaped), content.used);
       if (F_status_is_error(status)) return status;
     }
 
@@ -75,7 +75,7 @@ extern "C" {
 
     // ensure escaped is at least the same size as content.
     if (content.used > unescaped->size) {
-      f_macro_string_dynamic_t_resize(status, (*unescaped), content.used);
+      macro_f_string_dynamic_t_resize(status, (*unescaped), content.used);
       if (F_status_is_error(status)) return status;
     }
 
index 78acca9914ea05d5fb97d261c95a545d9ea7220c..49986c8ffdf9725e80f7256fab354cd1d46fc89c 100644 (file)
@@ -35,7 +35,7 @@ extern "C" {
  *   F_none on success.
  *   F_parameter (with error bit) if a parameter is invalid.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *   Errors (with error bit) from: macro_f_string_dynamic_t_resize().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #if !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_)
@@ -63,7 +63,7 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_syntax (with error bit) if the given string is invalid, such as having an undelimited quote.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *   Errors (with error bit) from: macro_f_string_dynamic_t_resize().
  *   Errors (with error bit) from: f_string_dynamic_increase_by().
  */
 #if !defined(_di_fll_iki_content_escape_un_) || !defined(_di_fll_iki_content_partial_escape_un_)
index 2b488b832151f129646a4aba62f2f43fe238b533..09dfab4ca05f20995130d80bb8979eed4bbbaa84 100644 (file)
@@ -120,7 +120,7 @@ extern "C" {
     if (decision != choices.id[0]) {
       f_status_t allocation_status = F_none;
 
-      f_macro_color_context_t_new(allocation_status, (*context));
+      macro_f_color_context_t_new(allocation_status, (*context));
       if (F_status_is_error(status)) return status;
 
       status = f_color_load_context(context, decision == choices.id[1]);
@@ -179,7 +179,7 @@ extern "C" {
           status = F_none;
         }
         else {
-          f_macro_memory_structure_macro_increment(status, (*destination), 1, f_memory_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+          macro_f_memory_structure_increment(status, (*destination), 1, f_memory_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
           if (F_status_is_error(status)) break;
 
           destination->array[destination->used] = ripped;
@@ -252,7 +252,7 @@ extern "C" {
           status = F_none;
         }
         else {
-          f_macro_string_dynamics_t_increase(status, (*destination));
+          macro_f_string_dynamics_t_increase(status, (*destination));
           if (F_status_is_error(status)) return status;
 
           destination->array[destination->used] = ripped;
@@ -291,7 +291,7 @@ extern "C" {
         status = fl_string_rip(argv[values.array[i]], length, &ripped);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(ripped);
+          macro_f_string_dynamic_t_delete_simple(ripped);
           return status;
         }
 
@@ -299,7 +299,7 @@ extern "C" {
           status = f_string_dynamic_mash(glue, glue_length, ripped, destination);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(ripped)
+            macro_f_string_dynamic_t_delete_simple(ripped)
             return F_status_set_error(F_string_too_large);
           }
         }
@@ -307,7 +307,7 @@ extern "C" {
     } // for
 
     if (ripped.size) {
-      f_macro_string_dynamic_t_delete_simple(ripped)
+      macro_f_string_dynamic_t_delete_simple(ripped)
     }
 
     if (status == F_none && start == destination->used) {
index b703d74ee3cb63f38abcee772197e7d8c2e7bb75..c12ccdcf10f30db80f2ef6a4d4716fa2f8e12b03 100644 (file)
@@ -80,12 +80,12 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, byte_dump_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, byte_dump_total_parameters);
 
       // Identify priority of color parameters.
       {
         f_console_parameter_id_t ids[3] = { byte_dump_parameter_no_color, byte_dump_parameter_light, byte_dump_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -111,7 +111,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { byte_dump_parameter_verbosity_quiet, byte_dump_parameter_verbosity_normal, byte_dump_parameter_verbosity_verbose, byte_dump_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -140,7 +140,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[5] = { byte_dump_parameter_hexidecimal, byte_dump_parameter_duodecimal, byte_dump_parameter_octal, byte_dump_parameter_binary, byte_dump_parameter_decimal };
         f_console_parameter_id_t choice = byte_dump_parameter_hexidecimal;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 5);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 5);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -172,7 +172,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[3] = { byte_dump_parameter_normal, byte_dump_parameter_simple, byte_dump_parameter_classic };
         f_console_parameter_id_t choice = byte_dump_parameter_normal;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -222,7 +222,7 @@ extern "C" {
       }
       else if (main->parameters[byte_dump_parameter_width].result == f_console_result_additional) {
         const f_array_length_t index = main->parameters[byte_dump_parameter_width].values.array[main->parameters[byte_dump_parameter_width].values.used - 1];
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
         f_number_unsigned_t number = 0;
 
@@ -254,7 +254,7 @@ extern "C" {
       }
       else if (main->parameters[byte_dump_parameter_first].result == f_console_result_additional) {
         const f_array_length_t index = main->parameters[byte_dump_parameter_first].values.array[main->parameters[byte_dump_parameter_first].values.used - 1];
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
         f_number_unsigned_t number = 0;
 
@@ -286,7 +286,7 @@ extern "C" {
       }
       else if (main->parameters[byte_dump_parameter_last].result == f_console_result_additional) {
         const f_array_length_t index = main->parameters[byte_dump_parameter_last].values.array[main->parameters[byte_dump_parameter_last].values.used - 1];
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
         f_number_unsigned_t number = 0;
 
@@ -453,14 +453,14 @@ extern "C" {
   f_status_t byte_dump_main_delete(byte_dump_main_t *main) {
 
     for (f_array_length_t i = 0; i < byte_dump_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 64ea449b6a1a4c70d453340bccd580ff3669b8bf..a45b1be2eac5bc61236d2fb08792afd826e51d05 100644 (file)
@@ -231,7 +231,7 @@ extern "C" {
       byte_dump_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       0, \
       0, \
index c5097d3d55d5625036e728785597c88b7ca03b7d..130df38e5a5967cf2492debe910ad4ba10ef638f 100644 (file)
@@ -66,7 +66,7 @@ extern "C" {
 
         // Storing the next character is designated by width_utf == -1.
         if (width_utf == -1) {
-          width_utf = f_macro_utf_byte_width_is(byte);
+          width_utf = macro_f_utf_byte_width_is(byte);
           width_count = 0;
 
           // The character is reset, the characters.used is to be reset.
@@ -84,7 +84,7 @@ extern "C" {
 
         // When width_count == 0, then this is that start of a new character sequence.
         if (!width_count) {
-          characters.string[character_current] = f_macro_utf_character_t_from_char_1(byte);
+          characters.string[character_current] = macro_f_utf_character_t_from_char_1(byte);
           width_count = 1;
 
           // The first character in a UTF-8 sequence cannot have a width of 1.
@@ -99,16 +99,16 @@ extern "C" {
         }
         // Process a UTF-8 character fragment.
         else if (width_count < width_utf) {
-          width_current = f_macro_utf_byte_width_is(byte);
+          width_current = macro_f_utf_byte_width_is(byte);
 
           if (width_count == 1) {
-            characters.string[character_current] |= f_macro_utf_character_t_from_char_2(byte);
+            characters.string[character_current] |= macro_f_utf_character_t_from_char_2(byte);
           }
           else if (width_count == 2) {
-            characters.string[character_current] |= f_macro_utf_character_t_from_char_3(byte);
+            characters.string[character_current] |= macro_f_utf_character_t_from_char_3(byte);
           }
           else if (width_count == 3) {
-            characters.string[character_current] |= f_macro_utf_character_t_from_char_4(byte);
+            characters.string[character_current] |= macro_f_utf_character_t_from_char_4(byte);
           }
 
           ++width_count;
@@ -258,16 +258,16 @@ extern "C" {
     f_array_length_t character_current = characters.used - 1;
 
     if (byte_current == 1) {
-      byte = f_macro_utf_character_t_to_char_1(characters.string[character_current]);
+      byte = macro_f_utf_character_t_to_char_1(characters.string[character_current]);
     }
     else if (byte_current == 2) {
-      byte = f_macro_utf_character_t_to_char_2(characters.string[character_current]);
+      byte = macro_f_utf_character_t_to_char_2(characters.string[character_current]);
     }
     else if (byte_current == 3) {
-      byte = f_macro_utf_character_t_to_char_3(characters.string[character_current]);
+      byte = macro_f_utf_character_t_to_char_3(characters.string[character_current]);
     }
     else if (byte_current == 4) {
-      byte = f_macro_utf_character_t_to_char_4(characters.string[character_current]);
+      byte = macro_f_utf_character_t_to_char_4(characters.string[character_current]);
     }
 
     if (!cell->column) {
@@ -522,8 +522,8 @@ extern "C" {
 
     for (uint8_t i = 0; i < characters.used && j < main.width; i++, j++) {
 
-      output = f_macro_utf_character_t_to_char_1(characters.string[i]);
-      width_utf = f_macro_utf_byte_width_is(output);
+      output = macro_f_utf_character_t_to_char_1(characters.string[i]);
+      width_utf = macro_f_utf_byte_width_is(output);
 
       if (invalid[i]) {
         f_color_print(main.output.stream, main.context.set.error, "%s", byte_dump_character_incomplete);
@@ -710,15 +710,15 @@ extern "C" {
         fprintf(main.output.stream, "%c", (uint8_t) output);
 
         if (width_utf > 1) {
-          output = f_macro_utf_character_t_to_char_2(characters.string[i]);
+          output = macro_f_utf_character_t_to_char_2(characters.string[i]);
           fprintf(main.output.stream, "%c", (uint8_t) output);
 
           if (width_utf > 2) {
-            output = f_macro_utf_character_t_to_char_3(characters.string[i]);
+            output = macro_f_utf_character_t_to_char_3(characters.string[i]);
             fprintf(main.output.stream, "%c", (uint8_t) output);
 
             if (width_utf > 3) {
-              output = f_macro_utf_character_t_to_char_4(characters.string[i]);
+              output = macro_f_utf_character_t_to_char_4(characters.string[i]);
               fprintf(main.output.stream, "%c", (uint8_t) output);
             }
           }
index 6163cf7098565eb691eac415f427eafa659cfb3e..a848a7478d5ba15c61e1bb196c6c94cc06cad08c 100644 (file)
@@ -27,38 +27,38 @@ extern "C" {
 #endif // _di_control_print_help_
 
 #ifndef _di_control_main_
-  f_status_t control_main(const f_console_arguments_t arguments, control_main_t *data) {
+  f_status_t control_main(const f_console_arguments_t arguments, control_main_t *main) {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(data->parameters, control_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, control_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { control_parameter_no_color, control_parameter_light, control_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
-        status = fll_program_parameter_process(arguments, parameters, choices, F_true, &data->remaining, &data->context);
+        status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
-        if (data->context.set.error.before) {
-          data->error.context = data->context.set.error;
-          data->error.notable = data->context.set.notable;
+        if (main->context.set.error.before) {
+          main->error.context = main->context.set.error;
+          main->error.notable = main->context.set.notable;
 
-          data->warning.context = data->context.set.warning;
-          data->warning.notable = data->context.set.notable;
+          main->warning.context = main->context.set.warning;
+          main->warning.notable = main->context.set.notable;
         }
         else {
-          f_color_set_t *sets[] = { &data->error.context, &data->error.notable, &data->warning.context, &data->warning.notable, 0 };
+          f_color_set_t *sets[] = { &main->error.context, &main->error.notable, &main->warning.context, &main->warning.notable, 0 };
 
-          fll_program_parameter_process_empty(&data->context, sets);
+          fll_program_parameter_process_empty(&main->context, sets);
         }
 
         if (F_status_is_error(status)) {
-          if (data->error.verbosity != f_console_verbosity_quiet) {
-            fll_error_print(data->error, F_status_set_fine(status), "fll_program_parameter_process", F_true);
-            fprintf(data->error.to.stream, "%c", f_string_eol_s[0]);
+          if (main->error.verbosity != f_console_verbosity_quiet) {
+            fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_process", F_true);
+            fprintf(main->error.to.stream, "%c", f_string_eol_s[0]);
           }
 
-          control_main_delete(data);
+          control_main_delete(main);
           return F_status_set_error(status);
         }
       }
@@ -67,72 +67,72 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { control_parameter_verbosity_quiet, control_parameter_verbosity_normal, control_parameter_verbosity_verbose, control_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          control_main_delete(data);
+          control_main_delete(main);
           return status;
         }
 
         if (choice == control_parameter_verbosity_quiet) {
-          data->error.verbosity = f_console_verbosity_quiet;
+          main->error.verbosity = f_console_verbosity_quiet;
         }
         else if (choice == control_parameter_verbosity_normal) {
-          data->error.verbosity = f_console_verbosity_normal;
+          main->error.verbosity = f_console_verbosity_normal;
         }
         else if (choice == control_parameter_verbosity_verbose) {
-          data->error.verbosity = f_console_verbosity_verbose;
+          main->error.verbosity = f_console_verbosity_verbose;
         }
         else if (choice == control_parameter_verbosity_debug) {
-          data->error.verbosity = f_console_verbosity_debug;
+          main->error.verbosity = f_console_verbosity_debug;
         }
       }
 
       status = F_none;
     }
 
-    if (data->parameters[control_parameter_help].result == f_console_result_found) {
-      control_print_help(data->output, data->context);
+    if (main->parameters[control_parameter_help].result == f_console_result_found) {
+      control_print_help(main->output, main->context);
 
-      control_main_delete(data);
+      control_main_delete(main);
       return F_none;
     }
 
-    if (data->parameters[control_parameter_version].result == f_console_result_found) {
-      fll_program_print_version(data->output, control_version);
+    if (main->parameters[control_parameter_version].result == f_console_result_found) {
+      fll_program_print_version(main->output, control_version);
 
-      control_main_delete(data);
+      control_main_delete(main);
       return F_none;
     }
 
     // @todo
 
     // ensure a newline is always put at the end of the program execution, unless in quiet mode.
-    if (data->error.verbosity != f_console_verbosity_quiet) {
+    if (main->error.verbosity != f_console_verbosity_quiet) {
       if (F_status_is_error(status)) {
-        fprintf(data->error.to.stream, "%c", f_string_eol_s[0]);
+        fprintf(main->error.to.stream, "%c", f_string_eol_s[0]);
       }
     }
 
-    control_main_delete(data);
+    control_main_delete(main);
     return status;
   }
 #endif // _di_control_main_
 
 #ifndef _di_control_main_delete_
-  f_status_t control_main_delete(control_main_t *data) {
+  f_status_t control_main_delete(control_main_t *main) {
 
     for (f_array_length_t i = 0; i < control_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(data->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(data->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(data->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(data->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 80fe02090a714ec79b2083f356d85f2cf67aa34a..5273235eb15797058e1c6d8a232563038dc73679 100644 (file)
@@ -101,9 +101,9 @@ extern "C" {
       control_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
-      fll_macro_error_print_t_initialize_warning(), \
+      macro_fll_error_print_t_initialize_warning(), \
       f_color_context_t_initialize, \
     }
 #endif // _di_control_data_t_
index 4398a1f7d32f0e85ea16918395198b9e9a13f0f0..e1b7cbc4caa9e8bfede352957e9f4350b3edda6b 100644 (file)
@@ -53,11 +53,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, controller_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, controller_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { controller_parameter_no_color, controller_parameter_light, controller_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -89,7 +89,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { controller_parameter_verbosity_quiet, controller_parameter_verbosity_normal, controller_parameter_verbosity_verbose, controller_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -395,13 +395,13 @@ extern "C" {
   f_status_t controller_main_delete(controller_main_t *main) {
 
     for (f_array_length_t i = 0; i < controller_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 67a1a1fe969f97988f946bf7ea65eb0640c036bf..0283366c47e114993e1594e31b3ddae11bb29ea6 100644 (file)
@@ -192,9 +192,9 @@ extern "C" {
       controller_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
-      fll_macro_error_print_t_initialize_warning(), \
+      macro_fll_error_print_t_initialize_warning(), \
       0, \
       0, \
       0, \
index 68ec39c6b4be550f415ca30fd827535323b79a3a..fc3ea9694479a1662423028b54f27a84234bd095 100644 (file)
@@ -118,9 +118,9 @@ extern "C" {
 #ifndef _di_controller_cache_delete_simple_
   void controller_cache_delete_simple(controller_cache_t *cache) {
 
-    f_macro_array_lengths_t_delete_simple(cache->ats)
-    f_macro_array_lengths_t_delete_simple(cache->stack)
-    f_macro_fss_delimits_t_delete_simple(cache->delimits)
+    macro_f_array_lengths_t_delete_simple(cache->ats)
+    macro_f_array_lengths_t_delete_simple(cache->stack)
+    macro_f_fss_delimits_t_delete_simple(cache->delimits)
 
     f_string_dynamic_resize(0, &cache->buffer_file);
     f_string_dynamic_resize(0, &cache->buffer_item);
@@ -485,7 +485,7 @@ extern "C" {
 
     f_string_dynamics_resize(0, &process->path_pids);
 
-    f_macro_array_lengths_t_delete_simple(process->stack)
+    macro_f_array_lengths_t_delete_simple(process->stack)
   }
 #endif // _di_controller_process_delete_simple_
 
@@ -698,10 +698,10 @@ extern "C" {
 
     f_string_dynamics_resize(0, &rule->environment);
 
-    f_macro_int32s_t_delete_simple(rule->affinity)
-    f_macro_control_group_t_delete_simple(rule->control_group)
-    f_macro_int32s_t_delete_simple(rule->groups)
-    f_macro_limit_sets_t_delete_simple(rule->limits)
+    macro_f_int32s_t_delete_simple(rule->affinity)
+    macro_f_control_group_t_delete_simple(rule->control_group)
+    macro_f_int32s_t_delete_simple(rule->groups)
+    macro_f_limit_sets_t_delete_simple(rule->limits)
 
     if (rule->capability) {
       f_capability_delete(&rule->capability);
index 9d401a7427eb8a54a5376284f3964b62118f96a3..9fd89ea6879503328b56fd76d6198cb100a9df79 100644 (file)
@@ -360,13 +360,13 @@ extern "C" {
     f_string_dynamic_t_initialize, \
   }
 
-  #define controller_macro_cache_action_t_clear(cache) \
+  #define macro_controller_cache_action_t_clear(cache) \
     cache.line_action = 0; \
     cache.line_item = 0; \
-    f_macro_string_dynamic_t_clear(cache.name_action) \
-    f_macro_string_dynamic_t_clear(cache.name_file) \
-    f_macro_string_dynamic_t_clear(cache.name_item) \
-    f_macro_string_dynamic_t_clear(cache.generic)
+    macro_f_string_dynamic_t_clear(cache.name_action) \
+    macro_f_string_dynamic_t_clear(cache.name_file) \
+    macro_f_string_dynamic_t_clear(cache.name_item) \
+    macro_f_string_dynamic_t_clear(cache.generic)
 #endif // _di_controller_cache_action_t_
 
 /**
@@ -449,8 +449,8 @@ extern "C" {
     fl_execute_as_t_initialize \
   }
 
-  #define controller_macro_execute_set_t_initialize(option, wait, environment, signals, main, as) { \
-    fl_macro_execute_parameter_t_initialize(option, wait, environment, signals, main), \
+  #define macro_controller_execute_set_t_initialize(option, wait, environment, signals, main, as) { \
+    macro_fl_execute_parameter_t_initialize(option, wait, environment, signals, main), \
     as, \
   }
 #endif // _di_controller_execute_set_t_
@@ -1180,7 +1180,7 @@ extern "C" {
     0, \
   }
 
-  #define controller_macro_entry_items_t_clear(items) \
+  #define macro_controller_entry_items_t_clear(items) \
     items.array = 0; \
     items.size = 0; \
     items.used = 0;
@@ -1427,7 +1427,7 @@ extern "C" {
 
   #define controller_global_t_initialize { 0, 0, 0 }
 
-  #define controller_macro_global_t_initialize(main, setting, thread) { \
+  #define macro_controller_global_t_initialize(main, setting, thread) { \
     main, \
     setting, \
     thread, \
@@ -1448,7 +1448,7 @@ extern "C" {
 
   #define controller_main_entry_t_initialize { 0, 0 }
 
-  #define controller_macro_main_entry_t_initialize(global, setting) { \
+  #define macro_controller_main_entry_t_initialize(global, setting) { \
     global, \
     setting, \
   }
@@ -1472,8 +1472,8 @@ extern "C" {
  * @param cache
  *   The cache to deallocate.
  *
- * @see f_macro_array_lengths_t_delete_simple()
- * @see f_macro_fss_delimits_t_delete_simple()
+ * @see macro_f_array_lengths_t_delete_simple()
+ * @see macro_f_fss_delimits_t_delete_simple()
  *
  * @see controller_cache_action_delete_simple()
  * @see f_string_dynamic_resize()
@@ -2019,13 +2019,13 @@ extern "C" {
  * @param rule
  *   The rule to deallocate.
  *
- * @see f_macro_control_group_t_delete_simple()
- * @see f_macro_int32s_t_delete_simple()
- * @see f_macro_limit_sets_t_delete_simple()
- * @see f_macro_string_dynamics_t_delete_simple()
- * @see f_macro_string_maps_t_delete_simple()
- * @see f_macro_thread_condition_t_delete_simple()
- * @see f_macro_thread_mutex_t_delete_simple()
+ * @see macro_f_control_group_t_delete_simple()
+ * @see macro_f_int32s_t_delete_simple()
+ * @see macro_f_limit_sets_t_delete_simple()
+ * @see macro_f_string_dynamics_t_delete_simple()
+ * @see macro_f_string_maps_t_delete_simple()
+ * @see macro_f_thread_condition_t_delete_simple()
+ * @see macro_f_thread_mutex_t_delete_simple()
  *
  * @see controller_rule_items_delete_simple()
  * @see f_capability_delete()
index 49982f20a22244b1d5b012cd0e582616985603b5..0eff3f06049c70aa226a29e4da19f4d53ce41b12 100644 (file)
@@ -49,7 +49,7 @@ extern "C" {
     cache->action.name_file.used = 0;
     cache->buffer_file.used = 0;
 
-    f_macro_time_spec_t_clear(cache->timestamp);
+    macro_f_time_spec_t_clear(cache->timestamp);
 
     status = f_string_append(path_prefix, path_prefix_length, &cache->action.name_file);
 
@@ -176,7 +176,7 @@ extern "C" {
         status = f_directory_exists(path_directory.string);
       }
 
-      f_macro_string_dynamic_t_delete_simple(path_directory)
+      macro_f_string_dynamic_t_delete_simple(path_directory)
 
       if (F_status_is_error(status)) return status;
 
@@ -227,7 +227,7 @@ extern "C" {
 
     if (F_status_is_error_not(status)) {
       f_number_unsigned_t number = 0;
-      f_string_range_t range = f_macro_string_range_t_initialize(pid_buffer.used);
+      f_string_range_t range = macro_f_string_range_t_initialize(pid_buffer.used);
 
       for (; range.start < pid_buffer.used; ++range.start) {
         if (!isspace(pid_buffer.string[range.start])) break;
@@ -247,7 +247,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(pid_buffer);
+    macro_f_string_dynamic_t_delete_simple(pid_buffer);
 
     return status;
   }
@@ -280,7 +280,7 @@ extern "C" {
 
     if (F_status_is_error_not(status)) {
       f_number_unsigned_t number = 0;
-      f_string_range_t range = f_macro_string_range_t_initialize(pid_buffer.used);
+      f_string_range_t range = macro_f_string_range_t_initialize(pid_buffer.used);
 
       for (; range.start < pid_buffer.used; ++range.start) {
         if (!isspace(pid_buffer.string[range.start])) break;
@@ -297,7 +297,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(pid_buffer);
+    macro_f_string_dynamic_t_delete_simple(pid_buffer);
 
     return status;
   }
@@ -479,10 +479,10 @@ extern "C" {
     cache->action.name_action.used = 0;
     cache->action.name_item.used = 0;
 
-    f_macro_array_lengths_t_increase_by(status, cache->ats, controller_default_allocation_step)
+    macro_f_array_lengths_t_increase_by(status, cache->ats, controller_default_allocation_step)
 
     if (F_status_is_error(status)) {
-      controller_entry_error_print(is_entry, global.main->error, cache->action, F_status_set_fine(status), "f_macro_array_lengths_t_increase_by", F_true, global.thread);
+      controller_entry_error_print(is_entry, global.main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, global.thread);
 
       return status;
     }
@@ -583,10 +583,10 @@ extern "C" {
 
               if (error_has) break;
 
-              f_macro_array_lengths_t_increase_by(status2, cache->ats, controller_default_allocation_step)
+              macro_f_array_lengths_t_increase_by(status2, cache->ats, controller_default_allocation_step)
 
               if (F_status_is_error(status2)) {
-                controller_entry_error_print(is_entry, global.main->error, cache->action, F_status_set_fine(status2), "f_macro_array_lengths_t_increase_by", F_true, global.thread);
+                controller_entry_error_print(is_entry, global.main->error, cache->action, F_status_set_fine(status2), "macro_f_array_lengths_t_increase_by", F_true, global.thread);
 
                 return status2;
               }
@@ -723,10 +723,10 @@ extern "C" {
       if (F_status_is_error(status)) return status;
     }
 
-    f_macro_array_lengths_t_increase_by(status, cache->ats, controller_default_allocation_step)
+    macro_f_array_lengths_t_increase_by(status, cache->ats, controller_default_allocation_step)
 
     if (F_status_is_error(status)) {
-      controller_entry_error_print(is_entry, global->main->error, cache->action, F_status_set_fine(status), "f_macro_array_lengths_t_increase_by", F_true, global->thread);
+      controller_entry_error_print(is_entry, global->main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, global->thread);
 
       return status;
     }
@@ -971,10 +971,10 @@ extern "C" {
             return F_status_is_error(F_critical);
           }
 
-          f_macro_array_lengths_t_increase_by(status, cache->ats, controller_default_allocation_step)
+          macro_f_array_lengths_t_increase_by(status, cache->ats, controller_default_allocation_step)
 
           if (F_status_is_error(status)) {
-            controller_entry_error_print(is_entry, global->main->error, cache->action, F_status_set_fine(status), "f_macro_array_lengths_t_increase_by", F_true, global->thread);
+            controller_entry_error_print(is_entry, global->main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, global->thread);
 
             return status;
           }
@@ -1039,7 +1039,7 @@ extern "C" {
 
           const f_array_length_t id_rule_length = entry_action->parameters.array[0].used + entry_action->parameters.array[1].used + 1;
           char id_rule_name[id_rule_length + 1];
-          const f_string_static_t alias_rule = f_macro_string_static_t_initialize(id_rule_name, id_rule_length);
+          const f_string_static_t alias_rule = macro_f_string_static_t_initialize(id_rule_name, id_rule_length);
 
           memcpy(id_rule_name, entry_action->parameters.array[0].string, entry_action->parameters.array[0].used);
           memcpy(id_rule_name + entry_action->parameters.array[0].used + 1, entry_action->parameters.array[1].string, entry_action->parameters.array[1].used);
@@ -1583,7 +1583,7 @@ extern "C" {
       if (status == F_false) return F_false;
     }
 
-    for (f_array_length_t i = f_macro_utf_byte_width(name.string[0]); i < name.used; i += f_macro_utf_byte_width(name.string[i])) {
+    for (f_array_length_t i = macro_f_utf_byte_width(name.string[0]); i < name.used; i += macro_f_utf_byte_width(name.string[i])) {
 
       if (name.string[i] == '_') continue;
 
@@ -1604,7 +1604,7 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    for (f_array_length_t i = 0; i < name.used; i += f_macro_utf_byte_width(name.string[i])) {
+    for (f_array_length_t i = 0; i < name.used; i += macro_f_utf_byte_width(name.string[i])) {
 
       status = f_utf_is_graph(name.string, name.used);
 
index 19c40621112b329a1a518f4ead6afa8b0663cffc..80a0289a7e23f1b46042eb6fea239994d72b3987 100644 (file)
@@ -313,14 +313,14 @@ extern "C" {
  *   F_recurse (with error bit) on a recursion error.
  *   F_valid_not (with error bit) on invalid entry item, entry item action, or entry item action value.
  *
- *   Errors (with error bit) from: f_macro_array_lengths_t_increase_by().
+ *   Errors (with error bit) from: macro_f_array_lengths_t_increase_by().
  *   Errors (with error bit) from: f_string_dynamic_append().
  *   Errors (with error bit) from: f_string_dynamic_terminate_after().
  *
  *   This will detect and report all errors, but only the first error is returned.
  *   Memory related errors return immediately.
 
- * @see f_macro_array_lengths_t_increase_by()
+ * @see macro_f_array_lengths_t_increase_by()
  * @see f_string_dynamic_append()
  * @see f_string_dynamic_terminate_after()
  */
@@ -350,11 +350,11 @@ extern "C" {
  *   F_critical (with error bit) on any critical error.
  *   F_execute (with error bit) if the "execute" Item Action failed.
  *
- *   Errors (with error bit) from: f_macro_array_lengths_t_increase_by().
+ *   Errors (with error bit) from: macro_f_array_lengths_t_increase_by().
  *   Errors (with error bit) from: controller_perform_ready().
  *   Errors (with error bit) from: controller_string_dynamic_append_terminated().
  *
- * @see f_macro_array_lengths_t_increase_by()
+ * @see macro_f_array_lengths_t_increase_by()
  * @see controller_perform_ready()
  * @see controller_string_dynamic_append_terminated()
  */
index 2ed8974fdc33ebd5cd7d79055cbde0c3b139ebda..b308636fdede19f8c1954890b4ef7158407bc19b 100644 (file)
@@ -629,7 +629,7 @@ extern "C" {
             }
 
             if (action->status == F_none) {
-              const f_string_range_t range = f_macro_string_range_t_initialize(action->parameters.array[1].used);
+              const f_string_range_t range = macro_f_string_range_t_initialize(action->parameters.array[1].used);
 
               status = fl_conversion_string_to_number_unsigned(action->parameters.array[1].string, range, &action->number);
 
@@ -770,7 +770,7 @@ extern "C" {
     cache->action.line_action = 0;
     cache->action.line_item = 0;
 
-    f_macro_time_spec_t_clear(cache->timestamp);
+    macro_f_time_spec_t_clear(cache->timestamp);
 
     cache->comments.used = 0;
     cache->delimits.used = 0;
@@ -815,7 +815,7 @@ extern "C" {
 
     if (F_status_is_error_not(status)) {
       if (cache->buffer_file.used) {
-        f_string_range_t range = f_macro_string_range_t_initialize(cache->buffer_file.used);
+        f_string_range_t range = macro_f_string_range_t_initialize(cache->buffer_file.used);
 
         status = fll_fss_basic_list_read(cache->buffer_file, &range, &cache->object_items, &cache->content_items, &cache->delimits, 0, &cache->comments);
 
index 8f627c593c9ac2fa959a464b70073a1d550a9e8a..9927df4a02fe83eb1ee8c43fd1215ef2b2eae588 100644 (file)
@@ -461,7 +461,7 @@ extern "C" {
     f_status_t status = F_none;
 
     // delete the third party structures.
-    f_macro_control_group_t_delete_simple(destination->control_group)
+    macro_f_control_group_t_delete_simple(destination->control_group)
     f_capability_delete(&destination->capability);
 
     for (f_array_length_t i = 0; i < controller_rule_action_type__enum_size; ++i) {
@@ -825,7 +825,7 @@ extern "C" {
 
     const f_string_dynamics_t arguments_none = f_string_dynamics_t_initialize;
 
-    controller_execute_set_t execute_set = controller_macro_execute_set_t_initialize(0, 0, &environment, &signals, 0, fl_execute_as_t_initialize);
+    controller_execute_set_t execute_set = macro_controller_execute_set_t_initialize(0, 0, &environment, &signals, 0, fl_execute_as_t_initialize);
 
     if (process->rule.affinity.used) {
       execute_set.as.affinity = &process->rule.affinity;
@@ -1056,7 +1056,7 @@ extern "C" {
        }
     } // for
 
-    f_macro_string_maps_t_delete_simple(environment);
+    macro_f_string_maps_t_delete_simple(environment);
 
     // lock failed, attempt to re-establish lock before returning.
     if (F_status_set_fine(status) == F_lock) {
@@ -1146,9 +1146,9 @@ extern "C" {
       // sleep for less than a second to better show simulation of synchronous vs asynchronous.
       usleep(controller_thread_simulation_timeout);
 
-      const f_string_static_t simulated_program = f_macro_string_static_t_initialize(f_string_empty_s, 0);
+      const f_string_static_t simulated_program = macro_f_string_static_t_initialize(f_string_empty_s, 0);
       const f_string_statics_t simulated_arguments = f_string_statics_t_initialize;
-      fl_execute_parameter_t simulated_parameter = fl_macro_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, execute_set->parameter.environment, execute_set->parameter.signals, &simulated_program);
+      fl_execute_parameter_t simulated_parameter = macro_fl_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, execute_set->parameter.environment, execute_set->parameter.signals, &simulated_program);
 
       status = fll_execute_program(controller_default_program_script, simulated_arguments, &simulated_parameter, &execute_set->as, simulated_parameter.option & fl_execute_parameter_option_return ? (void *) &id_child : (void *) &result);
     }
@@ -1389,9 +1389,9 @@ extern "C" {
       // sleep for less than a second to better show simulation of synchronous vs asynchronous.
       usleep(controller_thread_simulation_timeout);
 
-      const f_string_static_t simulated_program = f_macro_string_static_t_initialize(f_string_empty_s, 0);
+      const f_string_static_t simulated_program = macro_f_string_static_t_initialize(f_string_empty_s, 0);
       const f_string_statics_t simulated_arguments = f_string_statics_t_initialize;
-      fl_execute_parameter_t simulated_parameter = fl_macro_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, execute_set->parameter.environment, execute_set->parameter.signals, &simulated_program);
+      fl_execute_parameter_t simulated_parameter = macro_fl_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, execute_set->parameter.environment, execute_set->parameter.signals, &simulated_program);
 
       status = fll_execute_program(controller_default_program_script, simulated_arguments, &simulated_parameter, &execute_set->as, simulated_parameter.option & fl_execute_parameter_option_return ? (void *) &id_child : (void *) &result);
     }
@@ -1596,7 +1596,7 @@ extern "C" {
 
     f_status_t status = F_none;
 
-    f_string_range_t range = f_macro_string_range_t_initialize(cache->buffer_item.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(cache->buffer_item.used);
     f_array_length_t last = 0;
 
     uint8_t type = 0;
@@ -2155,7 +2155,7 @@ extern "C" {
             memcpy(alias_other_buffer, global.setting->rules.array[id_rule].alias.string, sizeof(char) * global.setting->rules.array[id_rule].alias.used);
             alias_other_buffer[global.setting->rules.array[id_rule].alias.used] = 0;
 
-            const f_string_static_t alias_other = f_macro_string_static_t_initialize(alias_other_buffer, global.setting->rules.array[id_rule].alias.used);
+            const f_string_static_t alias_other = macro_f_string_static_t_initialize(alias_other_buffer, global.setting->rules.array[id_rule].alias.used);
 
             f_thread_unlock(&global.thread->lock.rule);
 
@@ -2562,8 +2562,8 @@ extern "C" {
     process->options = options;
     process->type = type;
 
-    f_macro_time_spec_t_clear(process->cache.timestamp)
-    f_macro_string_range_t_clear(process->cache.range_action)
+    macro_f_time_spec_t_clear(process->cache.timestamp)
+    macro_f_string_range_t_clear(process->cache.range_action)
 
     process->cache.ats.used = 0;
     process->cache.stack.used = 0;
@@ -2689,7 +2689,7 @@ extern "C" {
 
     f_status_t status_lock = F_none;
 
-    controller_global_t global = controller_macro_global_t_initialize((controller_main_t *) process->main_data, (controller_setting_t *) process->main_setting, (controller_thread_t *) process->main_thread);
+    controller_global_t global = macro_controller_global_t_initialize((controller_main_t *) process->main_data, (controller_setting_t *) process->main_setting, (controller_thread_t *) process->main_thread);
 
     // the process and active locks shall be held for the duration of this processing (aside from switching between read to/from write).
     if (options_force & controller_process_option_asynchronous) {
@@ -2989,7 +2989,7 @@ extern "C" {
     rule->user = 0;
     rule->nice = 0;
 
-    f_macro_time_spec_t_clear(rule->timestamp);
+    macro_f_time_spec_t_clear(rule->timestamp);
 
     rule->alias.used = 0;
     rule->name.used = 0;
@@ -3015,7 +3015,7 @@ extern "C" {
     rule->control_group.path.used = 0;
     rule->control_group.groups.used = 0;
 
-    f_macro_control_group_t_clear(rule->control_group);
+    macro_f_control_group_t_clear(rule->control_group);
 
     rule->groups.used = 0;
     rule->limits.used = 0;
@@ -3077,7 +3077,7 @@ extern "C" {
       rule->timestamp = cache->timestamp;
 
       if (cache->buffer_file.used) {
-        f_string_range_t range = f_macro_string_range_t_initialize(cache->buffer_file.used);
+        f_string_range_t range = macro_f_string_range_t_initialize(cache->buffer_file.used);
 
         status = fll_fss_basic_list_read(cache->buffer_file, &range, &cache->object_items, &cache->content_items, &cache->delimits, 0, &cache->comments);
 
@@ -3234,7 +3234,7 @@ extern "C" {
     f_status_t status = F_none;
     f_status_t status_return = F_none;
 
-    f_string_range_t range = f_macro_string_range_t_initialize(cache->buffer_item.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(cache->buffer_item.used);
     f_string_range_t range2 = f_string_range_t_initialize;
 
     status = fll_fss_extended_read(cache->buffer_item, &range, &cache->object_actions, &cache->content_actions, 0, 0, &cache->delimits, 0);
@@ -3484,12 +3484,12 @@ extern "C" {
             }
 
             if (F_status_is_error_not(status)) {
-              f_macro_int32s_t_resize(status, rule->affinity, size);
+              macro_f_int32s_t_resize(status, rule->affinity, size);
             }
           }
 
           if (F_status_is_error(status)) {
-            controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "f_macro_int32s_t_resize", F_true, F_false, global.thread);
+            controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "macro_f_int32s_t_resize", F_true, F_false, global.thread);
             break;
           }
 
@@ -3940,7 +3940,7 @@ extern "C" {
 
         if (F_status_is_error(status)) continue;
 
-        f_macro_limit_sets_t_increase(status, rule->limits);
+        macro_f_limit_sets_t_increase(status, rule->limits);
 
         if (F_status_is_error(status)) {
           controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "f_limit_sets_increase", F_true, F_false, global.thread);
@@ -4640,10 +4640,10 @@ extern "C" {
 
         for (j = 0; j < cache->content_actions.array[i].used; ++j) {
 
-          f_macro_array_lengths_t_increase_by(status, rule->groups, controller_default_allocation_step)
+          macro_f_array_lengths_t_increase_by(status, rule->groups, controller_default_allocation_step)
 
           if (F_status_is_error(status)) {
-            controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "f_macro_array_lengths_t_increase_by", F_true, F_false, global.thread);
+            controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, F_false, global.thread);
 
             if (F_status_set_fine(status) == F_memory_not) {
               status_return = status;
index 0cae96cbc3f33ee710355f9d34d67ec3f716ee04..6118547a7a1285c0d5559c9c7e47f3a524bfe9f9 100644 (file)
@@ -188,7 +188,7 @@ extern "C" {
     f_status_t status = F_none;
 
     controller_thread_t thread = controller_thread_t_initialize;
-    controller_global_t global = controller_macro_global_t_initialize(main, setting, &thread);
+    controller_global_t global = macro_controller_global_t_initialize(main, setting, &thread);
 
     // the global locks must be initialized, but only once, so initialize immediately upon allocation.
     status = controller_lock_create(&thread.lock);
@@ -240,7 +240,7 @@ extern "C" {
       }
       else if (global.setting->name_entry.used) {
 
-        const controller_main_entry_t entry = controller_macro_main_entry_t_initialize(&global, global.setting);
+        const controller_main_entry_t entry = macro_controller_main_entry_t_initialize(&global, global.setting);
 
         status = f_thread_create(0, &thread.id_entry, &controller_thread_entry, (void *) &entry);
 
@@ -614,7 +614,7 @@ extern "C" {
         f_thread_create(0, &global->thread->id_signal, &controller_thread_signal_other, (void *) global);
       }
 
-      const controller_main_entry_t entry = controller_macro_main_entry_t_initialize(global, global->setting);
+      const controller_main_entry_t entry = macro_controller_main_entry_t_initialize(global, global->setting);
 
       f_status_t status = f_thread_create(0, &global->thread->id_entry, &controller_thread_exit, (void *) &entry);
 
index d52ca624fc88f82daa3438e0e374a19ff3a29a65..b5a78a50327478df261bc3224123b32fad11e247 100644 (file)
@@ -103,12 +103,12 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fake_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fake_total_parameters);
 
       // Load all parameters and identify priority of color parameters.
       {
         f_console_parameter_id_t ids[3] = { fake_parameter_no_color, fake_parameter_light, fake_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -134,7 +134,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fake_parameter_verbosity_quiet, fake_parameter_verbosity_normal, fake_parameter_verbosity_verbose, fake_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -372,69 +372,69 @@ extern "C" {
   f_status_t fake_main_delete(fake_main_t *main) {
 
     for (f_array_length_t i = 0; i < fake_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
-
-    f_macro_string_dynamics_t_delete_simple(main->define);
-    f_macro_string_dynamic_t_delete_simple(main->fakefile);
-    f_macro_string_dynamics_t_delete_simple(main->mode);
-    f_macro_string_dynamic_t_delete_simple(main->process);
-    f_macro_string_dynamic_t_delete_simple(main->settings);
-
-    f_macro_string_dynamic_t_delete_simple(main->path_build);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_documents);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_includes);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_libraries);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_libraries_script);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_libraries_shared);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_libraries_static);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_objects);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_programs);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_programs_script);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_programs_shared);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_programs_static);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_settings);
-    f_macro_string_dynamic_t_delete_simple(main->path_build_stage);
-    f_macro_string_dynamic_t_delete_simple(main->path_work);
-
-    f_macro_string_dynamic_t_delete_simple(main->path_data);
-    f_macro_string_dynamic_t_delete_simple(main->path_data_build);
-
-    f_macro_string_dynamic_t_delete_simple(main->path_data_settings);
-
-    f_macro_string_dynamic_t_delete_simple(main->path_documents);
-
-    f_macro_string_dynamic_t_delete_simple(main->path_licenses);
-
-    f_macro_string_dynamic_t_delete_simple(main->path_sources);
-    f_macro_string_dynamic_t_delete_simple(main->path_sources_bash);
-    f_macro_string_dynamic_t_delete_simple(main->path_sources_c);
-    f_macro_string_dynamic_t_delete_simple(main->path_sources_cpp);
-    f_macro_string_dynamic_t_delete_simple(main->path_sources_script);
-
-    f_macro_string_dynamic_t_delete_simple(main->path_work);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_includes);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_libraries);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_libraries_script);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_libraries_shared);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_libraries_static);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_programs);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_programs_script);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_programs_shared);
-    f_macro_string_dynamic_t_delete_simple(main->path_work_programs_static);
-
-    f_macro_string_dynamic_t_delete_simple(main->file_data_build_defines);
-    f_macro_string_dynamic_t_delete_simple(main->file_data_build_dependencies);
-    f_macro_string_dynamic_t_delete_simple(main->file_data_build_fakefile);
-    f_macro_string_dynamic_t_delete_simple(main->file_data_build_settings);
-
-    f_macro_string_dynamic_t_delete_simple(main->file_documents_readme);
-
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
+
+    macro_f_string_dynamics_t_delete_simple(main->define);
+    macro_f_string_dynamic_t_delete_simple(main->fakefile);
+    macro_f_string_dynamics_t_delete_simple(main->mode);
+    macro_f_string_dynamic_t_delete_simple(main->process);
+    macro_f_string_dynamic_t_delete_simple(main->settings);
+
+    macro_f_string_dynamic_t_delete_simple(main->path_build);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_documents);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_includes);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_libraries);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_libraries_script);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_libraries_shared);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_libraries_static);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_objects);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_programs);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_programs_script);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_programs_shared);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_programs_static);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_settings);
+    macro_f_string_dynamic_t_delete_simple(main->path_build_stage);
+    macro_f_string_dynamic_t_delete_simple(main->path_work);
+
+    macro_f_string_dynamic_t_delete_simple(main->path_data);
+    macro_f_string_dynamic_t_delete_simple(main->path_data_build);
+
+    macro_f_string_dynamic_t_delete_simple(main->path_data_settings);
+
+    macro_f_string_dynamic_t_delete_simple(main->path_documents);
+
+    macro_f_string_dynamic_t_delete_simple(main->path_licenses);
+
+    macro_f_string_dynamic_t_delete_simple(main->path_sources);
+    macro_f_string_dynamic_t_delete_simple(main->path_sources_bash);
+    macro_f_string_dynamic_t_delete_simple(main->path_sources_c);
+    macro_f_string_dynamic_t_delete_simple(main->path_sources_cpp);
+    macro_f_string_dynamic_t_delete_simple(main->path_sources_script);
+
+    macro_f_string_dynamic_t_delete_simple(main->path_work);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_includes);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_libraries);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_libraries_script);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_libraries_shared);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_libraries_static);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_programs);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_programs_script);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_programs_shared);
+    macro_f_string_dynamic_t_delete_simple(main->path_work_programs_static);
+
+    macro_f_string_dynamic_t_delete_simple(main->file_data_build_defines);
+    macro_f_string_dynamic_t_delete_simple(main->file_data_build_dependencies);
+    macro_f_string_dynamic_t_delete_simple(main->file_data_build_fakefile);
+    macro_f_string_dynamic_t_delete_simple(main->file_data_build_settings);
+
+    macro_f_string_dynamic_t_delete_simple(main->file_documents_readme);
+
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index ae5ab72a9938565d076cf41734b36ca5981fa9af..80792f29a236b76abb9531d65afea411a1159f6f 100644 (file)
@@ -445,7 +445,7 @@ extern "C" {
       fake_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       0, \
       0, \
index a2a37f5fa07747551d81fbf87c849a6a782c9eb1..8fc0e17d3a638aed49e9849c0fca2e67cf7602d4 100644 (file)
@@ -185,12 +185,12 @@ extern "C" {
       fprintf(main.output.stream, "%c", f_string_eol_s[0]);
     }
 
-     f_macro_string_dynamic_t_resize(*status, path_source, source.used);
+     macro_f_string_dynamic_t_resize(*status, path_source, source.used);
 
     if (F_status_is_error(*status)) {
-      fll_error_print(main.error, F_status_set_fine(*status), " f_macro_string_dynamic_t_resize", F_true);
+      fll_error_print(main.error, F_status_set_fine(*status), " macro_f_string_dynamic_t_resize", F_true);
 
-      f_macro_string_dynamic_t_delete_simple(path_source);
+      macro_f_string_dynamic_t_delete_simple(path_source);
       return;
     }
 
@@ -368,10 +368,10 @@ extern "C" {
       *status = F_none;
     } // for
 
-    f_macro_directory_statuss_t_delete_simple(failures);
-    f_macro_string_dynamic_t_delete_simple(path_source);
-    f_macro_string_dynamic_t_delete_simple(destination_file);
-    f_macro_string_dynamic_t_delete_simple(destination_directory);
+    macro_f_directory_statuss_t_delete_simple(failures);
+    macro_f_string_dynamic_t_delete_simple(path_source);
+    macro_f_string_dynamic_t_delete_simple(destination_file);
+    macro_f_string_dynamic_t_delete_simple(destination_directory);
 
     if (F_status_is_error_not(*status)) {
       fake_build_touch(main, file_stage, status);
@@ -542,7 +542,7 @@ extern "C" {
     if (F_status_is_error(*status)) {
       fll_error_print(main.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      macro_f_string_dynamics_t_delete_simple(arguments);
       return 0;
     }
 
@@ -562,8 +562,8 @@ extern "C" {
         if (F_status_is_error(*status)) {
           fll_error_print(main.error, F_status_set_fine(*status), "f_string_dynamic_mash", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(defines);
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          macro_f_string_dynamic_t_delete_simple(defines);
+          macro_f_string_dynamics_t_delete_simple(arguments);
           return 0;
         }
 
@@ -572,8 +572,8 @@ extern "C" {
         if (F_status_is_error(*status)) {
           fll_error_print(main.error, F_status_set_fine(*status), "f_string_dynamic_terminate_after", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(defines);
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          macro_f_string_dynamic_t_delete_simple(defines);
+          macro_f_string_dynamics_t_delete_simple(arguments);
           return 0;
         }
       }
@@ -640,12 +640,12 @@ extern "C" {
 
       *status = fll_execute_arguments_add_parameter_set(parameters_prefix, parameters_prefix_length, parameters_name, parameters_name_length, parameters_value, parameters_value_length, 7, &arguments);
 
-      f_macro_string_dynamic_t_delete_simple(defines);
+      macro_f_string_dynamic_t_delete_simple(defines);
 
       if (F_status_is_error(*status)) {
         fll_error_print(main.error, F_status_set_fine(*status), "fll_execute_arguments_add_parameter_set", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        macro_f_string_dynamics_t_delete_simple(arguments);
         return 0;
       }
     }
@@ -672,8 +672,8 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(main.error, F_status_set_fine(*status), function, F_true);
 
-        f_macro_string_dynamic_t_delete_simple(path);
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        macro_f_string_dynamic_t_delete_simple(path);
+        macro_f_string_dynamics_t_delete_simple(arguments);
         return 0;
       }
     }
@@ -683,8 +683,8 @@ extern "C" {
     if (fake_signal_received(main)) {
       *status = F_status_set_error(F_signal);
 
-      f_macro_string_dynamic_t_delete_simple(path);
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      macro_f_string_dynamic_t_delete_simple(path);
+      macro_f_string_dynamics_t_delete_simple(arguments);
     }
     else {
       // child processes should receive all signals, without blocking.
@@ -692,11 +692,11 @@ extern "C" {
       f_signal_set_empty(&signals.block);
       f_signal_set_fill(&signals.block_not);
 
-      fl_execute_parameter_t parameter = fl_macro_execute_parameter_t_initialize(fl_execute_parameter_option_path, 0, &data_build.environment, &signals, 0);
+      fl_execute_parameter_t parameter = macro_fl_execute_parameter_t_initialize(fl_execute_parameter_option_path, 0, &data_build.environment, &signals, 0);
 
       *status = fll_execute_program(path.string, arguments, &parameter, 0, (void *) &return_code);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      macro_f_string_dynamics_t_delete_simple(arguments);
 
       if (fake_signal_received(main)) {
         *status = F_status_set_error(F_signal);
@@ -722,7 +722,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(path);
+    macro_f_string_dynamic_t_delete_simple(path);
 
     return return_code;
   }
@@ -819,7 +819,7 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(main.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        macro_f_string_dynamics_t_delete_simple(arguments);
         return 0;
       }
     }
@@ -958,7 +958,7 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(main.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        macro_f_string_dynamics_t_delete_simple(arguments);
         return 0;
       }
     }
@@ -966,7 +966,7 @@ extern "C" {
     {
       const int result = fake_execute(main, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      macro_f_string_dynamics_t_delete_simple(arguments);
 
       if (F_status_is_error(*status)) {
         return 0;
@@ -1215,9 +1215,9 @@ extern "C" {
       result = fake_execute(main, data_build.environment, data_build.setting.build_indexer, arguments, status);
     }
 
-    f_macro_string_dynamic_t_delete_simple(file_name);
-    f_macro_string_dynamic_t_delete_simple(source_path);
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    macro_f_string_dynamic_t_delete_simple(file_name);
+    macro_f_string_dynamic_t_delete_simple(source_path);
+    macro_f_string_dynamics_t_delete_simple(arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(main, file_stage, status);
@@ -1324,7 +1324,7 @@ extern "C" {
         *status = F_status_set_error(F_signal);
       }
       else if (F_status_is_error_not(*status)) {
-        f_string_range_t range = f_macro_string_range_t_initialize(buffer.used);
+        f_string_range_t range = macro_f_string_range_t_initialize(buffer.used);
         f_fss_delimits_t delimits = f_fss_delimits_t_initialize;
 
         *status = fll_fss_extended_read(buffer, &range, &objects, &contents, 0, 0, &delimits, 0);
@@ -1343,12 +1343,12 @@ extern "C" {
           }
         }
 
-        f_macro_fss_delimits_t_delete_simple(delimits);
+        macro_f_fss_delimits_t_delete_simple(delimits);
       }
 
-      f_macro_string_dynamic_t_delete_simple(buffer);
-      f_macro_fss_objects_t_delete_simple(objects);
-      f_macro_fss_contents_t_delete_simple(contents);
+      macro_f_string_dynamic_t_delete_simple(buffer);
+      macro_f_fss_objects_t_delete_simple(objects);
+      macro_f_fss_contents_t_delete_simple(contents);
     }
 
     // error when required settings are not specified.
@@ -1625,10 +1625,10 @@ extern "C" {
 
           setting_mode_lengths[j] = settings_length[j] + 1 + modes->array[i].used;
 
-          f_macro_string_dynamic_t_resize(*status, settings_mode_name_dynamic[j], setting_mode_lengths[j]);
+          macro_f_string_dynamic_t_resize(*status, settings_mode_name_dynamic[j], setting_mode_lengths[j]);
 
           if (F_status_is_error(*status)) {
-            function = " f_macro_string_dynamic_t_resize";
+            function = " macro_f_string_dynamic_t_resize";
             break;
           }
 
@@ -1648,7 +1648,7 @@ extern "C" {
         }
 
         for (j = 0; j < fake_build_setting_total; j++) {
-          f_macro_string_dynamic_t_delete_simple(settings_mode_name_dynamic[j]);
+          macro_f_string_dynamic_t_delete_simple(settings_mode_name_dynamic[j]);
         } // for
 
         if (F_status_is_error(*status)) break;
@@ -2011,33 +2011,33 @@ extern "C" {
       } // for
     }
 
-    f_macro_string_dynamics_t_delete_simple(build_compiler);
-    f_macro_string_dynamics_t_delete_simple(build_indexer);
-    f_macro_string_dynamics_t_delete_simple(build_language);
-    f_macro_string_dynamics_t_delete_simple(build_script);
-    f_macro_string_dynamics_t_delete_simple(build_shared);
-    f_macro_string_dynamics_t_delete_simple(build_static);
-    f_macro_string_dynamics_t_delete_simple(path_headers);
-    f_macro_string_dynamics_t_delete_simple(path_headers_preserve);
-    f_macro_string_dynamics_t_delete_simple(path_language);
-    f_macro_string_dynamics_t_delete_simple(path_library_script);
-    f_macro_string_dynamics_t_delete_simple(path_library_shared);
-    f_macro_string_dynamics_t_delete_simple(path_library_static);
-    f_macro_string_dynamics_t_delete_simple(path_program_script);
-    f_macro_string_dynamics_t_delete_simple(path_program_shared);
-    f_macro_string_dynamics_t_delete_simple(path_program_static);
-    f_macro_string_dynamics_t_delete_simple(path_sources);
-    f_macro_string_dynamics_t_delete_simple(path_standard);
-    f_macro_string_dynamics_t_delete_simple(process_post);
-    f_macro_string_dynamics_t_delete_simple(process_pre);
-    f_macro_string_dynamics_t_delete_simple(project_name);
-    f_macro_string_dynamics_t_delete_simple(search_exclusive);
-    f_macro_string_dynamics_t_delete_simple(search_shared);
-    f_macro_string_dynamics_t_delete_simple(search_static);
-    f_macro_string_dynamics_t_delete_simple(version_major);
-    f_macro_string_dynamics_t_delete_simple(version_micro);
-    f_macro_string_dynamics_t_delete_simple(version_minor);
-    f_macro_string_dynamics_t_delete_simple(version_target);
+    macro_f_string_dynamics_t_delete_simple(build_compiler);
+    macro_f_string_dynamics_t_delete_simple(build_indexer);
+    macro_f_string_dynamics_t_delete_simple(build_language);
+    macro_f_string_dynamics_t_delete_simple(build_script);
+    macro_f_string_dynamics_t_delete_simple(build_shared);
+    macro_f_string_dynamics_t_delete_simple(build_static);
+    macro_f_string_dynamics_t_delete_simple(path_headers);
+    macro_f_string_dynamics_t_delete_simple(path_headers_preserve);
+    macro_f_string_dynamics_t_delete_simple(path_language);
+    macro_f_string_dynamics_t_delete_simple(path_library_script);
+    macro_f_string_dynamics_t_delete_simple(path_library_shared);
+    macro_f_string_dynamics_t_delete_simple(path_library_static);
+    macro_f_string_dynamics_t_delete_simple(path_program_script);
+    macro_f_string_dynamics_t_delete_simple(path_program_shared);
+    macro_f_string_dynamics_t_delete_simple(path_program_static);
+    macro_f_string_dynamics_t_delete_simple(path_sources);
+    macro_f_string_dynamics_t_delete_simple(path_standard);
+    macro_f_string_dynamics_t_delete_simple(process_post);
+    macro_f_string_dynamics_t_delete_simple(process_pre);
+    macro_f_string_dynamics_t_delete_simple(project_name);
+    macro_f_string_dynamics_t_delete_simple(search_exclusive);
+    macro_f_string_dynamics_t_delete_simple(search_shared);
+    macro_f_string_dynamics_t_delete_simple(search_static);
+    macro_f_string_dynamics_t_delete_simple(version_major);
+    macro_f_string_dynamics_t_delete_simple(version_micro);
+    macro_f_string_dynamics_t_delete_simple(version_minor);
+    macro_f_string_dynamics_t_delete_simple(version_target);
   }
 #endif // _di_fake_build_load_setting_process_
 
@@ -2335,7 +2335,7 @@ extern "C" {
       }
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(settings_file_base);
+    macro_f_string_dynamic_t_delete_simple(settings_file_base);
   }
 #endif // _di_fake_build_load_stage_
 
@@ -2522,14 +2522,14 @@ extern "C" {
 
       result = fake_execute(main, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      macro_f_string_dynamics_t_delete_simple(arguments);
 
       if (F_status_is_error(*status) || *status == F_child) break;
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(file_name);
-    f_macro_string_dynamic_t_delete_simple(destination_path);
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    macro_f_string_dynamic_t_delete_simple(file_name);
+    macro_f_string_dynamic_t_delete_simple(destination_path);
+    macro_f_string_dynamics_t_delete_simple(arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(main, file_stage, status);
@@ -2552,7 +2552,7 @@ extern "C" {
     fake_build_data_t data_build = fake_build_data_t_initialize;
     fake_build_stage_t stage = fake_build_stage_t_initialize;
 
-    f_macro_mode_t_set_default_umask(mode, main->umask);
+    macro_f_mode_t_set_default_umask(mode, main->umask);
 
     fake_build_load_setting(*main, setting_file, &data_build.setting, &status);
 
@@ -2649,8 +2649,8 @@ extern "C" {
 
     fake_build_execute_process_script(*main, data_build, data_build.setting.process_post, stage.file_process_post, &status);
 
-    fake_macro_build_main_delete_simple(data_build);
-    fake_macro_build_stage_t_delete_simple(stage);
+    macro_fake_build_main_delete_simple(data_build);
+    macro_fake_build_stage_t_delete_simple(stage);
 
     // signal is set with error code only to prevent further execution above, return without the error bit set.
     if (status == F_status_set_error(F_signal)) {
@@ -2759,13 +2759,13 @@ extern "C" {
     if (F_status_is_error(*status)) {
       fll_error_print(main.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      macro_f_string_dynamics_t_delete_simple(arguments);
       return 0;
     }
 
     int result = fake_execute(main, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    macro_f_string_dynamics_t_delete_simple(arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(main, file_stage, status);
@@ -2877,13 +2877,13 @@ extern "C" {
     if (F_status_is_error(*status)) {
       fll_error_print(main.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      macro_f_string_dynamics_t_delete_simple(arguments);
       return 0;
     }
 
     int result = fake_execute(main, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    macro_f_string_dynamics_t_delete_simple(arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(main, file_stage, status);
@@ -2899,7 +2899,7 @@ extern "C" {
 
     f_mode_t mode = f_mode_t_initialize;
 
-    f_macro_mode_t_set_default_umask(mode, main.umask);
+    macro_f_mode_t_set_default_umask(mode, main.umask);
 
     if (fake_signal_received(main)) {
       *status = F_status_set_error(F_signal);
index 7dead202141333e2a88c89e36e917caec991d6ca..077fabdf8c785f13f5be93e188c0e80149444537 100644 (file)
@@ -113,41 +113,41 @@ extern "C" {
     f_string_dynamics_t_initialize, \
   }
 
-  #define fake_macro_build_setting_t_delete_simple(setting) \
-    f_macro_string_dynamic_t_delete_simple(setting.build_compiler); \
-    f_macro_string_dynamic_t_delete_simple(setting.build_indexer); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_headers); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_language); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_library_script); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_library_shared); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_library_static); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_program_script); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_program_shared); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_program_static); \
-    f_macro_string_dynamic_t_delete_simple(setting.path_sources); \
-    f_macro_string_dynamic_t_delete_simple(setting.process_post); \
-    f_macro_string_dynamic_t_delete_simple(setting.process_pre); \
-    f_macro_string_dynamic_t_delete_simple(setting.project_name); \
-    f_macro_string_dynamic_t_delete_simple(setting.version_major); \
-    f_macro_string_dynamic_t_delete_simple(setting.version_micro); \
-    f_macro_string_dynamic_t_delete_simple(setting.version_minor); \
-    f_macro_string_dynamics_t_delete_simple(setting.build_libraries); \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_headers); \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_library); \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_program); \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_setting); \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_script); \
-    f_macro_string_dynamics_t_delete_simple(setting.defines_all); \
-    f_macro_string_dynamics_t_delete_simple(setting.defines_shared); \
-    f_macro_string_dynamics_t_delete_simple(setting.defines_static); \
-    f_macro_string_dynamics_t_delete_simple(setting.environment); \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_all); \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_library); \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_program); \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_shared); \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_static); \
-    f_macro_string_dynamics_t_delete_simple(setting.modes); \
-    f_macro_string_dynamics_t_delete_simple(setting.modes_default);
+  #define macro_fake_build_setting_t_delete_simple(setting) \
+    macro_f_string_dynamic_t_delete_simple(setting.build_compiler); \
+    macro_f_string_dynamic_t_delete_simple(setting.build_indexer); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_headers); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_language); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_library_script); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_library_shared); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_library_static); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_program_script); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_program_shared); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_program_static); \
+    macro_f_string_dynamic_t_delete_simple(setting.path_sources); \
+    macro_f_string_dynamic_t_delete_simple(setting.process_post); \
+    macro_f_string_dynamic_t_delete_simple(setting.process_pre); \
+    macro_f_string_dynamic_t_delete_simple(setting.project_name); \
+    macro_f_string_dynamic_t_delete_simple(setting.version_major); \
+    macro_f_string_dynamic_t_delete_simple(setting.version_micro); \
+    macro_f_string_dynamic_t_delete_simple(setting.version_minor); \
+    macro_f_string_dynamics_t_delete_simple(setting.build_libraries); \
+    macro_f_string_dynamics_t_delete_simple(setting.build_sources_headers); \
+    macro_f_string_dynamics_t_delete_simple(setting.build_sources_library); \
+    macro_f_string_dynamics_t_delete_simple(setting.build_sources_program); \
+    macro_f_string_dynamics_t_delete_simple(setting.build_sources_setting); \
+    macro_f_string_dynamics_t_delete_simple(setting.build_sources_script); \
+    macro_f_string_dynamics_t_delete_simple(setting.defines_all); \
+    macro_f_string_dynamics_t_delete_simple(setting.defines_shared); \
+    macro_f_string_dynamics_t_delete_simple(setting.defines_static); \
+    macro_f_string_dynamics_t_delete_simple(setting.environment); \
+    macro_f_string_dynamics_t_delete_simple(setting.flags_all); \
+    macro_f_string_dynamics_t_delete_simple(setting.flags_library); \
+    macro_f_string_dynamics_t_delete_simple(setting.flags_program); \
+    macro_f_string_dynamics_t_delete_simple(setting.flags_shared); \
+    macro_f_string_dynamics_t_delete_simple(setting.flags_static); \
+    macro_f_string_dynamics_t_delete_simple(setting.modes); \
+    macro_f_string_dynamics_t_delete_simple(setting.modes_default);
 
   #define fake_build_setting_name_build_compiler         "build_compiler"
   #define fake_build_setting_name_build_language         "build_language"
@@ -281,20 +281,20 @@ extern "C" {
 
   #define fake_build_stage_total 13
 
-  #define fake_macro_build_stage_t_delete_simple(stage) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_libraries_script); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_libraries_shared); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_libraries_static); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_objects_static); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_process_post); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_process_pre); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_programs_script); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_programs_shared); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_programs_static); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_skeleton); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_sources_headers); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_sources_script); \
-    f_macro_string_dynamic_t_delete_simple(stage.file_sources_settings);
+  #define macro_fake_build_stage_t_delete_simple(stage) \
+    macro_f_string_dynamic_t_delete_simple(stage.file_libraries_script); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_libraries_shared); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_libraries_static); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_objects_static); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_process_post); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_process_pre); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_programs_script); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_programs_shared); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_programs_static); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_skeleton); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_sources_headers); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_sources_script); \
+    macro_f_string_dynamic_t_delete_simple(stage.file_sources_settings);
 
   #define fake_build_stage_built            ".built"
   #define fake_build_stage_libraries_script "libraries_script"
@@ -340,9 +340,9 @@ extern "C" {
     f_string_maps_t_initialize, \
   }
 
-  #define fake_macro_build_main_delete_simple(build) \
-    fake_macro_build_setting_t_delete_simple(build.setting) \
-    f_macro_string_maps_t_delete_simple(build.environment);
+  #define macro_fake_build_main_delete_simple(build) \
+    macro_fake_build_setting_t_delete_simple(build.setting) \
+    macro_f_string_maps_t_delete_simple(build.environment);
 #endif // _di_fake_build_data_t_
 
 #ifndef _di_fake_build_parameter_
index 23a6cffd9015638cfccc3b082509e810c17ae068..2f5d1b94648ba9ed0334cd88c157957d353a6fe8 100644 (file)
@@ -41,7 +41,7 @@ extern "C" {
       f_signal_set_empty(&signals.block);
       f_signal_set_fill(&signals.block_not);
 
-      fl_execute_parameter_t parameter = fl_macro_execute_parameter_t_initialize(0, 0, &environment, &signals, 0);
+      fl_execute_parameter_t parameter = macro_fl_execute_parameter_t_initialize(0, 0, &environment, &signals, 0);
 
       *status = fll_execute_program(program.string, arguments, &parameter, 0, (void *) &return_code);
 
@@ -105,12 +105,12 @@ extern "C" {
             size_file = fake_common_initial_buffer_max;
           }
 
-           f_macro_string_dynamic_t_resize((status), (*buffer), size_file);
+           macro_f_string_dynamic_t_resize((status), (*buffer), size_file);
 
           if (F_status_is_error(status)) {
             fll_error_file_print(main.error, F_status_set_fine(status), name_function, F_true, path_file, "allocate buffer size for", fll_error_file_type_file);
 
-            f_macro_string_dynamic_t_delete_simple((*buffer));
+            macro_f_string_dynamic_t_delete_simple((*buffer));
             return status;
           }
         }
@@ -143,7 +143,7 @@ extern "C" {
     if (F_status_is_error(status)) {
       fll_error_file_print(main.error, F_status_set_fine(status), name_function, F_true, path_file, "read", fll_error_file_type_file);
 
-      f_macro_string_dynamic_t_delete_simple((*buffer));
+      macro_f_string_dynamic_t_delete_simple((*buffer));
     }
 
     return status;
@@ -705,10 +705,10 @@ extern "C" {
           }
         }
         else if (parameter_default_lengths[i] > 0) {
-          f_macro_string_dynamic_t_resize(status, (*parameters_value[i]), parameter_default_lengths[i]);
+          macro_f_string_dynamic_t_resize(status, (*parameters_value[i]), parameter_default_lengths[i]);
 
           if (F_status_is_error(status)) {
-            fll_error_print(main->error, F_status_set_fine(status), "f_macro_string_dynamic_t_resize", F_true);
+            fll_error_print(main->error, F_status_set_fine(status), "macro_f_string_dynamic_t_resize", F_true);
             return status;
           }
 
@@ -785,10 +785,10 @@ extern "C" {
           }
         }
         else if (parameter_default_lengths[i] > 0) {
-           f_macro_string_dynamic_t_resize(status, (*parameters_value[i]), parameter_default_lengths[i]);
+           macro_f_string_dynamic_t_resize(status, (*parameters_value[i]), parameter_default_lengths[i]);
 
           if (F_status_is_error(status)) {
-            if (fll_error_print(main->error, F_status_set_fine(status), " f_macro_string_dynamic_t_resize", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet) {
+            if (fll_error_print(main->error, F_status_set_fine(status), " macro_f_string_dynamic_t_resize", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet) {
               fprintf(main->error.to.stream, "%c", f_string_eol_s[0]);
               f_color_print(main->error.to.stream, main->context.set.error, "%sFailed to load default for the parameter '", fll_error_print_error);
               f_color_print(main->error.to.stream, main->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]);
index 49d182dfde593a58897dc9ec6a6bead716ffc753..a9ee57a4e4d30c22db211b4516b69c383566bab9 100644 (file)
@@ -22,7 +22,7 @@ extern "C" {
       return F_status_set_error(F_false);
     }
 
-    const f_string_range_t range = f_macro_string_range_t_initialize(data_make->path.stack.array[0].used);
+    const f_string_range_t range = macro_f_string_range_t_initialize(data_make->path.stack.array[0].used);
 
     if (range.start <= range.stop) {
       status = fl_string_dynamic_partial_compare(data_make->path.stack.array[0], data_make->path_cache, range, range);
@@ -45,7 +45,7 @@ extern "C" {
 
 #ifndef _di_fake_make_get_id_group_
   f_status_t fake_make_get_id_group(const fake_main_t main, const fll_error_print_t error, const f_string_static_t buffer, gid_t *id) {
-    const f_string_range_t range = f_macro_string_range_t_initialize(buffer.used);
+    const f_string_range_t range = macro_f_string_range_t_initialize(buffer.used);
 
     f_number_unsigned_t number = 0;
 
@@ -123,7 +123,7 @@ extern "C" {
 
 #ifndef _di_fake_make_get_id_owner_
   f_status_t fake_make_get_id_owner(const fake_main_t main, const fll_error_print_t error, const f_string_static_t buffer, uid_t *id) {
-    const f_string_range_t range = f_macro_string_range_t_initialize(buffer.used);
+    const f_string_range_t range = macro_f_string_range_t_initialize(buffer.used);
 
     f_number_unsigned_t number = 0;
 
@@ -202,7 +202,7 @@ extern "C" {
     f_fss_contents_t list_contents = f_fss_contents_t_initialize;
 
     {
-      f_string_range_t range = f_macro_string_range_t_initialize(data_make->buffer.used);
+      f_string_range_t range = macro_f_string_range_t_initialize(data_make->buffer.used);
       f_fss_delimits_t delimits = f_fss_delimits_t_initialize;
       f_fss_comments_t comments = f_fss_comments_t_initialize;
 
@@ -220,10 +220,10 @@ extern "C" {
       }
 
       if (F_status_is_error(*status)) {
-        f_macro_fss_delimits_t_delete_simple(delimits);
-        f_macro_fss_comments_t_delete_simple(comments);
-        f_macro_fss_objects_t_delete_simple(list_objects);
-        f_macro_fss_contents_t_delete_simple(list_contents);
+        macro_f_fss_delimits_t_delete_simple(delimits);
+        macro_f_fss_comments_t_delete_simple(comments);
+        macro_f_fss_objects_t_delete_simple(list_objects);
+        macro_f_fss_contents_t_delete_simple(list_contents);
         return;
       }
     }
@@ -234,20 +234,20 @@ extern "C" {
 
       f_fss_set_t settings = f_fss_set_t_initialize;
 
-      const f_string_static_t name_settings = f_macro_string_static_t_initialize(fake_make_section_settings, fake_make_section_settings_length);
-      const f_string_static_t name_main = f_macro_string_static_t_initialize(fake_make_section_main, fake_make_section_main_length);
+      const f_string_static_t name_settings = macro_f_string_static_t_initialize(fake_make_section_settings, fake_make_section_settings_length);
+      const f_string_static_t name_main = macro_f_string_static_t_initialize(fake_make_section_main, fake_make_section_main_length);
 
-      const f_string_range_t name_settings_range = f_macro_string_range_t_initialize(fake_make_section_settings_length);
-      const f_string_range_t name_main_range = f_macro_string_range_t_initialize(fake_make_section_main_length);
+      const f_string_range_t name_settings_range = macro_f_string_range_t_initialize(fake_make_section_settings_length);
+      const f_string_range_t name_main_range = macro_f_string_range_t_initialize(fake_make_section_main_length);
 
-      f_macro_fss_nameds_t_resize((*status), data_make->fakefile, list_objects.used);
+      macro_f_fss_nameds_t_resize((*status), data_make->fakefile, list_objects.used);
 
       if (F_status_is_error(*status)) {
-        fll_error_print(main.error, F_status_set_fine(*status), "f_macro_fss_nameds_t_resize", F_true);
+        fll_error_print(main.error, F_status_set_fine(*status), "macro_f_fss_nameds_t_resize", F_true);
 
-        f_macro_fss_set_t_delete_simple(settings);
-        f_macro_fss_objects_t_delete_simple(list_objects);
-        f_macro_fss_contents_t_delete_simple(list_contents);
+        macro_f_fss_set_t_delete_simple(settings);
+        macro_f_fss_objects_t_delete_simple(list_objects);
+        macro_f_fss_contents_t_delete_simple(list_contents);
         return;
       }
 
@@ -321,14 +321,14 @@ extern "C" {
           data_make->fakefile.used++;
         } // for
 
-        f_macro_fss_delimits_t_delete_simple(delimits);
+        macro_f_fss_delimits_t_delete_simple(delimits);
       }
 
-      f_macro_fss_objects_t_delete_simple(list_objects);
-      f_macro_fss_contents_t_delete_simple(list_contents);
+      macro_f_fss_objects_t_delete_simple(list_objects);
+      macro_f_fss_contents_t_delete_simple(list_contents);
 
       if (F_status_is_error(*status)) {
-        f_macro_fss_set_t_delete_simple(settings);
+        macro_f_fss_set_t_delete_simple(settings);
 
         return;
       }
@@ -345,15 +345,15 @@ extern "C" {
 
         *status = F_status_set_error(F_failure);
 
-        f_macro_fss_set_t_delete_simple(settings);
+        macro_f_fss_set_t_delete_simple(settings);
         return;
       }
 
       // always have the parameter variable "return" map at index 0 and pre-initialized.
       {
-        f_string_t function_name = "f_macro_string_map_multis_t_resize";
+        f_string_t function_name = "macro_f_string_map_multis_t_resize";
 
-        f_macro_string_map_multis_t_resize(*status, data_make->setting_make.parameter, f_memory_default_allocation_step);
+        macro_f_string_map_multis_t_resize(*status, data_make->setting_make.parameter, f_memory_default_allocation_step);
 
         if (F_status_is_error_not(*status)) {
           data_make->setting_make.parameter.used = 1;
@@ -380,7 +380,7 @@ extern "C" {
         if (F_status_is_error(*status)) {
           fll_error_print(main.error, F_status_set_fine(*status), function_name, F_true);
 
-          f_macro_fss_set_t_delete_simple(settings);
+          macro_f_fss_set_t_delete_simple(settings);
           return;
         }
       }
@@ -486,12 +486,12 @@ extern "C" {
             } // for
 
             if (F_status_is_error(*status)) {
-              f_macro_string_dynamic_t_delete_simple(name_define);
+              macro_f_string_dynamic_t_delete_simple(name_define);
               break;
             }
 
             *status = F_none;
-            f_macro_string_dynamic_t_delete_simple(name_define);
+            macro_f_string_dynamic_t_delete_simple(name_define);
           }
           else if (fl_string_dynamic_partial_compare_string(fake_make_setting_fail, data_make->buffer, fake_make_setting_fail_length, settings.objects.array[i]) == F_equal_to) {
             if (unmatched_fail) {
@@ -610,7 +610,7 @@ extern "C" {
         } // for
 
         if (F_status_is_error(*status)) {
-          f_macro_fss_set_t_delete_simple(settings);
+          macro_f_fss_set_t_delete_simple(settings);
 
           return;
         }
@@ -631,7 +631,7 @@ extern "C" {
       }
 
       if (F_status_is_error(*status)) {
-        f_macro_fss_set_t_delete_simple(settings);
+        macro_f_fss_set_t_delete_simple(settings);
         return;
       }
 
@@ -649,7 +649,7 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(main.error, F_status_set_fine(*status), "f_string_dynamic_partial_append", F_true);
 
-        f_macro_fss_set_t_delete_simple(settings);
+        macro_f_fss_set_t_delete_simple(settings);
         return;
       }
 
@@ -683,8 +683,8 @@ extern "C" {
         if (F_status_is_error(*status)) {
           fll_error_print(main.error, F_status_set_fine(*status), "fll_fss_snatch_map_apart", F_true);
 
-          f_macro_string_map_multis_t_delete_simple(define);
-          f_macro_fss_set_t_delete_simple(settings);
+          macro_f_string_map_multis_t_delete_simple(define);
+          macro_f_fss_set_t_delete_simple(settings);
           return;
         }
       }
@@ -745,11 +745,11 @@ extern "C" {
           }
         } // for
 
-        f_macro_string_dynamic_t_delete_simple(combined);
+        macro_f_string_dynamic_t_delete_simple(combined);
       }
 
-      f_macro_string_map_multis_t_delete_simple(define);
-      f_macro_fss_set_t_delete_simple(settings);
+      macro_f_string_map_multis_t_delete_simple(define);
+      macro_f_fss_set_t_delete_simple(settings);
     }
   }
 #endif // _di_fake_make_load_fakefile_
@@ -1073,7 +1073,7 @@ extern "C" {
     }
 
     if (fake_signal_received(*main)) {
-      fake_macro_make_data_t_delete_simple(data_make);
+      macro_fake_make_data_t_delete_simple(data_make);
       return F_signal;
     }
 
@@ -1082,7 +1082,7 @@ extern "C" {
     if (F_status_is_error(status)) {
       fll_error_print(main->error, F_status_set_fine(status), "f_path_current", F_true);
 
-      fake_macro_make_data_t_delete_simple(data_make);
+      macro_fake_make_data_t_delete_simple(data_make);
       return status;
     }
 
@@ -1091,20 +1091,20 @@ extern "C" {
     if (F_status_is_error(status)) {
       fll_error_print(main->error, F_status_set_fine(status), "f_directory_open", F_true);
 
-      fake_macro_make_data_t_delete_simple(data_make);
+      macro_fake_make_data_t_delete_simple(data_make);
       return status;
     }
 
     data_make.path.stack.used = 1;
 
-    f_macro_mode_t_set_default_umask(mode, main->umask);
+    macro_f_mode_t_set_default_umask(mode, main->umask);
 
     fake_make_load_parameters(*main, &data_make, &status);
 
     fake_make_load_fakefile(*main, &data_make, &status);
 
     if (F_status_is_error(status)) {
-      fake_macro_make_data_t_delete_simple(data_make);
+      macro_fake_make_data_t_delete_simple(data_make);
 
       // signal is set with error code only to prevent further execution above, return without the error bit set.
       if (F_status_set_fine(status) == F_signal) {
@@ -1160,8 +1160,8 @@ extern "C" {
 
     f_file_stream_close(F_true, &data_make.path.top);
 
-    f_macro_array_lengths_t_delete_simple(section_stack);
-    fake_macro_make_data_t_delete_simple(data_make);
+    macro_f_array_lengths_t_delete_simple(section_stack);
+    macro_fake_make_data_t_delete_simple(data_make);
 
     // signal is set with error code only to prevent further execution above, return without the error bit set.
     if (status == F_status_set_error(F_signal)) {
@@ -1187,11 +1187,11 @@ extern "C" {
       }
     }
 
-    const f_string_static_t vocabulary_define = f_macro_string_static_t_initialize(iki_vocabulary_0002_define_s, iki_vocabulary_0002_define_length);
-    const f_string_static_t vocabulary_parameter = f_macro_string_static_t_initialize(iki_vocabulary_0002_parameter_s, iki_vocabulary_0002_parameter_length);
+    const f_string_static_t vocabulary_define = macro_f_string_static_t_initialize(iki_vocabulary_0002_define_s, iki_vocabulary_0002_define_length);
+    const f_string_static_t vocabulary_parameter = macro_f_string_static_t_initialize(iki_vocabulary_0002_parameter_s, iki_vocabulary_0002_parameter_length);
 
-    const f_string_range_t range_define = f_macro_string_range_t_initialize(iki_vocabulary_0002_define_length);
-    const f_string_range_t range_parameter = f_macro_string_range_t_initialize(iki_vocabulary_0002_parameter_length);
+    const f_string_range_t range_define = macro_f_string_range_t_initialize(iki_vocabulary_0002_define_length);
+    const f_string_range_t range_parameter = macro_f_string_range_t_initialize(iki_vocabulary_0002_parameter_length);
 
     f_iki_variable_t iki_variable = f_iki_variable_t_initialize;
     f_iki_vocabulary_t iki_vocabulary = f_iki_vocabulary_t_initialize;
@@ -1540,14 +1540,14 @@ extern "C" {
         arguments->used++;
       }
 
-      f_macro_iki_variable_t_delete_simple(iki_variable);
-      f_macro_iki_vocabulary_t_delete_simple(iki_vocabulary);
-      f_macro_iki_content_t_delete_simple(iki_content);
+      macro_f_iki_variable_t_delete_simple(iki_variable);
+      macro_f_iki_vocabulary_t_delete_simple(iki_vocabulary);
+      macro_f_iki_content_t_delete_simple(iki_content);
     } // for
 
-    f_macro_iki_variable_t_delete_simple(iki_variable);
-    f_macro_iki_vocabulary_t_delete_simple(iki_vocabulary);
-    f_macro_iki_content_t_delete_simple(iki_content);
+    macro_f_iki_variable_t_delete_simple(iki_variable);
+    macro_f_iki_vocabulary_t_delete_simple(iki_vocabulary);
+    macro_f_iki_content_t_delete_simple(iki_content);
   }
 #endif // _di_fake_make_operate_expand_
 
@@ -1794,12 +1794,12 @@ extern "C" {
     }
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      macro_f_string_dynamic_t_delete_simple(value);
       return status;
     }
 
     if (unmatched) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      macro_f_string_dynamic_t_delete_simple(value);
       return F_false;
     }
 
@@ -1822,7 +1822,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(value);
+    macro_f_string_dynamic_t_delete_simple(value);
 
     if (F_status_is_error_not(status)) {
       return F_true;
@@ -1847,15 +1847,15 @@ extern "C" {
 
       status = f_environment_get(name.string, &value);
 
-      f_macro_string_dynamic_t_delete_simple(name);
+      macro_f_string_dynamic_t_delete_simple(name);
     }
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      macro_f_string_dynamic_t_delete_simple(value);
       return status;
     }
     else if (status == F_exist_not) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      macro_f_string_dynamic_t_delete_simple(value);
       return F_false;
     }
 
@@ -1878,7 +1878,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(value);
+    macro_f_string_dynamic_t_delete_simple(value);
 
     if (F_status_is_error_not(status)) {
       return F_true;
@@ -1906,10 +1906,10 @@ extern "C" {
 
     // add the operation id to the operation stack.
     if (section_stack->used + 1 > section_stack->size) {
-      f_macro_array_lengths_t_increase_by((*status), (*section_stack), f_memory_default_allocation_step);
+      macro_f_array_lengths_t_increase_by((*status), (*section_stack), f_memory_default_allocation_step);
 
       if (F_status_is_error(*status)) {
-        fll_error_print(data_make->error, F_status_set_fine(*status), "f_macro_array_lengths_t_increase_by", F_true);
+        fll_error_print(data_make->error, F_status_set_fine(*status), "macro_f_array_lengths_t_increase_by", F_true);
         return 0;
       }
     }
@@ -1937,71 +1937,71 @@ extern "C" {
     }
 
     const f_string_static_t operations_name[] = {
-      f_macro_string_static_t_initialize(fake_make_operation_break, fake_make_operation_break_length),
-      f_macro_string_static_t_initialize(fake_make_operation_build, fake_make_operation_build_length),
-      f_macro_string_static_t_initialize(fake_make_operation_clean, fake_make_operation_clean_length),
-      f_macro_string_static_t_initialize(fake_make_operation_clone, fake_make_operation_clone_length),
-      f_macro_string_static_t_initialize(fake_make_operation_compile, fake_make_operation_compile_length),
-      f_macro_string_static_t_initialize(fake_make_operation_copy, fake_make_operation_copy_length),
-      f_macro_string_static_t_initialize(fake_make_operation_define, fake_make_operation_define_length),
-      f_macro_string_static_t_initialize(fake_make_operation_delete, fake_make_operation_delete_length),
-      f_macro_string_static_t_initialize(fake_make_operation_deletes, fake_make_operation_deletes_length),
-      f_macro_string_static_t_initialize(fake_make_operation_else, fake_make_operation_else_length),
-      f_macro_string_static_t_initialize(fake_make_operation_exit, fake_make_operation_exit_length),
-      f_macro_string_static_t_initialize(fake_make_operation_fail, fake_make_operation_fail_length),
-      f_macro_string_static_t_initialize(fake_make_operation_group, fake_make_operation_group_length),
-      f_macro_string_static_t_initialize(fake_make_operation_groups, fake_make_operation_groups_length),
-      f_macro_string_static_t_initialize(fake_make_operation_if, fake_make_operation_if_length),
-      f_macro_string_static_t_initialize(fake_make_operation_index, fake_make_operation_index_length),
-      f_macro_string_static_t_initialize(fake_make_operation_link, fake_make_operation_link_length),
-      f_macro_string_static_t_initialize(fake_make_operation_mode, fake_make_operation_mode_length),
-      f_macro_string_static_t_initialize(fake_make_operation_modes, fake_make_operation_modes_length),
-      f_macro_string_static_t_initialize(fake_make_operation_move, fake_make_operation_move_length),
-      f_macro_string_static_t_initialize(fake_make_operation_operate, fake_make_operation_operate_length),
-      f_macro_string_static_t_initialize(fake_make_operation_owner, fake_make_operation_owner_length),
-      f_macro_string_static_t_initialize(fake_make_operation_owners, fake_make_operation_owners_length),
-      f_macro_string_static_t_initialize(fake_make_operation_pop, fake_make_operation_pop_length),
-      f_macro_string_static_t_initialize(fake_make_operation_print, fake_make_operation_print_length),
-      f_macro_string_static_t_initialize(fake_make_operation_run, fake_make_operation_run_length),
-      f_macro_string_static_t_initialize(fake_make_operation_shell, fake_make_operation_shell_length),
-      f_macro_string_static_t_initialize(fake_make_operation_skeleton, fake_make_operation_skeleton_length),
-      f_macro_string_static_t_initialize(fake_make_operation_to, fake_make_operation_to_length),
-      f_macro_string_static_t_initialize(fake_make_operation_top, fake_make_operation_top_length),
-      f_macro_string_static_t_initialize(fake_make_operation_touch, fake_make_operation_touch_length),
+      macro_f_string_static_t_initialize(fake_make_operation_break, fake_make_operation_break_length),
+      macro_f_string_static_t_initialize(fake_make_operation_build, fake_make_operation_build_length),
+      macro_f_string_static_t_initialize(fake_make_operation_clean, fake_make_operation_clean_length),
+      macro_f_string_static_t_initialize(fake_make_operation_clone, fake_make_operation_clone_length),
+      macro_f_string_static_t_initialize(fake_make_operation_compile, fake_make_operation_compile_length),
+      macro_f_string_static_t_initialize(fake_make_operation_copy, fake_make_operation_copy_length),
+      macro_f_string_static_t_initialize(fake_make_operation_define, fake_make_operation_define_length),
+      macro_f_string_static_t_initialize(fake_make_operation_delete, fake_make_operation_delete_length),
+      macro_f_string_static_t_initialize(fake_make_operation_deletes, fake_make_operation_deletes_length),
+      macro_f_string_static_t_initialize(fake_make_operation_else, fake_make_operation_else_length),
+      macro_f_string_static_t_initialize(fake_make_operation_exit, fake_make_operation_exit_length),
+      macro_f_string_static_t_initialize(fake_make_operation_fail, fake_make_operation_fail_length),
+      macro_f_string_static_t_initialize(fake_make_operation_group, fake_make_operation_group_length),
+      macro_f_string_static_t_initialize(fake_make_operation_groups, fake_make_operation_groups_length),
+      macro_f_string_static_t_initialize(fake_make_operation_if, fake_make_operation_if_length),
+      macro_f_string_static_t_initialize(fake_make_operation_index, fake_make_operation_index_length),
+      macro_f_string_static_t_initialize(fake_make_operation_link, fake_make_operation_link_length),
+      macro_f_string_static_t_initialize(fake_make_operation_mode, fake_make_operation_mode_length),
+      macro_f_string_static_t_initialize(fake_make_operation_modes, fake_make_operation_modes_length),
+      macro_f_string_static_t_initialize(fake_make_operation_move, fake_make_operation_move_length),
+      macro_f_string_static_t_initialize(fake_make_operation_operate, fake_make_operation_operate_length),
+      macro_f_string_static_t_initialize(fake_make_operation_owner, fake_make_operation_owner_length),
+      macro_f_string_static_t_initialize(fake_make_operation_owners, fake_make_operation_owners_length),
+      macro_f_string_static_t_initialize(fake_make_operation_pop, fake_make_operation_pop_length),
+      macro_f_string_static_t_initialize(fake_make_operation_print, fake_make_operation_print_length),
+      macro_f_string_static_t_initialize(fake_make_operation_run, fake_make_operation_run_length),
+      macro_f_string_static_t_initialize(fake_make_operation_shell, fake_make_operation_shell_length),
+      macro_f_string_static_t_initialize(fake_make_operation_skeleton, fake_make_operation_skeleton_length),
+      macro_f_string_static_t_initialize(fake_make_operation_to, fake_make_operation_to_length),
+      macro_f_string_static_t_initialize(fake_make_operation_top, fake_make_operation_top_length),
+      macro_f_string_static_t_initialize(fake_make_operation_touch, fake_make_operation_touch_length),
     };
 
     const f_string_range_t operations_range[] = {
-      f_macro_string_range_t_initialize(fake_make_operation_break_length),
-      f_macro_string_range_t_initialize(fake_make_operation_build_length),
-      f_macro_string_range_t_initialize(fake_make_operation_clean_length),
-      f_macro_string_range_t_initialize(fake_make_operation_clone_length),
-      f_macro_string_range_t_initialize(fake_make_operation_compile_length),
-      f_macro_string_range_t_initialize(fake_make_operation_copy_length),
-      f_macro_string_range_t_initialize(fake_make_operation_define_length),
-      f_macro_string_range_t_initialize(fake_make_operation_delete_length),
-      f_macro_string_range_t_initialize(fake_make_operation_deletes_length),
-      f_macro_string_range_t_initialize(fake_make_operation_else_length),
-      f_macro_string_range_t_initialize(fake_make_operation_exit_length),
-      f_macro_string_range_t_initialize(fake_make_operation_fail_length),
-      f_macro_string_range_t_initialize(fake_make_operation_group_length),
-      f_macro_string_range_t_initialize(fake_make_operation_groups_length),
-      f_macro_string_range_t_initialize(fake_make_operation_if_length),
-      f_macro_string_range_t_initialize(fake_make_operation_index_length),
-      f_macro_string_range_t_initialize(fake_make_operation_link_length),
-      f_macro_string_range_t_initialize(fake_make_operation_mode_length),
-      f_macro_string_range_t_initialize(fake_make_operation_modes_length),
-      f_macro_string_range_t_initialize(fake_make_operation_move_length),
-      f_macro_string_range_t_initialize(fake_make_operation_operate_length),
-      f_macro_string_range_t_initialize(fake_make_operation_owner_length),
-      f_macro_string_range_t_initialize(fake_make_operation_owners_length),
-      f_macro_string_range_t_initialize(fake_make_operation_pop_length),
-      f_macro_string_range_t_initialize(fake_make_operation_print_length),
-      f_macro_string_range_t_initialize(fake_make_operation_run_length),
-      f_macro_string_range_t_initialize(fake_make_operation_shell_length),
-      f_macro_string_range_t_initialize(fake_make_operation_skeleton_length),
-      f_macro_string_range_t_initialize(fake_make_operation_to_length),
-      f_macro_string_range_t_initialize(fake_make_operation_top_length),
-      f_macro_string_range_t_initialize(fake_make_operation_touch_length),
+      macro_f_string_range_t_initialize(fake_make_operation_break_length),
+      macro_f_string_range_t_initialize(fake_make_operation_build_length),
+      macro_f_string_range_t_initialize(fake_make_operation_clean_length),
+      macro_f_string_range_t_initialize(fake_make_operation_clone_length),
+      macro_f_string_range_t_initialize(fake_make_operation_compile_length),
+      macro_f_string_range_t_initialize(fake_make_operation_copy_length),
+      macro_f_string_range_t_initialize(fake_make_operation_define_length),
+      macro_f_string_range_t_initialize(fake_make_operation_delete_length),
+      macro_f_string_range_t_initialize(fake_make_operation_deletes_length),
+      macro_f_string_range_t_initialize(fake_make_operation_else_length),
+      macro_f_string_range_t_initialize(fake_make_operation_exit_length),
+      macro_f_string_range_t_initialize(fake_make_operation_fail_length),
+      macro_f_string_range_t_initialize(fake_make_operation_group_length),
+      macro_f_string_range_t_initialize(fake_make_operation_groups_length),
+      macro_f_string_range_t_initialize(fake_make_operation_if_length),
+      macro_f_string_range_t_initialize(fake_make_operation_index_length),
+      macro_f_string_range_t_initialize(fake_make_operation_link_length),
+      macro_f_string_range_t_initialize(fake_make_operation_mode_length),
+      macro_f_string_range_t_initialize(fake_make_operation_modes_length),
+      macro_f_string_range_t_initialize(fake_make_operation_move_length),
+      macro_f_string_range_t_initialize(fake_make_operation_operate_length),
+      macro_f_string_range_t_initialize(fake_make_operation_owner_length),
+      macro_f_string_range_t_initialize(fake_make_operation_owners_length),
+      macro_f_string_range_t_initialize(fake_make_operation_pop_length),
+      macro_f_string_range_t_initialize(fake_make_operation_print_length),
+      macro_f_string_range_t_initialize(fake_make_operation_run_length),
+      macro_f_string_range_t_initialize(fake_make_operation_shell_length),
+      macro_f_string_range_t_initialize(fake_make_operation_skeleton_length),
+      macro_f_string_range_t_initialize(fake_make_operation_to_length),
+      macro_f_string_range_t_initialize(fake_make_operation_top_length),
+      macro_f_string_range_t_initialize(fake_make_operation_touch_length),
     };
 
     const uint8_t operations_type[] = {
@@ -2232,7 +2232,7 @@ extern "C" {
 
     if (*status == F_status_set_error(F_signal)) {
       for (i = 0; i < section->objects.used; i++) {
-        f_macro_string_dynamics_t_delete_simple(arguments[i]);
+        macro_f_string_dynamics_t_delete_simple(arguments[i]);
       } // for
 
       return 0;
@@ -2267,7 +2267,7 @@ extern "C" {
     }
 
     for (i = 0; i < section->objects.used; i++) {
-      f_macro_string_dynamics_t_delete_simple(arguments[i]);
+      macro_f_string_dynamics_t_delete_simple(arguments[i]);
     } // for
 
     section_stack->used--;
@@ -2465,7 +2465,7 @@ extern "C" {
 
       f_mode_t mode = f_mode_t_initialize;
 
-      f_macro_mode_t_set_default_umask(mode, main->umask);
+      macro_f_mode_t_set_default_umask(mode, main->umask);
 
       if (main->error.verbosity == f_console_verbosity_verbose) {
         recurse.output = main->output;
@@ -2589,7 +2589,7 @@ extern "C" {
             return 0;
           }
         }
-        else if (f_macro_file_type_is_directory(file_stat.st_mode)) {
+        else if (macro_f_file_type_is_directory(file_stat.st_mode)) {
           if (main->error.verbosity == f_console_verbosity_verbose) {
             *status = f_directory_remove_custom(arguments.array[i].string, recursion_max, F_false, fake_clean_remove_recursively_verbosely);
           }
@@ -3003,25 +3003,25 @@ extern "C" {
             break;
           }
 
-          if (f_macro_file_type_is_block(mode_file)) {
+          if (macro_f_file_type_is_block(mode_file)) {
             type_file = 0x1;
           }
-          else if (f_macro_file_type_is_character(mode_file)) {
+          else if (macro_f_file_type_is_character(mode_file)) {
             type_file = 0x2;
           }
-          else if (f_macro_file_type_is_directory(mode_file)) {
+          else if (macro_f_file_type_is_directory(mode_file)) {
             type_file = 0x4;
           }
-          else if (f_macro_file_type_is_fifo(mode_file)) {
+          else if (macro_f_file_type_is_fifo(mode_file)) {
             type_file = 0x8;
           }
-          else if (f_macro_file_type_is_link(mode_file)) {
+          else if (macro_f_file_type_is_link(mode_file)) {
             type_file = 0x10;
           }
-          else if (f_macro_file_type_is_regular(mode_file)) {
+          else if (macro_f_file_type_is_regular(mode_file)) {
             type_file = 0x20;
           }
-          else if (f_macro_file_type_is_socket(mode_file)) {
+          else if (macro_f_file_type_is_socket(mode_file)) {
             type_file = 0x40;
           }
 
@@ -3322,7 +3322,7 @@ extern "C" {
           break;
         }
 
-        *status = f_file_mode_determine(mode_file, mode_rule, replace, f_macro_file_type_is_directory(mode_file), &mode);
+        *status = f_file_mode_determine(mode_file, mode_rule, replace, macro_f_file_type_is_directory(mode_file), &mode);
 
         if (F_status_is_error(*status)) {
           fll_error_file_print(data_make->error, F_status_set_fine(*status), "f_file_mode_determine", F_true, arguments.array[i].string, "change mode of", fll_error_file_type_file);
@@ -3368,7 +3368,7 @@ extern "C" {
           break;
         }
 
-        *status = f_file_mode_determine(mode_file, mode_rule, replace, f_macro_file_type_is_directory(mode_file), &mode);
+        *status = f_file_mode_determine(mode_file, mode_rule, replace, macro_f_file_type_is_directory(mode_file), &mode);
 
         if (F_status_is_error(*status)) {
           fll_error_file_print(data_make->error, F_status_set_fine(*status), "f_file_mode_determine", F_true, arguments.array[i].string, "change mode of", fll_error_file_type_file);
@@ -3562,7 +3562,7 @@ extern "C" {
     }
 
     if (operation == fake_make_operation_type_pop) {
-      f_macro_string_dynamic_t_delete_simple(data_make->path.stack.array[data_make->path.stack.used - 1]);
+      macro_f_string_dynamic_t_delete_simple(data_make->path.stack.array[data_make->path.stack.used - 1]);
 
       data_make->path.stack.used--;
 
@@ -3659,7 +3659,7 @@ extern "C" {
             return 0;
           }
           else if (F_status_is_error(*status)) {
-            fll_error_print(data_make->error, F_status_set_fine(*status), "f_macro_string_dynamics_t_resize", F_true);
+            fll_error_print(data_make->error, F_status_set_fine(*status), "macro_f_string_dynamics_t_resize", F_true);
             return 0;
           }
         }
@@ -3710,7 +3710,7 @@ extern "C" {
 
       // clear stack, except for the project root.
       for (f_array_length_t i = 1; i < data_make->path.stack.used; i++) {
-        f_macro_string_dynamic_t_delete_simple(data_make->path.stack.array[i]);
+        macro_f_string_dynamic_t_delete_simple(data_make->path.stack.array[i]);
       } // for
 
       data_make->path.stack.used = 1;
@@ -3720,7 +3720,7 @@ extern "C" {
     if (operation == fake_make_operation_type_touch) {
       f_mode_t mode = f_mode_t_initialize;
 
-      f_macro_mode_t_set_default_umask(mode, main->umask);
+      macro_f_mode_t_set_default_umask(mode, main->umask);
 
       for (f_array_length_t i = 1; i < arguments.used; i++) {
 
@@ -3815,7 +3815,7 @@ extern "C" {
     f_signal_set_empty(&signals.block);
     f_signal_set_fill(&signals.block_not);
 
-    fl_execute_parameter_t parameter = fl_macro_execute_parameter_t_initialize(as_shell ? 0 : fl_execute_parameter_option_path, 0, &data_make->environment, &signals, 0);
+    fl_execute_parameter_t parameter = macro_fl_execute_parameter_t_initialize(as_shell ? 0 : fl_execute_parameter_option_path, 0, &data_make->environment, &signals, 0);
 
     status = fll_execute_program(program.string, arguments, &parameter, 0, (void *) &return_code);
 
@@ -3870,13 +3870,13 @@ extern "C" {
 
           fll_error_print(data_make->error, F_status_set_fine(*status), "f_conversion_number_signed_to_string", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(number);
+          macro_f_string_dynamic_t_delete_simple(number);
           return;
         }
 
         status2 = f_string_dynamic_append(number, &data_make->setting_make.parameter.array[0].value.array[0]);
 
-        f_macro_string_dynamic_t_delete_simple(number);
+        macro_f_string_dynamic_t_delete_simple(number);
       }
       else {
         status2 = f_string_append("0", 1, &data_make->setting_make.parameter.array[0].value.array[0]);
@@ -3937,7 +3937,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data_make->error, F_status_set_fine(status), "f_string_dynamic_append", F_true);
 
-          f_macro_string_dynamics_t_delete_simple(args);
+          macro_f_string_dynamics_t_delete_simple(args);
           return status;
         }
 
@@ -3946,7 +3946,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data_make->error, F_status_set_fine(status), "f_string_dynamic_terminate", F_true);
 
-          f_macro_string_dynamics_t_delete_simple(args);
+          macro_f_string_dynamics_t_delete_simple(args);
           return status;
         }
 
@@ -3956,7 +3956,7 @@ extern "C" {
 
     status = fake_make_operate_process_execute(main, *program, args, as_shell, data_make);
 
-    f_macro_string_dynamics_t_delete_simple(args);
+    macro_f_string_dynamics_t_delete_simple(args);
     return status;
   }
 #endif // _di_fake_make_operate_process_run_
index 92a9572660819fffcdee8548373f17b28d927cb0..b9e92cbfd3a1cf78897f54dcf95dd0c2e0552e4d 100644 (file)
@@ -37,8 +37,8 @@ extern "C" {
     f_string_map_multis_t_initialize, \
   }
 
-  #define fake_macro_make_setting_t_delete_simple(setting) \
-    f_macro_string_map_multis_t_delete_simple(setting.parameter)
+  #define macro_fake_make_setting_t_delete_simple(setting) \
+    macro_f_string_map_multis_t_delete_simple(setting.parameter)
 
   #define fake_make_setting_compiler    "compiler"
   #define fake_make_setting_define      "define"
@@ -316,18 +316,18 @@ extern "C" {
     f_string_dynamics_t_initialize, \
   }
 
-  #define fake_macro_make_parameter_delete_simple(parameter) \
-    f_macro_string_dynamics_t_delete_simple(parameter.build); \
-    f_macro_string_dynamics_t_delete_simple(parameter.color); \
-    f_macro_string_dynamics_t_delete_simple(parameter.data); \
-    f_macro_string_dynamics_t_delete_simple(parameter.define); \
-    f_macro_string_dynamics_t_delete_simple(parameter.fakefile); \
-    f_macro_string_dynamics_t_delete_simple(parameter.mode); \
-    f_macro_string_dynamics_t_delete_simple(parameter.process); \
-    f_macro_string_dynamics_t_delete_simple(parameter.settings); \
-    f_macro_string_dynamics_t_delete_simple(parameter.sources); \
-    f_macro_string_dynamics_t_delete_simple(parameter.verbosity); \
-    f_macro_string_dynamics_t_delete_simple(parameter.work);
+  #define macro_fake_make_parameter_delete_simple(parameter) \
+    macro_f_string_dynamics_t_delete_simple(parameter.build); \
+    macro_f_string_dynamics_t_delete_simple(parameter.color); \
+    macro_f_string_dynamics_t_delete_simple(parameter.data); \
+    macro_f_string_dynamics_t_delete_simple(parameter.define); \
+    macro_f_string_dynamics_t_delete_simple(parameter.fakefile); \
+    macro_f_string_dynamics_t_delete_simple(parameter.mode); \
+    macro_f_string_dynamics_t_delete_simple(parameter.process); \
+    macro_f_string_dynamics_t_delete_simple(parameter.settings); \
+    macro_f_string_dynamics_t_delete_simple(parameter.sources); \
+    macro_f_string_dynamics_t_delete_simple(parameter.verbosity); \
+    macro_f_string_dynamics_t_delete_simple(parameter.work);
 #endif // _di_fake_make_parameter_t_
 
 #ifndef _di_fake_make_path_t_
@@ -344,8 +344,8 @@ extern "C" {
     f_string_dynamics_t_initialize, \
   }
 
-  #define fake_macro_make_path_delete_simple(path) \
-    f_macro_string_dynamics_t_delete_simple(path.stack);
+  #define macro_fake_make_path_delete_simple(path) \
+    macro_f_string_dynamics_t_delete_simple(path.stack);
 #endif // _di_fake_make_path_t_
 
 #ifndef _di_fake_make_data_t_
@@ -381,15 +381,15 @@ extern "C" {
     0, \
   }
 
-  #define fake_macro_make_data_t_delete_simple(structure) \
-    fake_macro_build_setting_t_delete_simple(structure.setting_build) \
-    fake_macro_make_setting_t_delete_simple(structure.setting_make) \
-    f_macro_string_maps_t_delete_simple(structure.environment); \
-    fake_macro_make_parameter_delete_simple(structure.parameter) \
-    fake_macro_make_path_delete_simple(structure.path) \
-    f_macro_fss_nameds_t_delete_simple(structure.fakefile) \
-    f_macro_string_dynamic_t_delete_simple(structure.buffer); \
-    f_macro_string_dynamic_t_delete_simple(structure.path_cache);
+  #define macro_fake_make_data_t_delete_simple(structure) \
+    macro_fake_build_setting_t_delete_simple(structure.setting_build) \
+    macro_fake_make_setting_t_delete_simple(structure.setting_make) \
+    macro_f_string_maps_t_delete_simple(structure.environment); \
+    macro_fake_make_parameter_delete_simple(structure.parameter) \
+    macro_fake_make_path_delete_simple(structure.path) \
+    macro_f_fss_nameds_t_delete_simple(structure.fakefile) \
+    macro_f_string_dynamic_t_delete_simple(structure.buffer); \
+    macro_f_string_dynamic_t_delete_simple(structure.path_cache);
 #endif // _di_fake_make_data_t_
 
 /**
index f02c2e91e721b7f5345480c10e5967dadf5269f3..1c6797bd33ad3b7a43846c9966ecf656834ced23 100644 (file)
@@ -147,8 +147,8 @@ extern "C" {
     }
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(file_data_build_process_post);
-      f_macro_string_dynamic_t_delete_simple(file_data_build_process_pre);
+      macro_f_string_dynamic_t_delete_simple(file_data_build_process_post);
+      macro_f_string_dynamic_t_delete_simple(file_data_build_process_pre);
       return status;
     }
 
index 2211e9b71676c85c4aeae7382013022b4bfb11ad..34c78ba67ed22b965e8df36a9f47818d7e4d332b 100644 (file)
@@ -56,30 +56,30 @@ extern "C" {
 #endif // _di_firewall_print_help_
 
 #ifndef _di_firewall_main_
-  f_status_t firewall_main(const f_console_arguments_t arguments, firewall_main_t *data) {
+  f_status_t firewall_main(const f_console_arguments_t arguments, firewall_main_t *main) {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(data->parameters, firewall_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, firewall_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { firewall_parameter_no_color, firewall_parameter_light, firewall_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
-        status = fll_program_parameter_process(arguments, parameters, choices, F_true, &data->remaining, &data->context);
+        status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
-        if (data->context.set.error.before) {
-          data->error.context = data->context.set.error;
-          data->error.notable = data->context.set.notable;
+        if (main->context.set.error.before) {
+          main->error.context = main->context.set.error;
+          main->error.notable = main->context.set.notable;
         }
         else {
-          f_color_set_t *sets[] = { &data->error.context, &data->error.notable, 0 };
+          f_color_set_t *sets[] = { &main->error.context, &main->error.notable, 0 };
 
-          fll_program_parameter_process_empty(&data->context, sets);
+          fll_program_parameter_process_empty(&main->context, sets);
         }
 
         if (F_status_is_error(status)) {
-          firewall_main_delete(data);
+          firewall_main_delete(main);
           return F_status_set_error(status);
         }
       }
@@ -87,44 +87,44 @@ extern "C" {
       // Identify priority of verbosity related parameters.
       {
         f_console_parameter_id_t ids[4] = { firewall_parameter_verbosity_quiet, firewall_parameter_verbosity_normal, firewall_parameter_verbosity_verbose, firewall_parameter_verbosity_debug };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
         f_console_parameter_id_t choice = 0;
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
         if (F_status_is_error(status)) {
-          firewall_main_delete(data);
+          firewall_main_delete(main);
           return status;
         }
 
         if (choice == firewall_parameter_verbosity_quiet) {
-          data->error.verbosity = f_console_verbosity_quiet;
+          main->error.verbosity = f_console_verbosity_quiet;
         }
         else if (choice == firewall_parameter_verbosity_normal) {
-          data->error.verbosity = f_console_verbosity_normal;
+          main->error.verbosity = f_console_verbosity_normal;
         }
         else if (choice == firewall_parameter_verbosity_verbose) {
-          data->error.verbosity = f_console_verbosity_verbose;
+          main->error.verbosity = f_console_verbosity_verbose;
         }
         else if (choice == firewall_parameter_verbosity_debug) {
-          data->error.verbosity = f_console_verbosity_debug;
+          main->error.verbosity = f_console_verbosity_debug;
         }
       }
 
       status = F_none;
     }
 
-    if (data->parameters[firewall_parameter_help].result == f_console_result_found) {
-      firewall_print_help(data->output, data->context);
+    if (main->parameters[firewall_parameter_help].result == f_console_result_found) {
+      firewall_print_help(main->output, main->context);
 
-      firewall_main_delete(data);
+      firewall_main_delete(main);
       return F_none;
     }
 
-    if (data->parameters[firewall_parameter_version].result == f_console_result_found) {
-      fll_program_print_version(data->output, firewall_version);
+    if (main->parameters[firewall_parameter_version].result == f_console_result_found) {
+      fll_program_print_version(main->output, firewall_version);
 
-      firewall_main_delete(data);
+      firewall_main_delete(main);
       return F_none;
     }
 
@@ -132,14 +132,14 @@ extern "C" {
     bool found_command = F_false;
     unsigned int command = 0;
 
-    if (data->parameters[firewall_parameter_command_start].result == f_console_result_found) {
+    if (main->parameters[firewall_parameter_command_start].result == f_console_result_found) {
       command = firewall_parameter_command_start;
       found_command = F_true;
     }
 
-    if (data->parameters[firewall_parameter_command_stop].result == f_console_result_found) {
+    if (main->parameters[firewall_parameter_command_stop].result == f_console_result_found) {
       if (found_command) {
-        if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_stop].values.array[0]) {
+        if (main->parameters[command].values.array[0] > main->parameters[firewall_parameter_command_stop].values.array[0]) {
           command = firewall_parameter_command_stop;
         }
       }
@@ -149,9 +149,9 @@ extern "C" {
       }
     }
 
-    if (data->parameters[firewall_parameter_command_restart].result == f_console_result_found) {
+    if (main->parameters[firewall_parameter_command_restart].result == f_console_result_found) {
       if (found_command) {
-        if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_restart].values.array[0]) {
+        if (main->parameters[command].values.array[0] > main->parameters[firewall_parameter_command_restart].values.array[0]) {
           command = firewall_parameter_command_restart;
         }
       }
@@ -161,9 +161,9 @@ extern "C" {
       }
     }
 
-    if (data->parameters[firewall_parameter_command_lock].result == f_console_result_found) {
+    if (main->parameters[firewall_parameter_command_lock].result == f_console_result_found) {
       if (found_command) {
-        if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_lock].values.array[0]) {
+        if (main->parameters[command].values.array[0] > main->parameters[firewall_parameter_command_lock].values.array[0]) {
           command = firewall_parameter_command_lock;
         }
       }
@@ -173,9 +173,9 @@ extern "C" {
       }
     }
 
-    if (data->parameters[firewall_parameter_command_show].result == f_console_result_found) {
+    if (main->parameters[firewall_parameter_command_show].result == f_console_result_found) {
       if (found_command) {
-        if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_show].values.array[0]) {
+        if (main->parameters[command].values.array[0] > main->parameters[firewall_parameter_command_show].values.array[0]) {
           command = firewall_parameter_command_show;
         }
       }
@@ -199,19 +199,19 @@ extern "C" {
         f_string_dynamics_t parameters = f_string_dynamics_t_initialize;
         int return_code = 0;
 
-        if (data->remaining.used > 0) {
+        if (main->remaining.used > 0) {
           show_nat = F_false;
           show_mangle = F_false;
           show_ports = F_false;
 
           f_array_length_t counter = 0;
 
-          for (; counter < data->remaining.used; counter++) {
+          for (; counter < main->remaining.used; counter++) {
 
-            if (strncmp("nat", arguments.argv[data->remaining.array[counter]], 4) != 0) {
-              if (strncmp("mangle",  arguments.argv[data->remaining.array[counter]], 7) != 0) {
-                if (strncmp("ports",  arguments.argv[data->remaining.array[counter]], 6) != 0) {
-                  f_color_print(f_type_warning, data->context.set.warning, "%s'%s' is not a valid show option%c", fll_error_print_warning, arguments.argv[data->remaining.array[counter]], f_string_eol_s[0]);
+            if (strncmp("nat", arguments.argv[main->remaining.array[counter]], 4) != 0) {
+              if (strncmp("mangle",  arguments.argv[main->remaining.array[counter]], 7) != 0) {
+                if (strncmp("ports",  arguments.argv[main->remaining.array[counter]], 6) != 0) {
+                  f_color_print(f_type_warning, main->context.set.warning, "%s'%s' is not a valid show option%c", fll_error_print_warning, arguments.argv[main->remaining.array[counter]], f_string_eol_s[0]);
                 }
                 else {
                   show_ports = F_true;
@@ -227,20 +227,20 @@ extern "C" {
           } // for
         }
 
-        f_macro_string_dynamics_t_resize(status, parameters, 7);
+        macro_f_string_dynamics_t_resize(status, parameters, 7);
 
         if (F_status_is_error(status)) {
-          f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
+          f_color_print(main->error.to.stream, main->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
           firewall_delete_local_data(&local);
-          firewall_main_delete(data);
+          firewall_main_delete(main);
           return status;
         }
 
         if (show_nat) {
-          f_color_print(data->output.stream, data->context.set.standout, "=========================== ");
-          f_color_print(data->output.stream, data->context.set.title, "NAT");
-          f_color_print(data->output.stream, data->context.set.standout, " ============================%c", f_string_eol_s[0]);
-          fflush(data->output.stream);
+          f_color_print(main->output.stream, main->context.set.standout, "=========================== ");
+          f_color_print(main->output.stream, main->context.set.title, "NAT");
+          f_color_print(main->output.stream, main->context.set.standout, " ============================%c", f_string_eol_s[0]);
+          fflush(main->output.stream);
 
           parameters.used = 6;
 
@@ -265,15 +265,15 @@ extern "C" {
             exit(return_code);
           }
 
-          fprintf(data->output.stream, "\n");
-          fflush(data->output.stream);
+          fprintf(main->output.stream, "\n");
+          fflush(main->output.stream);
         }
 
         if (F_status_is_error_not(status) && show_mangle) {
-          f_color_print(data->output.stream, data->context.set.standout, "========================== ");
-          f_color_print(data->output.stream, data->context.set.title, "MANGLE");
-          f_color_print(data->output.stream, data->context.set.standout, " ==========================%c", f_string_eol_s[0]);
-          fflush(data->output.stream);
+          f_color_print(main->output.stream, main->context.set.standout, "========================== ");
+          f_color_print(main->output.stream, main->context.set.title, "MANGLE");
+          f_color_print(main->output.stream, main->context.set.standout, " ==========================%c", f_string_eol_s[0]);
+          fflush(main->output.stream);
 
           parameters.used = 6;
 
@@ -298,15 +298,15 @@ extern "C" {
             exit(return_code);
           }
 
-          fprintf(data->output.stream, "\n");
-          fflush(data->output.stream);
+          fprintf(main->output.stream, "\n");
+          fflush(main->output.stream);
         }
 
         if (F_status_is_error_not(status) && show_ports) {
-          f_color_print(data->output.stream, data->context.set.standout, "========================== ");
-          f_color_print(data->output.stream, data->context.set.title, "FILTER");
-          f_color_print(data->output.stream, data->context.set.standout, " ==========================%c", f_string_eol_s[0]);
-          fflush(data->output.stream);
+          f_color_print(main->output.stream, main->context.set.standout, "========================== ");
+          f_color_print(main->output.stream, main->context.set.title, "FILTER");
+          f_color_print(main->output.stream, main->context.set.standout, " ==========================%c", f_string_eol_s[0]);
+          fflush(main->output.stream);
 
           parameters.used = 4;
 
@@ -327,30 +327,30 @@ extern "C" {
             exit(return_code);
           }
 
-          fprintf(data->output.stream, "\n");
-          fflush(data->output.stream);
+          fprintf(main->output.stream, "\n");
+          fflush(main->output.stream);
         }
 
         if (F_status_is_error(status)) {
           status = F_status_set_fine(status);
 
           if (status == F_memory_not) {
-            f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
+            f_color_print(main->error.to.stream, main->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
           }
           else {
-            f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_iptables, f_string_eol_s[0]);
+            f_color_print(main->error.to.stream, main->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_iptables, f_string_eol_s[0]);
             fprintf(f_type_error, "  ");
 
             f_array_length_t i = 0;
 
-            f_color_print_code(f_type_error, data->context.error);
+            f_color_print_code(f_type_error, main->context.error);
 
             fprintf(f_type_error, "%s ", firewall_tool_iptables);
             for (; i < parameters.used; i++) {
               fprintf(f_type_error, "%s ", parameters.array[i].string);
             } // for
 
-            f_color_print_code(f_type_error, data->context.reset);
+            f_color_print_code(f_type_error, main->context.reset);
             fprintf(f_type_error, "\n");
           }
 
@@ -372,30 +372,30 @@ extern "C" {
         parameters.array[5].used = 0;
         parameters.array[6].used = 0;
 
-        f_macro_string_dynamics_t_delete_simple( parameters);
+        macro_f_string_dynamics_t_delete_simple( parameters);
         firewall_delete_local_data(&local);
-        firewall_main_delete(data);
+        firewall_main_delete(main);
         return status;
       }
 
       // load all network devices
-      status = f_directory_list((f_string_t) network_devices, 0, alphasort, &data->devices);
+      status = f_directory_list((f_string_t) network_devices, 0, alphasort, &main->devices);
 
       if (F_status_is_error(status)) {
         status = F_status_set_fine(status);
 
         if (status == F_memory_not) {
-          f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
+          f_color_print(main->error.to.stream, main->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
         }
         else if (status == F_data_not) {
-          f_color_print(data->error.to.stream, data->context.set.error, "%sCould not find any network devices%c", fll_error_print_error, f_string_eol_s[0]);
+          f_color_print(main->error.to.stream, main->context.set.error, "%sCould not find any network devices%c", fll_error_print_error, f_string_eol_s[0]);
         }
         else if (status == F_failure) {
-          f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to read the device directory '%s'%c", fll_error_print_error, network_devices, f_string_eol_s[0]);
+          f_color_print(main->error.to.stream, main->context.set.error, "%sFailed to read the device directory '%s'%c", fll_error_print_error, network_devices, f_string_eol_s[0]);
         }
 
         firewall_delete_local_data(&local);
-        firewall_main_delete(data);
+        firewall_main_delete(main);
         return F_status_set_error(status);
       }
 
@@ -403,27 +403,27 @@ extern "C" {
       {
         f_array_length_t i = 0;
 
-        for (; i < data->devices.used; i++) {
-          if (fl_string_compare((f_string_t) firewall_device_loop, data->devices.array[i].string, firewall_device_loop_length + 1, data->devices.array[i].used) == F_equal_to) {
-            f_string_dynamic_t swap_string = data->devices.array[i];
+        for (; i < main->devices.used; i++) {
+          if (fl_string_compare((f_string_t) firewall_device_loop, main->devices.array[i].string, firewall_device_loop_length + 1, main->devices.array[i].used) == F_equal_to) {
+            f_string_dynamic_t swap_string = main->devices.array[i];
 
-            data->devices.used--;
+            main->devices.used--;
 
-            for (; i < data->devices.used; i++) {
-              data->devices.array[i] = data->devices.array[i+1];
+            for (; i < main->devices.used; i++) {
+              main->devices.array[i] = main->devices.array[i+1];
             } // for
 
-            data->devices.array[data->devices.used] = swap_string;
+            main->devices.array[main->devices.used] = swap_string;
           }
         } // for
       }
 
       if (command == firewall_parameter_command_stop || command == firewall_parameter_command_restart || command == firewall_parameter_command_lock) {
-        status = firewall_buffer_rules(network_path firewall_file_other, F_false, &local, data);
+        status = firewall_buffer_rules(network_path firewall_file_other, F_false, &local, main);
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_main_delete(data);
+          firewall_main_delete(main);
           return status;
         }
 
@@ -447,15 +447,15 @@ extern "C" {
 
         if (command == firewall_parameter_command_lock) {
           if (reserved.has_lock) {
-            status = firewall_delete_chains(*data);
+            status = firewall_delete_chains(*main);
 
             if (F_status_is_error_not(status)) {
-              status = firewall_default_lock(*data);
+              status = firewall_default_lock(*main);
             }
 
             if (F_status_is_error(status)) {
               firewall_delete_local_data(&local);
-              firewall_main_delete(data);
+              firewall_main_delete(main);
               return status;
             }
 
@@ -467,32 +467,32 @@ extern "C" {
             input.start = local.chain_contents.array[reserved.lock_at].array[0].start;
             input.stop = local.chain_contents.array[reserved.lock_at].array[0].stop;
 
-            status = firewall_process_rules(&input, &local, data);
+            status = firewall_process_rules(&input, &local, main);
 
             firewall_delete_local_data(&local);
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return status;
           }
           else {
-            f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform lock request because the lock instructions are missing from: %s.%c", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]);
+            f_color_print(main->error.to.stream, main->context.set.error, "%sFailed to perform lock request because the lock instructions are missing from: %s.%c", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]);
 
             firewall_delete_local_data(&local);
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return F_status_set_error(F_data);
           }
         }
 
         if (command == firewall_parameter_command_stop || command == firewall_parameter_command_restart) {
           if (reserved.has_stop) {
-            status = firewall_delete_chains(*data);
+            status = firewall_delete_chains(*main);
 
             if (F_status_is_error_not(status)) {
-              status = firewall_default_lock(*data);
+              status = firewall_default_lock(*main);
             }
 
             if (F_status_is_error(status)) {
               firewall_delete_local_data(&local);
-              firewall_main_delete(data);
+              firewall_main_delete(main);
               return status;
             }
 
@@ -505,19 +505,19 @@ extern "C" {
             input.start = local.chain_contents.array[reserved.stop_at].array[0].start;
             input.stop = local.chain_contents.array[reserved.stop_at].array[0].stop;
 
-            status = firewall_process_rules(&input, &local, data);
+            status = firewall_process_rules(&input, &local, main);
 
             if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
               firewall_delete_local_data(&local);
-              firewall_main_delete(data);
+              firewall_main_delete(main);
               return status;
             }
           }
           else {
-            f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform stop request because the lock instructions are missing from: %s.", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]);
+            f_color_print(main->error.to.stream, main->context.set.error, "%sFailed to perform stop request because the lock instructions are missing from: %s.", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]);
 
             firewall_delete_local_data(&local);
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return F_status_set_error(F_data);
           }
         }
@@ -526,33 +526,33 @@ extern "C" {
       }
 
       if (command == firewall_parameter_command_start || command == firewall_parameter_command_restart) {
-        status = firewall_buffer_rules(network_path firewall_file_first, F_false, &local, data);
+        status = firewall_buffer_rules(network_path firewall_file_first, F_false, &local, main);
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_main_delete(data);
+          firewall_main_delete(main);
           return status;
         }
 
         if (command == firewall_parameter_command_start) {
-          status = firewall_delete_chains(*data);
+          status = firewall_delete_chains(*main);
 
           if (F_status_is_error_not(status)) {
-            status = firewall_default_lock(*data);
+            status = firewall_default_lock(*main);
           }
 
           if (F_status_is_error(status)) {
             firewall_delete_local_data(&local);
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return status;
           }
         }
 
-        status = firewall_create_custom_chains(&reserved, &local, data);
+        status = firewall_create_custom_chains(&reserved, &local, main);
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_main_delete(data);
+          firewall_main_delete(main);
           return status;
         }
 
@@ -570,11 +570,11 @@ extern "C" {
           local.is_main = reserved.has_main && i == reserved.main_at ? F_true : F_false;
           local.chain = i;
 
-          status = firewall_process_rules(&input, &local, data);
+          status = firewall_process_rules(&input, &local, main);
 
           if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
             firewall_delete_local_data(&local);
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return status;
           }
 
@@ -583,31 +583,31 @@ extern "C" {
 
         firewall_delete_local_data(&local);
 
-        for (i = 0; i < data->devices.used; i++) {
+        for (i = 0; i < main->devices.used; i++) {
           local.device = i;
 
           {
             f_string_dynamic_t file_path = f_string_dynamic_t_initialize;
 
-            f_macro_string_dynamic_t_resize(status, file_path, network_path_length + data->devices.array[i].used + firewall_file_suffix_length + 1);
+            macro_f_string_dynamic_t_resize(status, file_path, network_path_length + main->devices.array[i].used + firewall_file_suffix_length + 1);
 
             if (F_status_is_error(status)) {
-              f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
+              f_color_print(main->error.to.stream, main->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
               firewall_delete_local_data(&local);
-              firewall_main_delete(data);
+              firewall_main_delete(main);
               return status;
             }
 
             memcpy((void *)file_path.string, network_path, network_path_length);
-            memcpy((void *)(file_path.string + network_path_length), data->devices.array[i].string, data->devices.array[i].used);
-            memcpy((void *)(file_path.string + network_path_length + data->devices.array[i].used), firewall_file_suffix, firewall_file_suffix_length);
+            memcpy((void *)(file_path.string + network_path_length), main->devices.array[i].string, main->devices.array[i].used);
+            memcpy((void *)(file_path.string + network_path_length + main->devices.array[i].used), firewall_file_suffix, firewall_file_suffix_length);
 
-            file_path.used = network_path_length + data->devices.array[i].used + firewall_file_suffix_length;
+            file_path.used = network_path_length + main->devices.array[i].used + firewall_file_suffix_length;
             file_path.string[file_path.used] = 0;
 
-            status = firewall_buffer_rules(file_path.string, F_true, &local, data);
+            status = firewall_buffer_rules(file_path.string, F_true, &local, main);
 
-            f_macro_string_dynamic_t_delete_simple(file_path);
+            macro_f_string_dynamic_t_delete_simple(file_path);
           }
 
           if (F_status_is_error(status)) {
@@ -620,15 +620,15 @@ extern "C" {
               continue;
             }
 
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return F_status_set_error(status);
           }
 
-          status = firewall_create_custom_chains(&reserved, &local, data);
+          status = firewall_create_custom_chains(&reserved, &local, main);
 
           if (F_status_is_error(status)) {
             firewall_delete_local_data(&local);
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return status;
           }
 
@@ -646,11 +646,11 @@ extern "C" {
             local.is_main = reserved.has_main && j == reserved.main_at ? F_true : F_false;
             local.chain = j;
 
-            status = firewall_process_rules(&input, &local, data);
+            status = firewall_process_rules(&input, &local, main);
 
             if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
               firewall_delete_local_data(&local);
-              firewall_main_delete(data);
+              firewall_main_delete(main);
               return status;
             }
           } // for
@@ -658,21 +658,21 @@ extern "C" {
           firewall_delete_local_data(&local);
         } // for
 
-        status = firewall_buffer_rules(network_path firewall_file_last, F_false, &local, data);
+        status = firewall_buffer_rules(network_path firewall_file_last, F_false, &local, main);
 
         if (F_status_is_error(status)) {
           firewall_delete_local_data(&local);
-          firewall_main_delete(data);
+          firewall_main_delete(main);
           return status;
         }
 
-        status = firewall_create_custom_chains(&reserved, &local, data);
+        status = firewall_create_custom_chains(&reserved, &local, main);
 
         if (F_status_is_error(status)) {
           f_status_t status2 = F_none;
 
-          firewall_macro_delete_fss_buffers(status2, local.buffer, local.chain_objects, local.chain_contents)
-          firewall_main_delete(data);
+          macro_firewall_delete_fss_buffers(status2, local.buffer, local.chain_objects, local.chain_contents)
+          firewall_main_delete(main);
           return status;
         }
 
@@ -690,11 +690,11 @@ extern "C" {
           local.is_main = reserved.has_main && i == reserved.main_at ? F_true : F_false;
           local.chain = i;
 
-          status = firewall_process_rules(&input, &local, data);
+          status = firewall_process_rules(&input, &local, main);
 
           if (F_status_is_error(status) || command == firewall_parameter_command_stop) {
             firewall_delete_local_data(&local);
-            firewall_main_delete(data);
+            firewall_main_delete(main);
             return status;
           }
 
@@ -706,29 +706,29 @@ extern "C" {
       firewall_delete_local_data(&local);
     }
     else {
-      f_color_print(data->error.to.stream, data->context.set.error, "%sYou did not pass a command%c", fll_error_print_error, f_string_eol_s[0]);
+      f_color_print(main->error.to.stream, main->context.set.error, "%sYou did not pass a command%c", fll_error_print_error, f_string_eol_s[0]);
       status = F_status_set_error(F_parameter);
     }
 
-    firewall_main_delete(data);
+    firewall_main_delete(main);
     return status;
   }
 #endif // _di_firewall_main_
 
 #ifndef _di_firewall_main_delete_
-  f_status_t firewall_main_delete(firewall_main_t *data) {
+  f_status_t firewall_main_delete(firewall_main_t *main) {
 
     for (f_array_length_t i = 0; i < firewall_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(data->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(data->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(data->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(data->chains);
-    f_macro_array_lengths_t_delete_simple(data->remaining);
-    f_macro_string_dynamics_t_delete_simple(data->devices);
+    macro_f_string_dynamics_t_delete_simple(main->chains);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
+    macro_f_string_dynamics_t_delete_simple(main->devices);
 
-    f_macro_color_context_t_delete_simple(data->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 3d64d440992c4fb303117ed106f9773f6e094be7..3d8c4447133338c14a9e7329f69df93015e1474d 100644 (file)
@@ -285,7 +285,7 @@ extern "C" {
       firewall_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_dynamics_t_initialize, \
       f_string_dynamics_t_initialize, \
index fddcfeb083d9551c0557552aaa0343521ca01632..4bf70b16b4e93c88689d9aea100f8165caf4e9b7 100644 (file)
@@ -41,15 +41,15 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
   }
   else {
     if (main.devices.array[local.device].used > 0) {
-       f_macro_string_dynamic_t_resize(status, device, main.devices.array[local.device].used);
+       macro_f_string_dynamic_t_resize(status, device, main.devices.array[local.device].used);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(device);
+        macro_f_string_dynamic_t_delete_simple(device);
 
         return status;
       }
 
-      firewall_macro_concat_string(device.string, main.devices.array[local.device].string, main.devices.array[local.device].used);
+      macro_firewall_concat_string(device.string, main.devices.array[local.device].string, main.devices.array[local.device].used);
       device.used = main.devices.array[local.device].used;
     }
   }
@@ -60,13 +60,13 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
   }
 
   for (; i < local.rule_objects.used; i++) {
-    length  = firewall_macro_structure_size(local.rule_objects, i);
+    length  = macro_firewall_structure_size(local.rule_objects, i);
     invalid = F_false;
 
     is_ip_list = F_false;
     ip_list_direction = F_false;
 
-    f_macro_string_dynamic_t_delete_simple(ip_list);
+    macro_f_string_dynamic_t_delete_simple(ip_list);
 
     // process chain rule
     if (length >= firewall_chain_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_chain, length, firewall_chain_length) == F_equal_to) {
@@ -76,9 +76,9 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
         continue;
       }
 
-      length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
+      length = macro_firewall_structure_size(local.rule_contents.array[i], 0);
 
-      if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
+      if (macro_firewall_rule_contents_has_incorrect_items(i, 1)) {
         invalid = F_true;
       }
       else if (length >= firewall_chain_input_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_chain_input, length, firewall_chain_input_length) == F_equal_to) {
@@ -107,9 +107,9 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
     }
     // process direction rule
     else if (length >= firewall_direction_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_direction, length, firewall_direction_length) == F_equal_to) {
-      length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
+      length = macro_firewall_structure_size(local.rule_contents.array[i], 0);
 
-      if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
+      if (macro_firewall_rule_contents_has_incorrect_items(i, 1)) {
         invalid = F_true;
       }
       else if (length >= firewall_direction_input_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_direction_input, length, firewall_direction_input_length) == F_equal_to) {
@@ -130,30 +130,30 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
     }
     // process device rule.
     else if (length >= firewall_device_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_device, length, firewall_device_length) == F_equal_to) {
-      length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
+      length = macro_firewall_structure_size(local.rule_contents.array[i], 0);
 
-      if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
+      if (macro_firewall_rule_contents_has_incorrect_items(i, 1)) {
         invalid = F_true;
       }
       else if (length >= firewall_device_all_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_device_all, length, firewall_device_all_length) == F_equal_to) {
-        f_macro_string_dynamic_t_delete_simple(device);
+        macro_f_string_dynamic_t_delete_simple(device);
         device_all = F_true;
         continue;
       }
       else if (length >= firewall_device_this_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_device_this, length, firewall_device_this_length) == F_equal_to) {
         if (main.devices.array[local.device].used > 0) {
           if (main.devices.array[local.device].used > device.size) {
-            f_macro_string_dynamic_t_resize(status, device, main.devices.array[local.device].used);
+            macro_f_string_dynamic_t_resize(status, device, main.devices.array[local.device].used);
 
             if (F_status_is_error(status)) break;
           }
 
-          firewall_macro_concat_string(device.string, main.devices.array[local.device].string, main.devices.array[local.device].used);
+          macro_firewall_concat_string(device.string, main.devices.array[local.device].string, main.devices.array[local.device].used);
 
           device.used = main.devices.array[local.device].used;
         }
         else {
-          f_macro_string_dynamic_t_delete_simple(device);
+          macro_f_string_dynamic_t_delete_simple(device);
         }
 
         device_all = F_false;
@@ -163,16 +163,16 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
       if (!invalid) {
         if (length > 0) {
           if (length > device.size) {
-            f_macro_string_dynamic_t_resize(status, device, length);
+            macro_f_string_dynamic_t_resize(status, device, length);
 
             if (F_status_is_error(status)) break;
           }
 
-          firewall_macro_concat_string(device.string, local.buffer.string + local.rule_contents.array[i].array[0].start, length);
+          macro_firewall_concat_string(device.string, local.buffer.string + local.rule_contents.array[i].array[0].start, length);
           device.used = length;
         }
         else {
-          f_macro_string_dynamic_t_delete_simple(device);
+          macro_f_string_dynamic_t_delete_simple(device);
         }
 
         device_all = F_false;
@@ -181,9 +181,9 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
     }
     // process action rule.
     else if (length >= firewall_action_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_action, length, firewall_action_length) == F_equal_to) {
-      length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
+      length = macro_firewall_structure_size(local.rule_contents.array[i], 0);
 
-      if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
+      if (macro_firewall_rule_contents_has_incorrect_items(i, 1)) {
         invalid = F_true;
       }
       else if (length >= firewall_action_append_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_action_append, length, firewall_action_append_length) == F_equal_to) {
@@ -206,7 +206,7 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
     }
     // process ip_list rule.
     else if (length >= firewall_ip_list_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_ip_list, length, firewall_ip_list_length) == F_equal_to) {
-      length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
+      length = macro_firewall_structure_size(local.rule_contents.array[i], 0);
       is_ip_list = F_true;
 
       if (length >= firewall_ip_list_source_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_ip_list_source, length, firewall_ip_list_source_length) == F_equal_to) {
@@ -220,9 +220,9 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
       }
     }
     else if (length >= firewall_protocol_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_protocol, length, firewall_protocol_length) == F_equal_to) {
-      length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
+      length = macro_firewall_structure_size(local.rule_contents.array[i], 0);
 
-      if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
+      if (macro_firewall_rule_contents_has_incorrect_items(i, 1)) {
         invalid = F_true;
       }
       else {
@@ -230,12 +230,12 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
           use_protocol = F_false;
         }
         else if (length > 0) {
-          f_macro_string_dynamic_t_delete_simple(protocol);
-           f_macro_string_dynamic_t_resize(status, protocol, length);
+          macro_f_string_dynamic_t_delete_simple(protocol);
+           macro_f_string_dynamic_t_resize(status, protocol, length);
 
           if (F_status_is_error(status)) break;
 
-          firewall_macro_concat_string(protocol.string, local.buffer.string + local.rule_contents.array[i].array[0].start, length);
+          macro_firewall_concat_string(protocol.string, local.buffer.string + local.rule_contents.array[i].array[0].start, length);
           protocol.used = length;
           use_protocol = F_true;
         }
@@ -248,9 +248,9 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
     }
     // process tool rule.
     else if (length >= firewall_tool_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_tool, length, firewall_tool_length) == F_equal_to) {
-      length = firewall_macro_structure_size(local.rule_contents.array[i], 0);
+      length = macro_firewall_structure_size(local.rule_contents.array[i], 0);
 
-      if (firewall_macro_rule_contents_has_incorrect_items(i, 1)) {
+      if (macro_firewall_rule_contents_has_incorrect_items(i, 1)) {
         invalid = F_true;
       }
       else {
@@ -297,14 +297,14 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
     }
 
     if (invalid) {
-      length = firewall_macro_structure_size(local.rule_objects, i);
+      length = macro_firewall_structure_size(local.rule_objects, i);
 
       if (length > 0) {
         f_color_print_code(f_type_warning, main.context.warning);
         fprintf(f_type_warning, "%sAt line %llu, the object '", fll_error_print_warning, i);
         f_print(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length);
         fprintf(f_type_warning, "' has invalid content '");
-        f_print(f_type_warning, local.buffer.string + local.rule_contents.array[i].array[0].start, firewall_macro_structure_size(local.rule_contents.array[i], 0));
+        f_print(f_type_warning, local.buffer.string + local.rule_contents.array[i].array[0].start, macro_firewall_structure_size(local.rule_contents.array[i], 0));
         fprintf(f_type_warning, "'");
         f_color_print_code(f_type_warning, main.context.reset);
         fprintf(f_type_warning, "\n");
@@ -335,98 +335,98 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(argument);
+      macro_f_string_dynamic_t_delete_simple(argument);
 
       if (F_status_is_error(status)) break;
 
       // process the action when a non-none chain is specified.
       if (chain != firewall_chain_none_id && action != firewall_action_none_id) {
         if (action == firewall_action_append_id) {
-           f_macro_string_dynamic_t_resize(status, argument, firewall_action_append_command_length);
+           macro_f_string_dynamic_t_resize(status, argument, firewall_action_append_command_length);
 
           if (F_status_is_error(status)) break;
 
-          firewall_macro_concat_string(argument.string, firewall_action_append_command, firewall_action_append_command_length);
+          macro_firewall_concat_string(argument.string, firewall_action_append_command, firewall_action_append_command_length);
           argument.used = firewall_action_append_command_length;
         }
         else if (action == firewall_action_insert_id) {
-           f_macro_string_dynamic_t_resize(status, argument, firewall_action_insert_command_length);
+           macro_f_string_dynamic_t_resize(status, argument, firewall_action_insert_command_length);
 
           if (F_status_is_error(status)) break;
 
-          firewall_macro_concat_string(argument.string, firewall_action_insert_command, firewall_action_insert_command_length);
+          macro_firewall_concat_string(argument.string, firewall_action_insert_command, firewall_action_insert_command_length);
           argument.used = firewall_action_insert_command_length;
         }
         else if (action == firewall_action_policy_id) {
-           f_macro_string_dynamic_t_resize(status, argument, firewall_action_policy_command_length);
+           macro_f_string_dynamic_t_resize(status, argument, firewall_action_policy_command_length);
 
           if (F_status_is_error(status)) break;
 
-          firewall_macro_concat_string(argument.string, firewall_action_policy_command, firewall_action_policy_command_length);
+          macro_firewall_concat_string(argument.string, firewall_action_policy_command, firewall_action_policy_command_length);
           argument.used = firewall_action_policy_command_length;
         }
 
         if (argument.used > 0) {
-          firewall_macro_append_argument_to_arguments(status, arguments, argument)
+          macro_firewall_append_argument_to_arguments(status, arguments, argument)
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(argument);
+            macro_f_string_dynamic_t_delete_simple(argument);
             break;
           }
 
           // process the chain, which is required by the action.
           if (chain == firewall_chain_custom_id) {
             if (main.chains.array[local.chain_ids.array[local.chain]].used > 0) {
-               f_macro_string_dynamic_t_resize(status, argument, main.chains.array[local.chain_ids.array[local.chain]].used);
+               macro_f_string_dynamic_t_resize(status, argument, main.chains.array[local.chain_ids.array[local.chain]].used);
 
               if (F_status_is_error(status)) break;
 
-              firewall_macro_concat_string(argument.string, main.chains.array[local.chain_ids.array[local.chain]].string, main.chains.array[local.chain_ids.array[local.chain]].used);
+              macro_firewall_concat_string(argument.string, main.chains.array[local.chain_ids.array[local.chain]].string, main.chains.array[local.chain_ids.array[local.chain]].used);
               argument.used = main.chains.array[local.chain_ids.array[local.chain]].used;
             }
           }
           else if (chain == firewall_chain_forward_id) {
-             f_macro_string_dynamic_t_resize(status, argument, firewall_chain_forward_length);
+             macro_f_string_dynamic_t_resize(status, argument, firewall_chain_forward_length);
 
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, firewall_chain_forward, firewall_chain_forward_length);
+            macro_firewall_concat_string(argument.string, firewall_chain_forward, firewall_chain_forward_length);
             argument.used = firewall_chain_forward_length;
           }
           else if (chain == firewall_chain_postrouting_id) {
-             f_macro_string_dynamic_t_resize(status, argument, firewall_chain_postrouting_length);
+             macro_f_string_dynamic_t_resize(status, argument, firewall_chain_postrouting_length);
 
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, firewall_chain_postrouting, firewall_chain_postrouting_length);
+            macro_firewall_concat_string(argument.string, firewall_chain_postrouting, firewall_chain_postrouting_length);
             argument.used += firewall_chain_postrouting_length;
           }
           else if (chain == firewall_chain_prerouting_id) {
-             f_macro_string_dynamic_t_resize(status, argument, firewall_chain_prerouting_length);
+             macro_f_string_dynamic_t_resize(status, argument, firewall_chain_prerouting_length);
 
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, firewall_chain_prerouting, firewall_chain_prerouting_length);
+            macro_firewall_concat_string(argument.string, firewall_chain_prerouting, firewall_chain_prerouting_length);
             argument.used = firewall_chain_prerouting_length;
           }
           else if (chain == firewall_chain_input_id) {
-             f_macro_string_dynamic_t_resize(status, argument, firewall_chain_input_length);
+             macro_f_string_dynamic_t_resize(status, argument, firewall_chain_input_length);
 
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, firewall_chain_input, firewall_chain_input_length);
+            macro_firewall_concat_string(argument.string, firewall_chain_input, firewall_chain_input_length);
             argument.used = firewall_chain_input_length;
           }
           else if (chain == firewall_chain_output_id) {
-             f_macro_string_dynamic_t_resize(status, argument, firewall_chain_output_length);
+             macro_f_string_dynamic_t_resize(status, argument, firewall_chain_output_length);
 
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, firewall_chain_output, firewall_chain_output_length);
+            macro_firewall_concat_string(argument.string, firewall_chain_output, firewall_chain_output_length);
             argument.used = firewall_chain_output_length;
           }
 
           if (argument.used > 0) {
-            firewall_macro_append_argument_to_arguments(status, arguments, argument)
+            macro_firewall_append_argument_to_arguments(status, arguments, argument)
             if (F_status_is_error(status)) {
               break;
             }
@@ -438,22 +438,22 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
       if (device.used > 0 && (direction == firewall_direction_input_id || direction == firewall_direction_output_id)) {
         if (length < firewall_device_all_length || fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_device_all, length, firewall_device_all_length) == F_equal_to_not) {
           if (direction == firewall_direction_input_id) {
-             f_macro_string_dynamic_t_resize(status, argument, firewall_device_input_command_length);
+             macro_f_string_dynamic_t_resize(status, argument, firewall_device_input_command_length);
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, firewall_device_input_command, firewall_device_input_command_length);
+            macro_firewall_concat_string(argument.string, firewall_device_input_command, firewall_device_input_command_length);
             argument.used = firewall_device_input_command_length;
           }
           else if (direction == firewall_direction_output_id) {
-             f_macro_string_dynamic_t_resize(status, argument, firewall_device_output_command_length);
+             macro_f_string_dynamic_t_resize(status, argument, firewall_device_output_command_length);
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, firewall_device_output_command, firewall_device_output_command_length);
+            macro_firewall_concat_string(argument.string, firewall_device_output_command, firewall_device_output_command_length);
             argument.used = firewall_device_output_command_length;
           }
 
           if (argument.used > 0) {
-            firewall_macro_append_argument_to_arguments(status, arguments, argument)
+            macro_firewall_append_argument_to_arguments(status, arguments, argument)
             if (F_status_is_error(status)) {
               break;
             }
@@ -462,14 +462,14 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
 
         // add the device.
         if (device.used > 0) {
-           f_macro_string_dynamic_t_resize(status, argument, device.used);
+           macro_f_string_dynamic_t_resize(status, argument, device.used);
 
           if (F_status_is_error(status)) break;
 
-          firewall_macro_concat_string(argument.string, device.string, device.used);
+          macro_firewall_concat_string(argument.string, device.string, device.used);
           argument.used = device.used;
 
-          firewall_macro_append_argument_to_arguments(status, arguments, argument)
+          macro_firewall_append_argument_to_arguments(status, arguments, argument)
           if (F_status_is_error(status)) {
             break;
           }
@@ -477,27 +477,27 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
       }
 
       if (use_protocol) {
-         f_macro_string_dynamic_t_resize(status, argument, firewall_protocol_command_length);
+         macro_f_string_dynamic_t_resize(status, argument, firewall_protocol_command_length);
 
         if (F_status_is_error(status)) break;
 
-        firewall_macro_concat_string(argument.string, firewall_protocol_command, firewall_protocol_command_length);
+        macro_firewall_concat_string(argument.string, firewall_protocol_command, firewall_protocol_command_length);
         argument.used = firewall_protocol_command_length;
 
-        firewall_macro_append_argument_to_arguments(status, arguments, argument)
+        macro_firewall_append_argument_to_arguments(status, arguments, argument)
         if (F_status_is_error(status)) {
           break;
         }
 
         if (protocol.used > 0) {
-           f_macro_string_dynamic_t_resize(status, argument, protocol.used);
+           macro_f_string_dynamic_t_resize(status, argument, protocol.used);
 
           if (F_status_is_error(status)) break;
 
-          firewall_macro_concat_string(argument.string, protocol.string, protocol.used);
+          macro_firewall_concat_string(argument.string, protocol.string, protocol.used);
           argument.used = protocol.used;
 
-          firewall_macro_append_argument_to_arguments(status, arguments, argument)
+          macro_firewall_append_argument_to_arguments(status, arguments, argument)
           if (F_status_is_error(status)) {
             break;
           }
@@ -512,17 +512,17 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
           // skip past the chain
           subcounter++;
 
-          length = firewall_macro_structure_size(local.rule_contents.array[i], subcounter);
+          length = macro_firewall_structure_size(local.rule_contents.array[i], subcounter);
 
           if (length > 0) {
-             f_macro_string_dynamic_t_resize(status, ip_list, length);
+             macro_f_string_dynamic_t_resize(status, ip_list, length);
 
             if (F_status_is_error(status)) {
               // prevent the loop below from being processed.
               subcounter = local.rule_contents.array[i].used;
             }
             else {
-              firewall_macro_concat_string(ip_list.string, local.buffer.string + local.rule_contents.array[i].array[subcounter].start, length);
+              macro_firewall_concat_string(ip_list.string, local.buffer.string + local.rule_contents.array[i].array[subcounter].start, length);
               ip_list.used = length;
 
               subcounter++;
@@ -532,17 +532,17 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
 
         for (; subcounter < local.rule_contents.array[i].used; subcounter++) {
 
-          length = firewall_macro_structure_size(local.rule_contents.array[i], subcounter);
+          length = macro_firewall_structure_size(local.rule_contents.array[i], subcounter);
 
           if (length > 0) {
-             f_macro_string_dynamic_t_resize(status, argument, length);
+             macro_f_string_dynamic_t_resize(status, argument, length);
 
             if (F_status_is_error(status)) break;
 
-            firewall_macro_concat_string(argument.string, local.buffer.string + local.rule_contents.array[i].array[subcounter].start, length);
+            macro_firewall_concat_string(argument.string, local.buffer.string + local.rule_contents.array[i].array[subcounter].start, length);
             argument.used = length;
 
-            firewall_macro_append_argument_to_arguments(status, arguments, argument)
+            macro_firewall_append_argument_to_arguments(status, arguments, argument)
             if (F_status_is_error(status)) {
               break;
             }
@@ -550,7 +550,7 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
         } // for
       }
       else {
-        length = firewall_macro_structure_size(local.rule_objects, i);
+        length = macro_firewall_structure_size(local.rule_objects, i);
 
         f_color_print_code(f_type_warning, main.context.warning);
         fprintf(f_type_warning, "%sAt line %llu, the object '", fll_error_print_warning, i);
@@ -572,11 +572,11 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
           f_fss_objects_t basic_objects = f_fss_objects_t_initialize;
           f_fss_contents_t basic_contents = f_fss_objects_t_initialize;
 
-           f_macro_string_dynamic_t_resize(status, file_path, network_path_length + ip_list.used + firewall_default_allocation_step);
+           macro_f_string_dynamic_t_resize(status, file_path, network_path_length + ip_list.used + firewall_default_allocation_step);
 
           if (status == F_none) {
-            firewall_macro_concat_string(file_path.string, network_path, network_path_length);
-            firewall_macro_concat_string(file_path.string + network_path_length, ip_list.string, ip_list.used);
+            macro_firewall_concat_string(file_path.string, network_path, network_path_length);
+            macro_firewall_concat_string(file_path.string + network_path_length, ip_list.string, ip_list.used);
             file_path.used = file_path.size;
             file_path.string[file_path.used] = 0;
 
@@ -649,7 +649,7 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
               f_fss_delimits_t delimits = f_fss_delimits_t_initialize;
 
               {
-                f_string_range_t input = f_macro_string_range_t_initialize(local_buffer.used);
+                f_string_range_t input = macro_f_string_range_t_initialize(local_buffer.used);
 
                 status = fll_fss_basic_read(local_buffer, &input, &basic_objects, &basic_contents, 0, &delimits, 0);
               }
@@ -687,57 +687,57 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
                 f_string_dynamic_t ip_list_action = f_string_dynamic_t_initialize;
 
                 if (ip_list_direction) {
-                  f_macro_string_dynamic_t_resize(status, ip_list_action, firewall_ip_list_destination_action_length);
+                  macro_f_string_dynamic_t_resize(status, ip_list_action, firewall_ip_list_destination_action_length);
 
                   if (F_status_is_error(status)) break;
 
-                  firewall_macro_concat_string(ip_list_action.string, firewall_ip_list_destination_action, firewall_ip_list_destination_action_length);
+                  macro_firewall_concat_string(ip_list_action.string, firewall_ip_list_destination_action, firewall_ip_list_destination_action_length);
                   ip_list_action.used = firewall_ip_list_destination_action_length;
                 }
                 else {
-                  f_macro_string_dynamic_t_resize(status, ip_list_action, firewall_ip_list_source_action_length);
+                  macro_f_string_dynamic_t_resize(status, ip_list_action, firewall_ip_list_source_action_length);
 
                   if (F_status_is_error(status)) break;
 
-                  firewall_macro_concat_string(ip_list_action.string, firewall_ip_list_source_action, firewall_ip_list_source_action_length);
+                  macro_firewall_concat_string(ip_list_action.string, firewall_ip_list_source_action, firewall_ip_list_source_action_length);
                   ip_list_action.used = firewall_ip_list_source_action_length;
                 }
 
                 status = F_none;
                 if (arguments.used + 2 > arguments.size) {
-                  f_macro_string_dynamics_t_resize(status, arguments, arguments.size + 2);
+                  macro_f_string_dynamics_t_resize(status, arguments, arguments.size + 2);
                 }
 
                 if (F_status_is_error(status)) {
                   f_color_print(main.error.to.stream, main.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
 
-                  f_macro_string_dynamic_t_delete_simple(ip_list_action);
+                  macro_f_string_dynamic_t_delete_simple(ip_list_action);
                 }
                 else {
                   f_string_dynamic_t ip_argument = f_string_dynamic_t_initialize;
 
-                  firewall_macro_append_argument_to_arguments(status, arguments, ip_list_action)
+                  macro_firewall_append_argument_to_arguments(status, arguments, ip_list_action)
                   if (F_status_is_error(status)) {
-                    f_macro_string_dynamic_t_delete_simple(ip_argument);
+                    macro_f_string_dynamic_t_delete_simple(ip_argument);
                     break;
                   }
 
                   // the ip_list file contains objects and no content, all objects are what matter an nothing else
                   for (; buffer_counter < basic_objects.used; buffer_counter++) {
 
-                    ip_length = firewall_macro_structure_size(basic_objects, buffer_counter);
+                    ip_length = macro_firewall_structure_size(basic_objects, buffer_counter);
 
-                     f_macro_string_dynamic_t_resize(status, ip_argument, ip_length);
+                     macro_f_string_dynamic_t_resize(status, ip_argument, ip_length);
 
                     if (F_status_is_error(status)) {
                       f_color_print(main.error.to.stream, main.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
                       break;
                     }
 
-                    firewall_macro_concat_string(ip_argument.string, local_buffer.string + basic_objects.array[buffer_counter].start, ip_length);
+                    macro_firewall_concat_string(ip_argument.string, local_buffer.string + basic_objects.array[buffer_counter].start, ip_length);
                     ip_argument.used = ip_length;
 
-                    firewall_macro_append_argument_to_arguments(status, arguments, ip_argument)
+                    macro_firewall_append_argument_to_arguments(status, arguments, ip_argument)
                     if (F_status_is_error(status)) break;
 
                     if (main.error.verbosity == f_console_verbosity_debug) {
@@ -774,7 +774,7 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
                       fprintf(f_type_error, "\n");
 
                       // remove ip_argument from arguments string.
-                      f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                      macro_f_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
                       arguments.used--;
 
                       break;
@@ -783,33 +783,33 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
                       f_color_print(main.error.to.stream, main.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]);
 
                       // remove ip_argument from arguments string.
-                      f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                      macro_f_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
                       arguments.used--;
 
                       break;
                     }
 
                     // remove ip_argument from arguments string.
-                    f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                    macro_f_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
                     arguments.used--;
                   } // for
 
-                  f_macro_string_dynamic_t_delete_simple(ip_argument);
+                  macro_f_string_dynamic_t_delete_simple(ip_argument);
 
                   // remove ip_list_action from arguments string.
-                  f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                  macro_f_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
                   arguments.used--;
                 }
               }
 
-              f_macro_fss_delimits_t_delete_simple(delimits);
+              macro_f_fss_delimits_t_delete_simple(delimits);
             }
           }
 
-          f_macro_string_dynamic_t_delete_simple(local_buffer);
-          f_macro_string_dynamic_t_delete_simple(file_path);
-          f_macro_fss_objects_t_delete_simple(basic_objects);
-          f_macro_fss_contents_t_delete_simple(basic_contents);
+          macro_f_string_dynamic_t_delete_simple(local_buffer);
+          macro_f_string_dynamic_t_delete_simple(file_path);
+          macro_f_fss_objects_t_delete_simple(basic_objects);
+          macro_f_fss_contents_t_delete_simple(basic_contents);
 
           if (status == F_failure || status == F_parameter) break;
         }
@@ -857,11 +857,11 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi
     } // for
   } // for
 
-  f_macro_string_dynamic_t_delete_simple(ip_list);
-  f_macro_string_dynamic_t_delete_simple(argument);
-  f_macro_string_dynamics_t_delete_simple(arguments);
-  f_macro_string_dynamic_t_delete_simple(device);
-  f_macro_string_dynamic_t_delete_simple(protocol);
+  macro_f_string_dynamic_t_delete_simple(ip_list);
+  macro_f_string_dynamic_t_delete_simple(argument);
+  macro_f_string_dynamics_t_delete_simple(arguments);
+  macro_f_string_dynamic_t_delete_simple(device);
+  macro_f_string_dynamic_t_delete_simple(protocol);
 
   return status;
 }
@@ -883,8 +883,8 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f
 
   f_string_dynamic_t fixed_string = f_string_dynamic_t_initialize;
 
-  f_macro_array_lengths_t_delete_simple(local->chain_ids);
-  f_macro_array_lengths_t_resize(status, local->chain_ids, local->chain_objects.used);
+  macro_f_array_lengths_t_delete_simple(local->chain_ids);
+  macro_f_array_lengths_t_resize(status, local->chain_ids, local->chain_objects.used);
 
   if (F_status_is_error(status)) {
     return status;
@@ -896,12 +896,12 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f
   status = f_string_dynamic_resize(firewall_chain_create_command_length, &arguments.array[0]);
 
   if (F_status_is_error(status)) {
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    macro_f_string_dynamics_t_delete_simple(arguments);
 
     return status;
   }
 
-  firewall_macro_concat_string(arguments.array[0].string, firewall_chain_create_command, firewall_chain_create_command_length);
+  macro_firewall_concat_string(arguments.array[0].string, firewall_chain_create_command, firewall_chain_create_command_length);
 
   arguments.array[0].used = firewall_chain_create_command_length;
 
@@ -909,7 +909,7 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f
 
   if (F_status_is_error(status)) {
     arguments.used = 1;
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    macro_f_string_dynamics_t_delete_simple(arguments);
 
     return status;
   }
@@ -966,7 +966,7 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f
       new_chain = F_false;
     }
 
-    f_macro_string_dynamic_t_clear(fixed_string);
+    macro_f_string_dynamic_t_clear(fixed_string);
 
     if (new_chain) {
       while (j < main->chains.used) {
@@ -986,33 +986,33 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f
 
     if (new_chain) {
       if (main->chains.used == main->chains.size) {
-        f_macro_string_dynamics_t_resize(status, main->chains, main->chains.used + firewall_default_allocation_step);
+        macro_f_string_dynamics_t_resize(status, main->chains, main->chains.used + firewall_default_allocation_step);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          macro_f_string_dynamics_t_delete_simple(arguments);
 
           return status;
         }
       }
 
       create_chain = F_true;
-      length = firewall_macro_structure_size(local->chain_objects, i);
+      length = macro_firewall_structure_size(local->chain_objects, i);
 
       arguments.array[1].used = 0;
       if (length > arguments.array[1].size) {
-        f_macro_string_dynamic_t_resize(status, arguments.array[1], length);
+        macro_f_string_dynamic_t_resize(status, arguments.array[1], length);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          macro_f_string_dynamics_t_delete_simple(arguments);
 
           return status;
         }
       }
 
-       f_macro_string_dynamic_t_resize(status, main->chains.array[main->chains.used], length);
+       macro_f_string_dynamic_t_resize(status, main->chains.array[main->chains.used], length);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        macro_f_string_dynamics_t_delete_simple(arguments);
 
         return status;
       }
@@ -1131,7 +1131,7 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f
             f_color_print(main->error.to.stream, main->context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]);
           }
 
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          macro_f_string_dynamics_t_delete_simple(arguments);
           return status;
         }
       }
@@ -1142,7 +1142,7 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f
     i++;
   } // while
 
-  f_macro_string_dynamics_t_delete_simple(arguments);
+  macro_f_string_dynamics_t_delete_simple(arguments);
 
   return status;
 }
@@ -1429,7 +1429,7 @@ f_status_t firewall_buffer_rules(const f_string_t filename, const bool optional,
   f_fss_comments_t comments = f_fss_comments_t_initialize;
 
   {
-    f_string_range_t input = f_macro_string_range_t_initialize(local->buffer.used);
+    f_string_range_t input = macro_f_string_range_t_initialize(local->buffer.used);
 
     status = fll_fss_basic_list_read(local->buffer, &input, &local->chain_objects, &local->chain_contents, &delimits, 0, &comments);
   }
@@ -1458,8 +1458,8 @@ f_status_t firewall_buffer_rules(const f_string_t filename, const bool optional,
     }
   }
 
-  f_macro_fss_delimits_t_delete_simple(delimits);
-  f_macro_fss_comments_t_delete_simple(comments);
+  macro_f_fss_delimits_t_delete_simple(delimits);
+  macro_f_fss_comments_t_delete_simple(comments);
 
   return status;
 }
@@ -1477,7 +1477,7 @@ f_status_t firewall_process_rules(f_string_range_t *range, firewall_local_data_t
     }
   }
 
-  f_macro_fss_delimits_t_delete_simple(delimits);
+  macro_f_fss_delimits_t_delete_simple(delimits);
 
   if (F_status_is_error_not(status)) {
     status = firewall_perform_commands(*local, *main);
@@ -1495,14 +1495,14 @@ f_status_t firewall_process_rules(f_string_range_t *range, firewall_local_data_t
         f_color_print(main->error.to.stream, main->context.set.error, "%sAn unhandled error (%u) has occurred while calling firewall_perform_commands().%c", fll_error_print_error, status, f_string_eol_s[0]);
       }
 
-      f_macro_fss_objects_t_delete_simple(local->rule_objects);
-      f_macro_fss_contents_t_delete_simple(local->rule_contents);
+      macro_f_fss_objects_t_delete_simple(local->rule_objects);
+      macro_f_fss_contents_t_delete_simple(local->rule_contents);
       return status;
     }
   }
 
-  f_macro_fss_objects_t_delete_simple(local->rule_objects);
-  f_macro_fss_contents_t_delete_simple(local->rule_contents);
+  macro_f_fss_objects_t_delete_simple(local->rule_objects);
+  macro_f_fss_contents_t_delete_simple(local->rule_contents);
   return status;
 }
 
@@ -1517,12 +1517,12 @@ f_status_t firewall_delete_local_data(firewall_local_data_t *local) {
   local->device = 0;
   local->chain = 0;
 
-  f_macro_string_dynamic_t_delete_simple(local->buffer);
-  f_macro_array_lengths_t_delete_simple(local->chain_ids);
-  f_macro_fss_objects_t_delete_simple(local->chain_objects);
-  f_macro_fss_contents_t_delete_simple(local->chain_contents);
-  f_macro_fss_objects_t_delete_simple(local->rule_objects);
-  f_macro_fss_contents_t_delete_simple(local->rule_contents);
+  macro_f_string_dynamic_t_delete_simple(local->buffer);
+  macro_f_array_lengths_t_delete_simple(local->chain_ids);
+  macro_f_fss_objects_t_delete_simple(local->chain_objects);
+  macro_f_fss_contents_t_delete_simple(local->chain_contents);
+  macro_f_fss_objects_t_delete_simple(local->rule_objects);
+  macro_f_fss_contents_t_delete_simple(local->rule_contents);
 
   return F_none;
 }
index 4f2b2efe9c3725c948883805c86f4c3367fcaaf2..e2e5e6cb17014614a049f4ca7ad323c4cc96d6fc 100644 (file)
@@ -65,30 +65,30 @@ typedef struct {
     0, \
   }
 
-#define firewall_macro_delete_fss_buffers(status, buffer, objects, contents) \
-  f_macro_string_dynamic_t_delete_simple(buffer); \
-  f_macro_fss_objects_t_delete_simple(objects); \
-  f_macro_fss_contents_t_delete_simple(contents);
+#define macro_firewall_delete_fss_buffers(status, buffer, objects, contents) \
+  macro_f_string_dynamic_t_delete_simple(buffer); \
+  macro_f_fss_objects_t_delete_simple(objects); \
+  macro_f_fss_contents_t_delete_simple(contents);
 
-#define firewall_macro_concat_string(destination, source, length) \
+#define macro_firewall_concat_string(destination, source, length) \
   memcpy((void *)(destination), source, length);
 
-#define firewall_macro_rule_contents_has_incorrect_items(index, total_items) \
+#define macro_firewall_rule_contents_has_incorrect_items(index, total_items) \
   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_string_dynamic_size(structure, index) \
+#define macro_firewall_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).
-#define firewall_macro_structure_size(structure, index) \
+#define macro_firewall_structure_size(structure, index) \
   (structure.array[index].stop - structure.array[index].start) + 1
 
 // TODO: temporarily added, convert this to a function below.
 // TODO: also report: f_color_print(main.error.to.stream, main.context.set.error, "CRITICAL ERROR: Unable to allocate memory.%c", f_string_eol_s[0]);
-#define firewall_macro_append_argument_to_arguments(status, arguments, argument) \
+#define macro_firewall_append_argument_to_arguments(status, arguments, argument) \
   if (arguments.used == arguments.size) { \
-    f_macro_string_dynamics_t_resize(status, arguments, arguments.used + firewall_default_allocation_step); \
+    macro_f_string_dynamics_t_resize(status, arguments, arguments.used + firewall_default_allocation_step); \
     \
     if (F_status_is_error(status)) break; \
   } \
@@ -98,7 +98,7 @@ typedef struct {
   arguments.array[arguments.used].used   = argument.used; \
   arguments.used++; \
   \
-  f_macro_string_dynamic_t_clear(argument);
+  macro_f_string_dynamic_t_clear(argument);
 
 /**
  * Perform commands.
index 74efe970af583fccf06deb7701308d875930c840..8f60b67c70fccc0c603ade65bbd5971f3def764d 100644 (file)
@@ -163,7 +163,7 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_basic_list_read_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_basic_list_read_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_basic_list_read_parameter_no_color, fss_basic_list_read_parameter_light, fss_basic_list_read_parameter_dark };
@@ -191,7 +191,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_basic_list_read_parameter_verbosity_quiet, fss_basic_list_read_parameter_verbosity_normal, fss_basic_list_read_parameter_verbosity_verbose, fss_basic_list_read_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -337,7 +337,7 @@ extern "C" {
               length--;
             }
 
-            f_string_range_t range = f_macro_string_range_t_initialize(length);
+            f_string_range_t range = macro_f_string_range_t_initialize(length);
 
             // ignore leading plus sign.
             if (arguments.argv[location][0] == '+') {
@@ -370,9 +370,9 @@ extern "C" {
 
       // This standard does not support nesting, so any depth greater than 0 can be predicted without processing the file.
       if (F_status_is_error_not(status) && depths.array[0].depth > 0) {
-        fss_basic_list_read_macro_depths_t_delete_simple(depths);
-        f_macro_fss_delimits_t_delete_simple(delimits);
-        f_macro_fss_comments_t_delete_simple(comments);
+        macro_fss_basic_list_read_depths_t_delete_simple(depths);
+        macro_f_fss_delimits_t_delete_simple(delimits);
+        macro_f_fss_comments_t_delete_simple(comments);
 
         if (main->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -409,9 +409,9 @@ extern "C" {
         }
 
         // Clear buffers before continuing.
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
       }
 
       if (F_status_is_error_not(status) && main->remaining.used > 0) {
@@ -465,21 +465,21 @@ extern "C" {
           }
 
           // Clear buffers before repeating the loop.
-          f_macro_fss_contents_t_delete_simple(main->contents);
-          f_macro_fss_objects_t_delete_simple(main->objects);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_contents_t_delete_simple(main->contents);
+          macro_f_fss_objects_t_delete_simple(main->objects);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         } // for
 
         if (F_status_is_error(status)) {
-          f_macro_fss_contents_t_delete_simple(main->contents);
-          f_macro_fss_objects_t_delete_simple(main->objects);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_contents_t_delete_simple(main->contents);
+          macro_f_fss_objects_t_delete_simple(main->objects);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         }
       }
 
-      fss_basic_list_read_macro_depths_t_delete_simple(depths);
-      f_macro_fss_delimits_t_delete_simple(delimits);
-      f_macro_fss_comments_t_delete_simple(comments);
+      macro_fss_basic_list_read_depths_t_delete_simple(depths);
+      macro_f_fss_delimits_t_delete_simple(delimits);
+      macro_f_fss_comments_t_delete_simple(comments);
     }
     else {
       f_color_print(main->error.to.stream, main->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -495,17 +495,17 @@ extern "C" {
   f_status_t fss_basic_list_read_main_delete(fss_basic_list_read_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_basic_list_read_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_fss_contents_t_delete_simple(main->contents);
-    f_macro_fss_objects_t_delete_simple(main->objects);
-    f_macro_string_dynamic_t_delete_simple(main->buffer);
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_fss_contents_t_delete_simple(main->contents);
+    macro_f_fss_objects_t_delete_simple(main->objects);
+    macro_f_string_dynamic_t_delete_simple(main->buffer);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index c0c8c6ad515d2fd0e5ded481349d74f2e57bb07f..7541f3616066a2f9ad011bf8a56c151034c82ac2 100644 (file)
@@ -191,7 +191,7 @@ extern "C" {
       fss_basic_list_read_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_fss_objects_t_initialize, \
index 19c212c0bc63b848f048143450d875f26da0a64e..ea29bfdf88933dff8a10bcde8b8157fa24805477 100644 (file)
@@ -16,7 +16,7 @@ extern "C" {
         depth_size = main.parameters[fss_basic_list_read_parameter_depth].values.used;
       }
 
-      fss_basic_list_read_macro_depths_t_resize(status, (*depths), depth_size);
+      macro_fss_basic_list_read_depths_t_resize(status, (*depths), depth_size);
 
       if (F_status_is_error(status)) {
         f_color_print(main.error.to.stream, main.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -36,7 +36,7 @@ extern "C" {
       depths->array[i].index_name = 0;
       depths->array[i].value_at = 0;
 
-      f_macro_string_dynamic_t_clear(depths->array[i].value_name);
+      macro_f_string_dynamic_t_clear(depths->array[i].value_name);
 
       if (!main.parameters[fss_basic_list_read_parameter_depth].values.used) {
         position_depth = 0;
@@ -44,7 +44,7 @@ extern "C" {
       else {
         position_depth = main.parameters[fss_basic_list_read_parameter_depth].values.array[i];
 
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
         status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
@@ -67,7 +67,7 @@ extern "C" {
 
           depths->array[i].index_at = main.parameters[fss_basic_list_read_parameter_at].values.array[position_at];
 
-          const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
+          const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
           status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
@@ -182,7 +182,7 @@ extern "C" {
     }
 
     {
-      f_string_range_t input = f_macro_string_range_t_initialize(main->buffer.used);
+      f_string_range_t input = macro_f_string_range_t_initialize(main->buffer.used);
 
       delimits->used = 0;
       comments->used = 0;
@@ -194,9 +194,9 @@ extern "C" {
         fll_error_file_print(main->error, F_status_set_fine(status), "fll_fss_basic_list_read", F_true, filename, "process", fll_error_file_type_file);
       }
       else if (status == F_data_not_stop || status == F_data_not_eos) {
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         if (main->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -207,9 +207,9 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         return status;
       }
@@ -229,7 +229,7 @@ extern "C" {
 
     if (main->parameters[fss_basic_list_read_parameter_select].result == f_console_result_additional) {
       const f_array_length_t index = main->parameters[fss_basic_list_read_parameter_select].values.array[main->parameters[fss_basic_list_read_parameter_select].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
       status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
@@ -248,7 +248,7 @@ extern "C" {
 
     if (main->parameters[fss_basic_list_read_parameter_line].result == f_console_result_additional) {
       const f_array_length_t index = main->parameters[fss_basic_list_read_parameter_line].values.array[main->parameters[fss_basic_list_read_parameter_line].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
       status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
index ffd4dab7985b9137377ee17545c72c5191e2714f..4165637bf69263113ad8d1497b21dc7bb808d838 100644 (file)
@@ -43,14 +43,14 @@ extern "C" {
       f_string_dynamic_t_initialize, \
     }
 
-  #define fss_basic_list_read_macro_depth_t_clear(structure) \
+  #define macro_fss_basic_list_read_depth_t_clear(structure) \
     structure.depth = 0; \
     structure.index_at = 0; \
     structure.index_name = 0; \
     structure.value_at = 0; \
-    f_macro_string_dynamic_t_clear(structure.value_name)
+    macro_f_string_dynamic_t_clear(structure.value_name)
 
-  #define fss_basic_list_read_macro_depth_t_delete_simple(structure)  f_macro_string_dynamic_t_delete_simple(structure.value_name);
+  #define macro_fss_basic_list_read_depth_t_delete_simple(structure)  macro_f_string_dynamic_t_delete_simple(structure.value_name);
 #endif // _di_fss_basic_list_read_depth_t_
 
 /**
@@ -70,22 +70,22 @@ extern "C" {
 
   #define fss_basic_list_read_depths_t_initialize { 0, 0, 0 }
 
-  #define fss_basic_list_read_macro_depths_t_clear(depths) f_macro_memory_structure_clear(depths)
+  #define macro_fss_basic_list_read_depths_t_clear(depths) macro_f_memory_structure_clear(depths)
 
-  #define fss_basic_list_read_macro_depths_t_delete_simple(depths) \
+  #define macro_fss_basic_list_read_depths_t_delete_simple(depths) \
     depths.used = depths.size; \
     while (depths.used > 0) { \
       depths.used--; \
-      fss_basic_list_read_macro_depth_t_delete_simple(depths.array[depths.used]); \
+      macro_fss_basic_list_read_depth_t_delete_simple(depths.array[depths.used]); \
     } \
-    if (!depths.used) f_macro_memory_structure_delete_simple(depths, fss_basic_list_read_depth_t)
+    if (!depths.used) macro_f_memory_structure_delete_simple(depths, fss_basic_list_read_depth_t)
 
-  #define fss_basic_list_read_macro_depths_t_resize(status, depths, new_length) \
+  #define macro_fss_basic_list_read_depths_t_resize(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_basic_list_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_basic_list_read_depth_t_delete_simple(depths.array[i]); \
       } \
     } \
     if (status == F_none) status = f_memory_resize(depths.size, new_length, sizeof(fss_basic_list_read_depth_t), (void **) & depths.array); \
@@ -94,12 +94,12 @@ extern "C" {
       if (depths.used > depths.size) depths.used = new_length; \
     }
 
-  #define fss_basic_list_read_macro_depths_t_adjust(status, depths, new_length) \
+  #define macro_fss_basic_list_read_depths_t_adjust(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_basic_list_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_basic_list_read_depth_t_delete_simple(depths.array[i]); \
       } \
     } \
     if (status == F_none) status = f_memory_adjust(depths.size, new_length, sizeof(fss_basic_list_read_depth_t), (void **) & depths.array); \
index 3e56c239f9bcc73b5f9a7e903ceec79095101634..2015af28725b6d749dcc62bd09ddee9409000c04 100644 (file)
@@ -90,11 +90,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_basic_list_write_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_basic_list_write_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_basic_list_write_parameter_no_color, fss_basic_list_write_parameter_light, fss_basic_list_write_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -118,7 +118,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_basic_list_write_parameter_verbosity_quiet, fss_basic_list_write_parameter_verbosity_normal, fss_basic_list_write_parameter_verbosity_verbose, fss_basic_list_write_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -310,7 +310,7 @@ extern "C" {
         const f_array_length_t length = strnlen(arguments.argv[index], f_console_parameter_size);
 
         if (length) {
-          f_string_range_t range = f_macro_string_range_t_initialize(length);
+          f_string_range_t range = macro_f_string_range_t_initialize(length);
 
           main->prepend.string = arguments.argv[index];
           main->prepend.used = length;
@@ -464,7 +464,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      macro_f_string_dynamic_t_delete_simple(escaped);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -489,9 +489,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(buffer);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     fss_basic_list_write_main_delete(main);
     return status;
   }
@@ -501,14 +501,14 @@ extern "C" {
   f_status_t fss_basic_list_write_main_delete(fss_basic_list_write_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_basic_list_write_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index c11550f3f28791196be3cb7b271f7a6399541ebb..7a556e42ba6b1606ae62aa9211e0c9b740a33dd5 100644 (file)
@@ -145,7 +145,7 @@ extern "C" {
       fss_basic_list_write_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_static_t_initialize, \
       f_color_context_t_initialize, \
index 22b36121a455ef46062d9707ff7a4d37dab0c95b..a7745b5701e6d67dba1d1ce1660838c4cc1a8928 100644 (file)
@@ -275,9 +275,9 @@ extern "C" {
       status = fss_basic_list_write_process(main, output, quote, &object, &content, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(block);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     return status;
   }
 #endif // _di_fss_basic_list_write_process_pipe_
index 71861d3f07f5aee77ebb22c6594c9640b8dafe17..4135112eba1ca308f8471e70d59654614881f4fb 100644 (file)
@@ -163,11 +163,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_basic_read_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_basic_read_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_basic_read_parameter_no_color, fss_basic_read_parameter_light, fss_basic_read_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -191,7 +191,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_basic_read_parameter_verbosity_quiet, fss_basic_read_parameter_verbosity_normal, fss_basic_read_parameter_verbosity_verbose, fss_basic_read_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -325,7 +325,7 @@ extern "C" {
               length--;
             }
 
-            f_string_range_t range = f_macro_string_range_t_initialize(length);
+            f_string_range_t range = macro_f_string_range_t_initialize(length);
 
             // ignore leading plus sign.
             if (arguments.argv[location][0] == '+') {
@@ -355,8 +355,8 @@ extern "C" {
 
       // This standard does not support nesting, so any depth greater than 0 can be predicted without processing the file.
       if (F_status_is_error_not(status) && depths.array[0].depth > 0) {
-        fss_basic_read_macro_depths_t_delete_simple(depths);
-        f_macro_fss_delimits_t_delete_simple(delimits);
+        macro_fss_basic_read_depths_t_delete_simple(depths);
+        macro_f_fss_delimits_t_delete_simple(delimits);
 
         if (main->parameters[fss_basic_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -371,7 +371,7 @@ extern "C" {
         f_color_print(main->error.to.stream, main->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select);
         f_color_print(main->error.to.stream, main->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]);
 
-        fss_basic_read_macro_depths_t_delete_simple(depths);
+        macro_fss_basic_read_depths_t_delete_simple(depths);
         status = F_status_set_error(F_parameter);
       }
 
@@ -384,7 +384,7 @@ extern "C" {
         files.size += main->remaining.used;
 
         for (f_array_length_t i = 0; i < files.used; ++i) {
-          f_macro_string_range_t_clear(files.array[i].range);
+          macro_f_string_range_t_clear(files.array[i].range);
         } // for
       }
 
@@ -463,12 +463,12 @@ extern "C" {
         status = fss_basic_read_process(arguments, files, depths, main, &delimits);
       }
 
-      f_macro_fss_contents_t_delete_simple(main->contents);
-      f_macro_fss_objects_t_delete_simple(main->objects);
-      f_macro_string_dynamic_t_delete_simple(main->buffer);
+      macro_f_fss_contents_t_delete_simple(main->contents);
+      macro_f_fss_objects_t_delete_simple(main->objects);
+      macro_f_string_dynamic_t_delete_simple(main->buffer);
 
-      fss_basic_read_macro_depths_t_delete_simple(depths);
-      f_macro_fss_delimits_t_delete_simple(delimits);
+      macro_fss_basic_read_depths_t_delete_simple(depths);
+      macro_f_fss_delimits_t_delete_simple(delimits);
     }
     else {
       f_color_print(main->error.to.stream, main->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -484,17 +484,17 @@ extern "C" {
   f_status_t fss_basic_read_main_delete(fss_basic_read_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_basic_read_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_fss_contents_t_delete_simple(main->contents);
-    f_macro_fss_objects_t_delete_simple(main->objects);
-    f_macro_string_dynamic_t_delete_simple(main->buffer);
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_fss_contents_t_delete_simple(main->contents);
+    macro_f_fss_objects_t_delete_simple(main->objects);
+    macro_f_string_dynamic_t_delete_simple(main->buffer);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index ba4b19b2262bf55f41e3b06daf79594e73a0cdaf..e43c5659120cab9b562c8a0e8591ca523743b7f8 100644 (file)
@@ -190,7 +190,7 @@ extern "C" {
       fss_basic_read_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_fss_objects_t_initialize, \
index 019cb5bf9865b60c80cb1720f168faa5e7a5b79d..0087bdcb941d2998fa2977e545d0ec89da07f233 100644 (file)
@@ -17,7 +17,7 @@ extern "C" {
         depth_size = main.parameters[fss_basic_read_parameter_depth].values.used;
       }
 
-      fss_basic_read_macro_depths_t_resize(status, (*depths), depth_size);
+      macro_fss_basic_read_depths_t_resize(status, (*depths), depth_size);
 
       if (F_status_is_error(status)) {
         f_color_print(main.error.to.stream, main.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -39,7 +39,7 @@ extern "C" {
       depths->array[i].index_name = 0;
       depths->array[i].value_at = 0;
 
-      f_macro_string_dynamic_t_clear(depths->array[i].value_name);
+      macro_f_string_dynamic_t_clear(depths->array[i].value_name);
 
       if (!main.parameters[fss_basic_read_parameter_depth].values.used) {
         position_depth = 0;
@@ -47,7 +47,7 @@ extern "C" {
       else {
         position_depth = main.parameters[fss_basic_read_parameter_depth].values.array[i];
 
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
         status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
@@ -70,7 +70,7 @@ extern "C" {
 
           depths->array[i].index_at = main.parameters[fss_basic_read_parameter_at].values.array[position_at];
 
-          const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
+          const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
           status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
@@ -192,7 +192,7 @@ extern "C" {
 
     if (main.parameters[parameter].result == f_console_result_additional) {
       const f_array_length_t index = main.parameters[parameter].values.array[main.parameters[parameter].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strnlen(arguments.argv[index], f_console_parameter_size));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strnlen(arguments.argv[index], f_console_parameter_size));
 
       const f_status_t status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, number);
 
@@ -325,7 +325,7 @@ extern "C" {
     }
 
     {
-      f_string_range_t input = f_macro_string_range_t_initialize(main->buffer.used);
+      f_string_range_t input = macro_f_string_range_t_initialize(main->buffer.used);
 
       delimits->used = 0;
 
index 62d3006101bd8dc20a3dfef3b39f2251525f7d11..d1b6448ff5b75804ec290ee3f1053f6cd1c4d36c 100644 (file)
@@ -43,15 +43,15 @@ extern "C" {
       f_string_dynamic_t_initialize, \
     }
 
-  #define fss_basic_read_macro_depth_t_clear(structure) \
+  #define macro_fss_basic_read_depth_t_clear(structure) \
     structure.depth = 0; \
     structure.index_at = 0; \
     structure.index_name = 0; \
     structure.value_at = 0; \
-    f_macro_string_dynamic_t_clear(structure.value_name)
+    macro_f_string_dynamic_t_clear(structure.value_name)
 
-  #define fss_basic_read_macro_depth_t_delete(status, structure) status = f_macro_string_dynamic_t_delete_simple(structure.value_name);
-  #define fss_basic_read_macro_depth_t_delete_simple(structure)  f_macro_string_dynamic_t_delete_simple(structure.value_name);
+  #define macro_fss_basic_read_depth_t_delete(status, structure) status = macro_f_string_dynamic_t_delete_simple(structure.value_name);
+  #define macro_fss_basic_read_depth_t_delete_simple(structure)  macro_f_string_dynamic_t_delete_simple(structure.value_name);
 #endif // _di_fss_basic_read_depth_t_
 
 /**
@@ -71,32 +71,32 @@ extern "C" {
 
   #define fss_basic_read_depths_t_initialize { 0, 0, 0 }
 
-  #define fss_basic_read_macro_depths_t_clear(depths) f_macro_memory_structure_clear(depths)
+  #define macro_fss_basic_read_depths_t_clear(depths) macro_f_memory_structure_clear(depths)
 
-  #define fss_basic_read_macro_depths_t_delete(status, depths) \
+  #define macro_fss_basic_read_depths_t_delete(status, depths) \
     status = F_none; \
     depths.used = depths.size; \
     while (depths.used > 0) { \
       depths.used--; \
-      fss_basic_read_macro_depth_t_delete(status, depths.array[depths.used]); \
+      macro_fss_basic_read_depth_t_delete(status, depths.array[depths.used]); \
       if (F_status_is_error(status)) break; \
     } \
-    if (status == F_none) f_macro_memory_structure_delete(depths, fss_basic_read_depth_t)
+    if (status == F_none) macro_f_memory_structure_delete(depths, fss_basic_read_depth_t)
 
-  #define fss_basic_read_macro_depths_t_delete_simple(depths) \
+  #define macro_fss_basic_read_depths_t_delete_simple(depths) \
     depths.used = depths.size; \
     while (depths.used > 0) { \
       depths.used--; \
-      fss_basic_read_macro_depth_t_delete_simple(depths.array[depths.used]); \
+      macro_fss_basic_read_depth_t_delete_simple(depths.array[depths.used]); \
     } \
-    if (!depths.used) f_macro_memory_structure_delete_simple(depths, fss_basic_read_depth_t)
+    if (!depths.used) macro_f_memory_structure_delete_simple(depths, fss_basic_read_depth_t)
 
-  #define fss_basic_read_macro_depths_t_resize(status, depths, new_length) \
+  #define macro_fss_basic_read_depths_t_resize(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_basic_read_macro_depth_t_delete(status, depths.array[i]); \
+        macro_fss_basic_read_depth_t_delete(status, depths.array[i]); \
         if (F_status_is_error(status)) break; \
       } \
     } \
@@ -106,12 +106,12 @@ extern "C" {
       if (depths.used > depths.size) depths.used = new_length; \
     }
 
-  #define fss_basic_read_macro_depths_t_adjust(status, depths, new_length) \
+  #define macro_fss_basic_read_depths_t_adjust(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_basic_read_macro_depth_t_delete(status, depths.array[i]); \
+        macro_fss_basic_read_depth_t_delete(status, depths.array[i]); \
         if (F_status_is_error(status)) break; \
       } \
     } \
index 18709941cd567e65e4efaf1312d52b25b7d05f13..e5a591b9ca27acf42ee66ca031520580df587590 100644 (file)
@@ -88,11 +88,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_basic_write_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_basic_write_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_basic_write_parameter_no_color, fss_basic_write_parameter_light, fss_basic_write_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -116,7 +116,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_basic_write_parameter_verbosity_quiet, fss_basic_write_parameter_verbosity_normal, fss_basic_write_parameter_verbosity_verbose, fss_basic_write_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -309,8 +309,8 @@ extern "C" {
 
         // Even though this standard does not utilize this parameter, provide the validation for consistency.
         if (length) {
-          f_string_range_t range = f_macro_string_range_t_initialize(length);
-          const f_string_static_t prepend = f_macro_string_static_t_initialize(arguments.argv[index], length);
+          f_string_range_t range = macro_f_string_range_t_initialize(length);
+          const f_string_static_t prepend = macro_f_string_static_t_initialize(arguments.argv[index], length);
 
           for (; range.start < length; range.start++) {
 
@@ -463,7 +463,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      macro_f_string_dynamic_t_delete_simple(escaped);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -488,9 +488,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(buffer);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     fss_basic_write_main_delete(main);
     return status;
   }
@@ -500,14 +500,14 @@ extern "C" {
   f_status_t fss_basic_write_main_delete(fss_basic_write_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_basic_write_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 25ba8d4540f971008bfaf367fcc664c7fffd73a9..ac0ff9a0dfe22a1785779647fba0cf10117a096d 100644 (file)
@@ -145,7 +145,7 @@ extern "C" {
       fss_basic_write_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_color_context_t_initialize, \
     }
index cde73f991f6f575492c1a048f35f6be0c9e69b33..d22004fd4b018bdb91fa6a0c9b545a76d8a8a41b 100644 (file)
@@ -294,9 +294,9 @@ extern "C" {
       status = fss_basic_write_process(main, output, quote, &object, &content, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(block);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     return status;
   }
 #endif // _di_fss_basic_write_process_pipe_
index e41fd422e95a680d7098ddfff20ef34a4009f37c..0c075b4849cb6d44422f007064ec59557945ef6a 100644 (file)
@@ -163,11 +163,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_embedded_list_read_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_embedded_list_read_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_embedded_list_read_parameter_no_color, fss_embedded_list_read_parameter_light, fss_embedded_list_read_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -191,7 +191,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_embedded_list_read_parameter_verbosity_quiet, fss_embedded_list_read_parameter_verbosity_normal, fss_embedded_list_read_parameter_verbosity_verbose, fss_embedded_list_read_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -337,7 +337,7 @@ extern "C" {
               length--;
             }
 
-            f_string_range_t range = f_macro_string_range_t_initialize(length);
+            f_string_range_t range = macro_f_string_range_t_initialize(length);
 
             // ignore leading plus sign.
             if (arguments.argv[location][0] == '+') {
@@ -396,8 +396,8 @@ extern "C" {
         }
 
         // Clear buffers before continuing.
-        f_macro_fss_nest_t_delete_simple(main->nest);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_nest_t_delete_simple(main->nest);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
       }
 
       if (F_status_is_error_not(status) && main->remaining.used > 0) {
@@ -450,20 +450,20 @@ extern "C" {
           }
 
           // Clear buffers before repeating the loop.
-          f_macro_fss_nest_t_delete_simple(main->nest);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_nest_t_delete_simple(main->nest);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         } // for
 
         if (F_status_is_error(status)) {
-          f_macro_fss_nest_t_delete_simple(main->nest);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_nest_t_delete_simple(main->nest);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         }
       }
 
-      fss_embedded_list_read_macro_depths_t_delete_simple(depths);
-      f_macro_fss_delimits_t_delete_simple(objects_delimits);
-      f_macro_fss_delimits_t_delete_simple(contents_delimits);
-      f_macro_fss_comments_t_delete_simple(comments);
+      macro_fss_embedded_list_read_depths_t_delete_simple(depths);
+      macro_f_fss_delimits_t_delete_simple(objects_delimits);
+      macro_f_fss_delimits_t_delete_simple(contents_delimits);
+      macro_f_fss_comments_t_delete_simple(comments);
     }
     else {
       f_color_print(main->error.to.stream, main->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -479,17 +479,17 @@ extern "C" {
   f_status_t fss_embedded_list_read_main_delete(fss_embedded_list_read_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_embedded_list_read_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_fss_nest_t_delete_simple(main->nest);
+    macro_f_fss_nest_t_delete_simple(main->nest);
 
-    f_macro_string_dynamic_t_delete_simple(main->buffer);
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_string_dynamic_t_delete_simple(main->buffer);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 7c1316addebbb75bd7f37bc971a629f77f40a324..b73fc81ee965d3007c64d7e1133d1ff1397843a6 100644 (file)
@@ -190,7 +190,7 @@ extern "C" {
       fss_embedded_list_read_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_fss_nest_t_initialize, \
index 9370d3a2caf221b7940b91595ff2edbde17afc0c..0ff8104893f7a71a7e99e3ebcf45e7ebce9be9fc 100644 (file)
@@ -102,7 +102,7 @@ extern "C" {
         i = main.parameters[fss_embedded_list_read_parameter_depth].values.used + 1;
       }
 
-      fss_embedded_list_read_macro_depths_t_resize(status, (*depths), i);
+      macro_fss_embedded_list_read_depths_t_resize(status, (*depths), i);
 
       if (F_status_is_error(status)) {
         fll_error_print(main.error, F_status_set_fine(status), "fss_embedded_list_read_main_preprocess_depth", F_true);
@@ -123,7 +123,7 @@ extern "C" {
       for (i = 0; i < values_total; ++i) {
 
         if (values_type[i] == fss_embedded_list_read_parameter_depth || values_type[i] == fss_embedded_list_read_parameter_at) {
-          const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[values_order[i]]));
+          const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[values_order[i]]));
 
           status = fl_conversion_string_to_number_unsigned(arguments.argv[values_order[i]], range, &number);
 
@@ -220,7 +220,7 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      f_string_range_t input = f_macro_string_range_t_initialize(main->buffer.used);
+      f_string_range_t input = macro_f_string_range_t_initialize(main->buffer.used);
 
       objects_delimits->used = 0;
       contents_delimits->used = 0;
@@ -233,8 +233,8 @@ extern "C" {
         fll_error_file_print(main->error, F_status_set_fine(status), "fll_fss_embedded_list_read", F_true, filename, "process", fll_error_file_type_file);
       }
       else if (status == F_data_not_stop || status == F_data_not_eos) {
-        f_macro_fss_nest_t_delete_simple(main->nest);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_nest_t_delete_simple(main->nest);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         if (main->parameters[fss_embedded_list_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -245,8 +245,8 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        f_macro_fss_nest_t_delete_simple(main->nest);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_nest_t_delete_simple(main->nest);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         return status;
       }
@@ -277,7 +277,7 @@ extern "C" {
 
       if (main->parameters[fss_embedded_list_read_parameter_select].result == f_console_result_additional) {
         const f_array_length_t index = main->parameters[fss_embedded_list_read_parameter_select].values.array[main->parameters[fss_embedded_list_read_parameter_select].values.used - 1];
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
         status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
@@ -297,7 +297,7 @@ extern "C" {
 
     if (main->parameters[fss_embedded_list_read_parameter_line].result == f_console_result_additional) {
       const f_array_length_t index = main->parameters[fss_embedded_list_read_parameter_line].values.array[main->parameters[fss_embedded_list_read_parameter_line].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
       status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
index 4dca4292b697fca69dfa0fc5c8eb5fbea8d97c15..cb6e720b5a053d2b924101f27900be072ee04f04 100644 (file)
@@ -43,14 +43,14 @@ extern "C" {
       f_string_dynamic_t_initialize, \
     }
 
-  #define fss_embedded_list_read_macro_depth_t_clear(structure) \
+  #define macro_fss_embedded_list_read_depth_t_clear(structure) \
     structure.depth = 0; \
     structure.index_at = 0; \
     structure.index_name = 0; \
     structure.value_at = 0; \
-    f_macro_string_dynamic_t_clear(structure.value_name)
+    macro_f_string_dynamic_t_clear(structure.value_name)
 
-  #define fss_embedded_list_read_macro_depth_t_delete_simple(structure)  f_macro_string_dynamic_t_delete_simple(structure.value_name)
+  #define macro_fss_embedded_list_read_depth_t_delete_simple(structure)  macro_f_string_dynamic_t_delete_simple(structure.value_name)
 #endif // _di_fss_embedded_list_read_depth_t_
 
 /**
@@ -71,7 +71,7 @@ extern "C" {
       0, \
     }
 
-  #define fss_embedded_list_read_macro_skip_t_initialize(skip, used) \
+  #define macro_fss_embedded_list_read_skip_t_initialize(skip, used) \
     { \
       skip, \
       used, \
@@ -95,22 +95,22 @@ extern "C" {
 
   #define fss_embedded_list_read_depths_t_initialize { 0, 0, 0 }
 
-  #define fss_embedded_list_read_macro_depths_t_clear(depths) f_macro_memory_structure_clear(depths)
+  #define macro_fss_embedded_list_read_depths_t_clear(depths) macro_f_memory_structure_clear(depths)
 
-  #define fss_embedded_list_read_macro_depths_t_delete_simple(depths) \
+  #define macro_fss_embedded_list_read_depths_t_delete_simple(depths) \
     depths.used = depths.size; \
     while (depths.used > 0) { \
       depths.used--; \
-      fss_embedded_list_read_macro_depth_t_delete_simple(depths.array[depths.used]); \
+      macro_fss_embedded_list_read_depth_t_delete_simple(depths.array[depths.used]); \
     } \
-    if (!depths.used) f_macro_memory_structure_delete_simple(depths, fss_embedded_list_read_depth_t)
+    if (!depths.used) macro_f_memory_structure_delete_simple(depths, fss_embedded_list_read_depth_t)
 
-  #define fss_embedded_list_read_macro_depths_t_resize(status, depths, new_length) \
+  #define macro_fss_embedded_list_read_depths_t_resize(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_embedded_list_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_embedded_list_read_depth_t_delete_simple(depths.array[i]); \
       } \
     } \
     if (status == F_none) status = f_memory_resize(depths.size, new_length, sizeof(fss_embedded_list_read_depth_t), (void **) & depths.array); \
@@ -119,12 +119,12 @@ extern "C" {
       if (depths.used > depths.size) depths.used = new_length; \
     }
 
-  #define fss_embedded_list_read_macro_depths_t_adjust(status, depths, new_length) \
+  #define macro_fss_embedded_list_read_depths_t_adjust(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_embedded_list_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_embedded_list_read_depth_t_delete_simple(depths.array[i]); \
       } \
     } \
     if (status == F_none) status = f_memory_adjust(depths.size, new_length, sizeof(fss_embedded_list_read_depth_t), (void **) & depths.array); \
index 7509b8ac49caadf0560d74a337b09ce6c5acc0c9..08dd966ab04151fed0cbd9a246dad6ef657e1e47 100644 (file)
@@ -96,11 +96,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_embedded_list_write_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_embedded_list_write_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_embedded_list_write_parameter_no_color, fss_embedded_list_write_parameter_light, fss_embedded_list_write_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -124,7 +124,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_embedded_list_write_parameter_verbosity_quiet, fss_embedded_list_write_parameter_verbosity_normal, fss_embedded_list_write_parameter_verbosity_verbose, fss_embedded_list_write_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -316,7 +316,7 @@ extern "C" {
         const f_array_length_t length = strnlen(arguments.argv[index], f_console_parameter_size);
 
         if (length) {
-          f_string_range_t range = f_macro_string_range_t_initialize(length);
+          f_string_range_t range = macro_f_string_range_t_initialize(length);
 
           main->prepend.string = arguments.argv[index];
           main->prepend.used = length;
@@ -480,8 +480,8 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
-      f_macro_string_ranges_t_delete_simple(ignore);
+      macro_f_string_dynamic_t_delete_simple(escaped);
+      macro_f_string_ranges_t_delete_simple(ignore);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -506,9 +506,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(buffer);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     fss_embedded_list_write_main_delete(main);
     return status;
   }
@@ -518,14 +518,14 @@ extern "C" {
   f_status_t fss_embedded_list_write_main_delete(fss_embedded_list_write_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_embedded_list_write_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 0ca32ea850c772a46351d7a0d85c8109df425751..06c4ecf312cc4a94b3244bcb4fa7b05961f2017a 100644 (file)
@@ -146,7 +146,7 @@ extern "C" {
       fss_embedded_list_write_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_static_t_initialize, \
       f_color_context_t_initialize, \
index 4ba7eb47470a56d902f529bd369ddc03bbefd9c2..e79e99d17daaa87675242d9075b1e132c6c6fcb8 100644 (file)
@@ -268,10 +268,10 @@ extern "C" {
                         break;
                       }
 
-                      f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
+                      macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
                     }
                     else {
-                      f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
+                      macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
                     }
 
                     if (F_status_is_error(status)) {
@@ -314,9 +314,9 @@ extern "C" {
       status = fss_embedded_list_write_process(main, output, quote, &object, &content, ignore, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(block);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     return status;
   }
 #endif // _di_fss_embedded_list_write_process_pipe_
@@ -349,10 +349,10 @@ extern "C" {
             return F_status_set_error(F_string_too_large);
           }
 
-          f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
+          macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
         }
         else {
-          f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
+          macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
         }
 
         if (F_status_is_error(status)) {
index 3b11b564ef7997549e75d23d5d80d6c129da6919..567fc2caeb32ac0befed12e5b28c3db68c4f2bfc 100644 (file)
@@ -163,7 +163,7 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_extended_list_read_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_extended_list_read_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_extended_list_read_parameter_no_color, fss_extended_list_read_parameter_light, fss_extended_list_read_parameter_dark };
@@ -191,7 +191,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_extended_list_read_parameter_verbosity_quiet, fss_extended_list_read_parameter_verbosity_normal, fss_extended_list_read_parameter_verbosity_verbose, fss_extended_list_read_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -337,7 +337,7 @@ extern "C" {
               length--;
             }
 
-            f_string_range_t range = f_macro_string_range_t_initialize(length);
+            f_string_range_t range = macro_f_string_range_t_initialize(length);
 
             // ignore leading plus sign.
             if (arguments.argv[location][0] == '+') {
@@ -370,9 +370,9 @@ extern "C" {
 
       // This standard does not support nesting, so any depth greater than 0 can be predicted without processing the file.
       if (F_status_is_error_not(status) && depths.array[0].depth > 0) {
-        fss_extended_list_read_macro_depths_t_delete_simple(depths);
-        f_macro_fss_delimits_t_delete_simple(delimits);
-        f_macro_fss_comments_t_delete_simple(comments);
+        macro_fss_extended_list_read_depths_t_delete_simple(depths);
+        macro_f_fss_delimits_t_delete_simple(delimits);
+        macro_f_fss_comments_t_delete_simple(comments);
 
         if (main->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -409,9 +409,9 @@ extern "C" {
         }
 
         // Clear buffers before continuing.
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
       }
 
       if (F_status_is_error_not(status) && main->remaining.used > 0) {
@@ -465,21 +465,21 @@ extern "C" {
           }
 
           // Clear buffers before repeating the loop.
-          f_macro_fss_contents_t_delete_simple(main->contents);
-          f_macro_fss_objects_t_delete_simple(main->objects);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_contents_t_delete_simple(main->contents);
+          macro_f_fss_objects_t_delete_simple(main->objects);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         } // for
 
         if (F_status_is_error(status)) {
-          f_macro_fss_contents_t_delete_simple(main->contents);
-          f_macro_fss_objects_t_delete_simple(main->objects);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_contents_t_delete_simple(main->contents);
+          macro_f_fss_objects_t_delete_simple(main->objects);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         }
       }
 
-      fss_extended_list_read_macro_depths_t_delete_simple(depths);
-      f_macro_fss_delimits_t_delete_simple(delimits);
-      f_macro_fss_comments_t_delete_simple(comments);
+      macro_fss_extended_list_read_depths_t_delete_simple(depths);
+      macro_f_fss_delimits_t_delete_simple(delimits);
+      macro_f_fss_comments_t_delete_simple(comments);
     }
     else {
       f_color_print(main->error.to.stream, main->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -495,17 +495,17 @@ extern "C" {
   f_status_t fss_extended_list_read_main_delete(fss_extended_list_read_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_extended_list_read_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_fss_contents_t_delete_simple(main->contents);
-    f_macro_fss_objects_t_delete_simple(main->objects);
-    f_macro_string_dynamic_t_delete_simple(main->buffer);
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_fss_contents_t_delete_simple(main->contents);
+    macro_f_fss_objects_t_delete_simple(main->objects);
+    macro_f_string_dynamic_t_delete_simple(main->buffer);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index cfae9f5229a653b0cd6e2cfa7ee342d98840abb3..3c523426befe28f6de2b2f934f54b5c7db251a33 100644 (file)
@@ -191,7 +191,7 @@ extern "C" {
       fss_extended_list_read_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_fss_objects_t_initialize, \
index 78da61a7a3ccfa128783f3adcf30c640bc6211dd..fa587506b999fc586a830a73f2f69adb0b90044b 100644 (file)
@@ -16,7 +16,7 @@ extern "C" {
         depth_size = main.parameters[fss_extended_list_read_parameter_depth].values.used;
       }
 
-      fss_extended_list_read_macro_depths_t_resize(status, (*depths), depth_size);
+      macro_fss_extended_list_read_depths_t_resize(status, (*depths), depth_size);
 
       if (F_status_is_error(status)) {
         f_color_print(main.error.to.stream, main.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -36,7 +36,7 @@ extern "C" {
       depths->array[i].index_name = 0;
       depths->array[i].value_at = 0;
 
-      f_macro_string_dynamic_t_clear(depths->array[i].value_name);
+      macro_f_string_dynamic_t_clear(depths->array[i].value_name);
 
       if (!main.parameters[fss_extended_list_read_parameter_depth].values.used) {
         position_depth = 0;
@@ -44,7 +44,7 @@ extern "C" {
       else {
         position_depth = main.parameters[fss_extended_list_read_parameter_depth].values.array[i];
 
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
         status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
@@ -67,7 +67,7 @@ extern "C" {
 
           depths->array[i].index_at = main.parameters[fss_extended_list_read_parameter_at].values.array[position_at];
 
-          const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
+          const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
           status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
@@ -182,7 +182,7 @@ extern "C" {
     }
 
     {
-      f_string_range_t input = f_macro_string_range_t_initialize(main->buffer.used);
+      f_string_range_t input = macro_f_string_range_t_initialize(main->buffer.used);
 
       delimits->used = 0;
       comments->used = 0;
@@ -194,9 +194,9 @@ extern "C" {
         fll_error_file_print(main->error, F_status_set_fine(status), "fll_fss_extended_list_read", F_true, filename, "process", fll_error_file_type_file);
       }
       else if (status == F_data_not_stop || status == F_data_not_eos) {
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         if (main->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -207,9 +207,9 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         return status;
       }
@@ -229,7 +229,7 @@ extern "C" {
 
     if (main->parameters[fss_extended_list_read_parameter_select].result == f_console_result_additional) {
       const f_array_length_t index = main->parameters[fss_extended_list_read_parameter_select].values.array[main->parameters[fss_extended_list_read_parameter_select].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
       status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
@@ -248,7 +248,7 @@ extern "C" {
 
     if (main->parameters[fss_extended_list_read_parameter_line].result == f_console_result_additional) {
       const f_array_length_t index = main->parameters[fss_extended_list_read_parameter_line].values.array[main->parameters[fss_extended_list_read_parameter_line].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
       status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
index 3e41a1e4aeb0f612c5253ab31ce943d960a87c92..1825471bea6ceb821b8528709a0dfb62235f3b3b 100644 (file)
@@ -43,14 +43,14 @@ extern "C" {
       f_string_dynamic_t_initialize, \
     }
 
-  #define fss_extended_list_read_macro_depth_t_clear(structure) \
+  #define macro_fss_extended_list_read_depth_t_clear(structure) \
     structure.depth = 0; \
     structure.index_at = 0; \
     structure.index_name = 0; \
     structure.value_at = 0; \
-    f_macro_string_dynamic_t_clear(structure.value_name)
+    macro_f_string_dynamic_t_clear(structure.value_name)
 
-  #define fss_extended_list_read_macro_depth_t_delete_simple(structure)  f_macro_string_dynamic_t_delete_simple(structure.value_name)
+  #define macro_fss_extended_list_read_depth_t_delete_simple(structure)  macro_f_string_dynamic_t_delete_simple(structure.value_name)
 #endif // _di_fss_extended_list_read_depth_t_
 
 /**
@@ -70,22 +70,22 @@ extern "C" {
 
   #define fss_extended_list_read_depths_t_initialize { 0, 0, 0 }
 
-  #define fss_extended_list_read_macro_depths_t_clear(depths) f_macro_memory_structure_clear(depths)
+  #define macro_fss_extended_list_read_depths_t_clear(depths) macro_f_memory_structure_clear(depths)
 
-  #define fss_extended_list_read_macro_depths_t_delete_simple(depths) \
+  #define macro_fss_extended_list_read_depths_t_delete_simple(depths) \
     depths.used = depths.size; \
     while (depths.used > 0) { \
       depths.used--; \
-      fss_extended_list_read_macro_depth_t_delete_simple(depths.array[depths.used]); \
+      macro_fss_extended_list_read_depth_t_delete_simple(depths.array[depths.used]); \
     } \
-    if (!depths.used) f_macro_memory_structure_delete_simple(depths, fss_extended_list_read_depth_t)
+    if (!depths.used) macro_f_memory_structure_delete_simple(depths, fss_extended_list_read_depth_t)
 
-  #define fss_extended_list_read_macro_depths_t_resize(status, depths, new_length) \
+  #define macro_fss_extended_list_read_depths_t_resize(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_extended_list_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_extended_list_read_depth_t_delete_simple(depths.array[i]); \
         if (F_status_is_error(status)) break; \
       } \
     } \
@@ -95,12 +95,12 @@ extern "C" {
       if (depths.used > depths.size) depths.used = new_length; \
     }
 
-  #define fss_extended_list_read_macro_depths_t_adjust(status, depths, new_length) \
+  #define macro_fss_extended_list_read_depths_t_adjust(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_extended_list_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_extended_list_read_depth_t_delete_simple(depths.array[i]); \
         if (F_status_is_error(status)) break; \
       } \
     } \
index e95156ea9b8d73093680cce37ff56d9c93c0b1b8..e105cfbdef18e2cddcfceb67ca0c8e3ff944ec7e 100644 (file)
@@ -96,11 +96,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_extended_list_write_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_extended_list_write_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_extended_list_write_parameter_no_color, fss_extended_list_write_parameter_light, fss_extended_list_write_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -124,7 +124,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_extended_list_write_parameter_verbosity_quiet, fss_extended_list_write_parameter_verbosity_normal, fss_extended_list_write_parameter_verbosity_verbose, fss_extended_list_write_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -316,7 +316,7 @@ extern "C" {
         const f_array_length_t length = strnlen(arguments.argv[index], f_console_parameter_size);
 
         if (length) {
-          f_string_range_t range = f_macro_string_range_t_initialize(length);
+          f_string_range_t range = macro_f_string_range_t_initialize(length);
 
           main->prepend.string = arguments.argv[index];
           main->prepend.used = length;
@@ -480,8 +480,8 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
-      f_macro_string_ranges_t_delete_simple(ignore);
+      macro_f_string_dynamic_t_delete_simple(escaped);
+      macro_f_string_ranges_t_delete_simple(ignore);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -506,9 +506,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(buffer);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     fss_extended_list_write_main_delete(main);
     return status;
   }
@@ -518,14 +518,14 @@ extern "C" {
   f_status_t fss_extended_list_write_main_delete(fss_extended_list_write_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_extended_list_write_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index baa19adc4e1dca7625da31d1ae1fac25f439b7f6..3992778aa220eca46d3d42232a9fb7d7f364b2e5 100644 (file)
@@ -146,7 +146,7 @@ extern "C" {
       fss_extended_list_write_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_static_t_initialize, \
       f_color_context_t_initialize, \
index 30675f58328df46d428ab9ea86bc8b1fc50a50f6..561a46c507af7acad07f37d4cb7105ba7613c0d3 100644 (file)
@@ -268,10 +268,10 @@ extern "C" {
                         break;
                       }
 
-                      f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
+                      macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
                     }
                     else {
-                      f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
+                      macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
                     }
 
                     if (F_status_is_error(status)) {
@@ -314,9 +314,9 @@ extern "C" {
       status = fss_extended_list_write_process(main, output, quote, &object, &content, ignore, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    macro_f_string_dynamic_t_delete_simple(block);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamic_t_delete_simple(content);
     return status;
   }
 #endif // _di_fss_extended_list_write_process_pipe_
@@ -349,10 +349,10 @@ extern "C" {
             return F_status_set_error(F_string_too_large);
           }
 
-          f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
+          macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + 1);
         }
         else {
-          f_macro_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
+          macro_f_string_ranges_t_resize(status, (*ignore), ignore->size + f_fss_default_allocation_step);
         }
 
         if (F_status_is_error(status)) {
index a4d4b83200d78d42669ca8352fb8657cd12971c9..0677a8460bc7147b61b72bc1be0e2fc77b145de5 100644 (file)
@@ -163,11 +163,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_extended_read_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_extended_read_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_extended_read_parameter_no_color, fss_extended_read_parameter_light, fss_extended_read_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -191,7 +191,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_extended_read_parameter_verbosity_quiet, fss_extended_read_parameter_verbosity_normal, fss_extended_read_parameter_verbosity_verbose, fss_extended_read_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -337,7 +337,7 @@ extern "C" {
               length--;
             }
 
-            f_string_range_t range = f_macro_string_range_t_initialize(length);
+            f_string_range_t range = macro_f_string_range_t_initialize(length);
 
             // ignore leading plus sign.
             if (arguments.argv[location][0] == '+') {
@@ -370,9 +370,9 @@ extern "C" {
 
       // This standard does not support nesting, so any depth greater than 0 can be predicted without processing the file.
       if (F_status_is_error_not(status) && depths.array[0].depth > 0) {
-        fss_extended_read_macro_depths_t_delete_simple(depths);
-        f_macro_fss_delimits_t_delete_simple(objects_delimits);
-        f_macro_fss_delimits_t_delete_simple(contents_delimits);
+        macro_fss_extended_read_depths_t_delete_simple(depths);
+        macro_f_fss_delimits_t_delete_simple(objects_delimits);
+        macro_f_fss_delimits_t_delete_simple(contents_delimits);
 
         if (main->parameters[fss_extended_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -409,9 +409,9 @@ extern "C" {
         }
 
         // Clear buffers before continuing.
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
       }
 
       if (F_status_is_error_not(status) && main->remaining.used > 0) {
@@ -465,21 +465,21 @@ extern "C" {
           }
 
           // Clear buffers before repeating the loop.
-          f_macro_fss_contents_t_delete_simple(main->contents);
-          f_macro_fss_objects_t_delete_simple(main->objects);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_contents_t_delete_simple(main->contents);
+          macro_f_fss_objects_t_delete_simple(main->objects);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         } // for
 
         if (F_status_is_error(status)) {
-          f_macro_fss_contents_t_delete_simple(main->contents);
-          f_macro_fss_objects_t_delete_simple(main->objects);
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_fss_contents_t_delete_simple(main->contents);
+          macro_f_fss_objects_t_delete_simple(main->objects);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         }
       }
 
-      fss_extended_read_macro_depths_t_delete_simple(depths);
-      f_macro_fss_delimits_t_delete_simple(objects_delimits);
-      f_macro_fss_delimits_t_delete_simple(contents_delimits);
+      macro_fss_extended_read_depths_t_delete_simple(depths);
+      macro_f_fss_delimits_t_delete_simple(objects_delimits);
+      macro_f_fss_delimits_t_delete_simple(contents_delimits);
     }
     else {
       f_color_print(main->error.to.stream, main->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -495,17 +495,17 @@ extern "C" {
   f_status_t fss_extended_read_main_delete(fss_extended_read_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_extended_read_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_fss_contents_t_delete_simple(main->contents);
-    f_macro_fss_objects_t_delete_simple(main->objects);
-    f_macro_string_dynamic_t_delete_simple(main->buffer);
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_fss_contents_t_delete_simple(main->contents);
+    macro_f_fss_objects_t_delete_simple(main->objects);
+    macro_f_string_dynamic_t_delete_simple(main->buffer);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 14df8242c1351ab4ec704de2737889924043b527..15d4aecb4dcb7d179d1e72c2e8bfb082c541b455 100644 (file)
@@ -191,7 +191,7 @@ extern "C" {
       fss_extended_read_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_fss_objects_t_initialize, \
index 08f2a18dc2e460e6bbd63ee34851a34b56554ccd..56931c9ee26b74734ef7842f99fd9747169628b9 100644 (file)
@@ -43,7 +43,7 @@ extern "C" {
         depth_size = main.parameters[fss_extended_read_parameter_depth].values.used;
       }
 
-      fss_extended_read_macro_depths_t_resize(status, (*depths), depth_size);
+      macro_fss_extended_read_depths_t_resize(status, (*depths), depth_size);
 
       if (F_status_is_error(status)) {
         f_color_print(main.error.to.stream, main.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]);
@@ -63,7 +63,7 @@ extern "C" {
       depths->array[i].index_name = 0;
       depths->array[i].value_at = 0;
 
-      f_macro_string_dynamic_t_clear(depths->array[i].value_name);
+      macro_f_string_dynamic_t_clear(depths->array[i].value_name);
 
       if (!main.parameters[fss_extended_read_parameter_depth].values.used) {
         position_depth = 0;
@@ -71,7 +71,7 @@ extern "C" {
       else {
         position_depth = main.parameters[fss_extended_read_parameter_depth].values.array[i];
 
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[position_depth]));
 
         status = fl_conversion_string_to_number_unsigned(arguments.argv[position_depth], range, &depths->array[i].depth);
 
@@ -94,7 +94,7 @@ extern "C" {
 
           depths->array[i].index_at = main.parameters[fss_extended_read_parameter_at].values.array[position_at];
 
-          const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
+          const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at]));
 
           status = fl_conversion_string_to_number_unsigned(arguments.argv[depths->array[i].index_at], range, &depths->array[i].value_at);
 
@@ -209,7 +209,7 @@ extern "C" {
     }
 
     {
-      f_string_range_t input = f_macro_string_range_t_initialize(main->buffer.used);
+      f_string_range_t input = macro_f_string_range_t_initialize(main->buffer.used);
 
       objects_delimits->used = 0;
       contents_delimits->used = 0;
@@ -221,9 +221,9 @@ extern "C" {
         fll_error_file_print(main->error, F_status_set_fine(status), "fll_fss_extended_read", F_true, filename, "process", fll_error_file_type_file);
       }
       else if (status == F_data_not_stop || status == F_data_not_eos) {
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         if (main->parameters[fss_extended_read_parameter_total].result == f_console_result_found) {
           fprintf(main->output.stream, "0%c", f_string_eol_s[0]);
@@ -234,9 +234,9 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        f_macro_fss_contents_t_delete_simple(main->contents);
-        f_macro_fss_objects_t_delete_simple(main->objects);
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_fss_contents_t_delete_simple(main->contents);
+        macro_f_fss_objects_t_delete_simple(main->objects);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
 
         return status;
       }
@@ -246,7 +246,7 @@ extern "C" {
 
     if (main->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) {
       const f_array_length_t index = main->parameters[fss_extended_read_parameter_select].values.array[main->parameters[fss_extended_read_parameter_select].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
       status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &select);
 
@@ -260,7 +260,7 @@ extern "C" {
 
     if (main->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) {
       const f_array_length_t index = main->parameters[fss_extended_read_parameter_line].values.array[main->parameters[fss_extended_read_parameter_line].values.used - 1];
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
       status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &line);
 
index 09d35f55ea425c9b5555c17bc6db41f9dd9b24bb..71e787db527b407d474cac2131dd839f0cd157ba 100644 (file)
@@ -43,14 +43,14 @@ extern "C" {
       f_string_dynamic_t_initialize, \
     }
 
-  #define fss_extended_read_macro_depth_t_clear(structure) \
+  #define macro_fss_extended_read_depth_t_clear(structure) \
     structure.depth = 0; \
     structure.index_at = 0; \
     structure.index_name = 0; \
     structure.value_at = 0; \
-    f_macro_string_dynamic_t_clear(structure.value_name)
+    macro_f_string_dynamic_t_clear(structure.value_name)
 
-  #define fss_extended_read_macro_depth_t_delete_simple(structure)  f_macro_string_dynamic_t_delete_simple(structure.value_name)
+  #define macro_fss_extended_read_depth_t_delete_simple(structure)  macro_f_string_dynamic_t_delete_simple(structure.value_name)
 #endif // _di_fss_extended_read_depth_t_
 
 /**
@@ -70,22 +70,22 @@ extern "C" {
 
   #define fss_extended_read_depths_t_initialize { 0, 0, 0 }
 
-  #define fss_extended_read_macro_depths_t_clear(depths) f_macro_memory_structure_clear(depths)
+  #define macro_fss_extended_read_depths_t_clear(depths) macro_f_memory_structure_clear(depths)
 
-  #define fss_extended_read_macro_depths_t_delete_simple(depths) \
+  #define macro_fss_extended_read_depths_t_delete_simple(depths) \
     depths.used = depths.size; \
     while (depths.used > 0) { \
       depths.used--; \
-      fss_extended_read_macro_depth_t_delete_simple(depths.array[depths.used]); \
+      macro_fss_extended_read_depth_t_delete_simple(depths.array[depths.used]); \
     } \
-    if (!depths.used) f_macro_memory_structure_delete_simple(depths, fss_extended_read_depth_t)
+    if (!depths.used) macro_f_memory_structure_delete_simple(depths, fss_extended_read_depth_t)
 
-  #define fss_extended_read_macro_depths_t_resize(status, depths, new_length) \
+  #define macro_fss_extended_read_depths_t_resize(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_extended_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_extended_read_depth_t_delete_simple(depths.array[i]); \
       } \
     } \
     if (status == F_none) status = f_memory_resize(depths.size, new_length, sizeof(fss_extended_read_depth_t), (void **) & depths.array); \
@@ -94,12 +94,12 @@ extern "C" {
       if (depths.used > depths.size) depths.used = new_length; \
     }
 
-  #define fss_extended_read_macro_depths_t_adjust(status, depths, new_length) \
+  #define macro_fss_extended_read_depths_t_adjust(status, depths, new_length) \
     status = F_none; \
     if (new_length < depths.size) { \
       f_array_length_t i = depths.size - new_length; \
       for (; i < depths.size; i++) { \
-        fss_extended_read_macro_depth_t_delete_simple(depths.array[i]); \
+        macro_fss_extended_read_depth_t_delete_simple(depths.array[i]); \
       } \
     } \
     if (status == F_none) status = f_memory_adjust(depths.size, new_length, sizeof(fss_extended_read_depth_t), (void **) & depths.array); \
index 454c733e4a39db3115d750b2dd9cee260329bd6c..6263be91bbce3b695191d0ae80f88b0b4794a77f 100644 (file)
@@ -88,11 +88,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_extended_write_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_extended_write_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_extended_write_parameter_no_color, fss_extended_write_parameter_light, fss_extended_write_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -116,7 +116,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_extended_write_parameter_verbosity_quiet, fss_extended_write_parameter_verbosity_normal, fss_extended_write_parameter_verbosity_verbose, fss_extended_write_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -320,8 +320,8 @@ extern "C" {
 
         // Even though this standard does not utilize this parameter, provide the validation for consistency.
         if (length) {
-          f_string_range_t range = f_macro_string_range_t_initialize(length);
-          const f_string_static_t prepend = f_macro_string_static_t_initialize(arguments.argv[index], length);
+          f_string_range_t range = macro_f_string_range_t_initialize(length);
+          const f_string_static_t prepend = macro_f_string_static_t_initialize(arguments.argv[index], length);
 
           for (; range.start < length; range.start++) {
 
@@ -538,7 +538,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      macro_f_string_dynamic_t_delete_simple(escaped);
 
       // object, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -562,9 +562,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamics_t_delete_simple(contents);
+    macro_f_string_dynamic_t_delete_simple(buffer);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamics_t_delete_simple(contents);
     fss_extended_write_main_delete(main);
     return status;
   }
@@ -574,14 +574,14 @@ extern "C" {
   f_status_t fss_extended_write_main_delete(fss_extended_write_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_extended_write_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 657ae39671770fc79ae9db60b5b2533694c1f3a2..df8dcaf8dc7c4056a83302ed0d91132d74a3b351 100644 (file)
@@ -145,7 +145,7 @@ extern "C" {
       fss_extended_write_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_static_t_initialize, \
       f_color_context_t_initialize, \
index 2ffb4764f15a1c6a8840948d9c8007e27a406fc0..9382e1c0913db71360b529c48fbbcf3097091ff2 100644 (file)
@@ -324,9 +324,9 @@ extern "C" {
       status = fss_extended_write_process(main, output, quote, &object, &contents, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamics_t_delete_simple(contents);
+    macro_f_string_dynamic_t_delete_simple(block);
+    macro_f_string_dynamic_t_delete_simple(object);
+    macro_f_string_dynamics_t_delete_simple(contents);
     return status;
   }
 #endif // _di_fss_extended_write_process_pipe_
index 763fce65741a768353659931d01af13b499fbed5..17f35b149a34c0e2bb92bd3a4fd8c0c0d0f4375b 100644 (file)
@@ -38,11 +38,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, fss_status_code_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, fss_status_code_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { fss_status_code_parameter_no_color, fss_status_code_parameter_light, fss_status_code_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -66,7 +66,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { fss_status_code_parameter_verbosity_quiet, fss_status_code_parameter_verbosity_normal, fss_status_code_parameter_verbosity_verbose, fss_status_code_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -205,14 +205,14 @@ extern "C" {
   f_status_t fss_status_code_main_delete(fss_status_code_main_t *main) {
 
     for (f_array_length_t i = 0; i < fss_status_code_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index d7c5c3a7df231f9215a2cd37921f22b52f4cb4ce..9a187af03376bf74b28ed93f45d7331eb8188e1a 100644 (file)
@@ -121,7 +121,7 @@ extern "C" {
       fss_status_code_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_color_context_t_initialize, \
     }
index e9fd1863ad1ddce7e0571007100205637b06eabe..3179684ea03708bce80b760d45bd3ac3f56556c0 100644 (file)
@@ -46,7 +46,7 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(value));
 
       f_number_unsigned_t number = 0;
 
@@ -129,7 +129,7 @@ extern "C" {
 
 #ifndef _di_fss_status_code_convert_number_
   f_status_t fss_status_code_convert_number(const fss_status_code_main_t main, const f_string_t value, f_number_unsigned_t *number) {
-    const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value));
+    const f_string_range_t range = macro_f_string_range_t_initialize(strlen(value));
 
     f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number);
 
index 37ac55b0576c297bbf7957890d53c4403d847198..077874c7ce9f9aa0aaefc7fb9e6dab758b2f162a 100644 (file)
@@ -93,11 +93,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, iki_read_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, iki_read_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { iki_read_parameter_no_color, iki_read_parameter_light, iki_read_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -127,7 +127,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { iki_read_parameter_verbosity_quiet, iki_read_parameter_verbosity_normal, iki_read_parameter_verbosity_verbose, iki_read_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -182,7 +182,7 @@ extern "C" {
       }
       else if (main->parameters[iki_read_parameter_at].result == f_console_result_additional) {
         const f_array_length_t index = main->parameters[iki_read_parameter_at].values.array[main->parameters[iki_read_parameter_at].values.used - 1];
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
         f_number_unsigned_t number = 0;
 
@@ -222,7 +222,7 @@ extern "C" {
       }
       else if (main->parameters[iki_read_parameter_line].result == f_console_result_additional) {
         const f_array_length_t index = main->parameters[iki_read_parameter_line].values.array[main->parameters[iki_read_parameter_line].values.used - 1];
-        const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index]));
+        const f_string_range_t range = macro_f_string_range_t_initialize(strlen(arguments.argv[index]));
 
         f_number_unsigned_t number = 0;
 
@@ -392,7 +392,7 @@ extern "C" {
         }
 
         // Clear buffers before continuing.
-        f_macro_string_dynamic_t_delete_simple(main->buffer);
+        macro_f_string_dynamic_t_delete_simple(main->buffer);
       }
 
       if (F_status_is_fine(status) && main->remaining.used > 0) {
@@ -401,7 +401,7 @@ extern "C" {
         f_file_t file = f_file_t_initialize;
 
         for (; i < main->remaining.used; i++) {
-          f_macro_file_t_reset(file);
+          macro_f_file_t_reset(file);
           total = 0;
 
           status = f_file_open(arguments.argv[main->remaining.array[i]], 0, &file);
@@ -439,7 +439,7 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           // Clear buffers before repeating the loop.
-          f_macro_string_dynamic_t_delete_simple(main->buffer);
+          macro_f_string_dynamic_t_delete_simple(main->buffer);
         } // for
       }
     }
@@ -468,15 +468,15 @@ extern "C" {
   f_status_t iki_read_main_delete(iki_read_main_t *main) {
 
     for (f_array_length_t i = 0; i < iki_read_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
-    f_macro_string_dynamic_t_delete_simple(main->buffer);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
+    macro_f_string_dynamic_t_delete_simple(main->buffer);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index 799d15160fbbff0e89d40ffbfaf74c250c6363c7..955ed3693d9818890844ad83f100266aa8e47b12 100644 (file)
@@ -154,10 +154,10 @@ extern "C" {
       f_string_static_t_initialize, \
     }
 
-  #define iki_read_macro_substitution_t_initialize(replace, with) \
+  #define macro_iki_read_substitution_t_initialize(replace, with) \
     { \
-      f_macro_string_static_t_initialize(replace), \
-      f_macro_string_static_t_initialize(with), \
+      macro_f_string_static_t_initialize(replace), \
+      macro_f_string_static_t_initialize(with), \
     }
 #endif // _di_iki_read_substitution_t_
 
@@ -171,13 +171,13 @@ extern "C" {
 
   #define iki_read_substitutions_t_initialize { 0, 0, 0 }
 
-  #define iki_read_macro_substitutions_t_clear(replacements) f_macro_memory_structure_clear(replacements)
+  #define macro_iki_read_substitutions_t_clear(replacements) macro_f_memory_structure_clear(replacements)
 
-  #define iki_read_macro_substitutions_t_delete_simple(replacements)  f_macro_memory_structure_delete_simple(replacements, iki_read_substitution_t)
-  #define iki_read_macro_substitutions_t_destroy_simple(replacements) f_macro_memory_structure_destroy_simple(replacements, iki_read_substitution_t)
+  #define macro_iki_read_substitutions_t_delete_simple(replacements)  macro_f_memory_structure_delete_simple(replacements, iki_read_substitution_t)
+  #define macro_iki_read_substitutions_t_destroy_simple(replacements) macro_f_memory_structure_destroy_simple(replacements, iki_read_substitution_t)
 
-  #define iki_read_macro_substitutions_t_resize(status, replacements, length) f_macro_memory_structure_resize(status, replacements, iki_read_substitution_t, length)
-  #define iki_read_macro_substitutions_t_adjust(status, replacements, length) f_macro_memory_structure_adjust(status, replacements, iki_read_substitution_t, length)
+  #define macro_iki_read_substitutions_t_resize(status, replacements, length) macro_f_memory_structure_resize(status, replacements, iki_read_substitution_t, length)
+  #define macro_iki_read_substitutions_t_adjust(status, replacements, length) macro_f_memory_structure_adjust(status, replacements, iki_read_substitution_t, length)
 #endif // _di_iki_read_substitutions_t_
 
 #ifndef _di_iki_read_main_t_
@@ -207,7 +207,7 @@ extern "C" {
       iki_read_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       0, \
       0, \
index b0c96d1bdb181515a8c9d24f961e74fadb822718..80ea4380092b1d68ed5783e2d6a6474bc131bc8a 100644 (file)
@@ -39,7 +39,7 @@ extern "C" {
     f_iki_content_t content = f_iki_content_t_initialize;
 
     if (main->parameters[iki_read_parameter_whole].result == f_console_result_found) {
-      f_string_range_t buffer_range = f_macro_string_range_t_initialize(main->buffer.used);
+      f_string_range_t buffer_range = macro_f_string_range_t_initialize(main->buffer.used);
 
       status = iki_read_process_at(arguments, file_name, main, &buffer_range);
 
@@ -66,7 +66,7 @@ extern "C" {
       status = iki_read_process_buffer_total(arguments, file_name, main, &variable, &vocabulary, &content);
     }
     else {
-      f_string_range_t buffer_range = f_macro_string_range_t_initialize(main->buffer.used);
+      f_string_range_t buffer_range = macro_f_string_range_t_initialize(main->buffer.used);
 
       status = iki_read_process_at(arguments, file_name, main, &buffer_range);
 
@@ -90,9 +90,9 @@ extern "C" {
       }
     }
 
-    f_macro_iki_variable_t_delete_simple(variable);
-    f_macro_iki_vocabulary_t_delete_simple(vocabulary);
-    f_macro_iki_content_t_delete_simple(content);
+    macro_f_iki_variable_t_delete_simple(variable);
+    macro_f_iki_vocabulary_t_delete_simple(vocabulary);
+    macro_f_iki_content_t_delete_simple(content);
 
     return status;
   }
@@ -124,7 +124,7 @@ extern "C" {
         fll_error_print(main->error, F_status_set_fine(status), "iki_read_substitutions_identify", F_true);
 
         for (f_array_length_t i = 0; i < variable->used; i++) {
-          iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
+          macro_iki_read_substitutions_t_delete_simple(substitutionss[i]);
         } // for
 
         return status;
@@ -150,10 +150,10 @@ extern "C" {
           fll_error_print(main->error, F_status_set_fine(status), "f_string_append_nulless", F_true);
 
           for (f_array_length_t i = 0; i < variable->used; i++) {
-            iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
+            macro_iki_read_substitutions_t_delete_simple(substitutionss[i]);
           } // for
 
-          f_macro_string_dynamic_t_delete_simple(name);
+          macro_f_string_dynamic_t_delete_simple(name);
           return status;
         }
 
@@ -178,7 +178,7 @@ extern "C" {
         } // for
       } // for
 
-      f_macro_string_dynamic_t_delete_simple(name);
+      macro_f_string_dynamic_t_delete_simple(name);
 
       if (unmatched) status = F_data_not;
       else status = F_none;
@@ -206,7 +206,7 @@ extern "C" {
     }
 
     for (f_array_length_t i = 0; i < variable->used; i++) {
-      iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
+      macro_iki_read_substitutions_t_delete_simple(substitutionss[i]);
     } // for
 
     return status;
@@ -243,7 +243,7 @@ extern "C" {
         fll_error_print(main->error, F_status_set_fine(status), "iki_read_substitutions_identify", F_true);
 
         for (f_array_length_t i = 0; i < variable->used; i++) {
-          iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
+          macro_iki_read_substitutions_t_delete_simple(substitutionss[i]);
         } // for
 
         return status;
@@ -279,7 +279,7 @@ extern "C" {
         } // for
 
         if (name_missed) {
-          f_macro_memory_structure_macro_increment(status, names, 1, f_iki_default_allocation_step, f_macro_string_dynamics_t_resize, F_array_too_large);
+          macro_f_memory_structure_increment(status, names, 1, f_iki_default_allocation_step, macro_f_string_dynamics_t_resize, F_array_too_large);
 
           if (F_status_is_error(status)) {
             fll_error_print(main->error, F_status_set_fine(status), "iki_read_process_buffer_ranges_whole", F_true);
@@ -299,10 +299,10 @@ extern "C" {
 
       if (F_status_is_error(status)) {
         for (i = 0; i < variable->used; i++) {
-          iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
+          macro_iki_read_substitutions_t_delete_simple(substitutionss[i]);
         } // for
 
-        f_macro_string_dynamics_t_delete_simple(names);
+        macro_f_string_dynamics_t_delete_simple(names);
         return status;
       }
     }
@@ -380,10 +380,10 @@ extern "C" {
     }
 
     for (f_array_length_t i = 0; i < variable->used; i++) {
-      iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
+      macro_iki_read_substitutions_t_delete_simple(substitutionss[i]);
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(names);
+    macro_f_string_dynamics_t_delete_simple(names);
     return F_none;
   }
 #endif // _di_iki_read_process_buffer_ranges_whole_
@@ -391,7 +391,7 @@ extern "C" {
 #ifndef _di_iki_read_process_buffer_total_
   f_status_t iki_read_process_buffer_total(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_main_t *main, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) {
     f_status_t status = F_none;
-    f_string_range_t range = f_macro_string_range_t_initialize(main->buffer.used);
+    f_string_range_t range = macro_f_string_range_t_initialize(main->buffer.used);
 
     status = iki_read_process_at(arguments, file_name, main, &range);
 
@@ -434,7 +434,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(main->error, F_status_set_fine(status), "f_string_append_nulless", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(name);
+          macro_f_string_dynamic_t_delete_simple(name);
           return status;
         }
 
@@ -447,7 +447,7 @@ extern "C" {
         } // for
       } // for
 
-      f_macro_string_dynamic_t_delete_simple(name);
+      macro_f_string_dynamic_t_delete_simple(name);
     }
     else {
       total = variable->used;
@@ -488,7 +488,7 @@ extern "C" {
         status = fl_string_compare(arguments.argv[index], main->buffer.string + vocabulary->array[j].start, length, (vocabulary->array[j].stop - vocabulary->array[j].start) + 1);
 
         if (status == F_equal_to) {
-          f_macro_memory_structure_macro_increment(status, substitutionss[j], 1, f_iki_default_allocation_step, iki_read_macro_substitutions_t_resize, F_array_too_large);
+          macro_f_memory_structure_increment(status, substitutionss[j], 1, f_iki_default_allocation_step, macro_iki_read_substitutions_t_resize, F_array_too_large);
           if (F_status_is_error(status)) return status;
 
           index = parameter->values.array[i + 1];
index 19d22560ab5269f28938fd083f0f85033e29ff01..db5e836d485b770cc77dd3c4c33fd2cdf7ae5667 100644 (file)
@@ -56,11 +56,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, iki_write_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, iki_write_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { iki_write_parameter_no_color, iki_write_parameter_light, iki_write_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -89,7 +89,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { iki_write_parameter_verbosity_quiet, iki_write_parameter_verbosity_normal, iki_write_parameter_verbosity_verbose, iki_write_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -358,9 +358,9 @@ extern "C" {
           status = F_status_set_error(F_parameter);
         }
 
-        f_macro_string_dynamic_t_delete_simple(buffer);
-        f_macro_string_dynamic_t_delete_simple(object);
-        f_macro_string_dynamic_t_delete_simple(content);
+        macro_f_string_dynamic_t_delete_simple(buffer);
+        macro_f_string_dynamic_t_delete_simple(object);
+        macro_f_string_dynamic_t_delete_simple(content);
       }
 
       if (F_status_is_error_not(status)) {
@@ -389,7 +389,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      macro_f_string_dynamic_t_delete_simple(escaped);
     }
 
     if (main->parameters[iki_write_parameter_file].result == f_console_result_additional) {
@@ -414,15 +414,15 @@ extern "C" {
   f_status_t iki_write_main_delete(iki_write_main_t *main) {
 
     for (f_array_length_t i = 0; i < iki_write_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
-    f_macro_string_dynamic_t_delete_simple(main->buffer);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
+    macro_f_string_dynamic_t_delete_simple(main->buffer);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index c2104dc28d29fee70a70d8382eaadffa7efbb73f..b43cabf4980b821f2ece6fb33fb1225df078394d 100644 (file)
@@ -136,7 +136,7 @@ extern "C" {
       iki_write_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_color_context_t_initialize, \
index eb201e28fb8412a833fcdb34aa1a7ccebd3b749d..510449be4869fe6d3fdc93e2df1f8d769abb9d3c 100644 (file)
@@ -47,7 +47,7 @@ extern "C" {
     if (F_status_is_error(status)) {
       fll_error_print(main.error, F_status_set_fine(status), "fll_iki_content_escape", F_true);
 
-      f_macro_string_dynamic_t_delete_simple((*escaped));
+      macro_f_string_dynamic_t_delete_simple((*escaped));
       return F_status_set_error(F_failure);
     }
 
index 3425d35a421ab0866ee7c6e43ca1cc846e5e1a3d..b0e6bddf18c5ffd92ce587cdaaa5ceb81cd6842b 100644 (file)
@@ -48,7 +48,7 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value));
+      const f_string_range_t range = macro_f_string_range_t_initialize(strlen(value));
 
       f_number_unsigned_t number = 0;
 
@@ -127,7 +127,7 @@ extern "C" {
 
 #ifndef _di_status_code_convert_number_
   f_status_t status_code_convert_number(const status_code_main_t main, const f_string_t value, f_number_unsigned_t *number) {
-    const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value));
+    const f_string_range_t range = macro_f_string_range_t_initialize(strlen(value));
 
     f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number);
 
index ce8bad0b617c71bade4f6461c9c94cb95be1ecdd..81e0f44207335ce778837a2a1a69cb18cc886a29 100644 (file)
@@ -38,11 +38,11 @@ extern "C" {
     f_status_t status = F_none;
 
     {
-      const f_console_parameters_t parameters = f_macro_console_parameters_t_initialize(main->parameters, status_code_total_parameters);
+      const f_console_parameters_t parameters = macro_f_console_parameters_t_initialize(main->parameters, status_code_total_parameters);
 
       {
         f_console_parameter_id_t ids[3] = { status_code_parameter_no_color, status_code_parameter_light, status_code_parameter_dark };
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 3);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 3);
 
         status = fll_program_parameter_process(arguments, parameters, choices, F_true, &main->remaining, &main->context);
 
@@ -66,7 +66,7 @@ extern "C" {
       {
         f_console_parameter_id_t ids[4] = { status_code_parameter_verbosity_quiet, status_code_parameter_verbosity_normal, status_code_parameter_verbosity_verbose, status_code_parameter_verbosity_debug };
         f_console_parameter_id_t choice = 0;
-        const f_console_parameter_ids_t choices = f_macro_console_parameter_ids_t_initialize(ids, 4);
+        const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
         status = f_console_parameter_prioritize_right(parameters, choices, &choice);
 
@@ -206,14 +206,14 @@ extern "C" {
   f_status_t status_code_main_delete(status_code_main_t *main) {
 
     for (f_array_length_t i = 0; i < status_code_total_parameters; i++) {
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
-      f_macro_array_lengths_t_delete_simple(main->parameters[i].values);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].locations_sub);
+      macro_f_array_lengths_t_delete_simple(main->parameters[i].values);
     } // for
 
-    f_macro_array_lengths_t_delete_simple(main->remaining);
+    macro_f_array_lengths_t_delete_simple(main->remaining);
 
-    f_macro_color_context_t_delete_simple(main->context);
+    macro_f_color_context_t_delete_simple(main->context);
 
     return F_none;
   }
index c9c1f50ff274aca54a707de7e56c764620fb27a7..d1d5d68c439a5841efac8dc0efb7b5aa3be4ce9e 100644 (file)
@@ -120,7 +120,7 @@ extern "C" {
       status_code_console_parameter_t_initialize, \
       f_array_lengths_t_initialize, \
       F_false, \
-      f_macro_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
+      macro_f_file_t_initialize2(f_type_output, f_type_descriptor_output, f_file_flag_write_only), \
       fll_error_print_t_initialize, \
       f_color_context_t_initialize, \
     }