From ee4d94dd00342582de7473dff746d60e03c2fda0 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 9 Jun 2024 19:00:24 -0500 Subject: [PATCH] Update: Add all of the fl_print_format() replacement sequences as a static string. I probably should create a single and double context for every sequence as well. That is rather time consuming so I will do this some time in the future. --- level_0/f_string/c/string/static.c | 160 ++++++++++++ level_0/f_string/c/string/static.h | 516 +++++++++++++++++++++++++++---------- 2 files changed, 542 insertions(+), 134 deletions(-) diff --git a/level_0/f_string/c/string/static.c b/level_0/f_string/c/string/static.c index 9d155ba..6d3497b 100644 --- a/level_0/f_string/c/string/static.c +++ b/level_0/f_string/c/string/static.c @@ -524,6 +524,26 @@ extern "C" { #endif // _di_f_string_ascii_s_ #ifndef _di_f_string_format_s_ + #ifndef _di_f_string_format_bracket_close_s_ + const f_string_static_t f_string_format_bracket_close_s = macro_f_string_static_t_initialize_1(F_string_format_bracket_close_s, 0, F_string_format_bracket_close_s_length); + #endif // _di_f_string_format_bracket_close_s_ + + #ifndef _di_f_string_format_bracket_open_s_ + const f_string_static_t f_string_format_bracket_open_s = macro_f_string_static_t_initialize_1(F_string_format_bracket_open_s, 0, F_string_format_bracket_open_s_length); + #endif // _di_f_string_format_bracket_open_s_ + + #ifndef _di_f_string_format_c_s_ + const f_string_static_t f_string_format_c_s = macro_f_string_static_t_initialize_1(F_string_format_c_s, 0, F_string_format_c_s_length); + #endif // _di_f_string_format_c_s_ + + #ifndef _di_f_string_format_C_s_ + const f_string_static_t f_string_format_C_s = macro_f_string_static_t_initialize_1(F_string_format_C_s, 0, F_string_format_C_s_length); + #endif // _di_f_string_format_C_s_ + + #ifndef _di_f_string_format_d_s_ + const f_string_static_t f_string_format_d_s = macro_f_string_static_t_initialize_1(F_string_format_d_s, 0, F_string_format_d_s_length); + #endif // _di_f_string_format_d_s_ + #ifndef _di_f_string_format_d_double_s_ const f_string_static_t f_string_format_d_double_s = macro_f_string_static_t_initialize_1(F_string_format_d_double_s, 0, F_string_format_d_double_s_length); #endif // _di_f_string_format_d_double_s_ @@ -532,6 +552,10 @@ extern "C" { const f_string_static_t f_string_format_d_single_s = macro_f_string_static_t_initialize_1(F_string_format_d_single_s, 0, F_string_format_d_single_s_length); #endif // _di_f_string_format_d_single_s_ + #ifndef _di_f_string_format_D_s_ + const f_string_static_t f_string_format_D_s = macro_f_string_static_t_initialize_1(F_string_format_D_s, 0, F_string_format_D_s_length); + #endif // _di_f_string_format_D_s_ + #ifndef _di_f_string_format_D_double_s_ const f_string_static_t f_string_format_D_double_s = macro_f_string_static_t_initialize_1(F_string_format_D_double_s, 0, F_string_format_D_double_s_length); #endif // _di_f_string_format_D_double_s_ @@ -540,6 +564,10 @@ extern "C" { const f_string_static_t f_string_format_D_single_s = macro_f_string_static_t_initialize_1(F_string_format_D_single_s, 0, F_string_format_D_single_s_length); #endif // _di_f_string_format_D_single_s_ + #ifndef _di_f_string_format_i_s_ + const f_string_static_t f_string_format_i_s = macro_f_string_static_t_initialize_1(F_string_format_i_s, 0, F_string_format_i_s_length); + #endif // _di_f_string_format_i_s_ + #ifndef _di_f_string_format_i_double_s_ const f_string_static_t f_string_format_i_double_s = macro_f_string_static_t_initialize_1(F_string_format_i_double_s, 0, F_string_format_i_double_s_length); #endif // _di_f_string_format_i_double_s_ @@ -548,6 +576,14 @@ extern "C" { const f_string_static_t f_string_format_i_single_s = macro_f_string_static_t_initialize_1(F_string_format_i_single_s, 0, F_string_format_i_single_s_length); #endif // _di_f_string_format_i_single_s_ + #ifndef _di_f_string_format_I_s_ + const f_string_static_t f_string_format_I_s = macro_f_string_static_t_initialize_1(F_string_format_I_s, 0, F_string_format_I_s_length); + #endif // _di_f_string_format_I_s_ + + #ifndef _di_f_string_format_q_s_ + const f_string_static_t f_string_format_q_s = macro_f_string_static_t_initialize_1(F_string_format_q_s, 0, F_string_format_q_s_length); + #endif // _di_f_string_format_q_s_ + #ifndef _di_f_string_format_q_double_s_ const f_string_static_t f_string_format_q_double_s = macro_f_string_static_t_initialize_1(F_string_format_q_double_s, 0, F_string_format_q_double_s_length); #endif // _di_f_string_format_q_double_s_ @@ -564,6 +600,10 @@ extern "C" { const f_string_static_t f_string_format_q_single_s = macro_f_string_static_t_initialize_1(F_string_format_q_single_s, 0, F_string_format_q_single_s_length); #endif // _di_f_string_format_q_single_s_ + #ifndef _di_f_string_format_Q_s_ + const f_string_static_t f_string_format_Q_s = macro_f_string_static_t_initialize_1(F_string_format_Q_s, 0, F_string_format_Q_s_length); + #endif // _di_f_string_format_Q_s_ + #ifndef _di_f_string_format_Q_double_s_ const f_string_static_t f_string_format_Q_double_s = macro_f_string_static_t_initialize_1(F_string_format_Q_double_s, 0, F_string_format_Q_double_s_length); #endif // _di_f_string_format_Q_double_s_ @@ -580,6 +620,10 @@ extern "C" { const f_string_static_t f_string_format_Q_single_s = macro_f_string_static_t_initialize_1(F_string_format_Q_single_s, 0, F_string_format_Q_single_s_length); #endif // _di_f_string_format_Q_single_s_ + #ifndef _di_f_string_format_r_s_ + const f_string_static_t f_string_format_r_s = macro_f_string_static_t_initialize_1(F_string_format_r_s, 0, F_string_format_r_s_length); + #endif // _di_f_string_format_r_s_ + #ifndef _di_f_string_format_r_double_s_ const f_string_static_t f_string_format_r_double_s = macro_f_string_static_t_initialize_1(F_string_format_r_double_s, 0, F_string_format_r_double_s_length); #endif // _di_f_string_format_r_double_s_ @@ -596,6 +640,10 @@ extern "C" { const f_string_static_t f_string_format_r_single_s = macro_f_string_static_t_initialize_1(F_string_format_r_single_s, 0, F_string_format_r_single_s_length); #endif // _di_f_string_format_r_single_s_ + #ifndef _di_f_string_format_R_s_ + const f_string_static_t f_string_format_R_s = macro_f_string_static_t_initialize_1(F_string_format_R_s, 0, F_string_format_R_s_length); + #endif // _di_f_string_format_R_s_ + #ifndef _di_f_string_format_R_double_s_ const f_string_static_t f_string_format_R_double_s = macro_f_string_static_t_initialize_1(F_string_format_R_double_s, 0, F_string_format_R_double_s_length); #endif // _di_f_string_format_R_double_s_ @@ -612,6 +660,10 @@ extern "C" { const f_string_static_t f_string_format_R_single_s = macro_f_string_static_t_initialize_1(F_string_format_R_single_s, 0, F_string_format_R_single_s_length); #endif // _di_f_string_format_R_single_s_ + #ifndef _di_f_string_format_s_s_ + const f_string_static_t f_string_format_s_s = macro_f_string_static_t_initialize_1(F_string_format_s_s, 0, F_string_format_s_s_length); + #endif // _di_f_string_format_s_s_ + #ifndef _di_f_string_format_s_double_s_ const f_string_static_t f_string_format_s_double_s = macro_f_string_static_t_initialize_1(F_string_format_s_double_s, 0, F_string_format_s_double_s_length); #endif // _di_f_string_format_s_double_s_ @@ -620,6 +672,10 @@ extern "C" { const f_string_static_t f_string_format_s_single_s = macro_f_string_static_t_initialize_1(F_string_format_s_single_s, 0, F_string_format_s_single_s_length); #endif // _di_f_string_format_s_single_s_ + #ifndef _di_f_string_format_S_s_ + const f_string_static_t f_string_format_S_s = macro_f_string_static_t_initialize_1(F_string_format_S_s, 0, F_string_format_S_s_length); + #endif // _di_f_string_format_S_s_ + #ifndef _di_f_string_format_S_double_s_ const f_string_static_t f_string_format_S_double_s = macro_f_string_static_t_initialize_1(F_string_format_S_double_s, 0, F_string_format_S_double_s_length); #endif // _di_f_string_format_S_double_s_ @@ -628,6 +684,10 @@ extern "C" { const f_string_static_t f_string_format_S_single_s = macro_f_string_static_t_initialize_1(F_string_format_S_single_s, 0, F_string_format_S_single_s_length); #endif // _di_f_string_format_S_single_s_ + #ifndef _di_f_string_format_u_s_ + const f_string_static_t f_string_format_u_s = macro_f_string_static_t_initialize_1(F_string_format_u_s, 0, F_string_format_u_s_length); + #endif // _di_f_string_format_u_s_ + #ifndef _di_f_string_format_u_double_s_ const f_string_static_t f_string_format_u_double_s = macro_f_string_static_t_initialize_1(F_string_format_u_double_s, 0, F_string_format_u_double_s_length); #endif // _di_f_string_format_u_double_s_ @@ -636,6 +696,14 @@ extern "C" { const f_string_static_t f_string_format_u_single_s = macro_f_string_static_t_initialize_1(F_string_format_u_single_s, 0, F_string_format_u_single_s_length); #endif // _di_f_string_format_u_single_s_ + #ifndef _di_f_string_format_U_s_ + const f_string_static_t f_string_format_U_s = macro_f_string_static_t_initialize_1(F_string_format_U_s, 0, F_string_format_U_s_length); + #endif // _di_f_string_format_U_s_ + + #ifndef _di_f_string_format_z_s_ + const f_string_static_t f_string_format_z_s = macro_f_string_static_t_initialize_1(F_string_format_z_s, 0, F_string_format_z_s_length); + #endif // _di_f_string_format_z_s_ + #ifndef _di_f_string_format_z_double_s_ const f_string_static_t f_string_format_z_double_s = macro_f_string_static_t_initialize_1(F_string_format_z_double_s, 0, F_string_format_z_double_s_length); #endif // _di_f_string_format_z_double_s_ @@ -644,6 +712,10 @@ extern "C" { const f_string_static_t f_string_format_z_single_s = macro_f_string_static_t_initialize_1(F_string_format_z_single_s, 0, F_string_format_z_single_s_length); #endif // _di_f_string_format_z_single_s_ + #ifndef _di_f_string_format_Z_s_ + const f_string_static_t f_string_format_Z_s = macro_f_string_static_t_initialize_1(F_string_format_Z_s, 0, F_string_format_Z_s_length); + #endif // _di_f_string_format_Z_s_ + #ifndef _di_f_string_format_Z_double_s_ const f_string_static_t f_string_format_Z_double_s = macro_f_string_static_t_initialize_1(F_string_format_Z_double_s, 0, F_string_format_Z_double_s_length); #endif // _di_f_string_format_Z_double_s_ @@ -652,6 +724,10 @@ extern "C" { const f_string_static_t f_string_format_Z_single_s = macro_f_string_static_t_initialize_1(F_string_format_Z_single_s, 0, F_string_format_Z_single_s_length); #endif // _di_f_string_format_Z_single_s_ + #ifndef _di_f_string_format_dl_s_ + const f_string_static_t f_string_format_dl_s = macro_f_string_static_t_initialize_1(F_string_format_dl_s, 0, F_string_format_dl_s_length); + #endif // _di_f_string_format_dl_s_ + #ifndef _di_f_string_format_dl_double_s_ const f_string_static_t f_string_format_dl_double_s = macro_f_string_static_t_initialize_1(F_string_format_dl_double_s, 0, F_string_format_dl_double_s_length); #endif // _di_f_string_format_dl_double_s_ @@ -660,6 +736,10 @@ extern "C" { const f_string_static_t f_string_format_dl_single_s = macro_f_string_static_t_initialize_1(F_string_format_dl_single_s, 0, F_string_format_dl_single_s_length); #endif // _di_f_string_format_dl_single_s_ + #ifndef _di_f_string_format_DL_s_ + const f_string_static_t f_string_format_DL_s = macro_f_string_static_t_initialize_1(F_string_format_DL_s, 0, F_string_format_DL_s_length); + #endif // _di_f_string_format_DL_s_ + #ifndef _di_f_string_format_DL_double_s_ const f_string_static_t f_string_format_DL_double_s = macro_f_string_static_t_initialize_1(F_string_format_DL_double_s, 0, F_string_format_DL_double_s_length); #endif // _di_f_string_format_DL_double_s_ @@ -668,6 +748,10 @@ extern "C" { const f_string_static_t f_string_format_DL_single_s = macro_f_string_static_t_initialize_1(F_string_format_DL_single_s, 0, F_string_format_DL_single_s_length); #endif // _di_f_string_format_DL_single_s_ + #ifndef _di_f_string_format_ii_s_ + const f_string_static_t f_string_format_ii_s = macro_f_string_static_t_initialize_1(F_string_format_ii_s, 0, F_string_format_ii_s_length); + #endif // _di_f_string_format_ii_s_ + #ifndef _di_f_string_format_ii_double_s_ const f_string_static_t f_string_format_ii_double_s = macro_f_string_static_t_initialize_1(F_string_format_ii_double_s, 0, F_string_format_ii_double_s_length); #endif // _di_f_string_format_ii_double_s_ @@ -676,6 +760,14 @@ extern "C" { const f_string_static_t f_string_format_ii_single_s = macro_f_string_static_t_initialize_1(F_string_format_ii_single_s, 0, F_string_format_ii_single_s_length); #endif // _di_f_string_format_ii_single_s_ + #ifndef _di_f_string_format_II_s_ + const f_string_static_t f_string_format_II_s = macro_f_string_static_t_initialize_1(F_string_format_II_s, 0, F_string_format_II_s_length); + #endif // _di_f_string_format_II_s_ + + #ifndef _di_f_string_format_il_s_ + const f_string_static_t f_string_format_il_s = macro_f_string_static_t_initialize_1(F_string_format_il_s, 0, F_string_format_il_s_length); + #endif // _di_f_string_format_il_s_ + #ifndef _di_f_string_format_il_double_s_ const f_string_static_t f_string_format_il_double_s = macro_f_string_static_t_initialize_1(F_string_format_il_double_s, 0, F_string_format_il_double_s_length); #endif // _di_f_string_format_il_double_s_ @@ -684,6 +776,14 @@ extern "C" { const f_string_static_t f_string_format_il_single_s = macro_f_string_static_t_initialize_1(F_string_format_il_single_s, 0, F_string_format_il_single_s_length); #endif // _di_f_string_format_il_single_s_ + #ifndef _di_f_string_format_IL_s_ + const f_string_static_t f_string_format_IL_s = macro_f_string_static_t_initialize_1(F_string_format_IL_s, 0, F_string_format_IL_s_length); + #endif // _di_f_string_format_IL_s_ + + #ifndef _di_f_string_format_in_s_ + const f_string_static_t f_string_format_in_s = macro_f_string_static_t_initialize_1(F_string_format_in_s, 0, F_string_format_in_s_length); + #endif // _di_f_string_format_in_s_ + #ifndef _di_f_string_format_in_double_s_ const f_string_static_t f_string_format_in_double_s = macro_f_string_static_t_initialize_1(F_string_format_in_double_s, 0, F_string_format_in_double_s_length); #endif // _di_f_string_format_in_double_s_ @@ -692,6 +792,10 @@ extern "C" { const f_string_static_t f_string_format_in_single_s = macro_f_string_static_t_initialize_1(F_string_format_in_single_s, 0, F_string_format_in_single_s_length); #endif // _di_f_string_format_in_single_s_ + #ifndef _di_f_string_format_IN_s_ + const f_string_static_t f_string_format_IN_s = macro_f_string_static_t_initialize_1(F_string_format_IN_s, 0, F_string_format_IN_s_length); + #endif // _di_f_string_format_IN_s_ + #ifndef _di_f_string_format_QQ_double_s_ const f_string_static_t f_string_format_QQ_double_s = macro_f_string_static_t_initialize_1(F_string_format_QQ_double_s, 0, F_string_format_QQ_double_s_length); #endif // _di_f_string_format_QQ_double_s_ @@ -732,6 +836,10 @@ extern "C" { const f_string_static_t f_string_format_SS_single_s = macro_f_string_static_t_initialize_1(F_string_format_SS_single_s, 0, F_string_format_SS_single_s_length); #endif // _di_f_string_format_SS_single_s_ + #ifndef _di_f_string_format_ui_s_ + const f_string_static_t f_string_format_ui_s = macro_f_string_static_t_initialize_1(F_string_format_ui_s, 0, F_string_format_ui_s_length); + #endif // _di_f_string_format_ui_s_ + #ifndef _di_f_string_format_ui_double_s_ const f_string_static_t f_string_format_ui_double_s = macro_f_string_static_t_initialize_1(F_string_format_ui_double_s, 0, F_string_format_ui_double_s_length); #endif // _di_f_string_format_ui_double_s_ @@ -740,6 +848,14 @@ extern "C" { const f_string_static_t f_string_format_ui_single_s = macro_f_string_static_t_initialize_1(F_string_format_ui_single_s, 0, F_string_format_ui_single_s_length); #endif // _di_f_string_format_ui_single_s_ + #ifndef _di_f_string_format_UI_s_ + const f_string_static_t f_string_format_UI_s = macro_f_string_static_t_initialize_1(F_string_format_UI_s, 0, F_string_format_UI_s_length); + #endif // _di_f_string_format_UI_s_ + + #ifndef _di_f_string_format_ul_s_ + const f_string_static_t f_string_format_ul_s = macro_f_string_static_t_initialize_1(F_string_format_ul_s, 0, F_string_format_ul_s_length); + #endif // _di_f_string_format_ul_s_ + #ifndef _di_f_string_format_ul_double_s_ const f_string_static_t f_string_format_ul_double_s = macro_f_string_static_t_initialize_1(F_string_format_ul_double_s, 0, F_string_format_ul_double_s_length); #endif // _di_f_string_format_ul_double_s_ @@ -748,6 +864,14 @@ extern "C" { const f_string_static_t f_string_format_ul_single_s = macro_f_string_static_t_initialize_1(F_string_format_ul_single_s, 0, F_string_format_ul_single_s_length); #endif // _di_f_string_format_ul_single_s_ + #ifndef _di_f_string_format_UL_s_ + const f_string_static_t f_string_format_UL_s = macro_f_string_static_t_initialize_1(F_string_format_UL_s, 0, F_string_format_UL_s_length); + #endif // _di_f_string_format_UL_s_ + + #ifndef _di_f_string_format_un_s_ + const f_string_static_t f_string_format_un_s = macro_f_string_static_t_initialize_1(F_string_format_un_s, 0, F_string_format_un_s_length); + #endif // _di_f_string_format_un_s_ + #ifndef _di_f_string_format_un_double_s_ const f_string_static_t f_string_format_un_double_s = macro_f_string_static_t_initialize_1(F_string_format_un_double_s, 0, F_string_format_un_double_s_length); #endif // _di_f_string_format_un_double_s_ @@ -756,6 +880,14 @@ extern "C" { const f_string_static_t f_string_format_un_single_s = macro_f_string_static_t_initialize_1(F_string_format_un_single_s, 0, F_string_format_un_single_s_length); #endif // _di_f_string_format_un_single_s_ + #ifndef _di_f_string_format_UN_s_ + const f_string_static_t f_string_format_UN_s = macro_f_string_static_t_initialize_1(F_string_format_UN_s, 0, F_string_format_UN_s_length); + #endif // _di_f_string_format_UN_s_ + + #ifndef _di_f_string_format_iii_s_ + const f_string_static_t f_string_format_iii_s = macro_f_string_static_t_initialize_1(F_string_format_iii_s, 0, F_string_format_iii_s_length); + #endif // _di_f_string_format_iii_s_ + #ifndef _di_f_string_format_iii_double_s_ const f_string_static_t f_string_format_iii_double_s = macro_f_string_static_t_initialize_1(F_string_format_iii_double_s, 0, F_string_format_iii_double_s_length); #endif // _di_f_string_format_iii_double_s_ @@ -764,6 +896,14 @@ extern "C" { const f_string_static_t f_string_format_iii_single_s = macro_f_string_static_t_initialize_1(F_string_format_iii_single_s, 0, F_string_format_iii_single_s_length); #endif // _di_f_string_format_iii_single_s_ + #ifndef _di_f_string_format_III_s_ + const f_string_static_t f_string_format_III_s = macro_f_string_static_t_initialize_1(F_string_format_III_s, 0, F_string_format_III_s_length); + #endif // _di_f_string_format_III_s_ + + #ifndef _di_f_string_format_ill_s_ + const f_string_static_t f_string_format_ill_s = macro_f_string_static_t_initialize_1(F_string_format_ill_s, 0, F_string_format_ill_s_length); + #endif // _di_f_string_format_ill_s_ + #ifndef _di_f_string_format_ill_double_s_ const f_string_static_t f_string_format_ill_double_s = macro_f_string_static_t_initialize_1(F_string_format_ill_double_s, 0, F_string_format_ill_double_s_length); #endif // _di_f_string_format_ill_double_s_ @@ -772,6 +912,14 @@ extern "C" { const f_string_static_t f_string_format_ill_single_s = macro_f_string_static_t_initialize_1(F_string_format_ill_single_s, 0, F_string_format_ill_single_s_length); #endif // _di_f_string_format_ill_single_s_ + #ifndef _di_f_string_format_ILL_s_ + const f_string_static_t f_string_format_ILL_s = macro_f_string_static_t_initialize_1(F_string_format_ILL_s, 0, F_string_format_ILL_s_length); + #endif // _di_f_string_format_ILL_s_ + + #ifndef _di_f_string_format_uii_s_ + const f_string_static_t f_string_format_uii_s = macro_f_string_static_t_initialize_1(F_string_format_uii_s, 0, F_string_format_uii_s_length); + #endif // _di_f_string_format_uii_s_ + #ifndef _di_f_string_format_uii_double_s_ const f_string_static_t f_string_format_uii_double_s = macro_f_string_static_t_initialize_1(F_string_format_uii_double_s, 0, F_string_format_uii_double_s_length); #endif // _di_f_string_format_uii_double_s_ @@ -780,6 +928,14 @@ extern "C" { const f_string_static_t f_string_format_uii_single_s = macro_f_string_static_t_initialize_1(F_string_format_uii_single_s, 0, F_string_format_uii_single_s_length); #endif // _di_f_string_format_uii_single_s_ + #ifndef _di_f_string_format_UII_s_ + const f_string_static_t f_string_format_UII_s = macro_f_string_static_t_initialize_1(F_string_format_UII_s, 0, F_string_format_UII_s_length); + #endif // _di_f_string_format_UII_s_ + + #ifndef _di_f_string_format_ull_s_ + const f_string_static_t f_string_format_ull_s = macro_f_string_static_t_initialize_1(F_string_format_ull_s, 0, F_string_format_ull_s_length); + #endif // _di_f_string_format_ull_s_ + #ifndef _di_f_string_format_ull_double_s_ const f_string_static_t f_string_format_ull_double_s = macro_f_string_static_t_initialize_1(F_string_format_ull_double_s, 0, F_string_format_ull_double_s_length); #endif // _di_f_string_format_ull_double_s_ @@ -788,6 +944,10 @@ extern "C" { const f_string_static_t f_string_format_ull_single_s = macro_f_string_static_t_initialize_1(F_string_format_ull_single_s, 0, F_string_format_ull_single_s_length); #endif // _di_f_string_format_ull_single_s_ + #ifndef _di_f_string_format_ULL_s_ + const f_string_static_t f_string_format_ULL_s = macro_f_string_static_t_initialize_1(F_string_format_ULL_s, 0, F_string_format_ULL_s_length); + #endif // _di_f_string_format_ULL_s_ + #ifndef _di_f_string_format_sentence_end_s_ const f_string_static_t f_string_format_sentence_end_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_s, 0, F_string_format_sentence_end_s_length); #endif // _di_f_string_format_sentence_end_s_ diff --git a/level_0/f_string/c/string/static.h b/level_0/f_string/c/string/static.h index 7da2489..81f80f7 100644 --- a/level_0/f_string/c/string/static.h +++ b/level_0/f_string/c/string/static.h @@ -875,145 +875,245 @@ extern "C" { * Provide a static strings focusing on the commonly used print format strings. */ #ifndef _di_f_string_format_s_ - #define F_string_format_d_double_s "%[%[%d%]%]" - #define F_string_format_d_single_s "%[%d%]" - #define F_string_format_D_double_s "%[%[%D%]%]" - #define F_string_format_D_single_s "%[%D%]" - #define F_string_format_i_double_s "%[%[%i%]%]" - #define F_string_format_i_single_s "%[%i%]" - #define F_string_format_q_double_s "%[%[%q%]%]" - #define F_string_format_q_range_double_s "%[%[%/q%]%]" - #define F_string_format_q_range_single_s "%[%/q%]" - #define F_string_format_q_single_s "%[%q%]" - #define F_string_format_Q_double_s "%[%[%Q%]%]" - #define F_string_format_Q_range_double_s "%[%[%/Q%]%]" - #define F_string_format_Q_range_single_s "%[%/Q%]" - #define F_string_format_Q_single_s "%[%Q%]" - #define F_string_format_r_double_s "%[%[%r%]%]" - #define F_string_format_r_range_double_s "%[%[%/r%]%]" - #define F_string_format_r_range_single_s "%[%/r%]" - #define F_string_format_r_single_s "%[%r%]" - #define F_string_format_R_double_s "%[%[%R%]%]" - #define F_string_format_R_range_double_s "%[%[%/R%]%]" - #define F_string_format_R_range_single_s "%[%/R%]" - #define F_string_format_R_single_s "%[%R%]" - #define F_string_format_s_double_s "%[%[%s%]%]" - #define F_string_format_s_single_s "%[%s%]" - #define F_string_format_S_double_s "%[%[%S%]%]" - #define F_string_format_S_single_s "%[%S%]" - #define F_string_format_u_double_s "%[%[%u%]%]" - #define F_string_format_u_single_s "%[%u%]" - #define F_string_format_z_double_s "%[%[%u%]%]" - #define F_string_format_z_single_s "%[%u%]" - #define F_string_format_Z_double_s "%[%[%u%]%]" - #define F_string_format_Z_single_s "%[%u%]" - #define F_string_format_dl_double_s "%[%[%dl%]%]" - #define F_string_format_dl_single_s "%[%dl%]" - #define F_string_format_DL_double_s "%[%[%DL%]%]" - #define F_string_format_DL_single_s "%[%DL%]" - #define F_string_format_ii_double_s "%[%[%ii%]%]" - #define F_string_format_ii_single_s "%[%ii%]" - #define F_string_format_il_double_s "%[%[%il%]%]" - #define F_string_format_il_single_s "%[%il%]" - #define F_string_format_in_double_s "%[%[%in%]%]" - #define F_string_format_in_single_s "%[%in%]" - #define F_string_format_QQ_double_s "%[%[%Q%Q%]%]" - #define F_string_format_QQ_single_s "%[%Q%Q%]" - #define F_string_format_rr_double_s "%[%[%r%r%]%]" - #define F_string_format_rr_single_s "%[%r%r%]" - #define F_string_format_RR_double_s "%[%[%R%R%]%]" - #define F_string_format_RR_single_s "%[%R%R%]" - #define F_string_format_ss_double_s "%[%[%s%s%]%]" - #define F_string_format_ss_single_s "%[%s%s%]" - #define F_string_format_SS_double_s "%[%[%S%S%]%]" - #define F_string_format_SS_single_s "%[%S%S%]" - #define F_string_format_ui_double_s "%[%[%ui%]%]" - #define F_string_format_ui_single_s "%[%ui%]" - #define F_string_format_ul_double_s "%[%[%ul%]%]" - #define F_string_format_ul_single_s "%[%ul%]" - #define F_string_format_un_double_s "%[%[%un%]%]" - #define F_string_format_un_single_s "%[%un%]" - #define F_string_format_iii_double_s "%[%[%iii%]%]" - #define F_string_format_iii_single_s "%[%iii%]" - #define F_string_format_ill_double_s "%[%[%ill%]%]" - #define F_string_format_ill_single_s "%[%ill%]" - #define F_string_format_uii_double_s "%[%[%uii%]%]" - #define F_string_format_uii_single_s "%[%uii%]" - #define F_string_format_ull_double_s "%[%[%ull%]%]" - #define F_string_format_ull_single_s "%[%ull%]" + #define F_string_format_bracket_close_s "%]" + #define F_string_format_bracket_open_s "%[" + #define F_string_format_c_s "%c" + #define F_string_format_C_s "%C" + #define F_string_format_d_s "%d" + #define F_string_format_d_double_s "%[%[%d%]%]" + #define F_string_format_d_single_s "%[%d%]" + #define F_string_format_D_s "%D" + #define F_string_format_D_double_s "%[%[%D%]%]" + #define F_string_format_D_single_s "%[%D%]" + #define F_string_format_i_s "%i" + #define F_string_format_i_double_s "%[%[%i%]%]" + #define F_string_format_i_single_s "%[%i%]" + #define F_string_format_I_s "%I" + #define F_string_format_q_s "%q" + #define F_string_format_q_double_s "%[%[%q%]%]" + #define F_string_format_q_range_double_s "%[%[%/q%]%]" + #define F_string_format_q_range_single_s "%[%/q%]" + #define F_string_format_q_single_s "%[%q%]" + #define F_string_format_Q_s "%Q" + #define F_string_format_Q_double_s "%[%[%Q%]%]" + #define F_string_format_Q_range_double_s "%[%[%/Q%]%]" + #define F_string_format_Q_range_single_s "%[%/Q%]" + #define F_string_format_Q_single_s "%[%Q%]" + #define F_string_format_r_s "%r" + #define F_string_format_r_double_s "%[%[%r%]%]" + #define F_string_format_r_range_double_s "%[%[%/r%]%]" + #define F_string_format_r_range_single_s "%[%/r%]" + #define F_string_format_r_single_s "%[%r%]" + #define F_string_format_R_s "%R" + #define F_string_format_R_double_s "%[%[%R%]%]" + #define F_string_format_R_range_double_s "%[%[%/R%]%]" + #define F_string_format_R_range_single_s "%[%/R%]" + #define F_string_format_R_single_s "%[%R%]" + #define F_string_format_s_s "%s" + #define F_string_format_s_double_s "%[%[%s%]%]" + #define F_string_format_s_single_s "%[%s%]" + #define F_string_format_S_s "%S" + #define F_string_format_S_double_s "%[%[%S%]%]" + #define F_string_format_S_single_s "%[%S%]" + #define F_string_format_u_s "%u" + #define F_string_format_u_double_s "%[%[%u%]%]" + #define F_string_format_u_single_s "%[%u%]" + #define F_string_format_U_s "%U" + #define F_string_format_z_s "%z" + #define F_string_format_z_double_s "%[%[%u%]%]" + #define F_string_format_z_single_s "%[%u%]" + #define F_string_format_Z_s "%Z" + #define F_string_format_Z_double_s "%[%[%u%]%]" + #define F_string_format_Z_single_s "%[%u%]" + #define F_string_format_dl_s "%dl" + #define F_string_format_dl_double_s "%[%[%dl%]%]" + #define F_string_format_dl_single_s "%[%dl%]" + #define F_string_format_DL_s "%DL" + #define F_string_format_DL_double_s "%[%[%DL%]%]" + #define F_string_format_DL_single_s "%[%DL%]" + #define F_string_format_ii_s "%ii" + #define F_string_format_ii_double_s "%[%[%ii%]%]" + #define F_string_format_ii_single_s "%[%ii%]" + #define F_string_format_II_s "%II" + #define F_string_format_il_s "%il" + #define F_string_format_il_double_s "%[%[%il%]%]" + #define F_string_format_il_single_s "%[%il%]" + #define F_string_format_IL_s "%IL" + #define F_string_format_in_s "%in" + #define F_string_format_in_double_s "%[%[%in%]%]" + #define F_string_format_in_single_s "%[%in%]" + #define F_string_format_IN_s "%IN" + #define F_string_format_QQ_double_s "%[%[%Q%Q%]%]" + #define F_string_format_QQ_single_s "%[%Q%Q%]" + #define F_string_format_rr_double_s "%[%[%r%r%]%]" + #define F_string_format_rr_single_s "%[%r%r%]" + #define F_string_format_RR_double_s "%[%[%R%R%]%]" + #define F_string_format_RR_single_s "%[%R%R%]" + #define F_string_format_ss_double_s "%[%[%s%s%]%]" + #define F_string_format_ss_single_s "%[%s%s%]" + #define F_string_format_SS_double_s "%[%[%S%S%]%]" + #define F_string_format_SS_single_s "%[%S%S%]" + #define F_string_format_ui_s "%ui" + #define F_string_format_ui_double_s "%[%[%ui%]%]" + #define F_string_format_ui_single_s "%[%ui%]" + #define F_string_format_UI_s "%UI" + #define F_string_format_ul_s "%ul" + #define F_string_format_ul_double_s "%[%[%ul%]%]" + #define F_string_format_ul_single_s "%[%ul%]" + #define F_string_format_UL_s "%UL" + #define F_string_format_un_s "%un" + #define F_string_format_un_double_s "%[%[%un%]%]" + #define F_string_format_un_single_s "%[%un%]" + #define F_string_format_UN_s "%UN" + #define F_string_format_iii_s "%iii" + #define F_string_format_iii_double_s "%[%[%iii%]%]" + #define F_string_format_iii_single_s "%[%iii%]" + #define F_string_format_III_s "%III" + #define F_string_format_ill_s "%ill" + #define F_string_format_ill_double_s "%[%[%ill%]%]" + #define F_string_format_ill_single_s "%[%ill%]" + #define F_string_format_ILL_s "%ILL" + #define F_string_format_uii_s "%uii" + #define F_string_format_uii_double_s "%[%[%uii%]%]" + #define F_string_format_uii_single_s "%[%uii%]" + #define F_string_format_UII_s "%UII" + #define F_string_format_ull_s "%ull" + #define F_string_format_ull_double_s "%[%[%ull%]%]" + #define F_string_format_ull_single_s "%[%ull%]" + #define F_string_format_ULL_s "%ULL" #define F_string_format_sentence_end_s "%[.%]%r" #define F_string_format_sentence_end_quote_s "%['.%]%r" - #define F_string_format_d_single_s_length 10 - #define F_string_format_d_double_s_length 6 - #define F_string_format_D_single_s_length 10 - #define F_string_format_D_double_s_length 6 - #define F_string_format_i_single_s_length 10 - #define F_string_format_i_double_s_length 6 - #define F_string_format_q_double_s_length 10 - #define F_string_format_q_range_double_s_length 11 - #define F_string_format_q_range_single_s_length 7 - #define F_string_format_q_single_s_length 6 - #define F_string_format_Q_double_s_length 10 - #define F_string_format_Q_range_double_s_length 11 - #define F_string_format_Q_range_single_s_length 7 - #define F_string_format_Q_single_s_length 6 - #define F_string_format_r_double_s_length 10 - #define F_string_format_r_range_double_s_length 11 - #define F_string_format_r_range_single_s_length 7 - #define F_string_format_r_single_s_length 6 - #define F_string_format_R_double_s_length 10 - #define F_string_format_R_range_double_s_length 11 - #define F_string_format_R_range_single_s_length 7 - #define F_string_format_R_single_s_length 6 - #define F_string_format_s_single_s_length 10 - #define F_string_format_s_double_s_length 6 - #define F_string_format_S_single_s_length 10 - #define F_string_format_S_double_s_length 6 - #define F_string_format_u_single_s_length 10 - #define F_string_format_u_double_s_length 6 - #define F_string_format_z_single_s_length 10 - #define F_string_format_z_double_s_length 6 - #define F_string_format_Z_single_s_length 10 - #define F_string_format_Z_double_s_length 6 - #define F_string_format_dl_single_s_length 11 - #define F_string_format_dl_double_s_length 7 - #define F_string_format_DL_single_s_length 11 - #define F_string_format_DL_double_s_length 7 - #define F_string_format_ii_single_s_length 11 - #define F_string_format_ii_double_s_length 7 - #define F_string_format_il_single_s_length 11 - #define F_string_format_il_double_s_length 7 - #define F_string_format_in_single_s_length 11 - #define F_string_format_in_double_s_length 7 - #define F_string_format_QQ_double_s_length 12 - #define F_string_format_QQ_single_s_length 8 - #define F_string_format_rr_double_s_length 12 - #define F_string_format_rr_single_s_length 8 - #define F_string_format_RR_double_s_length 12 - #define F_string_format_RR_single_s_length 8 - #define F_string_format_ss_single_s_length 12 - #define F_string_format_ss_double_s_length 8 - #define F_string_format_SS_single_s_length 12 - #define F_string_format_SS_double_s_length 8 - #define F_string_format_ui_single_s_length 11 - #define F_string_format_ui_double_s_length 7 - #define F_string_format_ul_single_s_length 11 - #define F_string_format_ul_double_s_length 7 - #define F_string_format_un_single_s_length 11 - #define F_string_format_un_double_s_length 7 - #define F_string_format_iii_single_s_length 12 - #define F_string_format_iii_double_s_length 8 - #define F_string_format_ill_single_s_length 12 - #define F_string_format_ill_double_s_length 8 - #define F_string_format_uii_single_s_length 12 - #define F_string_format_uii_double_s_length 8 - #define F_string_format_ull_single_s_length 12 - #define F_string_format_ull_double_s_length 8 + #define F_string_format_bracket_close_s_length 2 + #define F_string_format_bracket_open_s_length 2 + #define F_string_format_c_s_length 2 + #define F_string_format_C_s_length 2 + #define F_string_format_d_s_length 2 + #define F_string_format_d_single_s_length 10 + #define F_string_format_d_double_s_length 6 + #define F_string_format_D_s_length 2 + #define F_string_format_D_single_s_length 10 + #define F_string_format_D_double_s_length 6 + #define F_string_format_i_s_length 2 + #define F_string_format_i_single_s_length 10 + #define F_string_format_i_double_s_length 6 + #define F_string_format_I_s_length 2 + #define F_string_format_q_s_length 2 + #define F_string_format_q_double_s_length 10 + #define F_string_format_q_range_double_s_length 11 + #define F_string_format_q_range_single_s_length 7 + #define F_string_format_q_single_s_length 6 + #define F_string_format_Q_s_length 2 + #define F_string_format_Q_double_s_length 10 + #define F_string_format_Q_range_double_s_length 11 + #define F_string_format_Q_range_single_s_length 7 + #define F_string_format_Q_single_s_length 6 + #define F_string_format_r_s_length 2 + #define F_string_format_r_double_s_length 10 + #define F_string_format_r_range_double_s_length 11 + #define F_string_format_r_range_single_s_length 7 + #define F_string_format_r_single_s_length 6 + #define F_string_format_R_s_length 2 + #define F_string_format_R_double_s_length 10 + #define F_string_format_R_range_double_s_length 11 + #define F_string_format_R_range_single_s_length 7 + #define F_string_format_R_single_s_length 6 + #define F_string_format_s_s_length 2 + #define F_string_format_s_single_s_length 10 + #define F_string_format_s_double_s_length 6 + #define F_string_format_S_s_length 2 + #define F_string_format_S_single_s_length 10 + #define F_string_format_S_double_s_length 6 + #define F_string_format_u_s_length 2 + #define F_string_format_u_single_s_length 10 + #define F_string_format_u_double_s_length 6 + #define F_string_format_U_s_length 2 + #define F_string_format_z_s_length 2 + #define F_string_format_z_single_s_length 10 + #define F_string_format_z_double_s_length 6 + #define F_string_format_Z_s_length 2 + #define F_string_format_Z_single_s_length 10 + #define F_string_format_Z_double_s_length 6 + #define F_string_format_dl_s_length 3 + #define F_string_format_dl_single_s_length 11 + #define F_string_format_dl_double_s_length 7 + #define F_string_format_DL_s_length 3 + #define F_string_format_DL_single_s_length 11 + #define F_string_format_DL_double_s_length 7 + #define F_string_format_ii_s_length 3 + #define F_string_format_ii_single_s_length 11 + #define F_string_format_ii_double_s_length 7 + #define F_string_format_II_s_length 3 + #define F_string_format_il_s_length 3 + #define F_string_format_il_single_s_length 11 + #define F_string_format_il_double_s_length 7 + #define F_string_format_IL_s_length 3 + #define F_string_format_in_s_length 3 + #define F_string_format_in_single_s_length 11 + #define F_string_format_in_double_s_length 7 + #define F_string_format_IN_s_length 3 + #define F_string_format_QQ_double_s_length 12 + #define F_string_format_QQ_single_s_length 8 + #define F_string_format_rr_double_s_length 12 + #define F_string_format_rr_single_s_length 8 + #define F_string_format_RR_double_s_length 12 + #define F_string_format_RR_single_s_length 8 + #define F_string_format_ss_single_s_length 12 + #define F_string_format_ss_double_s_length 8 + #define F_string_format_SS_single_s_length 12 + #define F_string_format_SS_double_s_length 8 + #define F_string_format_ui_s_length 3 + #define F_string_format_ui_single_s_length 11 + #define F_string_format_ui_double_s_length 7 + #define F_string_format_UI_s_length 3 + #define F_string_format_ul_s_length 3 + #define F_string_format_ul_single_s_length 11 + #define F_string_format_ul_double_s_length 7 + #define F_string_format_UL_s_length 3 + #define F_string_format_un_s_length 3 + #define F_string_format_un_single_s_length 11 + #define F_string_format_un_double_s_length 7 + #define F_string_format_UN_s_length 3 + #define F_string_format_iii_s_length 4 + #define F_string_format_iii_single_s_length 12 + #define F_string_format_iii_double_s_length 8 + #define F_string_format_III_s_length 4 + #define F_string_format_ill_s_length 4 + #define F_string_format_ill_single_s_length 12 + #define F_string_format_ill_double_s_length 8 + #define F_string_format_ILL_s_length 4 + #define F_string_format_uii_s_length 4 + #define F_string_format_uii_single_s_length 12 + #define F_string_format_uii_double_s_length 8 + #define F_string_format_UII_s_length 4 + #define F_string_format_ull_s_length 4 + #define F_string_format_ull_single_s_length 12 + #define F_string_format_ull_double_s_length 8 + #define F_string_format_ULL_s_length 4 #define F_string_format_sentence_end_s_length 7 - #define F_string_format_sentence_end_quote_s_length 6 + #define F_string_format_sentence_end_quote_s_length 8 + + #ifndef _di_f_string_format_bracket_close_s_ + extern const f_string_static_t f_string_format_bracket_close_s; + #endif // _di_f_string_format_bracket_close_s_ + + #ifndef _di_f_string_format_bracket_open_s_ + extern const f_string_static_t f_string_format_bracket_open_s; + #endif // _di_f_string_format_bracket_open_s_ + + #ifndef _di_f_string_format_c_s_ + extern const f_string_static_t f_string_format_c_s; + #endif // _di_f_string_format_c_s_ + + #ifndef _di_f_string_format_C_s_ + extern const f_string_static_t f_string_format_C_s; + #endif // _di_f_string_format_C_s_ + + #ifndef _di_f_string_format_d_s_ + extern const f_string_static_t f_string_format_d_s; + #endif // _di_f_string_format_d_s_ #ifndef _di_f_string_format_d_double_s_ extern const f_string_static_t f_string_format_d_double_s; @@ -1023,6 +1123,10 @@ extern "C" { extern const f_string_static_t f_string_format_d_single_s; #endif // _di_f_string_format_d_single_s_ + #ifndef _di_f_string_format_D_s_ + extern const f_string_static_t f_string_format_D_s; + #endif // _di_f_string_format_D_s_ + #ifndef _di_f_string_format_D_double_s_ extern const f_string_static_t f_string_format_D_double_s; #endif // _di_f_string_format_D_double_s_ @@ -1031,6 +1135,10 @@ extern "C" { extern const f_string_static_t f_string_format_D_single_s; #endif // _di_f_string_format_D_single_s_ + #ifndef _di_f_string_format_i_s_ + extern const f_string_static_t f_string_format_i_s; + #endif // _di_f_string_format_i_s_ + #ifndef _di_f_string_format_i_double_s_ extern const f_string_static_t f_string_format_i_double_s; #endif // _di_f_string_format_i_double_s_ @@ -1039,6 +1147,18 @@ extern "C" { extern const f_string_static_t f_string_format_i_single_s; #endif // _di_f_string_format_i_single_s_ + #ifndef _di_f_string_format_I_s_ + extern const f_string_static_t f_string_format_I_s; + #endif // _di_f_string_format_I_s_ + + #ifndef _di_f_string_format_q_s_ + extern const f_string_static_t f_string_format_q_s; + #endif // _di_f_string_format_q_s_ + + #ifndef _di_f_string_format_q_single_s_ + extern const f_string_static_t f_string_format_q_single_s; + #endif // _di_f_string_format_q_single_s_ + #ifndef _di_f_string_format_q_double_s_ extern const f_string_static_t f_string_format_q_double_s; #endif // _di_f_string_format_q_double_s_ @@ -1055,6 +1175,14 @@ extern "C" { extern const f_string_static_t f_string_format_q_single_s; #endif // _di_f_string_format_q_single_s_ + #ifndef _di_f_string_format_Q_s_ + extern const f_string_static_t f_string_format_Q_s; + #endif // _di_f_string_format_Q_s_ + + #ifndef _di_f_string_format_Q_single_s_ + extern const f_string_static_t f_string_format_Q_single_s; + #endif // _di_f_string_format_Q_single_s_ + #ifndef _di_f_string_format_Q_double_s_ extern const f_string_static_t f_string_format_Q_double_s; #endif // _di_f_string_format_Q_double_s_ @@ -1071,6 +1199,10 @@ extern "C" { extern const f_string_static_t f_string_format_Q_single_s; #endif // _di_f_string_format_Q_single_s_ + #ifndef _di_f_string_format_r_s_ + extern const f_string_static_t f_string_format_r_s; + #endif // _di_f_string_format_r_s_ + #ifndef _di_f_string_format_r_double_s_ extern const f_string_static_t f_string_format_r_double_s; #endif // _di_f_string_format_r_double_s_ @@ -1087,6 +1219,10 @@ extern "C" { extern const f_string_static_t f_string_format_r_single_s; #endif // _di_f_string_format_r_single_s_ + #ifndef _di_f_string_format_R_s_ + extern const f_string_static_t f_string_format_R_s; + #endif // _di_f_string_format_R_s_ + #ifndef _di_f_string_format_R_double_s_ extern const f_string_static_t f_string_format_R_double_s; #endif // _di_f_string_format_R_double_s_ @@ -1103,6 +1239,10 @@ extern "C" { extern const f_string_static_t f_string_format_R_single_s; #endif // _di_f_string_format_R_single_s_ + #ifndef _di_f_string_format_s_s_ + extern const f_string_static_t f_string_format_s_s; + #endif // _di_f_string_format_s_s_ + #ifndef _di_f_string_format_s_double_s_ extern const f_string_static_t f_string_format_s_double_s; #endif // _di_f_string_format_s_double_s_ @@ -1111,6 +1251,10 @@ extern "C" { extern const f_string_static_t f_string_format_s_single_s; #endif // _di_f_string_format_s_single_s_ + #ifndef _di_f_string_format_S_s_ + extern const f_string_static_t f_string_format_S_s; + #endif // _di_f_string_format_S_s_ + #ifndef _di_f_string_format_S_double_s_ extern const f_string_static_t f_string_format_S_double_s; #endif // _di_f_string_format_S_double_s_ @@ -1119,6 +1263,10 @@ extern "C" { extern const f_string_static_t f_string_format_S_single_s; #endif // _di_f_string_format_S_single_s_ + #ifndef _di_f_string_format_u_s_ + extern const f_string_static_t f_string_format_u_s; + #endif // _di_f_string_format_u_s_ + #ifndef _di_f_string_format_u_double_s_ extern const f_string_static_t f_string_format_u_double_s; #endif // _di_f_string_format_u_double_s_ @@ -1127,6 +1275,14 @@ extern "C" { extern const f_string_static_t f_string_format_u_single_s; #endif // _di_f_string_format_u_single_s_ + #ifndef _di_f_string_format_U_s_ + extern const f_string_static_t f_string_format_U_s; + #endif // _di_f_string_format_U_s_ + + #ifndef _di_f_string_format_z_s_ + extern const f_string_static_t f_string_format_z_s; + #endif // _di_f_string_format_z_s_ + #ifndef _di_f_string_format_z_double_s_ extern const f_string_static_t f_string_format_z_double_s; #endif // _di_f_string_format_z_double_s_ @@ -1135,6 +1291,10 @@ extern "C" { extern const f_string_static_t f_string_format_z_single_s; #endif // _di_f_string_format_z_single_s_ + #ifndef _di_f_string_format_Z_s_ + extern const f_string_static_t f_string_format_Z_s; + #endif // _di_f_string_format_Z_s_ + #ifndef _di_f_string_format_Z_double_s_ extern const f_string_static_t f_string_format_Z_double_s; #endif // _di_f_string_format_Z_double_s_ @@ -1143,6 +1303,10 @@ extern "C" { extern const f_string_static_t f_string_format_Z_single_s; #endif // _di_f_string_format_Z_single_s_ + #ifndef _di_f_string_format_dl_s_ + extern const f_string_static_t f_string_format_dl_s; + #endif // _di_f_string_format_dl_s_ + #ifndef _di_f_string_format_dl_double_s_ extern const f_string_static_t f_string_format_dl_double_s; #endif // _di_f_string_format_dl_double_s_ @@ -1151,6 +1315,10 @@ extern "C" { extern const f_string_static_t f_string_format_dl_single_s; #endif // _di_f_string_format_dl_single_s_ + #ifndef _di_f_string_format_DL_s_ + extern const f_string_static_t f_string_format_DL_s; + #endif // _di_f_string_format_DL_s_ + #ifndef _di_f_string_format_DL_double_s_ extern const f_string_static_t f_string_format_DL_double_s; #endif // _di_f_string_format_DL_double_s_ @@ -1159,6 +1327,10 @@ extern "C" { extern const f_string_static_t f_string_format_DL_single_s; #endif // _di_f_string_format_DL_single_s_ + #ifndef _di_f_string_format_ii_s_ + extern const f_string_static_t f_string_format_ii_s; + #endif // _di_f_string_format_ii_s_ + #ifndef _di_f_string_format_ii_double_s_ extern const f_string_static_t f_string_format_ii_double_s; #endif // _di_f_string_format_ii_double_s_ @@ -1167,6 +1339,14 @@ extern "C" { extern const f_string_static_t f_string_format_ii_single_s; #endif // _di_f_string_format_ii_single_s_ + #ifndef _di_f_string_format_II_s_ + extern const f_string_static_t f_string_format_II_s; + #endif // _di_f_string_format_II_s_ + + #ifndef _di_f_string_format_il_s_ + extern const f_string_static_t f_string_format_il_s; + #endif // _di_f_string_format_il_s_ + #ifndef _di_f_string_format_il_double_s_ extern const f_string_static_t f_string_format_il_double_s; #endif // _di_f_string_format_il_double_s_ @@ -1175,6 +1355,14 @@ extern "C" { extern const f_string_static_t f_string_format_il_single_s; #endif // _di_f_string_format_il_single_s_ + #ifndef _di_f_string_format_IL_s_ + extern const f_string_static_t f_string_format_IL_s; + #endif // _di_f_string_format_IL_s_ + + #ifndef _di_f_string_format_in_s_ + extern const f_string_static_t f_string_format_in_s; + #endif // _di_f_string_format_in_s_ + #ifndef _di_f_string_format_in_double_s_ extern const f_string_static_t f_string_format_in_double_s; #endif // _di_f_string_format_in_double_s_ @@ -1183,6 +1371,10 @@ extern "C" { extern const f_string_static_t f_string_format_in_single_s; #endif // _di_f_string_format_in_single_s_ + #ifndef _di_f_string_format_IN_s_ + extern const f_string_static_t f_string_format_IN_s; + #endif // _di_f_string_format_IN_s_ + #ifndef _di_f_string_format_QQ_double_s_ extern const f_string_static_t f_string_format_QQ_double_s; #endif // _di_f_string_format_QQ_double_s_ @@ -1223,6 +1415,10 @@ extern "C" { extern const f_string_static_t f_string_format_SS_single_s; #endif // _di_f_string_format_SS_single_s_ + #ifndef _di_f_string_format_ui_s_ + extern const f_string_static_t f_string_format_ui_s; + #endif // _di_f_string_format_ui_s_ + #ifndef _di_f_string_format_ui_double_s_ extern const f_string_static_t f_string_format_ui_double_s; #endif // _di_f_string_format_ui_double_s_ @@ -1231,6 +1427,14 @@ extern "C" { extern const f_string_static_t f_string_format_ui_single_s; #endif // _di_f_string_format_ui_single_s_ + #ifndef _di_f_string_format_UI_s_ + extern const f_string_static_t f_string_format_UI_s; + #endif // _di_f_string_format_UI_s_ + + #ifndef _di_f_string_format_ul_s_ + extern const f_string_static_t f_string_format_ul_s; + #endif // _di_f_string_format_ul_s_ + #ifndef _di_f_string_format_ul_double_s_ extern const f_string_static_t f_string_format_ul_double_s; #endif // _di_f_string_format_ul_double_s_ @@ -1239,6 +1443,14 @@ extern "C" { extern const f_string_static_t f_string_format_ul_single_s; #endif // _di_f_string_format_ul_single_s_ + #ifndef _di_f_string_format_UL_s_ + extern const f_string_static_t f_string_format_UL_s; + #endif // _di_f_string_format_UL_s_ + + #ifndef _di_f_string_format_un_s_ + extern const f_string_static_t f_string_format_un_s; + #endif // _di_f_string_format_un_s_ + #ifndef _di_f_string_format_un_double_s_ extern const f_string_static_t f_string_format_un_double_s; #endif // _di_f_string_format_un_double_s_ @@ -1247,6 +1459,14 @@ extern "C" { extern const f_string_static_t f_string_format_un_single_s; #endif // _di_f_string_format_un_single_s_ + #ifndef _di_f_string_format_UN_s_ + extern const f_string_static_t f_string_format_UN_s; + #endif // _di_f_string_format_UN_s_ + + #ifndef _di_f_string_format_iii_s_ + extern const f_string_static_t f_string_format_iii_s; + #endif // _di_f_string_format_iii_s_ + #ifndef _di_f_string_format_iii_double_s_ extern const f_string_static_t f_string_format_iii_double_s; #endif // _di_f_string_format_iii_double_s_ @@ -1255,6 +1475,14 @@ extern "C" { extern const f_string_static_t f_string_format_iii_single_s; #endif // _di_f_string_format_iii_single_s_ + #ifndef _di_f_string_format_III_s_ + extern const f_string_static_t f_string_format_III_s; + #endif // _di_f_string_format_III_s_ + + #ifndef _di_f_string_format_ill_s_ + extern const f_string_static_t f_string_format_ill_s; + #endif // _di_f_string_format_ill_s_ + #ifndef _di_f_string_format_ill_double_s_ extern const f_string_static_t f_string_format_ill_double_s; #endif // _di_f_string_format_ill_double_s_ @@ -1263,13 +1491,29 @@ extern "C" { extern const f_string_static_t f_string_format_ill_single_s; #endif // _di_f_string_format_ill_single_s_ + #ifndef _di_f_string_format_ILL_s_ + extern const f_string_static_t f_string_format_ILL_s; + #endif // _di_f_string_format_ILL_s_ + + #ifndef _di_f_string_format_uii_s_ + extern const f_string_static_t f_string_format_uii_s; + #endif // _di_f_string_format_uii_s_ + #ifndef _di_f_string_format_uii_double_s_ extern const f_string_static_t f_string_format_uii_double_s; #endif // _di_f_string_format_uii_double_s_ #ifndef _di_f_string_format_uii_single_s_ extern const f_string_static_t f_string_format_uii_single_s; - #endif // _di_f_string_format_uii_single_s_ + #endif // _di_f_string_format_uii_single_s_ULL + + #ifndef _di_f_string_format_UII_s_ + extern const f_string_static_t f_string_format_UII_s; + #endif // _di_f_string_format_UII_s_ + + #ifndef _di_f_string_format_ull_s_ + extern const f_string_static_t f_string_format_ull_s; + #endif // _di_f_string_format_ull_s_ #ifndef _di_f_string_format_ull_double_s_ extern const f_string_static_t f_string_format_ull_double_s; @@ -1279,6 +1523,10 @@ extern "C" { extern const f_string_static_t f_string_format_ull_single_s; #endif // _di_f_string_format_ull_single_s_ + #ifndef _di_f_string_format_ULL_s_ + extern const f_string_static_t f_string_format_ULL_s; + #endif // _di_f_string_format_ULL_s_ + #ifndef _di_f_string_format_sentence_end_s_ extern const f_string_static_t f_string_format_sentence_end_s; #endif // _di_f_string_format_sentence_end_s_ -- 1.8.3.1