From: Kevin Day Date: Mon, 21 Apr 2025 00:49:56 +0000 (-0500) Subject: Update: Use defines over enums in f_console, add stop behavior, and add alone behavior. X-Git-Tag: 0.7.1~14 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=769d2b1f7b0ab76dc3835b2c7ab294386c5810ee;p=fll Update: Use defines over enums in f_console, add stop behavior, and add alone behavior. The enumerations take up more space in the binary. Several of the enumerations are being used as flags instead of enumerations. I was not certain how I should do handle this in the past but now I am certain that using defines for flags is the way to go. The ability to trigger stopping of the processing of parameters and storing the remaining parameters in the remaining array for f_console is now added via a stop flag. The "alone" behavior is not complete and is a good to have for the desired stop behavior. Many classic programs us `--` to trigger the end of the parameters. The "stop" and "alone" behaviors allow for `--` to be used in the same way as classic programs. --- diff --git a/build/disable/level_0/f_console.h b/build/disable/level_0/f_console.h index a0d0d43..fb2139b 100644 --- a/build/disable/level_0/f_console.h +++ b/build/disable/level_0/f_console.h @@ -1,6 +1,6 @@ #define _di_f_console_arguments_t_ #define _di_f_console_environment_process_ -#define _di_f_console_flag_e_ +#define _di_f_console_flag_d_ #define _di_f_console_flag_t_ #define _di_f_console_identify_ #define _di_f_console_length_size_d_ @@ -16,7 +16,7 @@ #define _di_f_console_parameters_delete_ #define _di_f_console_parameters_destroy_ #define _di_f_console_parameters_t_ -#define _di_f_console_result_e_ +#define _di_f_console_result_d_ #define _di_f_console_result_t_ #define _di_f_console_standard_long_copyright_s_ #define _di_f_console_standard_long_dark_s_ diff --git a/build/stand_alone/byte_dump.config.h b/build/stand_alone/byte_dump.config.h index 5bbafe4..5b7dc07 100644 --- a/build/stand_alone/byte_dump.config.h +++ b/build/stand_alone/byte_dump.config.h @@ -136,7 +136,7 @@ #define _di_f_compare_utf_utf_string_dynamic_partial_trim_ //#define _di_f_console_arguments_t_ #define _di_f_console_environment_process_ -//#define _di_f_console_flag_e_ +//#define _di_f_console_flag_d_ //#define _di_f_console_flag_t_ #define _di_f_console_identify_ //#define _di_f_console_length_size_d_ @@ -152,7 +152,7 @@ //#define _di_f_console_parameters_delete_ #define _di_f_console_parameters_destroy_ //#define _di_f_console_parameters_t_ -//#define _di_f_console_result_e_ +//#define _di_f_console_result_d_ //#define _di_f_console_result_t_ //#define _di_f_console_standard_long_copyright_s_ //#define _di_f_console_standard_long_dark_s_ diff --git a/build/stand_alone/example.config.h b/build/stand_alone/example.config.h index 2dfbf76..5fecf8c 100644 --- a/build/stand_alone/example.config.h +++ b/build/stand_alone/example.config.h @@ -87,7 +87,7 @@ //#define _di_f_color_terminal_value_linux_s_ //#define _di_f_console_arguments_t_ #define _di_f_console_environment_process_ -//#define _di_f_console_flag_e_ +//#define _di_f_console_flag_d_ //#define _di_f_console_flag_t_ #define _di_f_console_identify_ //#define _di_f_console_length_size_d_ @@ -103,7 +103,7 @@ //#define _di_f_console_parameters_delete_ #define _di_f_console_parameters_destroy_ //#define _di_f_console_parameters_t_ -//#define _di_f_console_result_e_ +//#define _di_f_console_result_d_ //#define _di_f_console_result_t_ //#define _di_f_console_standard_long_copyright_s_ //#define _di_f_console_standard_long_dark_s_ diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h index e95d3dc..2151c1e 100644 --- a/build/stand_alone/fake.config.h +++ b/build/stand_alone/fake.config.h @@ -216,7 +216,7 @@ #define _di_f_compare_utf_utf_string_dynamic_partial_trim_ //#define _di_f_console_arguments_t_ #define _di_f_console_environment_process_ -//#define _di_f_console_flag_e_ +//#define _di_f_console_flag_d_ //#define _di_f_console_flag_t_ #define _di_f_console_identify_ //#define _di_f_console_length_size_d_ @@ -232,7 +232,7 @@ //#define _di_f_console_parameters_delete_ #define _di_f_console_parameters_destroy_ //#define _di_f_console_parameters_t_ -//#define _di_f_console_result_e_ +//#define _di_f_console_result_d_ //#define _di_f_console_result_t_ //#define _di_f_console_standard_long_copyright_s_ //#define _di_f_console_standard_long_dark_s_ @@ -1261,7 +1261,7 @@ #define _di_f_string_constant_t_ //#define _di_f_string_dynamic_append_ //#define _di_f_string_dynamic_append_assure_ -#define _di_f_string_dynamic_append_assure_nulless_ +//#define _di_f_string_dynamic_append_assure_nulless_ //#define _di_f_string_dynamic_append_nulless_ //#define _di_f_string_dynamic_mash_ #define _di_f_string_dynamic_mash_nulless_ diff --git a/build/stand_alone/firewall.config.h b/build/stand_alone/firewall.config.h index 3aecd6a..c065453 100644 --- a/build/stand_alone/firewall.config.h +++ b/build/stand_alone/firewall.config.h @@ -217,7 +217,7 @@ #define _di_f_compare_utf_utf_string_dynamic_partial_trim_ //#define _di_f_console_arguments_t_ #define _di_f_console_environment_process_ -//#define _di_f_console_flag_e_ +//#define _di_f_console_flag_d_ //#define _di_f_console_flag_t_ #define _di_f_console_identify_ //#define _di_f_console_length_size_d_ @@ -233,7 +233,7 @@ //#define _di_f_console_parameters_delete_ #define _di_f_console_parameters_destroy_ //#define _di_f_console_parameters_t_ -//#define _di_f_console_result_e_ +//#define _di_f_console_result_d_ //#define _di_f_console_result_t_ //#define _di_f_console_standard_long_copyright_s_ //#define _di_f_console_standard_long_dark_s_ diff --git a/build/stand_alone/utf8.config.h b/build/stand_alone/utf8.config.h index 4ab1e4f..c69308c 100644 --- a/build/stand_alone/utf8.config.h +++ b/build/stand_alone/utf8.config.h @@ -136,7 +136,7 @@ #define _di_f_compare_utf_utf_string_dynamic_partial_trim_ //#define _di_f_console_arguments_t_ #define _di_f_console_environment_process_ -//#define _di_f_console_flag_e_ +//#define _di_f_console_flag_d_ //#define _di_f_console_flag_t_ #define _di_f_console_identify_ //#define _di_f_console_length_size_d_ @@ -152,7 +152,7 @@ //#define _di_f_console_parameters_delete_ #define _di_f_console_parameters_destroy_ //#define _di_f_console_parameters_t_ -//#define _di_f_console_result_e_ +//#define _di_f_console_result_d_ //#define _di_f_console_result_t_ //#define _di_f_console_standard_long_copyright_s_ //#define _di_f_console_standard_long_dark_s_ diff --git a/level_0/f_console/c/console.c b/level_0/f_console/c/console.c index 3a4c57b..50aeb46 100644 --- a/level_0/f_console/c/console.c +++ b/level_0/f_console/c/console.c @@ -87,7 +87,7 @@ extern "C" { if (choices.array[i] > parameters.used) return F_status_set_error(F_parameter); - if (parameters.array[choices.array[i]].result & f_console_result_found_e) { + if (parameters.array[choices.array[i]].result & f_console_result_found_d) { if (!location || parameters.array[choices.array[i]].location < location) { location = parameters.array[choices.array[i]].location; location_sub = parameters.array[choices.array[i]].location_sub; @@ -126,7 +126,7 @@ extern "C" { if (choices.array[i] > parameters.used) return F_status_set_error(F_parameter); - if (parameters.array[choices.array[i]].result & f_console_result_found_e) { + if (parameters.array[choices.array[i]].result & f_console_result_found_d) { if (!location || parameters.array[choices.array[i]].location > location) { location = parameters.array[choices.array[i]].location; location_sub = parameters.array[choices.array[i]].location_sub; @@ -185,6 +185,7 @@ extern "C" { // Parameter 0 represents the program name so skip it. process.location = 1; + uint8_t stop = F_false; f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; @@ -209,8 +210,7 @@ extern "C" { process.at = process.needs.array[0]; parameters->on_match(arguments, (void * const) parameters, &process, data); - if (F_status_is_error(state->status)) break; - if (state->status == F_break) break; + if (F_status_is_error(state->status) || state->status == F_break) break; if (state->status == F_continue) continue; } else { @@ -220,7 +220,11 @@ extern "C" { if (state->status == F_process) { i = process.needs.array[0]; - parameters->array[i].result |= f_console_result_value_e; + if (parameters->array[i].flag & f_console_flag_stop_d) { + stop = F_true; + } + + parameters->array[i].result |= f_console_result_value_d; parameters->array[i].values.array[parameters->array[i].values.used++] = process.location++; } @@ -232,6 +236,8 @@ extern "C" { state->status = F_okay; + if (stop && !process.needs.used) break; + continue; } @@ -256,7 +262,62 @@ extern "C" { process.found = F_false; state->status = F_okay; - if (process.result & f_console_result_short_e) { + if (process.result & f_console_result_alone_d) { + process.location_sub = 0; + process.needs.used = 0; + + process.found = F_false; + + for (i = 0; i < parameters->used; ++i) { + + if (state->interrupt) { + state->interrupt((void * const) state, 0); + if (F_status_set_fine(state->status) == F_interrupt) break; + } + + if (parameters->array[i].match_short.used || parameters->array[i].match_long.used || parameters->array[i].match_simple.used) continue; + + if ((process.result & f_console_result_inverse_d) && (parameters->array[i].flag & f_console_flag_inverse_d) || (process.result & f_console_result_normal_d) && (parameters->array[i].flag & f_console_flag_normal_d)) { + if ((process.result & f_console_result_long_d) && (parameters->array[i].flag & f_console_flag_empty_long_d) || (process.result & f_console_result_short_d) && !(parameters->array[i].flag & f_console_flag_empty_long_d)) { + if (parameters->on_match) { + process.type = f_console_parameter_state_type_alone_e; + process.at = i; + + parameters->on_match(arguments, (void * const) parameters, &process, data); + if (F_status_is_error(state->status)) break; + + if (state->status == F_break || state->status == F_continue) { + if (process.depth) { + --process.depth; + + break; + } + + state->status = F_okay; + + if (state->status == F_break) break; + + continue; + } + } + else { + state->status = F_process; + } + + process.found = F_true; + + break; + } + } + } // for + + if (process.found && (parameters->array[i].flag & f_console_flag_stop_d)) { + ++process.location; + + break; + } + } + else if (process.result & f_console_result_short_d) { // Perform pre-process. for (process.location_sub = 1; process.location_sub < parameters->arguments.array[process.location].used; ++process.location_sub) { @@ -270,9 +331,9 @@ extern "C" { if (F_status_set_fine(state->status) == F_interrupt) break; } - if (parameters->array[i].flag & f_console_flag_disable_e) continue; - if ((process.result & f_console_result_normal_e) && !(parameters->array[i].flag & f_console_flag_normal_e)) continue; - if ((process.result & f_console_result_inverse_e) && !(parameters->array[i].flag & f_console_flag_inverse_e)) continue; + if (parameters->array[i].flag & f_console_flag_disable_d) continue; + if ((process.result & f_console_result_normal_d) && !(parameters->array[i].flag & f_console_flag_normal_d)) continue; + if ((process.result & f_console_result_inverse_d) && !(parameters->array[i].flag & f_console_flag_inverse_d)) continue; if (!parameters->array[i].match_short.used) continue; if (!parameters->array[i].match_short.string) continue; if (arguments.argv[process.location][process.location_sub] != *parameters->array[i].match_short.string) continue; @@ -310,9 +371,11 @@ extern "C" { utf_console = 0; state->status = f_utf_char_to_character(arguments.argv[process.location] + process.location_sub, parameters->arguments.array[process.location].used - process.location_sub, &utf_argument); - if (F_status_is_error(state->status)) break; - state->status = f_utf_char_to_character(parameters->array[i].match_short.string, parameters->array[i].match_short.used, &utf_console); + if (F_status_is_error_not(state->status)) { + state->status = f_utf_char_to_character(parameters->array[i].match_short.string, parameters->array[i].match_short.used, &utf_console); + } + if (F_status_is_error(state->status)) break; if (utf_argument != utf_console) continue; @@ -390,9 +453,9 @@ extern "C" { if (F_status_set_fine(state->status) == F_interrupt) break; } - if (parameters->array[i].flag & f_console_flag_disable_e) continue; - if ((process.result & f_console_result_normal_e) && !(parameters->array[i].flag & f_console_flag_normal_e)) continue; - if ((process.result & f_console_result_inverse_e) && !(parameters->array[i].flag & f_console_flag_inverse_e)) continue; + if (parameters->array[i].flag & f_console_flag_disable_d) continue; + if ((process.result & f_console_result_normal_d) && !(parameters->array[i].flag & f_console_flag_normal_d)) continue; + if ((process.result & f_console_result_inverse_d) && !(parameters->array[i].flag & f_console_flag_inverse_d)) continue; if (!parameters->array[i].match_short.used) continue; if (!parameters->array[i].match_short.string) continue; if (arguments.argv[process.location][process.location_sub] != *parameters->array[i].match_short.string) continue; @@ -433,7 +496,7 @@ extern "C" { parameters->array[i].locations.array[parameters->array[i].locations.used++] = process.location; } - parameters->array[i].result |= process.result | f_console_result_found_e; + parameters->array[i].result |= process.result | f_console_result_found_d; parameters->array[i].location = process.location; parameters->array[i].location_sub = process.location_sub; parameters->array[i].locations_sub.array[parameters->array[i].locations_sub.used++] = process.location_sub; @@ -481,10 +544,16 @@ extern "C" { continue; } + + if ((parameters->array[i].flag & f_console_flag_stop_d) && !process.needs.used) { + ++process.location; + + break; + } } } else { - if (process.result & f_console_result_long_e) { + if (process.result & f_console_result_long_d) { process.location_sub = 2; process.needs.used = 0; @@ -495,9 +564,9 @@ extern "C" { if (F_status_set_fine(state->status) == F_interrupt) break; } - if (parameters->array[i].flag & f_console_flag_disable_e) continue; - if ((process.result & f_console_result_normal_e) && !(parameters->array[i].flag & f_console_flag_normal_e)) continue; - if ((process.result & f_console_result_inverse_e) && !(parameters->array[i].flag & f_console_flag_inverse_e)) continue; + if (parameters->array[i].flag & f_console_flag_disable_d) continue; + if ((process.result & f_console_result_normal_d) && !(parameters->array[i].flag & f_console_flag_normal_d)) continue; + if ((process.result & f_console_result_inverse_d) && !(parameters->array[i].flag & f_console_flag_inverse_d)) continue; if (!parameters->array[i].match_long.used) continue; if (!parameters->array[i].match_long.string) continue; if (strncmp(&arguments.argv[process.location][process.location_sub], parameters->array[i].match_long.string, parameters->array[i].match_long.used + 1)) continue; @@ -540,8 +609,8 @@ extern "C" { if (F_status_set_fine(state->status) == F_interrupt) break; } - if (parameters->array[i].flag & f_console_flag_disable_e) continue; - if (!(parameters->array[i].flag & f_console_flag_simple_e)) continue; + if (parameters->array[i].flag & f_console_flag_disable_d) continue; + if (!(parameters->array[i].flag & f_console_flag_simple_d)) continue; if (!parameters->array[i].match_simple.used && !parameters->array[i].match_simple.string) continue; if (strncmp(arguments.argv[process.location], parameters->array[i].match_simple.string, parameters->array[i].match_simple.used + 1)) continue; @@ -594,7 +663,7 @@ extern "C" { state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) ¶meters->array[i].locations_sub.array, ¶meters->array[i].locations_sub.used, ¶meters->array[i].locations_sub.size); if (F_status_is_error(state->status)) break; - parameters->array[i].result |= process.result | f_console_result_found_e; + parameters->array[i].result |= process.result | f_console_result_found_d; parameters->array[i].location = process.location; parameters->array[i].location_sub = 0; parameters->array[i].locations.array[parameters->array[i].locations.used++] = process.location; @@ -609,6 +678,12 @@ extern "C" { } state->status = F_okay; + + if (process.found && (parameters->array[i].flag & f_console_flag_stop_d) && !process.needs.used) { + ++process.location; + + break; + } } if (F_status_is_error(state->status)) break; @@ -694,8 +769,8 @@ extern "C" { memset(parameters->array[i].locations_sub.array, 0, parameters->array[i].locations_sub.used); memset(parameters->array[i].values.array, 0, parameters->array[i].values.used); - parameters->array[i].flag &= ~f_console_flag_disable_e; - parameters->array[i].result = f_console_result_none_e; + parameters->array[i].flag &= ~f_console_flag_disable_d; + parameters->array[i].result = f_console_result_none_d; parameters->array[i].location = 0; parameters->array[i].location_sub = 0; parameters->array[i].locations.used = 0; diff --git a/level_0/f_console/c/console/common.h b/level_0/f_console/c/console/common.h index 5b3d8c1..5dd1db1 100644 --- a/level_0/f_console/c/console/common.h +++ b/level_0/f_console/c/console/common.h @@ -34,63 +34,67 @@ extern "C" { * The disabled flag prevents it from being processed at all and will be treated as other data. * If the flag should still be processed, then do not set disabled flag and instead just ignore it when found. * - * f_console_flag_*e: - * - none: No flag data is set. - * - normal: Parameters using minus sign, such as '--help' ("inverse" and "additional" bits are 0. - * - inverse: Parameters using plus sign, such as '++version'. - * - simple: Parameters using neither minus nor plus sign, such as 'build'. - * - complex: Parameters that provide a set of additional parameters, similar to 'git clone http:s//..' (Not yet implemented). - * - disable: This parameter is disabled (does not get processed). - * - * f_console_flag_mask_*: + * f_console_flag_*_d: + * - none: No flag data is set. + * + * Type Flags: + * - complex: Parameters that provide a set of additional parameters, similar to 'git clone http:s//..' (Not yet implemented). + * - empty_long: Parameters of "inverse" or "normal" are explicitly "long" rather than "short" when the short, long, and simple strings are empty (string used length is set to 0). + * - inverse: Parameters using plus sign, such as '++version'. + * - normal: Parameters using minus sign, such as '--help' ("inverse" and "additional" bits are 0). + * - simple: Parameters using neither minus nor plus sign, such as 'build'. + * + * State Flags: + * - disable: This parameter is disabled (does not get processed). + * - stop: This parameter designates that no further parameters are to be processed after this (all remaining parameters are added to the remaining array). + * + * f_console_flag_mask_*_d: * - type: A mask for selecting the bits representing all possible type value flags. * - state: A mask for selecting the bits representing all possible state flags. */ -#ifndef _di_f_console_flag_e_ - enum { - f_console_flag_none_e = 0x0, +#ifndef _di_f_console_flag_d_ + #define f_console_flag_none_d 0x0 - // Type flags. - f_console_flag_normal_e = 0x1, - f_console_flag_inverse_e = 0x2, - f_console_flag_simple_e = 0x4, - f_console_flag_complex_e = 0x8, + // Type flags. + #define f_console_flag_complex_d 0x1 + #define f_console_flag_empty_long_d 0x2 + #define f_console_flag_inverse_d 0x4 + #define f_console_flag_normal_d 0x8 + #define f_console_flag_simple_d 0x10 - // State flags. - f_console_flag_disable_e = 0x10, - }; // enum + // State flags. + #define f_console_flag_disable_d 0x20 + #define f_console_flag_stop_d 0x40 - #define f_console_flag_mask_type_d 0xf - #define f_console_flag_mask_state_d 0x10 -#endif // _di_f_console_flag_e_ + #define f_console_flag_mask_type_d 0x1f + #define f_console_flag_mask_state_d 0x60 +#endif // _di_f_console_flag_d_ /** * Result values that represent the type of command found. * * Here "alone" refers to '-', or '++', in that they only have the symbols (whereas '-x', or '++x' would not be alone). * - * f_console_result_*e: + * f_console_result_*_d: * - none: No flags are set. + * - alone: The prefix character is by itself (such as only "-" rather than "-h"). * - found: The parameter has been found. - * - normal: The normal prefix character ("-" by default) has been found. * - inverse: The inverse prefix character ("+" by default) has been found. - * - short: The found prefix is short (only a single character, such as "-" or "+"). * - long: The found prefix is long (two characters, such as "--" or "++"). - * - alone: The prefix character is by itself (such as only "-" rather than "-h"). + * - normal: The normal prefix character ("-" by default) has been found. + * - short: The found prefix is short (only a single character, such as "-" or "+"). * - value: One or more values associated with the parameter have been found. */ -#ifndef _di_f_console_result_e_ - enum { - f_console_result_none_e = 0x0, - f_console_result_found_e = 0x1, - f_console_result_normal_e = 0x2, - f_console_result_inverse_e = 0x4, - f_console_result_short_e = 0x8, - f_console_result_long_e = 0x10, - f_console_result_alone_e = 0x20, - f_console_result_value_e = 0x40, - }; // enum -#endif // _di_f_console_result_e_ +#ifndef _di_f_console_result_d_ + #define f_console_result_none_d 0x0 + #define f_console_result_alone_d 0x1 + #define f_console_result_found_d 0x2 + #define f_console_result_inverse_d 0x4 + #define f_console_result_long_d 0x8 + #define f_console_result_normal_d 0x10 + #define f_console_result_short_d 0x20 + #define f_console_result_value_d 0x40 +#endif // _di_f_console_result_d_ /** * Provide the standard verbosity codes. @@ -124,11 +128,12 @@ extern "C" { * * f_console_parameter_state_type_*_e: * - none: No type set. + * - alone: Perform alone parameter match processing. * - identify: Perform identify processing. * - long: Perform long parameter match processing. - * - miss: Perform no parameter match processi + * - miss: Perform no parameter match processing. * - short: Perform short parameter match processing. - * - short_preprocess: Perform short parameter match processing. + * - short_preprocess: Perform short parameter match pre-processing. * - simple: Perform simple parameter match processing. * - need: Perform value is needed processing. * - wrap_up: Perform wrap up processing. @@ -136,6 +141,7 @@ extern "C" { #ifndef _di_f_console_parameter_state_type_e_ enum { f_console_parameter_state_type_none_e = 0, + f_console_parameter_state_type_alone_e, f_console_parameter_state_type_identify_e, f_console_parameter_state_type_long_e, f_console_parameter_state_type_miss_e, @@ -188,7 +194,7 @@ extern "C" { #ifndef _di_f_console_flag_t_ typedef uint8_t f_console_flag_t; - #define f_console_flag_t_initialize f_console_flag_none_e + #define f_console_flag_t_initialize f_console_flag_none_d #endif // _di_f_console_flag_t_ /** @@ -197,7 +203,7 @@ extern "C" { #ifndef _di_f_console_result_t_ typedef uint8_t f_console_result_t; - #define f_console_result_t_initialize f_console_result_none_e + #define f_console_result_t_initialize f_console_result_none_d #endif // _di_f_console_result_t_ /** @@ -373,6 +379,7 @@ extern "C" { * The macro_f_console_parameter_t_initialize_4() reduced arguments has short. * The macro_f_console_parameter_t_initialize_5() reduced arguments has long. * The macro_f_console_parameter_t_initialize_6() reduced arguments has simple. + * The macro_f_console_parameter_t_initialize_7() reduced arguments has none of short, long, and simple (all are set to an empty string). */ #ifndef _di_f_console_parameter_t_ typedef struct { @@ -429,7 +436,7 @@ extern "C" { match_simple, \ values_total, \ flag, \ - f_console_result_none_e, \ + f_console_result_none_d, \ 0, \ 0, \ f_number_unsigneds_t_initialize, \ @@ -443,7 +450,7 @@ extern "C" { f_string_empty_s, \ values_total, \ flag, \ - f_console_result_none_e, \ + f_console_result_none_d, \ 0, \ 0, \ f_number_unsigneds_t_initialize, \ @@ -457,7 +464,7 @@ extern "C" { f_string_empty_s, \ values_total, \ flag, \ - f_console_result_none_e, \ + f_console_result_none_d, \ 0, \ 0, \ f_number_unsigneds_t_initialize, \ @@ -471,7 +478,7 @@ extern "C" { f_string_empty_s, \ values_total, \ flag, \ - f_console_result_none_e, \ + f_console_result_none_d, \ 0, \ 0, \ f_number_unsigneds_t_initialize, \ @@ -485,7 +492,21 @@ extern "C" { match_simple, \ values_total, \ flag, \ - f_console_result_none_e, \ + f_console_result_none_d, \ + 0, \ + 0, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + } + + #define macro_f_console_parameter_t_initialize_7(values_total, flag) { \ + f_string_empty_s, \ + f_string_empty_s, \ + f_string_empty_s, \ + values_total, \ + flag, \ + f_console_result_none_d, \ 0, \ 0, \ f_number_unsigneds_t_initialize, \ diff --git a/level_0/f_console/c/private-console.c b/level_0/f_console/c/private-console.c index c5d32b0..a88f5cb 100644 --- a/level_0/f_console/c/private-console.c +++ b/level_0/f_console/c/private-console.c @@ -8,7 +8,7 @@ extern "C" { #if !defined(_di_f_console_identify_) || !defined(_di_f_console_parameter_process_) f_status_t private_f_console_identify(const f_string_t input, f_console_result_t * const result) { - *result = f_console_result_none_e; + *result = f_console_result_none_d; if (!input) return F_data_not; @@ -19,41 +19,41 @@ extern "C" { if (!length) return F_data_not; if (input[0] == f_console_symbol_short_normal_s.string[0]) { - *result = f_console_result_found_e | f_console_result_normal_e; + *result = f_console_result_found_d | f_console_result_normal_d; if (length > 1) { if (input[1] == f_console_symbol_short_normal_s.string[0]) { - *result |= f_console_result_long_e; + *result |= f_console_result_long_d; if (length < 3) { - *result |= f_console_result_alone_e; + *result |= f_console_result_alone_d; } } else { - *result |= f_console_result_short_e; + *result |= f_console_result_short_d; } } else { - *result |= f_console_result_short_e | f_console_result_alone_e; + *result |= f_console_result_short_d | f_console_result_alone_d; } } else if (input[0] == f_console_symbol_short_inverse_s.string[0]) { - *result = f_console_result_found_e | f_console_result_inverse_e; + *result = f_console_result_found_d | f_console_result_inverse_d; if (length > 1) { if (input[1] == f_console_symbol_short_inverse_s.string[0]) { - *result |= f_console_result_long_e; + *result |= f_console_result_long_d; if (length < 3) { - *result |= f_console_result_alone_e; + *result |= f_console_result_alone_d; } } else { - *result |= f_console_result_short_e; + *result |= f_console_result_short_d; } } else { - *result |= f_console_result_short_e | f_console_result_alone_e; + *result |= f_console_result_short_d | f_console_result_alone_d; } } } diff --git a/level_0/f_console/tests/unit/c/test-console-identify.c b/level_0/f_console/tests/unit/c/test-console-identify.c index 152c949..fb374f0 100644 --- a/level_0/f_console/tests/unit/c/test-console-identify.c +++ b/level_0/f_console/tests/unit/c/test-console-identify.c @@ -25,70 +25,70 @@ void test__f_console_identify__works(void **state) { const f_status_t status = f_console_identify(input, &result); assert_int_equal(status, F_data_not); - assert_int_equal(result, f_console_result_none_e); + assert_int_equal(result, f_console_result_none_d); } { const f_status_t status = f_console_identify("input", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_none_e); + assert_int_equal(result, f_console_result_none_d); } { const f_status_t status = f_console_identify("-", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_normal_e | f_console_result_short_e | f_console_result_alone_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_normal_d | f_console_result_short_d | f_console_result_alone_d); } { const f_status_t status = f_console_identify("+", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_inverse_e | f_console_result_short_e | f_console_result_alone_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_inverse_d | f_console_result_short_d | f_console_result_alone_d); } { const f_status_t status = f_console_identify("-i", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_normal_e | f_console_result_short_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_normal_d | f_console_result_short_d); } { const f_status_t status = f_console_identify("+i", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_inverse_e | f_console_result_short_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_inverse_d | f_console_result_short_d); } { const f_status_t status = f_console_identify("--input", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_normal_e | f_console_result_long_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_normal_d | f_console_result_long_d); } { const f_status_t status = f_console_identify("++input", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_inverse_e | f_console_result_long_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_inverse_d | f_console_result_long_d); } { const f_status_t status = f_console_identify("--", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_normal_e | f_console_result_long_e | f_console_result_alone_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_normal_d | f_console_result_long_d | f_console_result_alone_d); } { const f_status_t status = f_console_identify("++", &result); assert_int_equal(status, F_okay); - assert_int_equal(result, f_console_result_found_e | f_console_result_inverse_e | f_console_result_long_e | f_console_result_alone_e); + assert_int_equal(result, f_console_result_found_d | f_console_result_inverse_d | f_console_result_long_d | f_console_result_alone_d); } } diff --git a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c index 4898035..e75f6ed 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c +++ b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c @@ -89,10 +89,10 @@ void test__f_console_parameter_prioritize_left__works(void **state) { f_console_parameter_t parameter_1 = f_console_parameter_t_initialize; f_console_parameter_t parameter_2 = f_console_parameter_t_initialize; - parameter_1.result = f_console_result_found_e; + parameter_1.result = f_console_result_found_d; parameter_1.location = 5; parameter_1.location_sub = 6; - parameter_2.result = f_console_result_found_e; + parameter_2.result = f_console_result_found_d; parameter_2.location = 3; parameter_2.location_sub = 4; diff --git a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c index 67982e6..14c94dd 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c +++ b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c @@ -89,10 +89,10 @@ void test__f_console_parameter_prioritize_right__works(void **state) { f_console_parameter_t parameter_1 = f_console_parameter_t_initialize; f_console_parameter_t parameter_2 = f_console_parameter_t_initialize; - parameter_1.result = f_console_result_found_e; + parameter_1.result = f_console_result_found_d; parameter_1.location = 5; parameter_1.location_sub = 6; - parameter_2.result = f_console_result_found_e; + parameter_2.result = f_console_result_found_d; parameter_2.location = 3; parameter_2.location_sub = 4; diff --git a/level_0/f_console/tests/unit/c/test-console-parameter_process.c b/level_0/f_console/tests/unit/c/test-console-parameter_process.c index 7aa0ed2..b11faf6 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameter_process.c +++ b/level_0/f_console/tests/unit/c/test-console-parameter_process.c @@ -28,15 +28,15 @@ void test__f_console_parameter_process__incomplete_arguments(void **state) { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(2, argv, 0); f_console_parameter_t parameter[] = { - macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_e), + macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_d), }; f_console_parameters_t parameters = macro_f_console_parameters_t_initialize_1(parameter, 9, 0); @@ -47,14 +47,14 @@ void test__f_console_parameter_process__incomplete_arguments(void **state) { assert_int_equal(state.status, F_complete_not); - assert_int_equal(parameter[0].result, f_console_result_none_e); + assert_int_equal(parameter[0].result, f_console_result_none_d); assert_int_equal(parameter[0].locations.used, 0); assert_int_equal(parameter[0].locations_sub.used, 0); assert_int_equal(parameter[0].values.used, 0); assert_int_equal(parameter[0].location, 0); assert_int_equal(parameter[0].location_sub, 0); - assert_int_equal(parameter[1].result & f_console_result_found_e, f_console_result_found_e); + assert_int_equal(parameter[1].result & f_console_result_found_d, f_console_result_found_d); assert_int_equal(parameter[1].locations.used, 1); assert_int_equal(parameter[1].locations_sub.used, 1); assert_int_equal(parameter[1].values.used, 0); @@ -63,49 +63,49 @@ void test__f_console_parameter_process__incomplete_arguments(void **state) { assert_int_equal(parameter[1].locations.array[0], 1); assert_int_equal(parameter[1].locations_sub.array[0], 0); - assert_int_equal(parameter[2].result, f_console_result_none_e); + assert_int_equal(parameter[2].result, f_console_result_none_d); assert_int_equal(parameter[2].locations.used, 0); assert_int_equal(parameter[2].locations_sub.used, 0); assert_int_equal(parameter[2].values.used, 0); assert_int_equal(parameter[2].location, 0); assert_int_equal(parameter[2].location_sub, 0); - assert_int_equal(parameter[3].result, f_console_result_none_e); + assert_int_equal(parameter[3].result, f_console_result_none_d); assert_int_equal(parameter[3].locations.used, 0); assert_int_equal(parameter[3].locations_sub.used, 0); assert_int_equal(parameter[3].values.used, 0); assert_int_equal(parameter[3].location, 0); assert_int_equal(parameter[3].location_sub, 0); - assert_int_equal(parameter[4].result, f_console_result_none_e); + assert_int_equal(parameter[4].result, f_console_result_none_d); assert_int_equal(parameter[4].locations.used, 0); assert_int_equal(parameter[4].locations_sub.used, 0); assert_int_equal(parameter[4].values.used, 0); assert_int_equal(parameter[4].location, 0); assert_int_equal(parameter[4].location_sub, 0); - assert_int_equal(parameter[5].result, f_console_result_none_e); + assert_int_equal(parameter[5].result, f_console_result_none_d); assert_int_equal(parameter[5].locations.used, 0); assert_int_equal(parameter[5].locations_sub.used, 0); assert_int_equal(parameter[5].values.used, 0); assert_int_equal(parameter[5].location, 0); assert_int_equal(parameter[5].location_sub, 0); - assert_int_equal(parameter[6].result, f_console_result_none_e); + assert_int_equal(parameter[6].result, f_console_result_none_d); assert_int_equal(parameter[6].locations.used, 0); assert_int_equal(parameter[6].locations_sub.used, 0); assert_int_equal(parameter[6].values.used, 0); assert_int_equal(parameter[6].location, 0); assert_int_equal(parameter[6].location_sub, 0); - assert_int_equal(parameter[7].result, f_console_result_none_e); + assert_int_equal(parameter[7].result, f_console_result_none_d); assert_int_equal(parameter[7].locations.used, 0); assert_int_equal(parameter[7].locations_sub.used, 0); assert_int_equal(parameter[7].values.used, 0); assert_int_equal(parameter[7].location, 0); assert_int_equal(parameter[7].location_sub, 0); - assert_int_equal(parameter[8].result, f_console_result_none_e); + assert_int_equal(parameter[8].result, f_console_result_none_d); assert_int_equal(parameter[8].locations.used, 0); assert_int_equal(parameter[8].locations_sub.used, 0); assert_int_equal(parameter[8].values.used, 0); @@ -143,15 +143,15 @@ void test__f_console_parameter_process__no_arguments_no_program(void **state) { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(argc, argv, 0); f_console_parameter_t parameter[] = { - macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_e), + macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_d), }; f_console_parameters_t parameters = macro_f_console_parameters_t_initialize_1(parameter, 9, 0); @@ -162,55 +162,55 @@ void test__f_console_parameter_process__no_arguments_no_program(void **state) { assert_int_equal(state.status, F_data_not); - assert_int_equal(parameter[0].result, f_console_result_none_e); + assert_int_equal(parameter[0].result, f_console_result_none_d); assert_int_equal(parameter[0].locations.used, 0); assert_int_equal(parameter[0].values.used, 0); assert_int_equal(parameter[0].location, 0); assert_int_equal(parameter[0].location_sub, 0); - assert_int_equal(parameter[1].result, f_console_result_none_e); + assert_int_equal(parameter[1].result, f_console_result_none_d); assert_int_equal(parameter[1].locations.used, 0); assert_int_equal(parameter[1].values.used, 0); assert_int_equal(parameter[1].location, 0); assert_int_equal(parameter[1].location_sub, 0); - assert_int_equal(parameter[2].result, f_console_result_none_e); + assert_int_equal(parameter[2].result, f_console_result_none_d); assert_int_equal(parameter[2].locations.used, 0); assert_int_equal(parameter[2].values.used, 0); assert_int_equal(parameter[2].location, 0); assert_int_equal(parameter[2].location_sub, 0); - assert_int_equal(parameter[3].result, f_console_result_none_e); + assert_int_equal(parameter[3].result, f_console_result_none_d); assert_int_equal(parameter[3].locations.used, 0); assert_int_equal(parameter[3].values.used, 0); assert_int_equal(parameter[3].location, 0); assert_int_equal(parameter[3].location_sub, 0); - assert_int_equal(parameter[4].result, f_console_result_none_e); + assert_int_equal(parameter[4].result, f_console_result_none_d); assert_int_equal(parameter[4].locations.used, 0); assert_int_equal(parameter[4].values.used, 0); assert_int_equal(parameter[4].location, 0); assert_int_equal(parameter[4].location_sub, 0); - assert_int_equal(parameter[5].result, f_console_result_none_e); + assert_int_equal(parameter[5].result, f_console_result_none_d); assert_int_equal(parameter[5].locations.used, 0); assert_int_equal(parameter[5].values.used, 0); assert_int_equal(parameter[5].location, 0); assert_int_equal(parameter[5].location_sub, 0); - assert_int_equal(parameter[6].result, f_console_result_none_e); + assert_int_equal(parameter[6].result, f_console_result_none_d); assert_int_equal(parameter[6].locations.used, 0); assert_int_equal(parameter[6].values.used, 0); assert_int_equal(parameter[6].location, 0); assert_int_equal(parameter[6].location_sub, 0); - assert_int_equal(parameter[7].result, f_console_result_none_e); + assert_int_equal(parameter[7].result, f_console_result_none_d); assert_int_equal(parameter[7].locations.used, 0); assert_int_equal(parameter[7].values.used, 0); assert_int_equal(parameter[7].location, 0); assert_int_equal(parameter[7].location_sub, 0); - assert_int_equal(parameter[8].result, f_console_result_none_e); + assert_int_equal(parameter[8].result, f_console_result_none_d); assert_int_equal(parameter[8].locations.used, 0); assert_int_equal(parameter[8].values.used, 0); assert_int_equal(parameter[8].location, 0); @@ -249,15 +249,15 @@ void test__f_console_parameter_process__no_arguments(void **state) { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(argc, argv, 0); f_console_parameter_t parameter[] = { - macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_e), + macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_d), }; f_console_parameters_t parameters = macro_f_console_parameters_t_initialize_1(parameter, 9, 0); @@ -268,63 +268,63 @@ void test__f_console_parameter_process__no_arguments(void **state) { assert_int_equal(state.status, argc ? F_okay : F_data_not); - assert_int_equal(parameter[0].result, f_console_result_none_e); + assert_int_equal(parameter[0].result, f_console_result_none_d); assert_int_equal(parameter[0].locations.used, 0); assert_int_equal(parameter[0].locations_sub.used, 0); assert_int_equal(parameter[0].values.used, 0); assert_int_equal(parameter[0].location, 0); assert_int_equal(parameter[0].location_sub, 0); - assert_int_equal(parameter[1].result, f_console_result_none_e); + assert_int_equal(parameter[1].result, f_console_result_none_d); assert_int_equal(parameter[1].locations.used, 0); assert_int_equal(parameter[1].locations_sub.used, 0); assert_int_equal(parameter[1].values.used, 0); assert_int_equal(parameter[1].location, 0); assert_int_equal(parameter[1].location_sub, 0); - assert_int_equal(parameter[2].result, f_console_result_none_e); + assert_int_equal(parameter[2].result, f_console_result_none_d); assert_int_equal(parameter[2].locations.used, 0); assert_int_equal(parameter[2].locations_sub.used, 0); assert_int_equal(parameter[2].values.used, 0); assert_int_equal(parameter[2].location, 0); assert_int_equal(parameter[2].location_sub, 0); - assert_int_equal(parameter[3].result, f_console_result_none_e); + assert_int_equal(parameter[3].result, f_console_result_none_d); assert_int_equal(parameter[3].locations.used, 0); assert_int_equal(parameter[3].locations_sub.used, 0); assert_int_equal(parameter[3].values.used, 0); assert_int_equal(parameter[3].location, 0); assert_int_equal(parameter[3].location_sub, 0); - assert_int_equal(parameter[4].result, f_console_result_none_e); + assert_int_equal(parameter[4].result, f_console_result_none_d); assert_int_equal(parameter[4].locations.used, 0); assert_int_equal(parameter[4].locations_sub.used, 0); assert_int_equal(parameter[4].values.used, 0); assert_int_equal(parameter[4].location, 0); assert_int_equal(parameter[4].location_sub, 0); - assert_int_equal(parameter[5].result, f_console_result_none_e); + assert_int_equal(parameter[5].result, f_console_result_none_d); assert_int_equal(parameter[5].locations.used, 0); assert_int_equal(parameter[5].locations_sub.used, 0); assert_int_equal(parameter[5].values.used, 0); assert_int_equal(parameter[5].location, 0); assert_int_equal(parameter[5].location_sub, 0); - assert_int_equal(parameter[6].result, f_console_result_none_e); + assert_int_equal(parameter[6].result, f_console_result_none_d); assert_int_equal(parameter[6].locations.used, 0); assert_int_equal(parameter[6].locations_sub.used, 0); assert_int_equal(parameter[6].values.used, 0); assert_int_equal(parameter[6].location, 0); assert_int_equal(parameter[6].location_sub, 0); - assert_int_equal(parameter[7].result, f_console_result_none_e); + assert_int_equal(parameter[7].result, f_console_result_none_d); assert_int_equal(parameter[7].locations.used, 0); assert_int_equal(parameter[7].locations_sub.used, 0); assert_int_equal(parameter[7].values.used, 0); assert_int_equal(parameter[7].location, 0); assert_int_equal(parameter[7].location_sub, 0); - assert_int_equal(parameter[8].result, f_console_result_none_e); + assert_int_equal(parameter[8].result, f_console_result_none_d); assert_int_equal(parameter[8].locations.used, 0); assert_int_equal(parameter[8].locations_sub.used, 0); assert_int_equal(parameter[8].values.used, 0); @@ -360,15 +360,15 @@ void test__f_console_parameter_process__null_arguments(void **state) { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(argc, argv, 0); f_console_parameter_t parameter[] = { - macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_e), + macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_d), }; f_console_parameters_t parameters = macro_f_console_parameters_t_initialize_1(parameter, 9, 0); @@ -379,63 +379,63 @@ void test__f_console_parameter_process__null_arguments(void **state) { assert_int_equal(state.status, F_data_not); - assert_int_equal(parameter[0].result, f_console_result_none_e); + assert_int_equal(parameter[0].result, f_console_result_none_d); assert_int_equal(parameter[0].locations.used, 0); assert_int_equal(parameter[0].locations_sub.used, 0); assert_int_equal(parameter[0].values.used, 0); assert_int_equal(parameter[0].location, 0); assert_int_equal(parameter[0].location_sub, 0); - assert_int_equal(parameter[1].result, f_console_result_none_e); + assert_int_equal(parameter[1].result, f_console_result_none_d); assert_int_equal(parameter[1].locations.used, 0); assert_int_equal(parameter[1].locations_sub.used, 0); assert_int_equal(parameter[1].values.used, 0); assert_int_equal(parameter[1].location, 0); assert_int_equal(parameter[1].location_sub, 0); - assert_int_equal(parameter[2].result, f_console_result_none_e); + assert_int_equal(parameter[2].result, f_console_result_none_d); assert_int_equal(parameter[2].locations.used, 0); assert_int_equal(parameter[2].locations_sub.used, 0); assert_int_equal(parameter[2].values.used, 0); assert_int_equal(parameter[2].location, 0); assert_int_equal(parameter[2].location_sub, 0); - assert_int_equal(parameter[3].result, f_console_result_none_e); + assert_int_equal(parameter[3].result, f_console_result_none_d); assert_int_equal(parameter[3].locations.used, 0); assert_int_equal(parameter[3].locations_sub.used, 0); assert_int_equal(parameter[3].values.used, 0); assert_int_equal(parameter[3].location, 0); assert_int_equal(parameter[3].location_sub, 0); - assert_int_equal(parameter[4].result, f_console_result_none_e); + assert_int_equal(parameter[4].result, f_console_result_none_d); assert_int_equal(parameter[4].locations.used, 0); assert_int_equal(parameter[4].locations_sub.used, 0); assert_int_equal(parameter[4].values.used, 0); assert_int_equal(parameter[4].location, 0); assert_int_equal(parameter[4].location_sub, 0); - assert_int_equal(parameter[5].result, f_console_result_none_e); + assert_int_equal(parameter[5].result, f_console_result_none_d); assert_int_equal(parameter[5].locations.used, 0); assert_int_equal(parameter[5].locations_sub.used, 0); assert_int_equal(parameter[5].values.used, 0); assert_int_equal(parameter[5].location, 0); assert_int_equal(parameter[5].location_sub, 0); - assert_int_equal(parameter[6].result, f_console_result_none_e); + assert_int_equal(parameter[6].result, f_console_result_none_d); assert_int_equal(parameter[6].locations.used, 0); assert_int_equal(parameter[6].locations_sub.used, 0); assert_int_equal(parameter[6].values.used, 0); assert_int_equal(parameter[6].location, 0); assert_int_equal(parameter[6].location_sub, 0); - assert_int_equal(parameter[7].result, f_console_result_none_e); + assert_int_equal(parameter[7].result, f_console_result_none_d); assert_int_equal(parameter[7].locations.used, 0); assert_int_equal(parameter[7].locations_sub.used, 0); assert_int_equal(parameter[7].values.used, 0); assert_int_equal(parameter[7].location, 0); assert_int_equal(parameter[7].location_sub, 0); - assert_int_equal(parameter[8].result, f_console_result_none_e); + assert_int_equal(parameter[8].result, f_console_result_none_d); assert_int_equal(parameter[8].locations.used, 0); assert_int_equal(parameter[8].locations_sub.used, 0); assert_int_equal(parameter[8].values.used, 0); @@ -492,15 +492,15 @@ void test__f_console_parameter_process__only_remaining(void **state) { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(total, argv, 0); f_console_parameter_t parameter[] = { - macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_e), + macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_d), }; f_console_parameters_t parameters = macro_f_console_parameters_t_initialize_1(parameter, 9, 0); @@ -511,55 +511,55 @@ void test__f_console_parameter_process__only_remaining(void **state) { assert_int_equal(state.status, F_okay); - assert_int_equal(parameter[0].result, f_console_result_none_e); + assert_int_equal(parameter[0].result, f_console_result_none_d); assert_int_equal(parameter[0].locations.used, 0); assert_int_equal(parameter[0].values.used, 0); assert_int_equal(parameter[0].location, 0); assert_int_equal(parameter[0].location_sub, 0); - assert_int_equal(parameter[1].result, f_console_result_none_e); + assert_int_equal(parameter[1].result, f_console_result_none_d); assert_int_equal(parameter[1].locations.used, 0); assert_int_equal(parameter[1].values.used, 0); assert_int_equal(parameter[1].location, 0); assert_int_equal(parameter[1].location_sub, 0); - assert_int_equal(parameter[2].result, f_console_result_none_e); + assert_int_equal(parameter[2].result, f_console_result_none_d); assert_int_equal(parameter[2].locations.used, 0); assert_int_equal(parameter[2].values.used, 0); assert_int_equal(parameter[2].location, 0); assert_int_equal(parameter[2].location_sub, 0); - assert_int_equal(parameter[3].result, f_console_result_none_e); + assert_int_equal(parameter[3].result, f_console_result_none_d); assert_int_equal(parameter[3].locations.used, 0); assert_int_equal(parameter[3].values.used, 0); assert_int_equal(parameter[3].location, 0); assert_int_equal(parameter[3].location_sub, 0); - assert_int_equal(parameter[4].result, f_console_result_none_e); + assert_int_equal(parameter[4].result, f_console_result_none_d); assert_int_equal(parameter[4].locations.used, 0); assert_int_equal(parameter[4].values.used, 0); assert_int_equal(parameter[4].location, 0); assert_int_equal(parameter[4].location_sub, 0); - assert_int_equal(parameter[5].result, f_console_result_none_e); + assert_int_equal(parameter[5].result, f_console_result_none_d); assert_int_equal(parameter[5].locations.used, 0); assert_int_equal(parameter[5].values.used, 0); assert_int_equal(parameter[5].location, 0); assert_int_equal(parameter[5].location_sub, 0); - assert_int_equal(parameter[6].result, f_console_result_none_e); + assert_int_equal(parameter[6].result, f_console_result_none_d); assert_int_equal(parameter[6].locations.used, 0); assert_int_equal(parameter[6].values.used, 0); assert_int_equal(parameter[6].location, 0); assert_int_equal(parameter[6].location_sub, 0); - assert_int_equal(parameter[7].result, f_console_result_none_e); + assert_int_equal(parameter[7].result, f_console_result_none_d); assert_int_equal(parameter[7].locations.used, 0); assert_int_equal(parameter[7].values.used, 0); assert_int_equal(parameter[7].location, 0); assert_int_equal(parameter[7].location_sub, 0); - assert_int_equal(parameter[8].result, f_console_result_none_e); + assert_int_equal(parameter[8].result, f_console_result_none_d); assert_int_equal(parameter[8].locations.used, 0); assert_int_equal(parameter[8].values.used, 0); assert_int_equal(parameter[8].location, 0); @@ -670,18 +670,18 @@ void test__f_console_parameter_process__works(void **state) { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(24, argv, 0); f_console_parameter_t parameter[] = { - macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_m, s_mixed_1, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_M, s_mixed_2, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_x, s_mixed_3, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_e), + macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_m, s_mixed_1, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_M, s_mixed_2, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_x, s_mixed_3, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_d), }; f_console_parameters_t parameters = macro_f_console_parameters_t_initialize_1(parameter, 12, 0); @@ -692,7 +692,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(state.status, F_okay); - assert_int_equal(parameter[0].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[0].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[0].locations.used, 1); assert_int_equal(parameter[0].locations_sub.used, 1); assert_int_equal(parameter[0].values.used, 1); @@ -702,7 +702,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[0].locations_sub.array[0], 1); assert_string_equal(argv[parameter[0].values.array[0]], argv[2]); - assert_int_equal(parameter[1].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[1].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[1].locations.used, 1); assert_int_equal(parameter[1].locations_sub.used, 1); assert_int_equal(parameter[1].values.used, 1); @@ -712,7 +712,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[1].locations_sub.array[0], 1); assert_string_equal(argv[parameter[1].values.array[0]], argv[4]); - assert_int_equal(parameter[2].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[2].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[2].locations.used, 1); assert_int_equal(parameter[2].locations_sub.used, 1); assert_int_equal(parameter[2].values.used, 1); @@ -722,7 +722,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[2].locations_sub.array[0], 2); assert_string_equal(argv[parameter[2].values.array[0]], argv[5]); - assert_int_equal(parameter[3].result & f_console_result_found_e, f_console_result_found_e); + assert_int_equal(parameter[3].result & f_console_result_found_d, f_console_result_found_d); assert_int_equal(parameter[3].locations.used, 1); assert_int_equal(parameter[3].locations_sub.used, 1); assert_int_equal(parameter[3].values.used, 0); @@ -731,7 +731,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[3].locations.array[0], 7); assert_int_equal(parameter[3].locations_sub.array[0], 1); - assert_int_equal(parameter[4].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[4].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[4].locations.used, 1); assert_int_equal(parameter[4].locations_sub.used, 1); assert_int_equal(parameter[4].values.used, 1); @@ -741,7 +741,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[4].locations_sub.array[0], 0); assert_string_equal(argv[parameter[4].values.array[0]], argv[9]); - assert_int_equal(parameter[5].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[5].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[5].locations.used, 1); assert_int_equal(parameter[5].locations_sub.used, 1); assert_int_equal(parameter[5].values.used, 1); @@ -751,7 +751,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[5].locations_sub.array[0], 0); assert_string_equal(argv[parameter[5].values.array[0]], argv[11]); - assert_int_equal(parameter[6].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[6].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[6].locations.used, 1); assert_int_equal(parameter[6].locations_sub.used, 1); assert_int_equal(parameter[6].values.used, 2); @@ -762,14 +762,14 @@ void test__f_console_parameter_process__works(void **state) { assert_string_equal(argv[parameter[6].values.array[0]], argv[13]); assert_string_equal(argv[parameter[6].values.array[1]], argv[14]); - assert_int_equal(parameter[7].result, f_console_result_none_e); + assert_int_equal(parameter[7].result, f_console_result_none_d); assert_int_equal(parameter[7].locations.used, 0); assert_int_equal(parameter[7].locations_sub.used, 0); assert_int_equal(parameter[7].values.used, 0); assert_int_equal(parameter[7].location, 0); assert_int_equal(parameter[7].location_sub, 0); - assert_int_equal(parameter[8].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[8].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[8].locations.used, 1); assert_int_equal(parameter[8].locations_sub.used, 1); assert_int_equal(parameter[8].values.used, 1); @@ -779,7 +779,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[8].locations_sub.array[0], 1); assert_string_equal(argv[parameter[8].values.array[0]], argv[21]); - assert_int_equal(parameter[9].result & f_console_result_value_e, f_console_result_value_e); + assert_int_equal(parameter[9].result & f_console_result_value_d, f_console_result_value_d); assert_int_equal(parameter[9].locations.used, 1); assert_int_equal(parameter[9].locations_sub.used, 1); assert_int_equal(parameter[9].values.used, 2); @@ -790,7 +790,7 @@ void test__f_console_parameter_process__works(void **state) { assert_string_equal(argv[parameter[9].values.array[0]], argv[22]); assert_string_equal(argv[parameter[9].values.array[1]], argv[23]); - assert_int_equal(parameter[10].result & f_console_result_found_e, f_console_result_found_e); + assert_int_equal(parameter[10].result & f_console_result_found_d, f_console_result_found_d); assert_int_equal(parameter[10].locations.used, 1); assert_int_equal(parameter[10].locations_sub.used, 2); assert_int_equal(parameter[10].values.used, 0); @@ -800,7 +800,7 @@ void test__f_console_parameter_process__works(void **state) { assert_int_equal(parameter[10].locations_sub.array[0], 3); assert_int_equal(parameter[10].locations_sub.array[1], 4); - assert_int_equal(parameter[11].result & f_console_result_found_e, f_console_result_found_e); + assert_int_equal(parameter[11].result & f_console_result_found_d, f_console_result_found_d); assert_int_equal(parameter[11].locations.used, 2); assert_int_equal(parameter[11].locations_sub.used, 2); assert_int_equal(parameter[11].values.used, 0); diff --git a/level_0/f_console/tests/unit/c/test-console-parameter_reset.c b/level_0/f_console/tests/unit/c/test-console-parameter_reset.c index a98284c..6bb5db6 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameter_reset.c +++ b/level_0/f_console/tests/unit/c/test-console-parameter_reset.c @@ -66,18 +66,18 @@ void test__f_console_parameter_reset__works(void **state) { const uint8_t parameters_total = 12; f_console_parameter_t parameter[] = { - macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_m, s_mixed_1, f_string_empty_s, 1, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_M, s_mixed_2, f_string_empty_s, 2, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(s_x, s_mixed_3, f_string_empty_s, 0, f_console_flag_normal_e), - macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_e), + macro_f_console_parameter_t_initialize_2(s_f, f_string_empty_s, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_s, s_second, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_t, s_third, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_F, f_string_empty_s, f_string_empty_s, 0, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_fifth, f_string_empty_s, 1, f_console_flag_inverse_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_sixth, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, s_seventh, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_N, s_not_found, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_m, s_mixed_1, f_string_empty_s, 1, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_M, s_mixed_2, f_string_empty_s, 2, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(s_x, s_mixed_3, f_string_empty_s, 0, f_console_flag_normal_d), + macro_f_console_parameter_t_initialize_2(f_string_empty_s, f_string_empty_s, s_other, 0, f_console_flag_simple_d), }; f_console_parameters_t parameters = macro_f_console_parameters_t_initialize_1(parameter, parameters_total, 0); @@ -90,7 +90,7 @@ void test__f_console_parameter_reset__works(void **state) { assert_int_equal(state.status, F_okay); } - parameter[0].flag |= f_console_flag_disable_e; + parameter[0].flag |= f_console_flag_disable_d; { const f_status_t status = f_console_parameter_reset(¶meters); @@ -104,8 +104,8 @@ void test__f_console_parameter_reset__works(void **state) { for (uint8_t i = 0; i < parameters_total; ++i) { - assert_int_equal(parameter[i].flag & f_console_flag_disable_e, 0); - assert_int_equal(parameter[i].result, f_console_result_none_e); + assert_int_equal(parameter[i].flag & f_console_flag_disable_d, 0); + assert_int_equal(parameter[i].result, f_console_result_none_d); assert_int_equal(parameter[i].locations.used, 0); assert_int_equal(parameter[i].locations_sub.used, 0); assert_int_equal(parameter[i].values.used, 0); diff --git a/level_1/fl_directory/c/directory.c b/level_1/fl_directory/c/directory.c index 0da3bde..167beea 100644 --- a/level_1/fl_directory/c/directory.c +++ b/level_1/fl_directory/c/directory.c @@ -77,22 +77,24 @@ extern "C" { #endif // _di_level_1_parameter_checking_ if (path.used) { - recurse->state.status = f_string_dynamic_append_nulless(path, &recurse->path); + recurse->state.status = f_string_dynamic_append_assure_nulless(path, &recurse->path); if (F_status_is_error_not(recurse->state.status)) { // Do not allow trailing path separators in the string's length calculation, except root directory '/'. - for (; recurse->path.used; --recurse->path.used) { - if (recurse->path.string[recurse->path.used - 1] != f_path_separator_s.string[0]) break; - } // for + if (recurse->path.used > 1) { + for (; recurse->path.used; --recurse->path.used) { + if (recurse->path.string[recurse->path.used - 1] != f_path_separator_s.string[0]) break; + } // for - recurse->path.string[recurse->path.used] = 0; + if (recurse->path.used < path.used) { + recurse->path.string[recurse->path.used] = 0; + } + } - recurse->state.status = f_directory_exists(path); + recurse->state.status = f_directory_exists(recurse->path); - if (recurse->state.status == F_false) { - recurse->state.status = F_status_set_error(F_directory_not); - } + recurse->state.status = recurse->state.status == F_false ? F_status_set_error(F_directory_not) : F_okay; } } else { diff --git a/level_1/fl_directory/c/directory.h b/level_1/fl_directory/c/directory.h index 6cbbea7..32128a0 100644 --- a/level_1/fl_directory/c/directory.h +++ b/level_1/fl_directory/c/directory.h @@ -156,7 +156,7 @@ extern "C" { * Errors (with error bit) from: f_memory_array_increase_by(). * Errors (with error bit) from: f_memory_array_resize(). * Errors (with error bit) from: f_string_dynamic_append_assure(). - * Errors (with error bit) from: f_string_dynamic_append_nulless(). + * Errors (with error bit) from: f_string_dynamic_append_assure_nulless(). * * Errors (with error bit) from: recurse.action(). * Errors (with error bit) from: recurse.handle(). diff --git a/level_2/fll_program/c/program/common.h b/level_2/fll_program/c/program/common.h index 5c0ce20..629e18d 100644 --- a/level_2/fll_program/c/program/common.h +++ b/level_2/fll_program/c/program/common.h @@ -186,17 +186,17 @@ extern "C" { } #define macro_fll_program_console_parameter_standard_initialize \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_copyright_s, f_console_standard_long_copyright_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_error_s, f_console_standard_long_error_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, f_console_flag_inverse_e), \ - macro_f_console_parameter_t_initialize_3(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, f_console_flag_inverse_e) + macro_f_console_parameter_t_initialize_3(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_copyright_s, f_console_standard_long_copyright_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_error_s, f_console_standard_long_error_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, f_console_flag_inverse_d), \ + macro_f_console_parameter_t_initialize_3(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, f_console_flag_inverse_d) #endif // _di_fll_program_data_t_ /** diff --git a/level_3/byte_dump/c/main/common.c b/level_3/byte_dump/c/main/common.c index 5e3c373..9600d27 100644 --- a/level_3/byte_dump/c/main/common.c +++ b/level_3/byte_dump/c/main/common.c @@ -125,19 +125,19 @@ extern "C" { } } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= byte_dump_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= byte_dump_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= byte_dump_main_flag_copyright_d; return; @@ -153,7 +153,7 @@ extern "C" { main->setting.flag &= ~byte_dump_main_flag_pipe_d; } - if (parameters->array[byte_dump_parameter_width_e].result & f_console_result_value_e) { + if (parameters->array[byte_dump_parameter_width_e].result & f_console_result_value_d) { index = parameters->array[byte_dump_parameter_width_e].values.array[parameters->array[byte_dump_parameter_width_e].values.used - 1]; main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, parameters->arguments.array[index], &number); @@ -171,7 +171,7 @@ extern "C" { main->setting.width = (uint8_t) number; } - else if (parameters->array[byte_dump_parameter_width_e].result & f_console_result_found_e) { + else if (parameters->array[byte_dump_parameter_width_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, byte_dump_long_width_s); @@ -202,7 +202,7 @@ extern "C" { for (uint8_t i = 0; i < 2; ++i) { - if (parameters->array[indexs[i]].result & f_console_result_value_e) { + if (parameters->array[indexs[i]].result & f_console_result_value_d) { index = parameters->array[indexs[i]].values.array[parameters->array[indexs[i]].values.used - 1]; main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, parameters->arguments.array[index], &number); @@ -221,7 +221,7 @@ extern "C" { *values[i] = number; main->setting.flag |= flags[i]; } - else if (parameters->array[indexs[i]].result & f_console_result_found_e) { + else if (parameters->array[indexs[i]].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, names[i]); @@ -247,28 +247,28 @@ extern "C" { } } - if (parameters->array[byte_dump_parameter_text_e].result & f_console_result_found_e) { + if (parameters->array[byte_dump_parameter_text_e].result & f_console_result_found_d) { main->setting.flag |= byte_dump_main_flag_text_d; } else { main->setting.flag &= ~byte_dump_main_flag_text_d; } - if (parameters->array[byte_dump_parameter_unicode_e].result & f_console_result_found_e) { + if (parameters->array[byte_dump_parameter_unicode_e].result & f_console_result_found_d) { main->setting.flag |= byte_dump_main_flag_unicode_d; } else { main->setting.flag &= ~byte_dump_main_flag_unicode_d; } - if (parameters->array[byte_dump_parameter_placeholder_e].result & f_console_result_found_e) { + if (parameters->array[byte_dump_parameter_placeholder_e].result & f_console_result_found_d) { main->setting.flag |= byte_dump_main_flag_placeholder_d; } else { main->setting.flag &= ~byte_dump_main_flag_placeholder_d; } - if (parameters->array[byte_dump_parameter_classic_e].result & f_console_result_found_e) { + if (parameters->array[byte_dump_parameter_classic_e].result & f_console_result_found_d) { main->setting.flag |= byte_dump_main_flag_classic_d; } else { diff --git a/level_3/byte_dump/c/main/common/enumeration.h b/level_3/byte_dump/c/main/common/enumeration.h index f5f3185..44cbc55 100644 --- a/level_3/byte_dump/c/main/common/enumeration.h +++ b/level_3/byte_dump/c/main/common/enumeration.h @@ -107,25 +107,25 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_binary_s, byte_dump_long_binary_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_decimal_s, byte_dump_long_decimal_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_duodecimal_s, byte_dump_long_duodecimal_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_hexidecimal_s, byte_dump_long_hexidecimal_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_octal_s, byte_dump_long_octal_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_unicode_s, byte_dump_long_unicode_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_binary_s, byte_dump_long_binary_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_decimal_s, byte_dump_long_decimal_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_duodecimal_s, byte_dump_long_duodecimal_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_hexidecimal_s, byte_dump_long_hexidecimal_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_octal_s, byte_dump_long_octal_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_unicode_s, byte_dump_long_unicode_s, 0, f_console_flag_normal_d), \ \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_first_s, byte_dump_long_first_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_last_s, byte_dump_long_last_s, 1, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_first_s, byte_dump_long_first_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_last_s, byte_dump_long_last_s, 1, f_console_flag_normal_d), \ \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_narrow_s, byte_dump_long_narrow_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_placeholder_s, byte_dump_long_placeholder_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_text_s, byte_dump_long_text_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_wide_s, byte_dump_long_wide_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(byte_dump_short_width_s, byte_dump_long_width_s, 1, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_narrow_s, byte_dump_long_narrow_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_placeholder_s, byte_dump_long_placeholder_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_text_s, byte_dump_long_text_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_wide_s, byte_dump_long_wide_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(byte_dump_short_width_s, byte_dump_long_width_s, 1, f_console_flag_normal_d), \ \ - macro_f_console_parameter_t_initialize_5(byte_dump_long_normal_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5(byte_dump_long_simple_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5(byte_dump_long_classic_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_5(byte_dump_long_normal_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5(byte_dump_long_simple_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5(byte_dump_long_classic_s, 0, f_console_flag_normal_d), \ } #define byte_dump_parameter_total_d (f_console_parameter_state_type_total_d + 16) diff --git a/level_3/example/c/main/common.c b/level_3/example/c/main/common.c index 9044499..4614e7e 100644 --- a/level_3/example/c/main/common.c +++ b/level_3/example/c/main/common.c @@ -39,19 +39,19 @@ extern "C" { return; } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= example_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= example_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= example_main_flag_copyright_d; return; diff --git a/level_3/example/c/main/common/enumeration.h b/level_3/example/c/main/common/enumeration.h index 8882b5f..07285ab 100644 --- a/level_3/example/c/main/common/enumeration.h +++ b/level_3/example/c/main/common/enumeration.h @@ -28,7 +28,7 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(example_short_example_s, example_long_example_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(example_short_example_s, example_long_example_s, 0, f_console_flag_normal_d), \ } #define example_parameter_total_d (f_console_parameter_state_type_total_d + 1) diff --git a/level_3/fake/c/main/build/load.c b/level_3/fake/c/main/build/load.c index d85ca33..bac5c52 100644 --- a/level_3/fake/c/main/build/load.c +++ b/level_3/fake/c/main/build/load.c @@ -1668,7 +1668,7 @@ extern "C" { fake_main_t * const main = data->main; - if (main->program.parameters.array[fake_parameter_sources_e].result & f_console_result_value_e && setting->path_sources.used) { + if (main->program.parameters.array[fake_parameter_sources_e].result & f_console_result_value_d && setting->path_sources.used) { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &setting->path_sources); if (F_status_is_error(main->setting.state.status)) { @@ -1678,8 +1678,8 @@ extern "C" { } } - if (main->program.parameters.array[fake_parameter_shared_disable_e].result & f_console_result_found_e) { - if (main->program.parameters.array[fake_parameter_shared_enable_e].result & f_console_result_found_e) { + if (main->program.parameters.array[fake_parameter_shared_disable_e].result & f_console_result_found_d) { + if (main->program.parameters.array[fake_parameter_shared_enable_e].result & f_console_result_found_d) { if (main->program.parameters.array[fake_parameter_shared_enable_e].location > main->program.parameters.array[fake_parameter_shared_disable_e].location) { setting->build_shared = F_true; setting->search_shared = F_true; @@ -1696,13 +1696,13 @@ extern "C" { setting->search_shared = F_false; } } - else if (main->program.parameters.array[fake_parameter_shared_enable_e].result & f_console_result_found_e) { + else if (main->program.parameters.array[fake_parameter_shared_enable_e].result & f_console_result_found_d) { setting->build_shared = F_true; setting->search_shared = F_true; } - if (main->program.parameters.array[fake_parameter_static_disable_e].result & f_console_result_found_e) { - if (main->program.parameters.array[fake_parameter_static_enable_e].result & f_console_result_found_e) { + if (main->program.parameters.array[fake_parameter_static_disable_e].result & f_console_result_found_d) { + if (main->program.parameters.array[fake_parameter_static_enable_e].result & f_console_result_found_d) { if (main->program.parameters.array[fake_parameter_static_enable_e].location > main->program.parameters.array[fake_parameter_static_disable_e].location) { setting->build_static = F_true; setting->search_static = F_true; @@ -1719,7 +1719,7 @@ extern "C" { setting->search_static = F_false; } } - else if (main->program.parameters.array[fake_parameter_static_enable_e].result & f_console_result_found_e) { + else if (main->program.parameters.array[fake_parameter_static_enable_e].result & f_console_result_found_d) { setting->build_static = F_true; setting->search_static = F_true; } diff --git a/level_3/fake/c/main/common.c b/level_3/fake/c/main/common.c index b322baf..f1dc850 100644 --- a/level_3/fake/c/main/common.c +++ b/level_3/fake/c/main/common.c @@ -49,19 +49,19 @@ extern "C" { return; } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= fake_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= fake_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= fake_main_flag_copyright_d; return; @@ -101,8 +101,8 @@ extern "C" { for (; i < 3; ++i) { - if (parameters->array[enables[i]].result & f_console_result_found_e) { - if (parameters->array[disables[i]].result & f_console_result_found_e) { + if (parameters->array[enables[i]].result & f_console_result_found_d) { + if (parameters->array[disables[i]].result & f_console_result_found_d) { if (parameters->array[enables[i]].location < parameters->array[disables[i]].location) { main->setting.flag &= ~flags[i]; } @@ -114,7 +114,7 @@ extern "C" { main->setting.flag |= flags[i]; } } - else if (parameters->array[disables[i]].result & f_console_result_found_e) { + else if (parameters->array[disables[i]].result & f_console_result_found_d) { main->setting.flag &= ~flags[i]; } } // for @@ -199,7 +199,7 @@ extern "C" { for (i = 0; i < 10; ++i) { - if ((parameters->array[params[i]].result & f_console_result_found_e) && !(parameters->array[params[i]].result & f_console_result_value_e)) { + if ((parameters->array[params[i]].result & f_console_result_found_d) && !(parameters->array[params[i]].result & f_console_result_value_d)) { main->setting.state.status = F_status_set_error(F_parameter); if (main->program.error.verbosity > f_console_verbosity_quiet_e) { @@ -209,7 +209,7 @@ extern "C" { return; } - if (parameters->array[params[i]].result & f_console_result_value_e) { + if (parameters->array[params[i]].result & f_console_result_value_d) { index = parameters->array[params[i]].values.array[parameters->array[params[i]].values.used - 1]; if (parameters->arguments.array[index].used) { @@ -318,7 +318,7 @@ extern "C" { for (i = 0; i < 2; ++i) { - if ((parameters->array[params[i]].result & f_console_result_found_e) && !(parameters->array[params[i]].result & f_console_result_value_e)) { + if ((parameters->array[params[i]].result & f_console_result_found_d) && !(parameters->array[params[i]].result & f_console_result_value_d)) { main->setting.state.status = F_status_set_error(F_parameter); if (main->program.error.verbosity > f_console_verbosity_quiet_e) { @@ -328,7 +328,7 @@ extern "C" { return; } - if (parameters->array[params[i]].result & f_console_result_value_e) { + if (parameters->array[params[i]].result & f_console_result_value_d) { main->setting.state.status = fll_program_parameter_additional_rip(parameters->arguments.array, parameters->array[params[i]].values, variable[i]); if (F_status_is_error(main->setting.state.status)) { diff --git a/level_3/fake/c/main/common/enumeration.h b/level_3/fake/c/main/common/enumeration.h index 4cddfb1..22c44b4 100644 --- a/level_3/fake/c/main/common/enumeration.h +++ b/level_3/fake/c/main/common/enumeration.h @@ -51,30 +51,30 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(fake_short_build_s, fake_long_build_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_data_s, fake_long_data_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_define_s, fake_long_define_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_documents_s, fake_long_documents_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_fakefile_s, fake_long_fakefile_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_licenses_s, fake_long_licenses_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_mode_s, fake_long_mode_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_process_s, fake_long_process_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_settings_s, fake_long_settings_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_sources_s, fake_long_sources_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_under_s, fake_long_under_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fake_short_work_s, fake_long_work_s, 1, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(fake_short_build_s, fake_long_build_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_data_s, fake_long_data_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_define_s, fake_long_define_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_documents_s, fake_long_documents_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_fakefile_s, fake_long_fakefile_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_licenses_s, fake_long_licenses_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_mode_s, fake_long_mode_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_process_s, fake_long_process_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_settings_s, fake_long_settings_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_sources_s, fake_long_sources_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_under_s, fake_long_under_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fake_short_work_s, fake_long_work_s, 1, f_console_flag_normal_d), \ \ - macro_f_console_parameter_t_initialize_5(fake_long_documents_disabled_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5(fake_long_documents_enabled_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5(fake_long_shared_disabled_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5(fake_long_shared_enabled_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5(fake_long_static_disabled_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5(fake_long_static_enabled_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_5(fake_long_documents_disabled_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5(fake_long_documents_enabled_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5(fake_long_shared_disabled_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5(fake_long_shared_enabled_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5(fake_long_static_disabled_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5(fake_long_static_enabled_s, 0, f_console_flag_normal_d), \ \ - macro_f_console_parameter_t_initialize_6(fake_other_operation_build_s, 0, f_console_flag_simple_e), \ - macro_f_console_parameter_t_initialize_6(fake_other_operation_clean_s, 0, f_console_flag_simple_e), \ - macro_f_console_parameter_t_initialize_6(fake_other_operation_make_s, 0, f_console_flag_simple_e), \ - macro_f_console_parameter_t_initialize_6(fake_other_operation_skeleton_s, 0, f_console_flag_simple_e), \ + macro_f_console_parameter_t_initialize_6(fake_other_operation_build_s, 0, f_console_flag_simple_d), \ + macro_f_console_parameter_t_initialize_6(fake_other_operation_clean_s, 0, f_console_flag_simple_d), \ + macro_f_console_parameter_t_initialize_6(fake_other_operation_make_s, 0, f_console_flag_simple_d), \ + macro_f_console_parameter_t_initialize_6(fake_other_operation_skeleton_s, 0, f_console_flag_simple_d), \ } #define fake_parameter_total_d (f_console_parameter_state_type_total_d + 22) diff --git a/level_3/fake/c/main/fake.c b/level_3/fake/c/main/fake.c index 69a40c3..c67d319 100644 --- a/level_3/fake/c/main/fake.c +++ b/level_3/fake/c/main/fake.c @@ -416,7 +416,7 @@ extern "C" { // Check only expected operations (fake_operation_clean_e and fake_operation_skeleton_e should not call this function). if (data->operation == fake_operation_make_e) { - if (main->program.parameters.array[fake_parameter_fakefile_e].result == f_console_result_none_e) { + if (main->program.parameters.array[fake_parameter_fakefile_e].result == f_console_result_none_d) { if (main->setting.build.used && f_file_exists(main->setting.build, F_false) != F_true) { if (f_file_exists(fake_default_fakefile_s, F_false) == F_true) { requireds[1] = F_false; // fake_long_data_s @@ -433,7 +433,7 @@ extern "C" { : fake_parameter_settings_e ]; - if (parameter->result & f_console_result_value_e) { + if (parameter->result & f_console_result_value_d) { const f_number_unsigned_t index = parameter->values.array[parameter->values.used - 1]; // @fixme these should not be accessing main->program.parameters.arguments directly and should instead use setting flags. diff --git a/level_3/fake/c/main/make/load_parameters.c b/level_3/fake/c/main/make/load_parameters.c index cbdde78..dccbbb2 100644 --- a/level_3/fake/c/main/make/load_parameters.c +++ b/level_3/fake/c/main/make/load_parameters.c @@ -26,10 +26,10 @@ extern "C" { } if (main->program.context.mode == f_color_mode_not_e) { - if (main->program.parameters.array[f_console_standard_parameter_no_color_e].flag & f_console_flag_normal_e) { + if (main->program.parameters.array[f_console_standard_parameter_no_color_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_normal_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } - else if (main->program.parameters.array[f_console_standard_parameter_no_color_e].flag & f_console_flag_normal_e) { + else if (main->program.parameters.array[f_console_standard_parameter_no_color_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_inverse_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } @@ -38,10 +38,10 @@ extern "C" { } } else if (main->program.context.mode == f_color_mode_dark_e) { - if (main->program.parameters.array[f_console_standard_parameter_dark_e].flag & f_console_flag_normal_e) { + if (main->program.parameters.array[f_console_standard_parameter_dark_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_normal_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } - else if (main->program.parameters.array[f_console_standard_parameter_dark_e].flag & f_console_flag_normal_e) { + else if (main->program.parameters.array[f_console_standard_parameter_dark_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_inverse_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } @@ -50,10 +50,10 @@ extern "C" { } } else { - if (main->program.parameters.array[f_console_standard_parameter_light_e].flag & f_console_flag_normal_e) { + if (main->program.parameters.array[f_console_standard_parameter_light_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_normal_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } - else if (main->program.parameters.array[f_console_standard_parameter_light_e].flag & f_console_flag_normal_e) { + else if (main->program.parameters.array[f_console_standard_parameter_light_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_inverse_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } @@ -90,10 +90,10 @@ extern "C" { } if (main->program.error.verbosity == f_console_verbosity_quiet_e) { - if (main->program.parameters.array[f_console_standard_parameter_verbosity_quiet_e].flag & f_console_flag_normal_e) { + if (main->program.parameters.array[f_console_standard_parameter_verbosity_quiet_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_normal_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } - else if (main->program.parameters.array[f_console_standard_parameter_verbosity_quiet_e].flag & f_console_flag_normal_e) { + else if (main->program.parameters.array[f_console_standard_parameter_verbosity_quiet_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_inverse_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } @@ -102,10 +102,10 @@ extern "C" { } } else if (main->program.error.verbosity == f_console_verbosity_error_e) { - if (main->program.parameters.array[f_console_standard_parameter_verbosity_error_e].flag & f_console_flag_normal_e) { + if (main->program.parameters.array[f_console_standard_parameter_verbosity_error_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_normal_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } - else if (main->program.parameters.array[f_console_standard_parameter_verbosity_error_e].flag & f_console_flag_normal_e) { + else if (main->program.parameters.array[f_console_standard_parameter_verbosity_error_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_inverse_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } @@ -114,10 +114,10 @@ extern "C" { } } else if (main->program.error.verbosity >= f_console_verbosity_verbose_e) { - if (main->program.parameters.array[f_console_standard_parameter_verbosity_verbose_e].flag & f_console_flag_normal_e) { + if (main->program.parameters.array[f_console_standard_parameter_verbosity_verbose_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_normal_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } - else if (main->program.parameters.array[f_console_standard_parameter_verbosity_verbose_e].flag & f_console_flag_normal_e) { + else if (main->program.parameters.array[f_console_standard_parameter_verbosity_verbose_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_inverse_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } @@ -126,10 +126,10 @@ extern "C" { } } else { - if (main->program.parameters.array[f_console_standard_parameter_verbosity_debug_e].flag & f_console_flag_normal_e) { + if (main->program.parameters.array[f_console_standard_parameter_verbosity_debug_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_normal_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } - else if (main->program.parameters.array[f_console_standard_parameter_verbosity_debug_e].flag & f_console_flag_normal_e) { + else if (main->program.parameters.array[f_console_standard_parameter_verbosity_debug_e].flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append(f_console_symbol_short_inverse_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } @@ -187,7 +187,7 @@ extern "C" { for (uint8_t i = 0; i < 2; ++i) { - if (!(console[i]->result & f_console_result_found_e)) continue; + if (!(console[i]->result & f_console_result_found_d)) continue; for (j = 0; j < source[i].used; ++j) { @@ -213,10 +213,10 @@ extern "C" { return; } - if (console[i]->flag & f_console_flag_normal_e) { + if (console[i]->flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append_nulless(f_console_symbol_short_normal_s, &destination[i]->array[destination[i]->used]); } - else if (console[i]->flag & f_console_flag_inverse_e) { + else if (console[i]->flag & f_console_flag_inverse_d) { main->setting.state.status = f_string_dynamic_append_nulless(f_console_symbol_short_inverse_s, &destination[i]->array[destination[i]->used]); } @@ -344,7 +344,7 @@ extern "C" { for (uint8_t i = 0; i < 10; ++i) { - if (!(console[i]->result & f_console_result_found_e)) continue; + if (!(console[i]->result & f_console_result_found_d)) continue; if (destination[i]->used + 2 > destination[i]->size) { main->setting.state.status = f_memory_array_increase_by(fake_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &destination[i]->array, &destination[i]->used, &destination[i]->size); @@ -368,10 +368,10 @@ extern "C" { return; } - if (console[i]->flag & f_console_flag_normal_e) { + if (console[i]->flag & f_console_flag_normal_d) { main->setting.state.status = f_string_dynamic_append_nulless(f_console_symbol_short_normal_s, &destination[i]->array[destination[i]->used]); } - else if (console[i]->flag & f_console_flag_inverse_e) { + else if (console[i]->flag & f_console_flag_inverse_d) { main->setting.state.status = f_string_dynamic_append_nulless(f_console_symbol_short_inverse_s, &destination[i]->array[destination[i]->used]); } diff --git a/level_3/fake/c/main/make/operate_process_type.c b/level_3/fake/c/main/make/operate_process_type.c index 98388b4..4673845 100644 --- a/level_3/fake/c/main/make/operate_process_type.c +++ b/level_3/fake/c/main/make/operate_process_type.c @@ -1241,18 +1241,18 @@ extern "C" { main->setting.under.used, F_true, main->setting.work.used, - main->program.parameters.array[fake_parameter_build_e].result & f_console_result_value_e, - (main->program.parameters.array[f_console_standard_parameter_light_e].result & f_console_result_found_e) || (main->program.parameters.array[f_console_standard_parameter_dark_e].result & f_console_result_found_e) || (main->program.parameters.array[f_console_standard_parameter_no_color_e].result & f_console_result_found_e), - main->program.parameters.array[fake_parameter_data_e].result & f_console_result_value_e, - main->program.parameters.array[fake_parameter_define_e].result & f_console_result_value_e, - main->program.parameters.array[fake_parameter_fakefile_e].result & f_console_result_value_e, - main->program.parameters.array[fake_parameter_mode_e].result & f_console_result_value_e, - main->program.parameters.array[fake_parameter_process_e].result & f_console_result_value_e, - main->program.parameters.array[fake_parameter_settings_e].result & f_console_result_value_e, - main->program.parameters.array[fake_parameter_sources_e].result & f_console_result_value_e, - main->program.parameters.array[fake_parameter_under_e].result & f_console_result_value_e, - (main->program.parameters.array[f_console_standard_parameter_verbosity_quiet_e].result & f_console_result_found_e) || (main->program.parameters.array[f_console_standard_parameter_verbosity_normal_e].result & f_console_result_found_e) || (main->program.parameters.array[f_console_standard_parameter_verbosity_verbose_e].result & f_console_result_found_e) || (main->program.parameters.array[f_console_standard_parameter_verbosity_debug_e].result & f_console_result_found_e), - main->program.parameters.array[fake_parameter_work_e].result & f_console_result_value_e, + main->program.parameters.array[fake_parameter_build_e].result & f_console_result_value_d, + (main->program.parameters.array[f_console_standard_parameter_light_e].result & f_console_result_found_d) || (main->program.parameters.array[f_console_standard_parameter_dark_e].result & f_console_result_found_d) || (main->program.parameters.array[f_console_standard_parameter_no_color_e].result & f_console_result_found_d), + main->program.parameters.array[fake_parameter_data_e].result & f_console_result_value_d, + main->program.parameters.array[fake_parameter_define_e].result & f_console_result_value_d, + main->program.parameters.array[fake_parameter_fakefile_e].result & f_console_result_value_d, + main->program.parameters.array[fake_parameter_mode_e].result & f_console_result_value_d, + main->program.parameters.array[fake_parameter_process_e].result & f_console_result_value_d, + main->program.parameters.array[fake_parameter_settings_e].result & f_console_result_value_d, + main->program.parameters.array[fake_parameter_sources_e].result & f_console_result_value_d, + main->program.parameters.array[fake_parameter_under_e].result & f_console_result_value_d, + (main->program.parameters.array[f_console_standard_parameter_verbosity_quiet_e].result & f_console_result_found_d) || (main->program.parameters.array[f_console_standard_parameter_verbosity_normal_e].result & f_console_result_found_d) || (main->program.parameters.array[f_console_standard_parameter_verbosity_verbose_e].result & f_console_result_found_d) || (main->program.parameters.array[f_console_standard_parameter_verbosity_debug_e].result & f_console_result_found_d), + main->program.parameters.array[fake_parameter_work_e].result & f_console_result_value_d, data_make->parameter_value.build.used, data_make->parameter_value.color.used, data_make->parameter_value.data.used, diff --git a/level_3/firewall/c/main/common.c b/level_3/firewall/c/main/common.c index 442c386..60ff2f3 100644 --- a/level_3/firewall/c/main/common.c +++ b/level_3/firewall/c/main/common.c @@ -39,19 +39,19 @@ extern "C" { return; } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= firewall_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= firewall_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= firewall_main_flag_copyright_d; return; @@ -59,14 +59,14 @@ extern "C" { f_number_unsigned_t index = 0; - if (parameters->array[firewall_parameter_operation_start_e].result & f_console_result_found_e) { + if (parameters->array[firewall_parameter_operation_start_e].result & f_console_result_found_d) { main->setting.flag &= ~firewall_main_flag_operation_d; main->setting.flag |= firewall_main_flag_operation_start_d; index = parameters->array[firewall_parameter_operation_start_e].location; } - if (parameters->array[firewall_parameter_operation_stop_e].result & f_console_result_found_e) { + if (parameters->array[firewall_parameter_operation_stop_e].result & f_console_result_found_d) { if (!(main->setting.flag & firewall_main_flag_operation_d) || parameters->array[firewall_parameter_operation_stop_e].location > index) { main->setting.flag &= ~firewall_main_flag_operation_d; main->setting.flag |= firewall_main_flag_operation_stop_d; @@ -75,7 +75,7 @@ extern "C" { } } - if (parameters->array[firewall_parameter_operation_restart_e].result & f_console_result_found_e) { + if (parameters->array[firewall_parameter_operation_restart_e].result & f_console_result_found_d) { if (!(main->setting.flag & firewall_main_flag_operation_d) || parameters->array[firewall_parameter_operation_restart_e].location > index) { main->setting.flag &= ~firewall_main_flag_operation_d; main->setting.flag |= firewall_main_flag_operation_restart_d; @@ -84,7 +84,7 @@ extern "C" { } } - if (parameters->array[firewall_parameter_operation_lock_e].result & f_console_result_found_e) { + if (parameters->array[firewall_parameter_operation_lock_e].result & f_console_result_found_d) { if (!(main->setting.flag & firewall_main_flag_operation_d) || parameters->array[firewall_parameter_operation_lock_e].location > index) { main->setting.flag &= ~firewall_main_flag_operation_d; main->setting.flag |= firewall_main_flag_operation_lock_d; @@ -93,15 +93,15 @@ extern "C" { } } - if (parameters->array[firewall_parameter_operation_show_e].result & f_console_result_found_e) { + if (parameters->array[firewall_parameter_operation_show_e].result & f_console_result_found_d) { if (!(main->setting.flag & firewall_main_flag_operation_d) || parameters->array[firewall_parameter_operation_show_e].location > index) { main->setting.flag &= ~firewall_main_flag_operation_d; main->setting.flag |= firewall_main_flag_operation_show_d; } } - if (parameters->array[firewall_parameter_4_e].result & f_console_result_found_e) { - if (parameters->array[firewall_parameter_6_e].result & f_console_result_found_e) { + if (parameters->array[firewall_parameter_4_e].result & f_console_result_found_d) { + if (parameters->array[firewall_parameter_6_e].result & f_console_result_found_d) { main->setting.flag |= firewall_main_flag_ipv46_d; } else { @@ -109,7 +109,7 @@ extern "C" { main->setting.flag |= firewall_main_flag_ipv4_d; } } - else if (parameters->array[firewall_parameter_6_e].result & f_console_result_found_e) { + else if (parameters->array[firewall_parameter_6_e].result & f_console_result_found_d) { main->setting.flag &= ~firewall_main_flag_ipv4_d; main->setting.flag |= firewall_main_flag_ipv6_d; } diff --git a/level_3/firewall/c/main/common/enumeration.h b/level_3/firewall/c/main/common/enumeration.h index 936df98..90e952e 100644 --- a/level_3/firewall/c/main/common/enumeration.h +++ b/level_3/firewall/c/main/common/enumeration.h @@ -130,13 +130,13 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_4(firewall_short_4_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_4(firewall_short_6_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_6(firewall_operation_lock_s, 0, f_console_flag_simple_e), \ - macro_f_console_parameter_t_initialize_6(firewall_operation_restart_s, 0, f_console_flag_simple_e), \ - macro_f_console_parameter_t_initialize_6(firewall_operation_show_s, 0, f_console_flag_simple_e), \ - macro_f_console_parameter_t_initialize_6(firewall_operation_start_s, 0, f_console_flag_simple_e), \ - macro_f_console_parameter_t_initialize_6(firewall_operation_stop_s, 0, f_console_flag_simple_e), \ + macro_f_console_parameter_t_initialize_4(firewall_short_4_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_4(firewall_short_6_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_6(firewall_operation_lock_s, 0, f_console_flag_simple_d), \ + macro_f_console_parameter_t_initialize_6(firewall_operation_restart_s, 0, f_console_flag_simple_d), \ + macro_f_console_parameter_t_initialize_6(firewall_operation_show_s, 0, f_console_flag_simple_d), \ + macro_f_console_parameter_t_initialize_6(firewall_operation_start_s, 0, f_console_flag_simple_d), \ + macro_f_console_parameter_t_initialize_6(firewall_operation_stop_s, 0, f_console_flag_simple_d), \ } #define firewall_parameter_total_d (f_console_parameter_state_type_total_d + 7) diff --git a/level_3/fss_identify/c/main/common.c b/level_3/fss_identify/c/main/common.c index 2cda242..7523e1e 100644 --- a/level_3/fss_identify/c/main/common.c +++ b/level_3/fss_identify/c/main/common.c @@ -39,19 +39,19 @@ extern "C" { return; } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= fss_identify_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= fss_identify_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= fss_identify_main_flag_copyright_d; return; @@ -59,28 +59,28 @@ extern "C" { f_number_unsigned_t index = 0; - if (parameters->array[fss_identify_parameter_content_e].result & f_console_result_found_e) { + if (parameters->array[fss_identify_parameter_content_e].result & f_console_result_found_d) { main->setting.flag |= fss_identify_main_flag_content_d; } else { main->setting.flag &= ~fss_identify_main_flag_content_d; } - if (parameters->array[fss_identify_parameter_object_e].result & f_console_result_found_e) { + if (parameters->array[fss_identify_parameter_object_e].result & f_console_result_found_d) { main->setting.flag |= fss_identify_main_flag_object_d; } else { main->setting.flag &= ~fss_identify_main_flag_object_d; } - if (parameters->array[fss_identify_parameter_total_e].result & f_console_result_found_e) { + if (parameters->array[fss_identify_parameter_total_e].result & f_console_result_found_d) { main->setting.flag |= fss_identify_main_flag_total_d; } else { main->setting.flag &= ~fss_identify_main_flag_total_d; } - if (parameters->array[fss_identify_parameter_line_e].result & f_console_result_value_e) { + if (parameters->array[fss_identify_parameter_line_e].result & f_console_result_value_d) { index = parameters->array[fss_identify_parameter_line_e].values.array[parameters->array[fss_identify_parameter_line_e].values.used - 1]; main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, parameters->arguments.array[index], &main->setting.line); @@ -98,7 +98,7 @@ extern "C" { main->setting.flag |= fss_identify_main_flag_line_d; } - else if (parameters->array[fss_identify_parameter_line_e].result & f_console_result_found_e) { + else if (parameters->array[fss_identify_parameter_line_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, fss_identify_long_line_s); @@ -109,7 +109,7 @@ extern "C" { main->setting.flag &= ~fss_identify_main_flag_line_d; } - if (parameters->array[fss_identify_parameter_name_e].result & f_console_result_value_e) { + if (parameters->array[fss_identify_parameter_name_e].result & f_console_result_value_d) { main->setting.names.used = 0; main->setting.state.status = f_memory_array_increase_by(parameters->array[fss_identify_parameter_name_e].values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.names.array, &main->setting.names.used, &main->setting.names.size); @@ -186,7 +186,7 @@ extern "C" { main->setting.flag |= fss_identify_main_flag_name_d; } - else if (parameters->array[fss_identify_parameter_name_e].result & f_console_result_found_e) { + else if (parameters->array[fss_identify_parameter_name_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, fss_identify_long_name_s); diff --git a/level_3/fss_identify/c/main/common/enumeration.h b/level_3/fss_identify/c/main/common/enumeration.h index 93d08e6..484b62d 100644 --- a/level_3/fss_identify/c/main/common/enumeration.h +++ b/level_3/fss_identify/c/main/common/enumeration.h @@ -32,11 +32,11 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(fss_identify_short_content_s, fss_identify_long_content_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_identify_short_line_s, fss_identify_long_line_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_identify_short_name_s, fss_identify_long_name_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_identify_short_object_s, fss_identify_long_object_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_identify_short_total_s, fss_identify_long_total_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(fss_identify_short_content_s, fss_identify_long_content_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_identify_short_line_s, fss_identify_long_line_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_identify_short_name_s, fss_identify_long_name_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_identify_short_object_s, fss_identify_long_object_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_identify_short_total_s, fss_identify_long_total_s, 0, f_console_flag_normal_d), \ } #define fss_identify_parameter_total_d (f_console_parameter_state_type_total_d + 5) diff --git a/level_3/fss_read/c/main/common.c b/level_3/fss_read/c/main/common.c index d0ba535..f2f7873 100644 --- a/level_3/fss_read/c/main/common.c +++ b/level_3/fss_read/c/main/common.c @@ -79,15 +79,15 @@ extern "C" { return; } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_help_d; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_version_d; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_copyright_d; } @@ -102,9 +102,9 @@ extern "C" { } } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) return; - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) return; - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) return; + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) return; + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) return; + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) return; f_number_unsigned_t i = 0; f_number_unsigned_t index = 0; @@ -168,7 +168,7 @@ extern "C" { for (i = 0; i < 6; ++i) { - if (parameters->array[parameter_code[i]].result & f_console_result_value_e) { + if (parameters->array[parameter_code[i]].result & f_console_result_value_d) { main->setting.flag |= parameter_flag[i]; if (parameter_value_digit[i]) { @@ -183,7 +183,7 @@ extern "C" { } } } - else if (parameters->array[parameter_code[i]].result & f_console_result_found_e) { + else if (parameters->array[parameter_code[i]].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fss_read_print_error_parameter_requires_message(&main->program.error, f_console_symbol_long_normal_s, parameter_name[i], parameter_message[i]); @@ -193,7 +193,7 @@ extern "C" { } // for } - if (parameters->array[fss_read_parameter_columns_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_columns_e].result & f_console_result_found_d) { const f_number_unsigned_t parameter_code[] = { fss_read_parameter_depth_e, fss_read_parameter_line_e, @@ -211,11 +211,11 @@ extern "C" { }; const uint8_t parameter_match[] = { - f_console_result_value_e, - f_console_result_value_e, - f_console_result_found_e, - f_console_result_value_e, - f_console_result_found_e, + f_console_result_value_d, + f_console_result_value_d, + f_console_result_found_d, + f_console_result_value_d, + f_console_result_found_d, }; for (i = 0; i < 5; ++i) { @@ -234,8 +234,8 @@ extern "C" { main->setting.flag |= fss_read_main_flag_columns_d; } - if (parameters->array[fss_read_parameter_pipe_e].result & f_console_result_found_e) { - if ((parameters->array[fss_read_parameter_total_e].result & f_console_result_found_e) || (parameters->array[fss_read_parameter_total_e].result & f_console_result_found_e)) { + if (parameters->array[fss_read_parameter_pipe_e].result & f_console_result_found_d) { + if ((parameters->array[fss_read_parameter_total_e].result & f_console_result_found_d) || (parameters->array[fss_read_parameter_total_e].result & f_console_result_found_d)) { main->setting.state.status = F_status_set_error(F_parameter); if (main->program.error.verbosity > f_console_verbosity_quiet_e) { @@ -243,7 +243,7 @@ extern "C" { &main->program.error, f_console_symbol_long_normal_s, f_console_symbol_long_normal_s, fss_read_long_pipe_s, - (parameters->array[fss_read_parameter_total_e].result & f_console_result_found_e) + (parameters->array[fss_read_parameter_total_e].result & f_console_result_found_d) ? fss_read_long_total_s : fss_read_long_line_s ); @@ -253,7 +253,7 @@ extern "C" { } } - if (parameters->array[fss_read_parameter_delimit_e].result & f_console_result_value_e) { + if (parameters->array[fss_read_parameter_delimit_e].result & f_console_result_value_d) { f_number_unsigned_t length = 0; // Set the value to 0 to allow for detecting mode based on what is provided. @@ -390,14 +390,14 @@ extern "C" { } } - if (parameters->array[fss_read_parameter_content_e].result & f_console_result_found_e) { - if (parameters->array[fss_read_parameter_object_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_content_e].result & f_console_result_found_d) { + if (parameters->array[fss_read_parameter_object_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_object_d; } main->setting.flag |= fss_read_main_flag_content_d; } - else if (parameters->array[fss_read_parameter_object_e].result & f_console_result_found_e) { + else if (parameters->array[fss_read_parameter_object_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_object_d; } else { @@ -406,30 +406,30 @@ extern "C" { main->setting.flag |= fss_read_main_flag_content_d; } - if (parameters->array[fss_read_parameter_empty_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_empty_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_empty_d; } - if (parameters->array[fss_read_parameter_original_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_original_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_original_d; } - if (parameters->array[fss_read_parameter_pipe_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_pipe_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_pipe_format_d; } - if (parameters->array[fss_read_parameter_total_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_total_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_total_d; } - if (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_trim_d; } fss_read_setting_load_depth(arguments, main, parameters); if (F_status_is_error(main->setting.state.status)) return; - if (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_d) { main->setting.flag |= fss_read_main_flag_trim_d; } @@ -583,7 +583,7 @@ extern "C" { f_number_unsigned_t i = 1; - if (parameters->array[fss_read_parameter_depth_e].result & f_console_result_value_e) { + if (parameters->array[fss_read_parameter_depth_e].result & f_console_result_value_d) { i = parameters->array[fss_read_parameter_depth_e].values.used; } @@ -630,7 +630,7 @@ extern "C" { position_depth = 0; } - if (parameters->array[fss_read_parameter_at_e].result & f_console_result_value_e) { + if (parameters->array[fss_read_parameter_at_e].result & f_console_result_value_d) { for (; position_at < parameters->array[fss_read_parameter_at_e].values.used; ++position_at) { if (parameters->array[fss_read_parameter_at_e].values.array[position_at] < position_depth) { @@ -653,7 +653,7 @@ extern "C" { } // for } - if (parameters->array[fss_read_parameter_name_e].result & f_console_result_value_e) { + if (parameters->array[fss_read_parameter_name_e].result & f_console_result_value_d) { for (; position_name < parameters->array[fss_read_parameter_name_e].values.used; ++position_name) { if (parameters->array[fss_read_parameter_name_e].values.array[position_name] < position_depth) { @@ -666,7 +666,7 @@ extern "C" { current->index_name = parameters->array[fss_read_parameter_name_e].values.array[position_name]; - if (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_e) { + if (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_d) { main->setting.state.status = f_rip_dynamic(parameters->arguments.array[current->index_name], ¤t->value_name); } else { @@ -674,7 +674,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_e) ? macro_fss_read_f(f_rip_dynamic) : macro_fss_read_f(f_string_dynamic_append)); + fss_read_print_error(&main->program.error, (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_d) ? macro_fss_read_f(f_rip_dynamic) : macro_fss_read_f(f_string_dynamic_append)); return; } diff --git a/level_3/fss_read/c/main/common/enumeration.h b/level_3/fss_read/c/main/common/enumeration.h index 00e9178..7b1cf38 100644 --- a/level_3/fss_read/c/main/common/enumeration.h +++ b/level_3/fss_read/c/main/common/enumeration.h @@ -43,22 +43,22 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(fss_read_short_as_s, fss_read_long_as_s, 1, f_console_flag_normal_e | f_console_flag_disable_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_at_s, fss_read_long_at_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_content_s, fss_read_long_content_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_columns_s, fss_read_long_columns_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_delimit_s, fss_read_long_delimit_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_depth_s, fss_read_long_depth_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_empty_s, fss_read_long_empty_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_line_s, fss_read_long_line_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_name_s, fss_read_long_name_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_object_s, fss_read_long_object_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_5( fss_read_long_payload_s, 1, f_console_flag_normal_e | f_console_flag_disable_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_pipe_s, fss_read_long_pipe_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_original_s, fss_read_long_original_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_select_s, fss_read_long_select_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_total_s, fss_read_long_total_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_read_short_trim_s, fss_read_long_trim_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_as_s, fss_read_long_as_s, 1, f_console_flag_normal_d | f_console_flag_disable_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_at_s, fss_read_long_at_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_content_s, fss_read_long_content_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_columns_s, fss_read_long_columns_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_delimit_s, fss_read_long_delimit_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_depth_s, fss_read_long_depth_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_empty_s, fss_read_long_empty_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_line_s, fss_read_long_line_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_name_s, fss_read_long_name_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_object_s, fss_read_long_object_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_5( fss_read_long_payload_s, 1, f_console_flag_normal_d | f_console_flag_disable_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_pipe_s, fss_read_long_pipe_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_original_s, fss_read_long_original_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_select_s, fss_read_long_select_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_total_s, fss_read_long_total_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_read_short_trim_s, fss_read_long_trim_s, 0, f_console_flag_normal_d), \ } #define fss_read_parameter_total_d (f_console_parameter_state_type_total_d + 16) diff --git a/level_3/fss_read/c/main/main.c b/level_3/fss_read/c/main/main.c index b2da409..74fc370 100644 --- a/level_3/fss_read/c/main/main.c +++ b/level_3/fss_read/c/main/main.c @@ -28,7 +28,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_read_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_read_parameter_as_e].flag &= ~f_console_flag_disable_e; + data.program.parameters.array[fss_read_parameter_as_e].flag &= ~f_console_flag_disable_d; data.program.parameters.used = fss_read_parameter_total_d; data.program.environment = envp; @@ -136,7 +136,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->setting.feature |= fss_read_feature_flag_line_single_d; main->setting.feature |= fss_read_feature_flag_quote_content_d | fss_read_feature_flag_quote_object_d; - if (parameters->array[fss_read_parameter_as_e].result & f_console_result_value_e && parameters->array[fss_read_parameter_as_e].values.used) { + if (parameters->array[fss_read_parameter_as_e].result & f_console_result_value_d && parameters->array[fss_read_parameter_as_e].values.used) { const f_number_unsigned_t index = parameters->array[fss_read_parameter_as_e].values.array[parameters->array[fss_read_parameter_as_e].values.used - 1]; const f_string_static_t as = parameters->arguments.array[index]; @@ -160,7 +160,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->setting.feature |= fss_read_feature_flag_line_single_d; main->setting.feature |= fss_read_feature_flag_quote_content_d | fss_read_feature_flag_quote_object_d; - parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e; + parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_d; main->call.process_at = &fss_read_process_at; main->call.process_at_line = &fss_read_process_at_line; @@ -198,7 +198,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->setting.feature |= fss_read_feature_flag_line_single_d | fss_read_feature_flag_content_multiple_d; main->setting.feature |= fss_read_feature_flag_quote_content_d | fss_read_feature_flag_quote_object_d; - parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e; + parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_d; main->call.process_at = &fss_read_process_at; main->call.process_at_line = &fss_read_process_at_line; @@ -235,7 +235,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->setting.feature |= fss_read_feature_flag_object_as_line_d | fss_read_feature_flag_object_trim_d | fss_read_feature_flag_object_trim_expand_d; - parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e; + parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_d; main->call.process_at = &fss_read_process_at; main->call.process_at_line = &fss_read_process_at_line; @@ -275,7 +275,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->setting.feature |= fss_read_feature_flag_object_align_d; main->setting.feature |= fss_read_feature_flag_object_as_line_d | fss_read_feature_flag_object_trim_d | fss_read_feature_flag_object_trim_expand_d; - parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e; + parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_d; main->call.process_at = &fss_read_process_at; main->call.process_at_line = &fss_read_process_at_line; @@ -314,7 +314,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->setting.feature |= fss_read_feature_flag_depth_multiple_d | fss_read_feature_flag_object_align_d; main->setting.feature |= fss_read_feature_flag_object_as_line_d | fss_read_feature_flag_object_trim_d | fss_read_feature_flag_object_trim_expand_d; - parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_e; + parameters->array[fss_read_parameter_payload_e].flag |= f_console_flag_disable_d; main->call.process_at = &fss_read_process_at; main->call.process_at_line = &fss_read_process_at_line; @@ -352,7 +352,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->setting.feature |= fss_read_feature_flag_object_trim_d | fss_read_feature_flag_object_trim_expand_d; main->setting.flag |= fss_read_main_flag_payload_error_d; - parameters->array[fss_read_parameter_payload_e].flag &= ~f_console_flag_disable_e; + parameters->array[fss_read_parameter_payload_e].flag &= ~f_console_flag_disable_d; main->call.process_at = &fss_read_process_at; main->call.process_at_line = &fss_read_process_at_line; @@ -431,7 +431,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { } } } - else if (parameters->array[fss_read_parameter_as_e].result & f_console_result_found_e) { + else if (parameters->array[fss_read_parameter_as_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); if (main->setting.flag & fss_read_main_flag_help_d) { diff --git a/level_3/fss_read/c/payload/fss_read.c b/level_3/fss_read/c/payload/fss_read.c index e6993b6..000b5cc 100644 --- a/level_3/fss_read/c/payload/fss_read.c +++ b/level_3/fss_read/c/payload/fss_read.c @@ -144,7 +144,7 @@ extern "C" { f_number_unsigneds_t * const values = &main->program.parameters.array[fss_read_parameter_payload_e].values; - if ((main->program.parameters.array[fss_read_parameter_payload_e].result & f_console_result_value_e) && values->used) { + if ((main->program.parameters.array[fss_read_parameter_payload_e].result & f_console_result_value_d) && values->used) { f_string_static_t * const argv = main->program.parameters.arguments.array; if (f_compare_dynamic(argv[values->array[values->used - 1]], fss_read_string_create_s) == F_equal_to) { diff --git a/level_3/fss_read/c/payload/main.c b/level_3/fss_read/c/payload/main.c index e193a61..111b385 100644 --- a/level_3/fss_read/c/payload/main.c +++ b/level_3/fss_read/c/payload/main.c @@ -48,7 +48,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_read_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_read_parameter_payload_e].flag &= ~f_console_flag_disable_e; + data.program.parameters.array[fss_read_parameter_payload_e].flag &= ~f_console_flag_disable_d; data.program.parameters.used = fss_read_parameter_total_d; data.program.environment = envp; diff --git a/level_3/fss_write/c/basic/main.c b/level_3/fss_write/c/basic/main.c index e0a9823..e89f01c 100644 --- a/level_3/fss_write/c/basic/main.c +++ b/level_3/fss_write/c/basic/main.c @@ -28,7 +28,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_write_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_e; + data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_d; data.program.parameters.used = fss_write_parameter_total_d; data.program.environment = envp; diff --git a/level_3/fss_write/c/basic_list/main.c b/level_3/fss_write/c/basic_list/main.c index 7cd3a70..cc34636 100644 --- a/level_3/fss_write/c/basic_list/main.c +++ b/level_3/fss_write/c/basic_list/main.c @@ -28,7 +28,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_write_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_e; + data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_d; data.program.parameters.used = fss_write_parameter_total_d; data.program.environment = envp; diff --git a/level_3/fss_write/c/embedded_list/main.c b/level_3/fss_write/c/embedded_list/main.c index 5c6b3c1..f1b6e50 100644 --- a/level_3/fss_write/c/embedded_list/main.c +++ b/level_3/fss_write/c/embedded_list/main.c @@ -31,7 +31,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_write_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_e; + data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_d; data.program.parameters.used = fss_write_parameter_total_d; data.program.environment = envp; diff --git a/level_3/fss_write/c/extended/main.c b/level_3/fss_write/c/extended/main.c index fe1117f..6c0fad9 100644 --- a/level_3/fss_write/c/extended/main.c +++ b/level_3/fss_write/c/extended/main.c @@ -30,7 +30,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_write_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_e; + data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_d; data.program.parameters.used = fss_write_parameter_total_d; data.program.environment = envp; diff --git a/level_3/fss_write/c/extended_list/main.c b/level_3/fss_write/c/extended_list/main.c index 4f91810..c33d0cc 100644 --- a/level_3/fss_write/c/extended_list/main.c +++ b/level_3/fss_write/c/extended_list/main.c @@ -30,7 +30,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_write_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_e; + data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_d; data.program.parameters.used = fss_write_parameter_total_d; data.program.environment = envp; diff --git a/level_3/fss_write/c/main/common.c b/level_3/fss_write/c/main/common.c index cd6d519..2f2b608 100644 --- a/level_3/fss_write/c/main/common.c +++ b/level_3/fss_write/c/main/common.c @@ -43,15 +43,15 @@ extern "C" { main->program.output.to.stream = F_type_output_d; main->program.output.to.flag = F_file_flag_create_d | F_file_flag_write_only_d | F_file_flag_append_d; - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= fss_write_main_flag_help_d; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= fss_write_main_flag_version_d; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= fss_write_main_flag_copyright_d; } @@ -73,10 +73,10 @@ extern "C" { } } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) return; - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) return; + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) return; + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) return; - if ((parameters->array[fss_write_parameter_file_e].result & f_console_result_value_e) && parameters->array[fss_write_parameter_file_e].values.used) { + if ((parameters->array[fss_write_parameter_file_e].result & f_console_result_value_d) && parameters->array[fss_write_parameter_file_e].values.used) { if (parameters->array[fss_write_parameter_file_e].values.used > 1) { main->setting.state.status = F_status_set_error(F_parameter); @@ -100,7 +100,7 @@ extern "C" { main->setting.flag |= fss_write_main_flag_file_to_d; } - else if (parameters->array[fss_write_parameter_file_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_file_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, fss_write_long_file_s); @@ -108,7 +108,7 @@ extern "C" { return; } - if ((parameters->array[fss_write_parameter_object_e].result & f_console_result_value_e) && parameters->array[fss_write_parameter_object_e].values.used) { + if ((parameters->array[fss_write_parameter_object_e].result & f_console_result_value_d) && parameters->array[fss_write_parameter_object_e].values.used) { f_number_unsigneds_t * const values = ¶meters->array[fss_write_parameter_object_e].values; main->setting.objects.used = 0; @@ -133,7 +133,7 @@ extern "C" { main->setting.flag |= fss_write_main_flag_object_d; } - else if (parameters->array[fss_write_parameter_object_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_object_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, fss_write_long_object_s); @@ -141,7 +141,7 @@ extern "C" { return; } - if ((parameters->array[fss_write_parameter_content_e].result & f_console_result_value_e) && parameters->array[fss_write_parameter_content_e].values.used) { + if ((parameters->array[fss_write_parameter_content_e].result & f_console_result_value_d) && parameters->array[fss_write_parameter_content_e].values.used) { if (main->setting.flag & fss_write_main_flag_object_d) { if (!(main->setting.flag & fss_write_main_flag_content_multiple_d)) { @@ -220,7 +220,7 @@ extern "C" { main->setting.flag |= fss_write_main_flag_content_d; } - else if (parameters->array[fss_write_parameter_content_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_content_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, fss_write_long_content_s); @@ -228,7 +228,7 @@ extern "C" { return; } - if ((parameters->array[fss_write_parameter_prepend_e].result & f_console_result_value_e) && parameters->array[fss_write_parameter_prepend_e].values.used) { + if ((parameters->array[fss_write_parameter_prepend_e].result & f_console_result_value_d) && parameters->array[fss_write_parameter_prepend_e].values.used) { const f_number_unsigned_t index = parameters->array[fss_write_parameter_prepend_e].values.array[parameters->array[fss_write_parameter_prepend_e].location]; main->setting.prepend.used = 0; @@ -263,7 +263,7 @@ extern "C" { main->setting.flag |= fss_write_main_flag_prepend_d; } - else if (parameters->array[fss_write_parameter_prepend_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_prepend_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, fss_write_long_prepend_s); @@ -271,7 +271,7 @@ extern "C" { return; } - if ((parameters->array[fss_write_parameter_ignore_e].result & f_console_result_value_e) && parameters->array[fss_write_parameter_ignore_e].values.used) { + if ((parameters->array[fss_write_parameter_ignore_e].result & f_console_result_value_d) && parameters->array[fss_write_parameter_ignore_e].values.used) { if (parameters->array[fss_write_parameter_ignore_e].values.used % 2) { main->setting.state.status = F_status_set_error(F_parameter); @@ -421,7 +421,7 @@ extern "C" { } // while } } - else if (parameters->array[fss_write_parameter_ignore_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_ignore_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); @@ -435,7 +435,7 @@ extern "C" { main->setting.flag &= ~fss_write_main_flag_ignore_d; } - if (parameters->array[fss_write_parameter_partial_e].result & f_console_result_found_e) { + if (parameters->array[fss_write_parameter_partial_e].result & f_console_result_found_d) { main->setting.flag |= fss_write_main_flag_partial_d; } @@ -472,7 +472,7 @@ extern "C" { for (uint8_t i = 0; i < 3; ++i) { - if (parameters->array[has[i]].result & f_console_result_found_e) { + if (parameters->array[has[i]].result & f_console_result_found_d) { if (main->setting.flag & (fss_write_main_flag_object_d | fss_write_main_flag_content_d)) { if (!(main->setting.flag & fss_write_main_flag_partial_d)) { main->setting.state.status = F_status_set_error(F_parameter); @@ -497,7 +497,7 @@ extern "C" { } } - if (parameters->array[has_cannots[i][0]].result & f_console_result_found_e) { + if (parameters->array[has_cannots[i][0]].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_cannot_use_with(&main->program.error, f_console_symbol_long_normal_s, f_console_symbol_long_normal_s, has_string[i], has_cannots_string[i][0]); @@ -505,7 +505,7 @@ extern "C" { return; } - if (parameters->array[has_cannots[i][1]].result & f_console_result_found_e) { + if (parameters->array[has_cannots[i][1]].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_cannot_use_with(&main->program.error, f_console_symbol_long_normal_s, f_console_symbol_long_normal_s, has_string[i], has_cannots_string[i][1]); @@ -531,7 +531,7 @@ extern "C" { } if ((main->setting.flag & fss_write_main_flag_content_d) && (main->setting.flag & fss_write_main_flag_partial_d)) { - if (parameters->array[fss_write_parameter_content_e].result & f_console_result_value_e) { + if (parameters->array[fss_write_parameter_content_e].result & f_console_result_value_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_cannot_use_with_xor(&main->program.error, f_console_symbol_long_normal_s, f_console_symbol_long_normal_s, f_console_symbol_long_normal_s, fss_write_long_partial_s, fss_write_long_object_s, fss_write_long_content_s); @@ -544,43 +544,43 @@ extern "C" { main->setting.quote = f_fss_quote_double_s; - if (parameters->array[fss_write_parameter_double_e].result & f_console_result_found_e) { - if (parameters->array[fss_write_parameter_single_e].result & f_console_result_found_e) { + if (parameters->array[fss_write_parameter_double_e].result & f_console_result_found_d) { + if (parameters->array[fss_write_parameter_single_e].result & f_console_result_found_d) { if (parameters->array[fss_write_parameter_double_e].location < parameters->array[fss_write_parameter_single_e].location) { main->setting.quote = f_fss_quote_single_s; - if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[fss_write_parameter_single_e].location < parameters->array[fss_write_parameter_grave_e].location) { main->setting.quote = f_fss_quote_grave_s; } } } - else if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[fss_write_parameter_double_e].location < parameters->array[fss_write_parameter_grave_e].location) { main->setting.quote = f_fss_quote_grave_s; } } } - else if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[fss_write_parameter_double_e].location < parameters->array[fss_write_parameter_grave_e].location) { main->setting.quote = f_fss_quote_grave_s; } } } - else if (parameters->array[fss_write_parameter_single_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_single_e].result & f_console_result_found_d) { main->setting.quote = f_fss_quote_single_s; - if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[fss_write_parameter_single_e].location < parameters->array[fss_write_parameter_grave_e].location) { main->setting.quote = f_fss_quote_grave_s; } } } - else if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + else if (parameters->array[fss_write_parameter_grave_e].result & f_console_result_found_d) { main->setting.quote = f_fss_quote_grave_s; } - if (parameters->array[fss_write_parameter_trim_e].result & f_console_result_found_e) { + if (parameters->array[fss_write_parameter_trim_e].result & f_console_result_found_d) { main->setting.flag |= fss_write_main_flag_trim_d; } diff --git a/level_3/fss_write/c/main/common/enumeration.h b/level_3/fss_write/c/main/common/enumeration.h index 3b46c04..47fab66 100644 --- a/level_3/fss_write/c/main/common/enumeration.h +++ b/level_3/fss_write/c/main/common/enumeration.h @@ -41,20 +41,20 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(fss_write_short_as_s, fss_write_long_as_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_content_s, fss_write_long_content_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_content_end_s, fss_write_long_content_end_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_content_next_s, fss_write_long_content_next_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_double_s, fss_write_long_double_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_file_s, fss_write_long_file_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_grave_s, fss_write_long_grave_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_ignore_s, fss_write_long_ignore_s, 2, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_object_s, fss_write_long_object_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_object_open_s, fss_write_long_object_open_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_partial_s, fss_write_long_partial_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_prepend_s, fss_write_long_prepend_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_single_s, fss_write_long_single_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_trim_s, fss_write_long_trim_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_as_s, fss_write_long_as_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_content_s, fss_write_long_content_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_content_end_s, fss_write_long_content_end_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_content_next_s, fss_write_long_content_next_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_double_s, fss_write_long_double_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_file_s, fss_write_long_file_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_grave_s, fss_write_long_grave_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_ignore_s, fss_write_long_ignore_s, 2, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_object_s, fss_write_long_object_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_object_open_s, fss_write_long_object_open_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_partial_s, fss_write_long_partial_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_prepend_s, fss_write_long_prepend_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_single_s, fss_write_long_single_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_trim_s, fss_write_long_trim_s, 0, f_console_flag_normal_d), \ } #define fss_write_parameter_total_d (f_console_parameter_state_type_total_d + 14) diff --git a/level_3/fss_write/c/main/main.c b/level_3/fss_write/c/main/main.c index f7a184f..a53a492 100644 --- a/level_3/fss_write/c/main/main.c +++ b/level_3/fss_write/c/main/main.c @@ -105,7 +105,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { main->call.process_pipe = &fss_write_process_pipe; main->call.process_set = &fss_write_process_set; - if (main->program.parameters.array[fss_write_parameter_as_e].result & f_console_result_value_e && main->program.parameters.array[fss_write_parameter_as_e].values.used) { + if (main->program.parameters.array[fss_write_parameter_as_e].result & f_console_result_value_d && main->program.parameters.array[fss_write_parameter_as_e].values.used) { f_number_unsigned_t index = 0; f_string_static_t * const argv = main->program.parameters.arguments.array; @@ -238,7 +238,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { return; } } - else if (main->program.parameters.array[fss_write_parameter_as_e].result & f_console_result_found_e) { + else if (main->program.parameters.array[fss_write_parameter_as_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); if (main->setting.flag & fss_write_main_flag_help_d) { diff --git a/level_3/fss_write/c/payload/fss_write.c b/level_3/fss_write/c/payload/fss_write.c index c302eb0..d8f4ce7 100644 --- a/level_3/fss_write/c/payload/fss_write.c +++ b/level_3/fss_write/c/payload/fss_write.c @@ -533,7 +533,7 @@ extern "C" { f_number_unsigneds_t * const values = &main->program.parameters.array[fss_write_parameter_object_e].values; f_string_static_t * const argv = main->program.parameters.arguments.array; - if ((main->program.parameters.array[fss_write_parameter_object_e].result & f_console_result_value_e) && values->used) { + if ((main->program.parameters.array[fss_write_parameter_object_e].result & f_console_result_value_d) && values->used) { for (f_number_unsigned_t i = 0; i < values->used; ++i) { if (f_compare_dynamic(argv[values->array[i]], fss_write_payload_s) == F_equal_to && i + 1 < values->used) { diff --git a/level_3/fss_write/c/payload/main.c b/level_3/fss_write/c/payload/main.c index eefd07c..41d8c4c 100644 --- a/level_3/fss_write/c/payload/main.c +++ b/level_3/fss_write/c/payload/main.c @@ -29,7 +29,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = fss_write_console_parameter_t_initialize; data.program.parameters.array = parameters; - data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_e; + data.program.parameters.array[fss_write_parameter_as_e].flag |= f_console_flag_disable_d; data.program.parameters.used = fss_write_parameter_total_d; data.program.environment = envp; diff --git a/level_3/iki_read/c/eki/common.c b/level_3/iki_read/c/eki/common.c index 13f9a64..7746827 100644 --- a/level_3/iki_read/c/eki/common.c +++ b/level_3/iki_read/c/eki/common.c @@ -14,9 +14,9 @@ extern "C" { if (!main) return; - if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_e) return; + if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_d) return; } #endif // _di_iki_read_eki_setting_load_ diff --git a/level_3/iki_read/c/eki/process.c b/level_3/iki_read/c/eki/process.c index d7397d4..5b575e6 100644 --- a/level_3/iki_read/c/eki/process.c +++ b/level_3/iki_read/c/eki/process.c @@ -645,7 +645,7 @@ extern "C" { main->cache.buffer.string[data->delimits.array[i]] = f_iki_syntax_placeholder_s.string[0]; } // for - if (main->program.parameters.array[iki_read_parameter_name_e].result & f_console_result_value_e) { + if (main->program.parameters.array[iki_read_parameter_name_e].result & f_console_result_value_d) { f_string_dynamic_t name = f_string_dynamic_t_initialize; f_number_unsigned_t index = 0; diff --git a/level_3/iki_read/c/iki/common.c b/level_3/iki_read/c/iki/common.c index 74d70b1..9a18ed0 100644 --- a/level_3/iki_read/c/iki/common.c +++ b/level_3/iki_read/c/iki/common.c @@ -14,9 +14,9 @@ extern "C" { if (!main) return; - if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_e) return; + if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_d) return; } #endif // _di_iki_read_iki_setting_load_ diff --git a/level_3/iki_read/c/iki/process.c b/level_3/iki_read/c/iki/process.c index b3bc261..34f8a52 100644 --- a/level_3/iki_read/c/iki/process.c +++ b/level_3/iki_read/c/iki/process.c @@ -596,7 +596,7 @@ extern "C" { main->cache.buffer.string[data->delimits.array[i]] = f_iki_syntax_placeholder_s.string[0]; } // for - if (main->program.parameters.array[iki_read_parameter_name_e].result & f_console_result_value_e) { + if (main->program.parameters.array[iki_read_parameter_name_e].result & f_console_result_value_d) { f_string_dynamic_t name = f_string_dynamic_t_initialize; f_number_unsigned_t index = 0; diff --git a/level_3/iki_read/c/main/common.c b/level_3/iki_read/c/main/common.c index 2c1b7cd..c6dc45b 100644 --- a/level_3/iki_read/c/main/common.c +++ b/level_3/iki_read/c/main/common.c @@ -54,19 +54,19 @@ extern "C" { } } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= iki_read_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= iki_read_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= iki_read_main_flag_copyright_d; return; @@ -92,7 +92,7 @@ extern "C" { f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; - if (parameters->array[iki_read_parameter_at_e].result & f_console_result_value_e) { + if (parameters->array[iki_read_parameter_at_e].result & f_console_result_value_d) { index = parameters->array[iki_read_parameter_at_e].values.array[parameters->array[iki_read_parameter_at_e].values.used - 1]; main->setting.at = 0; @@ -114,7 +114,7 @@ extern "C" { main->setting.flag |= iki_read_main_flag_at_d; } - else if (parameters->array[iki_read_parameter_at_e].result & f_console_result_found_e) { + else if (parameters->array[iki_read_parameter_at_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_read_long_at_s); @@ -122,7 +122,7 @@ extern "C" { return; } - if (parameters->array[iki_read_parameter_line_e].result & f_console_result_value_e) { + if (parameters->array[iki_read_parameter_line_e].result & f_console_result_value_d) { index = parameters->array[iki_read_parameter_line_e].values.array[parameters->array[iki_read_parameter_line_e].values.used - 1]; main->setting.line = 0; @@ -144,7 +144,7 @@ extern "C" { main->setting.flag |= iki_read_main_flag_line_d; } - else if (parameters->array[iki_read_parameter_line_e].result & f_console_result_found_e) { + else if (parameters->array[iki_read_parameter_line_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_read_long_line_s); @@ -152,7 +152,7 @@ extern "C" { return; } - if (parameters->array[iki_read_parameter_name_e].result & f_console_result_value_e) { + if (parameters->array[iki_read_parameter_name_e].result & f_console_result_value_d) { main->setting.names.used = 0; main->setting.state.status = f_memory_array_increase_by(parameters->array[iki_read_parameter_name_e].values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.names.array, &main->setting.names.used, &main->setting.names.size); @@ -196,7 +196,7 @@ extern "C" { main->setting.flag |= iki_read_main_flag_name_d; } - else if (parameters->array[iki_read_parameter_name_e].result & f_console_result_found_e) { + else if (parameters->array[iki_read_parameter_name_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_read_long_name_s); @@ -204,8 +204,8 @@ extern "C" { return; } - if (parameters->array[iki_read_parameter_replace_e].result & f_console_result_found_e) { - if (!(parameters->array[iki_read_parameter_replace_e].result & f_console_result_value_e) || (parameters->array[iki_read_parameter_replace_e].values.used % 2)) { + if (parameters->array[iki_read_parameter_replace_e].result & f_console_result_found_d) { + if (!(parameters->array[iki_read_parameter_replace_e].result & f_console_result_value_d) || (parameters->array[iki_read_parameter_replace_e].values.used % 2)) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value_requires_amount(&main->program.error, f_console_symbol_long_normal_s, iki_read_long_replace_s, iki_read_string_two_s); @@ -270,8 +270,8 @@ extern "C" { main->setting.flag |= iki_read_main_flag_replace_d; } - if (parameters->array[iki_read_parameter_select_e].result & f_console_result_found_e) { - if (!(parameters->array[iki_read_parameter_select_e].result & f_console_result_value_e) || !parameters->array[iki_read_parameter_select_e].values.used) { + if (parameters->array[iki_read_parameter_select_e].result & f_console_result_found_d) { + if (!(parameters->array[iki_read_parameter_select_e].result & f_console_result_value_d) || !parameters->array[iki_read_parameter_select_e].values.used) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_read_long_select_s); @@ -313,8 +313,8 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) return; - if (parameters->array[iki_read_parameter_wrap_e].result & f_console_result_found_e) { - if (!(parameters->array[iki_read_parameter_wrap_e].result & f_console_result_value_e) || (parameters->array[iki_read_parameter_wrap_e].values.used % 3)) { + if (parameters->array[iki_read_parameter_wrap_e].result & f_console_result_found_d) { + if (!(parameters->array[iki_read_parameter_wrap_e].result & f_console_result_value_d) || (parameters->array[iki_read_parameter_wrap_e].values.used % 3)) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value_requires_amount(&main->program.error, f_console_symbol_long_normal_s, iki_read_long_wrap_s, iki_read_string_three_s); @@ -389,7 +389,7 @@ extern "C" { main->setting.flag |= iki_read_main_flag_wrap_d; } - if (parameters->array[iki_read_parameter_literal_e].result & f_console_result_found_e) { + if (parameters->array[iki_read_parameter_literal_e].result & f_console_result_found_d) { const uint8_t ids[3] = { iki_read_parameter_object_e, iki_read_parameter_content_e, @@ -403,7 +403,7 @@ extern "C" { for (uint8_t k = 0; k < 3; ++k) { - if (parameters->array[ids[k]].result & f_console_result_found_e) { + if (parameters->array[ids[k]].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_cannot_use_with(&main->program.error, f_console_symbol_long_normal_s, f_console_symbol_long_normal_s, iki_read_long_literal_s, names[k]); @@ -414,7 +414,7 @@ extern "C" { main->setting.flag |= iki_read_main_flag_literal_d; } - else if (parameters->array[iki_read_parameter_object_e].result & f_console_result_found_e) { + else if (parameters->array[iki_read_parameter_object_e].result & f_console_result_found_d) { const uint8_t ids[2] = { iki_read_parameter_content_e, }; @@ -425,7 +425,7 @@ extern "C" { for (uint8_t k = 0; k < 1; ++k) { - if (parameters->array[ids[k]].result & f_console_result_found_e) { + if (parameters->array[ids[k]].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_cannot_use_with(&main->program.error, f_console_symbol_long_normal_s, f_console_symbol_long_normal_s, iki_read_long_object_s, names[k]); @@ -442,14 +442,14 @@ extern "C" { main->setting.flag |= iki_read_main_flag_content_d; } - if (parameters->array[iki_read_parameter_whole_e].result & f_console_result_found_e) { + if (parameters->array[iki_read_parameter_whole_e].result & f_console_result_found_d) { main->setting.flag |= iki_read_main_flag_whole_d; } else { main->setting.flag &= ~iki_read_main_flag_whole_d; } - if (parameters->array[iki_read_parameter_total_e].result & f_console_result_found_e) { + if (parameters->array[iki_read_parameter_total_e].result & f_console_result_found_d) { main->setting.flag |= iki_read_main_flag_total_d; } else { @@ -503,7 +503,7 @@ extern "C" { #ifndef _di_iki_read_setting_load_parameter_substitution_ f_status_t iki_read_setting_load_parameter_substitution(iki_read_main_t * const main, const f_console_parameter_t parameter, const f_string_static_t name, f_string_triples_t * const triple) { - if (!(parameter.result & f_console_result_found_e)) return F_false; + if (!(parameter.result & f_console_result_found_d)) return F_false; if (parameter.values.used % 3) { main->setting.state.status = F_status_set_error(F_parameter); diff --git a/level_3/iki_read/c/main/common/enumeration.h b/level_3/iki_read/c/main/common/enumeration.h index 21d6321..14adddb 100644 --- a/level_3/iki_read/c/main/common/enumeration.h +++ b/level_3/iki_read/c/main/common/enumeration.h @@ -40,19 +40,19 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(iki_read_short_at_s, iki_read_long_at_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_content_s, iki_read_long_content_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_line_s, iki_read_long_line_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_literal_s, iki_read_long_literal_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_name_s, iki_read_long_name_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_object_s, iki_read_long_object_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_reassign_s, iki_read_long_reassign_s, 3, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_replace_s, iki_read_long_replace_s, 2, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_select_s, iki_read_long_select_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_substitute_s, iki_read_long_substitute_s, 3, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_total_s, iki_read_long_total_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_whole_s, iki_read_long_whole_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_read_short_wrap_s, iki_read_long_wrap_s, 3, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_at_s, iki_read_long_at_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_content_s, iki_read_long_content_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_line_s, iki_read_long_line_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_literal_s, iki_read_long_literal_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_name_s, iki_read_long_name_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_object_s, iki_read_long_object_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_reassign_s, iki_read_long_reassign_s, 3, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_replace_s, iki_read_long_replace_s, 2, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_select_s, iki_read_long_select_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_substitute_s, iki_read_long_substitute_s, 3, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_total_s, iki_read_long_total_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_whole_s, iki_read_long_whole_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_read_short_wrap_s, iki_read_long_wrap_s, 3, f_console_flag_normal_d), \ } #define iki_read_parameter_total_d (f_console_parameter_state_type_total_d + 13) diff --git a/level_3/iki_write/c/eki/common.c b/level_3/iki_write/c/eki/common.c index 26ae331..9e6ec6f 100644 --- a/level_3/iki_write/c/eki/common.c +++ b/level_3/iki_write/c/eki/common.c @@ -14,14 +14,14 @@ extern "C" { if (!main) return; - if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_e) return; + if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_d) return; f_number_unsigned_t index = 0; f_console_parameter_t * const content = &main->program.parameters.array[iki_write_parameter_content_e]; - if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_value_e) { + if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_value_d) { f_console_parameter_t * const object = &main->program.parameters.array[iki_write_parameter_object_e]; f_string_dynamicss_t * const objectss = &main->setting.objectss; @@ -83,7 +83,7 @@ extern "C" { main->setting.flag |= iki_write_main_flag_object_d; } - else if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_found_e) { + else if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_write_long_object_s); @@ -91,7 +91,7 @@ extern "C" { return; } - if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_value_e) { + if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_value_d) { main->setting.contents.used = 0; main->setting.state.status = f_memory_arrays_resize(content->values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.contents.array, &main->setting.contents.used, &main->setting.contents.size, &f_string_dynamics_delete_callback); @@ -116,7 +116,7 @@ extern "C" { main->setting.flag |= iki_write_main_flag_content_d; } - else if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_found_e) { + else if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_write_long_content_s); diff --git a/level_3/iki_write/c/iki/common.c b/level_3/iki_write/c/iki/common.c index 79de01c..a98bc70 100644 --- a/level_3/iki_write/c/iki/common.c +++ b/level_3/iki_write/c/iki/common.c @@ -14,13 +14,13 @@ extern "C" { if (!main) return; - if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_e) return; - if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_e) return; + if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_d) return; + if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_d) return; f_number_unsigned_t index = 0; - if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_value_e) { + if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_value_d) { f_number_unsigneds_t * const values = &main->program.parameters.array[iki_write_parameter_object_e].values; main->setting.objectss.used = 0; @@ -56,7 +56,7 @@ extern "C" { main->setting.flag |= iki_write_main_flag_object_d; } - else if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_found_e) { + else if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_write_long_object_s); @@ -64,7 +64,7 @@ extern "C" { return; } - if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_value_e) { + if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_value_d) { f_number_unsigneds_t * const values = &main->program.parameters.array[iki_write_parameter_content_e].values; main->setting.contents.used = 0; @@ -91,7 +91,7 @@ extern "C" { main->setting.flag |= iki_write_main_flag_content_d; } - else if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_found_e) { + else if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_write_long_content_s); diff --git a/level_3/iki_write/c/main/common.c b/level_3/iki_write/c/main/common.c index 8fd2cf4..94d1df5 100644 --- a/level_3/iki_write/c/main/common.c +++ b/level_3/iki_write/c/main/common.c @@ -54,19 +54,19 @@ extern "C" { } } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= iki_write_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= iki_write_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= iki_write_main_flag_copyright_d; return; @@ -79,7 +79,7 @@ extern "C" { main->setting.flag &= ~iki_write_main_flag_pipe_d; } - if (parameters->array[iki_write_parameter_file_e].result & f_console_result_value_e && parameters->array[iki_write_parameter_file_e].values.used) { + if (parameters->array[iki_write_parameter_file_e].result & f_console_result_value_d && parameters->array[iki_write_parameter_file_e].values.used) { if (parameters->array[iki_write_parameter_file_e].values.used > 1) { main->setting.state.status = F_status_set_error(F_parameter); @@ -103,7 +103,7 @@ extern "C" { main->setting.flag |= iki_write_main_flag_file_to_d; } - else if (parameters->array[iki_write_parameter_file_e].result & f_console_result_found_e) { + else if (parameters->array[iki_write_parameter_file_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, iki_write_long_file_s); @@ -119,7 +119,7 @@ extern "C" { return; } - if (parameters->array[iki_write_parameter_wrap_e].result & f_console_result_found_e) { + if (parameters->array[iki_write_parameter_wrap_e].result & f_console_result_found_d) { main->setting.flag |= iki_write_main_flag_wrap_d; main->setting.state.flag |= f_iki_state_flag_force_wrap_e; } @@ -129,39 +129,39 @@ extern "C" { main->setting.quote = f_iki_syntax_quote_double_s; - if (parameters->array[iki_write_parameter_double_e].result & f_console_result_found_e) { - if (parameters->array[iki_write_parameter_single_e].result & f_console_result_found_e) { + if (parameters->array[iki_write_parameter_double_e].result & f_console_result_found_d) { + if (parameters->array[iki_write_parameter_single_e].result & f_console_result_found_d) { if (parameters->array[iki_write_parameter_double_e].location < parameters->array[iki_write_parameter_single_e].location) { main->setting.quote = f_iki_syntax_quote_single_s; - if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[iki_write_parameter_single_e].location < parameters->array[iki_write_parameter_grave_e].location) { main->setting.quote = f_iki_syntax_quote_grave_s; } } } - else if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + else if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[iki_write_parameter_double_e].location < parameters->array[iki_write_parameter_grave_e].location) { main->setting.quote = f_iki_syntax_quote_grave_s; } } } - else if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + else if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[iki_write_parameter_double_e].location < parameters->array[iki_write_parameter_grave_e].location) { main->setting.quote = f_iki_syntax_quote_grave_s; } } } - else if (parameters->array[iki_write_parameter_single_e].result & f_console_result_found_e) { + else if (parameters->array[iki_write_parameter_single_e].result & f_console_result_found_d) { main->setting.quote = f_iki_syntax_quote_single_s; - if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_d) { if (parameters->array[iki_write_parameter_single_e].location < parameters->array[iki_write_parameter_grave_e].location) { main->setting.quote = f_iki_syntax_quote_grave_s; } } } - else if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + else if (parameters->array[iki_write_parameter_grave_e].result & f_console_result_found_d) { main->setting.quote = f_iki_syntax_quote_grave_s; } } diff --git a/level_3/iki_write/c/main/common/enumeration.h b/level_3/iki_write/c/main/common/enumeration.h index d0c7019..cc908ad 100644 --- a/level_3/iki_write/c/main/common/enumeration.h +++ b/level_3/iki_write/c/main/common/enumeration.h @@ -34,13 +34,13 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(iki_write_short_content_s, iki_write_long_content_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_double_s, iki_write_long_double_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_file_s, iki_write_long_file_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_grave_s, iki_write_long_grave_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_object_s, iki_write_long_object_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_single_s, iki_write_long_single_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_wrap_s, iki_write_long_wrap_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_content_s, iki_write_long_content_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_double_s, iki_write_long_double_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_file_s, iki_write_long_file_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_grave_s, iki_write_long_grave_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_object_s, iki_write_long_object_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_single_s, iki_write_long_single_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_wrap_s, iki_write_long_wrap_s, 0, f_console_flag_normal_d), \ } #define iki_write_parameter_total_d (f_console_parameter_state_type_total_d + 7) diff --git a/level_3/status_code/c/main/common.c b/level_3/status_code/c/main/common.c index 67ddf6c..32a90bf 100644 --- a/level_3/status_code/c/main/common.c +++ b/level_3/status_code/c/main/common.c @@ -39,19 +39,19 @@ extern "C" { return; } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= status_code_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= status_code_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= status_code_main_flag_copyright_d; return; @@ -64,19 +64,19 @@ extern "C" { main->setting.flag &= ~status_code_main_flag_pipe_d; } - if (parameters->array[status_code_parameter_error_e].result & f_console_result_found_e) { + if (parameters->array[status_code_parameter_error_e].result & f_console_result_found_d) { main->setting.flag |= status_code_main_flag_error_d; } - if (parameters->array[status_code_parameter_fine_e].result & f_console_result_found_e) { + if (parameters->array[status_code_parameter_fine_e].result & f_console_result_found_d) { main->setting.flag |= status_code_main_flag_fine_d; } - if (parameters->array[status_code_parameter_warning_e].result & f_console_result_found_e) { + if (parameters->array[status_code_parameter_warning_e].result & f_console_result_found_d) { main->setting.flag |= status_code_main_flag_warning_d; } - if (parameters->array[status_code_parameter_number_e].result & f_console_result_found_e) { + if (parameters->array[status_code_parameter_number_e].result & f_console_result_found_d) { main->setting.flag |= status_code_main_flag_number_d; } diff --git a/level_3/status_code/c/main/common/enumeration.h b/level_3/status_code/c/main/common/enumeration.h index 4e0d900..e8528dd 100644 --- a/level_3/status_code/c/main/common/enumeration.h +++ b/level_3/status_code/c/main/common/enumeration.h @@ -31,10 +31,10 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(status_code_short_fine_s, status_code_long_fine_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(status_code_short_warning_s, status_code_long_warning_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(status_code_short_error_s, status_code_long_error_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(status_code_short_number_s, status_code_long_number_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(status_code_short_fine_s, status_code_long_fine_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(status_code_short_warning_s, status_code_long_warning_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(status_code_short_error_s, status_code_long_error_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(status_code_short_number_s, status_code_long_number_s, 0, f_console_flag_normal_d), \ } #define status_code_parameter_total_d (f_console_parameter_state_type_total_d + 4) diff --git a/level_3/utf8/c/main/common.c b/level_3/utf8/c/main/common.c index 04e1a14..e0fb2ba 100644 --- a/level_3/utf8/c/main/common.c +++ b/level_3/utf8/c/main/common.c @@ -95,7 +95,7 @@ extern "C" { main->setting.mode &= ~(utf8_mode_to_bytesequence_e | utf8_mode_to_codepoint_e); // --to_width may be specified with --to_combining. - if (parameters->array[utf8_parameter_to_width_e].result & f_console_result_found_e) { + if (parameters->array[utf8_parameter_to_width_e].result & f_console_result_found_d) { main->setting.mode |= utf8_mode_to_width_e; } @@ -105,7 +105,7 @@ extern "C" { main->setting.mode &= ~(utf8_mode_to_bytesequence_e | utf8_mode_to_codepoint_e); // --to_width may be specified with --to_combining. - if (parameters->array[utf8_parameter_to_combining_e].result & f_console_result_found_e) { + if (parameters->array[utf8_parameter_to_combining_e].result & f_console_result_found_d) { main->setting.mode |= utf8_mode_to_combining_e; } @@ -114,19 +114,19 @@ extern "C" { } } - if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_d) { main->setting.flag |= utf8_main_flag_help_d; return; } - if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_d) { main->setting.flag |= utf8_main_flag_version_d; return; } - if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) { + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) { main->setting.flag |= utf8_main_flag_copyright_d; return; @@ -139,7 +139,7 @@ extern "C" { main->setting.flag &= ~utf8_main_flag_pipe_d; } - if (parameters->array[utf8_parameter_to_file_e].result & f_console_result_value_e) { + if (parameters->array[utf8_parameter_to_file_e].result & f_console_result_value_d) { if (parameters->array[utf8_parameter_to_file_e].values.used > 1) { main->setting.state.status = F_status_set_error(F_parameter); @@ -189,7 +189,7 @@ extern "C" { return; } } - else if (parameters->array[utf8_parameter_to_file_e].result & f_console_result_found_e) { + else if (parameters->array[utf8_parameter_to_file_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, utf8_long_to_file_s); @@ -203,7 +203,7 @@ extern "C" { f_number_unsigned_t index = 0; - if (parameters->array[utf8_parameter_from_file_e].result & f_console_result_value_e) { + if (parameters->array[utf8_parameter_from_file_e].result & f_console_result_value_d) { main->setting.path_files_from.used = 0; main->setting.state.status = f_memory_array_increase_by(parameters->array[utf8_parameter_from_file_e].values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.path_files_from.array, &main->setting.path_files_from.used, &main->setting.path_files_from.size); @@ -253,7 +253,7 @@ extern "C" { main->setting.flag |= utf8_main_flag_file_from_d; } - else if (parameters->array[utf8_parameter_from_file_e].result & f_console_result_found_e) { + else if (parameters->array[utf8_parameter_from_file_e].result & f_console_result_found_d) { main->setting.state.status = F_status_set_error(F_parameter); fll_program_print_error_parameter_missing_value(&main->program.error, f_console_symbol_long_normal_s, utf8_long_from_file_s); @@ -295,7 +295,7 @@ extern "C" { } if (!(main->setting.mode & utf8_mode_to_bytesequence_e)) { - if ((parameters->array[utf8_parameter_separate_e].result & f_console_result_found_e) || (parameters->array[utf8_parameter_headers_e].result & f_console_result_found_e)) { + if ((parameters->array[utf8_parameter_separate_e].result & f_console_result_found_d) || (parameters->array[utf8_parameter_headers_e].result & f_console_result_found_d)) { main->setting.prepend = utf8_string_prepend_padding_s; main->setting.append = f_string_eol_s; } @@ -304,8 +304,8 @@ extern "C" { } } - if (parameters->array[utf8_parameter_headers_e].result & f_console_result_found_e) { - if (parameters->array[utf8_parameter_separate_e].result & f_console_result_found_e) { + if (parameters->array[utf8_parameter_headers_e].result & f_console_result_found_d) { + if (parameters->array[utf8_parameter_separate_e].result & f_console_result_found_d) { if (parameters->array[utf8_parameter_headers_e].location < parameters->array[utf8_parameter_separate_e].location) { main->setting.flag |= utf8_main_flag_separate_d; } @@ -325,11 +325,11 @@ extern "C" { main->setting.flag |= utf8_main_flag_header_d; } } - else if (parameters->array[utf8_parameter_separate_e].result & f_console_result_found_e) { + else if (parameters->array[utf8_parameter_separate_e].result & f_console_result_found_d) { main->setting.flag |= utf8_main_flag_separate_d; } - if (parameters->array[utf8_parameter_strip_invalid_e].result & f_console_result_found_e) { + if (parameters->array[utf8_parameter_strip_invalid_e].result & f_console_result_found_d) { main->setting.flag |= utf8_main_flag_strip_invalid_d; } diff --git a/level_3/utf8/c/main/common/enumeration.h b/level_3/utf8/c/main/common/enumeration.h index 38164ae..5956e05 100644 --- a/level_3/utf8/c/main/common/enumeration.h +++ b/level_3/utf8/c/main/common/enumeration.h @@ -75,18 +75,18 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(utf8_short_from_bytesequence_s, utf8_long_from_bytesequence_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_from_codepoint_s, utf8_long_from_codepoint_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_from_file_s, utf8_long_from_file_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_headers_s, utf8_long_headers_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_separate_s, utf8_long_separate_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_strip_invalid_s, utf8_long_strip_invalid_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_to_bytesequence_s, utf8_long_to_bytesequence_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_to_codepoint_s, utf8_long_to_codepoint_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_to_combining_s, utf8_long_to_combining_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_to_file_s, utf8_long_to_file_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_to_width_s, utf8_long_to_width_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(utf8_short_verify_s, utf8_long_verify_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(utf8_short_from_bytesequence_s, utf8_long_from_bytesequence_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_from_codepoint_s, utf8_long_from_codepoint_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_from_file_s, utf8_long_from_file_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_headers_s, utf8_long_headers_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_separate_s, utf8_long_separate_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_strip_invalid_s, utf8_long_strip_invalid_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_to_bytesequence_s, utf8_long_to_bytesequence_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_to_codepoint_s, utf8_long_to_codepoint_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_to_combining_s, utf8_long_to_combining_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_to_file_s, utf8_long_to_file_s, 1, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_to_width_s, utf8_long_to_width_s, 0, f_console_flag_normal_d), \ + macro_f_console_parameter_t_initialize_3(utf8_short_verify_s, utf8_long_verify_s, 0, f_console_flag_normal_d), \ } #define utf8_parameter_total_d (f_console_parameter_state_type_total_d + 12)