From: Kevin Day Date: Sun, 28 Jul 2024 22:18:07 +0000 (-0500) Subject: Update: The format sentence end strings, making their usage more clear. X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=2a0ce5f865110843608b81bbb478efa73eb4bc19;p=fll Update: The format sentence end strings, making their usage more clear. The sentence ends, unlike the other similar global static strings, does not have the "_single" in the name. Add the "_single" in the name and then for consistency addthe case where there should be no "_single". These cases are as a result now handled: - ".%r". - "'.%r". - "%[.%]%r" - "%['.%]%r" - "%[%[.%]%]%r" - "%[%['.%]%]%r" --- diff --git a/build/stand_alone/byte_dump.config.h b/build/stand_alone/byte_dump.config.h index a5e3d41..246ed49 100644 --- a/build/stand_alone/byte_dump.config.h +++ b/build/stand_alone/byte_dump.config.h @@ -1117,8 +1117,12 @@ //#define _di_f_string_format_s_ #define _di_f_string_format_s_double_s_ #define _di_f_string_format_S_double_s_ -//#define _di_f_string_format_sentence_end_quote_s_ -//#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_quote_s_ +#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_double_quote_s_ +#define _di_f_string_format_sentence_end_double_s_ +//#define _di_f_string_format_sentence_end_single_quote_s_ +//#define _di_f_string_format_sentence_end_single_s_ #define _di_f_string_format_ss_double_s_ #define _di_f_string_format_SS_double_s_ #define _di_f_string_format_s_single_s_ diff --git a/build/stand_alone/example.config.h b/build/stand_alone/example.config.h index a8cef24..a90bdb7 100644 --- a/build/stand_alone/example.config.h +++ b/build/stand_alone/example.config.h @@ -1043,7 +1043,11 @@ #define _di_f_string_format_s_double_s_ #define _di_f_string_format_S_double_s_ #define _di_f_string_format_sentence_end_quote_s_ -//#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_double_quote_s_ +#define _di_f_string_format_sentence_end_double_s_ +#define _di_f_string_format_sentence_end_single_quote_s_ +//#define _di_f_string_format_sentence_end_single_s_ #define _di_f_string_format_ss_double_s_ #define _di_f_string_format_SS_double_s_ #define _di_f_string_format_s_single_s_ diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h index 8fc0578..c989164 100644 --- a/build/stand_alone/fake.config.h +++ b/build/stand_alone/fake.config.h @@ -1604,8 +1604,12 @@ //#define _di_f_string_format_s_ #define _di_f_string_format_s_double_s_ #define _di_f_string_format_S_double_s_ -//#define _di_f_string_format_sentence_end_quote_s_ -//#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_quote_s_ +#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_double_quote_s_ +#define _di_f_string_format_sentence_end_double_s_ +//#define _di_f_string_format_sentence_end_single_quote_s_ +//#define _di_f_string_format_sentence_end_single_s_ #define _di_f_string_format_ss_double_s_ #define _di_f_string_format_SS_double_s_ #define _di_f_string_format_s_single_s_ diff --git a/build/stand_alone/firewall.config.h b/build/stand_alone/firewall.config.h index a63e24c..6884059 100644 --- a/build/stand_alone/firewall.config.h +++ b/build/stand_alone/firewall.config.h @@ -1672,8 +1672,12 @@ //#define _di_f_string_format_s_ #define _di_f_string_format_s_double_s_ #define _di_f_string_format_S_double_s_ -//#define _di_f_string_format_sentence_end_quote_s_ -//#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_quote_s_ +#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_double_quote_s_ +#define _di_f_string_format_sentence_end_double_s_ +//#define _di_f_string_format_sentence_end_single_quote_s_ +//#define _di_f_string_format_sentence_end_single_s_ #define _di_f_string_format_ss_double_s_ #define _di_f_string_format_SS_double_s_ #define _di_f_string_format_s_single_s_ diff --git a/build/stand_alone/utf8.config.h b/build/stand_alone/utf8.config.h index 5727ebc..0673dc5 100644 --- a/build/stand_alone/utf8.config.h +++ b/build/stand_alone/utf8.config.h @@ -1135,8 +1135,12 @@ //#define _di_f_string_format_s_ #define _di_f_string_format_s_double_s_ #define _di_f_string_format_S_double_s_ -//#define _di_f_string_format_sentence_end_quote_s_ -//#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_quote_s_ +#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_double_quote_s_ +#define _di_f_string_format_sentence_end_double_s_ +//#define _di_f_string_format_sentence_end_single_quote_s_ +//#define _di_f_string_format_sentence_end_single_s_ #define _di_f_string_format_ss_double_s_ #define _di_f_string_format_SS_double_s_ #define _di_f_string_format_s_single_s_ diff --git a/level_0/f_string/c/string/static.c b/level_0/f_string/c/string/static.c index c4084f7..9d2b848 100644 --- a/level_0/f_string/c/string/static.c +++ b/level_0/f_string/c/string/static.c @@ -954,6 +954,22 @@ extern "C" { #ifndef _di_f_string_format_sentence_end_quote_s_ const f_string_static_t f_string_format_sentence_end_quote_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_quote_s, 0, F_string_format_sentence_end_quote_s_length); #endif // _di_f_string_format_sentence_end_quote_s_ + + #ifndef _di_f_string_format_sentence_end_double_s_ + const f_string_static_t f_string_format_sentence_end_double_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_double_s, 0, F_string_format_sentence_end_double_s_length); + #endif // _di_f_string_format_sentence_end_double_s_ + + #ifndef _di_f_string_format_sentence_end_double_quote_s_ + const f_string_static_t f_string_format_sentence_end_double_quote_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_double_quote_s, 0, F_string_format_sentence_end_double_quote_s_length); + #endif // _di_f_string_format_sentence_end_double_quote_s_ + + #ifndef _di_f_string_format_sentence_end_single_s_ + const f_string_static_t f_string_format_sentence_end_single_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_single_s, 0, F_string_format_sentence_end_single_s_length); + #endif // _di_f_string_format_sentence_end_single_s_ + + #ifndef _di_f_string_format_sentence_end_single_quote_s_ + const f_string_static_t f_string_format_sentence_end_single_quote_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_single_quote_s, 0, F_string_format_sentence_end_single_quote_s_length); + #endif // _di_f_string_format_sentence_end_single_quote_s_ #endif // _di_f_string_format_s_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/static.h b/level_0/f_string/c/string/static.h index 81f80f7..85e8e64 100644 --- a/level_0/f_string/c/string/static.h +++ b/level_0/f_string/c/string/static.h @@ -982,8 +982,12 @@ extern "C" { #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_sentence_end_s ".%r" + #define F_string_format_sentence_end_quote_s "'.%r" + #define F_string_format_sentence_end_double_s "%[%[.%]%]%r" + #define F_string_format_sentence_end_double_quote_s "%[%['.%]%]%r" + #define F_string_format_sentence_end_single_s "%[.%]%r" + #define F_string_format_sentence_end_single_quote_s "%['.%]%r" #define F_string_format_bracket_close_s_length 2 #define F_string_format_bracket_open_s_length 2 @@ -1092,8 +1096,12 @@ extern "C" { #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 8 + #define F_string_format_sentence_end_s_length 2 + #define F_string_format_sentence_end_quote_s_length 3 + #define F_string_format_sentence_end_double_s_length 11 + #define F_string_format_sentence_end_double_quote_s_length 12 + #define F_string_format_sentence_end_single_s_length 7 + #define F_string_format_sentence_end_single_quote_s_length 8 #ifndef _di_f_string_format_bracket_close_s_ extern const f_string_static_t f_string_format_bracket_close_s; @@ -1534,6 +1542,22 @@ extern "C" { #ifndef _di_f_string_format_sentence_end_quote_s_ extern const f_string_static_t f_string_format_sentence_end_quote_s; #endif // _di_f_string_format_sentence_end_quote_s_ + + #ifndef _di_f_string_format_sentence_end_double_s_ + extern const f_string_static_t f_string_format_sentence_end_double_s; + #endif // _di_f_string_format_sentence_end_double_s_ + + #ifndef _di_f_string_format_sentence_end_double_quote_s_ + extern const f_string_static_t f_string_format_sentence_end_double_quote_s; + #endif // _di_f_string_format_sentence_end_double_quote_s_ + + #ifndef _di_f_string_format_sentence_end_single_s_ + extern const f_string_static_t f_string_format_sentence_end_single_s; + #endif // _di_f_string_format_sentence_end_single_s_ + + #ifndef _di_f_string_format_sentence_end_single_quote_s_ + extern const f_string_static_t f_string_format_sentence_end_single_quote_s; + #endif // _di_f_string_format_sentence_end_single_quote_s_ #endif // _di_f_string_format_s_ /** diff --git a/level_2/fll_error/c/error.c b/level_2/fll_error/c/error.c index 9a503e1..f69d08d 100644 --- a/level_2/fll_error/c/error.c +++ b/level_2/fll_error/c/error.c @@ -45,7 +45,7 @@ extern "C" { fl_print_format("%[%QAccess denied while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -59,7 +59,7 @@ extern "C" { fl_print_format("%[%QCurrent user is not allowed to use the given group while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -73,7 +73,7 @@ extern "C" { fl_print_format("%[%QCurrent user is not allowed to use the given owner while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -87,7 +87,7 @@ extern "C" { fl_print_format("%[%QInvalid directory while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -115,7 +115,7 @@ extern "C" { fl_print_format("%[%QFailed to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -157,7 +157,7 @@ extern "C" { fl_print_format("%[%QFile descriptor error while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -171,7 +171,7 @@ extern "C" { fl_print_format("%[%QMax file descriptors reached while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -185,7 +185,7 @@ extern "C" { fl_print_format("%[%QInvalid file descriptor while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -283,7 +283,7 @@ extern "C" { fl_print_format("%[%QMax open files reached while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -297,7 +297,7 @@ extern "C" { fl_print_format("%[%QOverflow while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -325,7 +325,7 @@ extern "C" { fl_print_format("%[%QRead failed while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -339,7 +339,7 @@ extern "C" { fl_print_format("%[%QSeek failed while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -353,7 +353,7 @@ extern "C" { fl_print_format("%[%QStat failed while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -367,7 +367,7 @@ extern "C" { fl_print_format("%[%QSynchronize failed while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -395,7 +395,7 @@ extern "C" { fl_print_format("%[%QUTF failure while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -409,7 +409,7 @@ extern "C" { fl_print_format("%[%QInvalid UTF while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -423,7 +423,7 @@ extern "C" { fl_print_format("%[%QUnderflow while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -451,7 +451,7 @@ extern "C" { fl_print_format("%[%QLoop while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -465,7 +465,7 @@ extern "C" { fl_print_format("%[%QInvalid %Q name '%]", print->to, print->context, print->prefix, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -479,7 +479,7 @@ extern "C" { fl_print_format("%[%QNumber overflow while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -493,7 +493,7 @@ extern "C" { fl_print_format("%[%QNumber underflow while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -511,7 +511,7 @@ extern "C" { fl_print_format(" for the %Q '%]", print->to, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -525,7 +525,7 @@ extern "C" { fl_print_format("%[%QProhibited by system while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -570,7 +570,7 @@ extern "C" { fl_print_format("%[%QInvalid or missing directory in path while trying to %Q %Q '%]", print->to, print->context, print->prefix, operation, type_name, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -670,7 +670,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, argument, print->notable); fl_print_format("%[' is not a valid number for the parameter '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, parameter, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -686,7 +686,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, argument, print->notable); fl_print_format("%[' is negative, which is not allowed for the parameter '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, parameter, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -702,7 +702,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, argument, print->notable); fl_print_format("%[' is too large for the parameter '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, parameter, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -718,7 +718,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, argument, print->notable); fl_print_format("%[' is positive, which is not allowed for the parameter '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, parameter, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } @@ -734,7 +734,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, argument, print->notable); fl_print_format("%[' is too small for the parameter '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, parameter, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); funlockfile(print->to.stream); } diff --git a/level_2/fll_program/c/program/print.c b/level_2/fll_program/c/program/print.c index 3aab56b..7c59693 100644 --- a/level_2/fll_program/c/program/print.c +++ b/level_2/fll_program/c/program/print.c @@ -66,7 +66,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, variable, print->set->notable); fl_print_format("%[ is missing or has a length of%] ", print->to, print->set->error, print->set->error); fl_print_format("%[0%]", print->to, print->set->notable, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -246,7 +246,7 @@ extern "C" { fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' must not be less than %]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, than, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -270,7 +270,7 @@ extern "C" { fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' must not be more than %]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, than, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -420,7 +420,7 @@ extern "C" { fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, value, print->set->notable); fl_print_format("%[' may only be specified once for the parameter '%]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -440,7 +440,7 @@ extern "C" { fl_print_format("%[%QFailure while processing the parameter '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -464,7 +464,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value_stop, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -679,7 +679,7 @@ extern "C" { fl_print_format("%]%[Received signal code %]", print->to, print->set->reset, print->set->warning, print->set->warning); fl_print_format(f_string_format_u_single_s.string, print->to, print->set->notable, signal, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->warning, print->set->warning, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->warning, print->set->warning, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/byte_dump/c/main/print/error.c b/level_3/byte_dump/c/main/print/error.c index c5a2c7d..29c4117 100644 --- a/level_3/byte_dump/c/main/print/error.c +++ b/level_3/byte_dump/c/main/print/error.c @@ -40,7 +40,7 @@ extern "C" { fl_print_format("%r%[Invalid UTF-8 codes were detected for file '%]", print->to, f_string_eol_s, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name.used ? name : f_string_ascii_minus_s, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -70,7 +70,7 @@ extern "C" { fl_print_format("%[%Qread() failed for '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name.used ? name : f_string_ascii_minus_s, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_print_dynamic_raw(f_string_eol_s, print->to); f_file_stream_unlock(print->to); @@ -97,7 +97,7 @@ extern "C" { fl_print_format(f_string_format_ul_single_s.string, print->to, print->set->notable, main->setting.last, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, byte_dump_long_last_s, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -121,7 +121,7 @@ extern "C" { fl_print_format("%[ul%]", print->to, print->set->notable, minimum, print->set->notable); fl_print_format(" %[and%] ", print->to, print->set->error, print->set->error); fl_print_format("%[ul%]", print->to, print->set->notable, maximum, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/control/specifications/settings.txt b/level_3/control/specifications/settings.txt index c8ffabe..d824231 100644 --- a/level_3/control/specifications/settings.txt +++ b/level_3/control/specifications/settings.txt @@ -1,8 +1,14 @@ -# fss-0002 +# fss-0002 iki-0000 # # license: open-standard-license-1.0-or-later # version 2024/07/02 # +# This file (assumed to be named settings.txt) can be more easily read using the following iki_read commands: +# iki_read settings.txt +Q -w -W code '"' '"' +# +# To read the "Entry Specification" section of this file, use this command sequence: +# fss_basic_list_read settings.txt +Q -cn "Settings Specification" | iki_read +Q -w -W code '"' '"' +# Settings Specification: The control settings "settings" file follows the FSS-0001 (Extended) format. diff --git a/level_3/fake/c/main/print/error.c b/level_3/fake/c/main/print/error.c index 0f40312..ca7dc2e 100644 --- a/level_3/fake/c/main/print/error.c +++ b/level_3/fake/c/main/print/error.c @@ -89,7 +89,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, destination, print->notable); } - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); } @@ -191,7 +191,7 @@ extern "C" { fake_print_error_build_operation_file_partial(print, operation, source, destination, how); } else { - fl_print_format("%[", print->to, print->context); + fl_print_format(f_string_format_bracket_open_s.string, print->to, print->context); } fl_print_format("%S.%]%r", print->to, after, print->context, f_string_eol_s); @@ -494,7 +494,7 @@ extern "C" { fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_argument_force_s, print->notable); fl_print_format("%[' or '%]", print->to, print->context, print->context); fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_argument_strict_s, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fake/c/main/print/message.c b/level_3/fake/c/main/print/message.c index 11131a4..b532e9e 100644 --- a/level_3/fake/c/main/print/message.c +++ b/level_3/fake/c/main/print/message.c @@ -37,7 +37,7 @@ extern "C" { } } // for - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->important, print->set->important, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->important, print->set->important, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/firewall/c/main/print/error.c b/level_3/firewall/c/main/print/error.c index df1127c..fc951fe 100644 --- a/level_3/firewall/c/main/print/error.c +++ b/level_3/firewall/c/main/print/error.c @@ -40,7 +40,7 @@ extern "C" { fl_print_format("%[%QNo relevant data is found within the file '%]", print->to, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, file, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -85,7 +85,7 @@ extern "C" { fl_print_format("%]%[', error code is%] ", print->to, print->set->notable, print->context, print->context); fl_print_format(f_string_format_ui_single_s.string, print->to, print->set->notable, F_status_set_fine(main->setting.state.status), print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -107,7 +107,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, operation, print->notable); fl_print_format(" %[instructions are missing from '%]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, file, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -132,7 +132,7 @@ extern "C" { fl_print_format("%]%[' returned with code of%] ", print->to, print->set->notable, print->context, print->context); fl_print_format(f_string_format_i_single_s.string, print->to, print->set->notable, return_code, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -170,7 +170,7 @@ extern "C" { if (file.used) { fl_print_format("%[() for the file%] ", print->to, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, file, print->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->context, print->context, f_string_eol_s); } else { fl_print_format("%[().%]%r", print->to, print->context, print->context, f_string_eol_s); diff --git a/level_3/fss_identify/c/main/print/error.c b/level_3/fss_identify/c/main/print/error.c index f525e49..1ebb39f 100644 --- a/level_3/fss_identify/c/main/print/error.c +++ b/level_3/fss_identify/c/main/print/error.c @@ -54,7 +54,7 @@ extern "C" { fl_print_format(f_string_format_un_single_s.string, print->to, print->set->notable, index, print->set->notable); fl_print_format(" %[for the parameter '%]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_identify_long_name_s, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/main/main/print.c b/level_3/fss_read/c/main/main/print.c index 66e133d..de35050 100644 --- a/level_3/fss_read/c/main/main/print.c +++ b/level_3/fss_read/c/main/main/print.c @@ -23,7 +23,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' is not known for the parameter%] ", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_read_long_as_s, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -45,7 +45,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, previous, print->set->notable); fl_print_format("%[' to %] ", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, current, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/main/print/error.c b/level_3/fss_read/c/main/print/error.c index b0e0a24..a0b6d1b 100644 --- a/level_3/fss_read/c/main/print/error.c +++ b/level_3/fss_read/c/main/print/error.c @@ -60,7 +60,7 @@ extern "C" { fl_print_format(f_string_format_un_single_s.string, print->to, print->notable, value, print->notable); fl_print_format("%[' before the value '%]", print->to, print->context, print->context); fl_print_format(f_string_format_un_single_s.string, print->to, print->notable, before, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -80,7 +80,7 @@ extern "C" { fl_print_format(f_string_format_un_single_s.string, print->to, print->notable, value, print->notable); fl_print_format("%[' may only be specified once for the parameter '%]", print->to, print->context, print->context); fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, symbol, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/payload/print.c b/level_3/fss_read/c/payload/print.c index a7b1324..3685c89 100644 --- a/level_3/fss_read/c/payload/print.c +++ b/level_3/fss_read/c/payload/print.c @@ -52,7 +52,7 @@ extern "C" { fl_print_format("%[%Q%]", print->to, print->notable, fss_read_string_none_s, print->notable); fl_print_format("%[', and '%]", print->to, print->context, print->context); fl_print_format("%[%Q%]", print->to, print->notable, fss_read_string_warn_s, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fss_write/c/main/main/print.c b/level_3/fss_write/c/main/main/print.c index b9aaf1c..e0d1798 100644 --- a/level_3/fss_write/c/main/main/print.c +++ b/level_3/fss_write/c/main/main/print.c @@ -23,7 +23,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' is not known for the parameter%] ", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_write_long_as_s, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/utf8/c/main/print/error.c b/level_3/utf8/c/main/print/error.c index 83efad9..096c7db 100644 --- a/level_3/utf8/c/main/print/error.c +++ b/level_3/utf8/c/main/print/error.c @@ -35,7 +35,7 @@ extern "C" { fl_print_format("%02_uii", print->to, (uint8_t) invalid.string[i]); } // for - fl_print_format("%]", print->to, print->set->notable); + fl_print_format(f_string_format_bracket_close_s.string, print->to, print->set->notable); } if (F_status_set_fine(main->setting.state.status) == F_utf_not) { @@ -50,7 +50,7 @@ extern "C" { else { fl_print_format("%[', error code%] ", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_ui_single_s.string, print->to, print->set->notable, F_status_set_fine(main->setting.state.status), print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); } return F_okay; @@ -76,7 +76,7 @@ extern "C" { else { fl_print_format("%[', error code%] ", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_ui_single_s.string, print->to, print->set->notable, F_status_set_fine(main->setting.state.status), print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); } return F_okay; @@ -119,7 +119,7 @@ extern "C" { fl_print_format("%[%QNo file specified at parameter index%] ", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_un_single_s.string, print->to, print->set->notable, index, print->set->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -137,7 +137,7 @@ extern "C" { fl_print_format("%[%QFailed to find the %r file '%]", print->to, print->set->error, print->prefix, from ? utf8_string_from_s : utf8_string_to_s, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to);