From f9c449c00b39902477a2b2443265848455f941ac Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 15 Jan 2024 12:34:10 -0600 Subject: [PATCH] Refactor: The backtick into the grave. Both the Unicode standard uses the word "grave" rather than the word "backtick" to commonly refer to the U+0060 character. Change the use of the word from backtick to the word grave throughout the project. This is a breaking change for the relevant programs, such as fss_write and iki_write. Documentation, such as the website documentation and specifications, will need to be updated following this change. --- level_0/f_fss/c/fss/common.h | 6 +-- level_0/f_fss/c/fss/quote.h | 10 ++-- level_0/f_iki/c/iki.c | 8 ++-- level_0/f_iki/c/iki.h | 4 +- level_0/f_iki/c/iki/common.c | 8 ++-- level_0/f_iki/c/iki/common.h | 42 ++++++++--------- level_0/f_iki/c/private-iki.h | 2 +- level_1/fl_fss/c/private-fss.c | 12 ++--- level_2/fll_iki/c/iki.c | 8 ++-- level_2/fll_iki/c/iki.h | 8 ++-- level_2/fll_iki/c/private-iki.h | 4 +- level_3/fss_read/c/main/print/data.c | 4 +- level_3/fss_write/c/main/common.c | 28 +++++------ level_3/fss_write/c/main/common/enumeration.h | 4 +- level_3/fss_write/c/main/common/string.c | 4 +- level_3/fss_write/c/main/common/string.h | 12 ++--- level_3/fss_write/c/main/print/message.c | 2 +- level_3/iki_write/c/main/common.c | 28 +++++------ level_3/iki_write/c/main/common/enumeration.h | 18 +++---- level_3/iki_write/c/main/common/string.c | 4 +- level_3/iki_write/c/main/common/string.h | 68 +++++++++++++-------------- level_3/iki_write/c/main/print/message.c | 14 +++--- specifications/fss-0000.txt | 2 +- specifications/fss-0001.txt | 2 +- specifications/fss-0002.txt | 2 +- specifications/fss-0003.txt | 2 +- specifications/fss.txt | 2 +- specifications/iki.txt | 4 +- 28 files changed, 156 insertions(+), 156 deletions(-) diff --git a/level_0/f_fss/c/fss/common.h b/level_0/f_fss/c/fss/common.h index dbfd475..21514e4 100644 --- a/level_0/f_fss/c/fss/common.h +++ b/level_0/f_fss/c/fss/common.h @@ -26,8 +26,8 @@ extern "C" { #define F_fss_minus_s F_string_ascii_minus_s #define F_fss_f_s F_string_ascii_f_s #define F_fss_pound_s F_string_ascii_pound_s - #define F_fss_quote_backtick_s F_string_ascii_grave_s #define F_fss_quote_double_s F_string_ascii_quote_double_s + #define F_fss_quote_grave_s F_string_ascii_grave_s #define F_fss_quote_single_s F_string_ascii_quote_single_s #define F_fss_s_s F_string_ascii_s_s #define F_fss_slash_s F_string_ascii_slash_backward_s @@ -40,8 +40,8 @@ extern "C" { #define F_fss_minus_s_length F_string_ascii_minus_s_length #define F_fss_f_s_length F_string_ascii_f_s_length #define F_fss_pound_s_length F_string_ascii_pound_s_length - #define F_fss_quote_backtick_s_length F_string_ascii_grave_s_length #define F_fss_quote_double_s_length F_string_ascii_quote_double_s_length + #define F_fss_quote_grave_s_length F_string_ascii_grave_s_length #define F_fss_quote_single_s_length F_string_ascii_quote_single_s_length #define F_fss_s_s_length F_string_ascii_s_s_length #define F_fss_slash_s_length F_string_ascii_slash_backward_s_length @@ -54,8 +54,8 @@ extern "C" { #define f_fss_minus_s f_string_ascii_minus_s #define f_fss_f_s f_string_ascii_f_s #define f_fss_pound_s f_string_ascii_pound_s - #define f_fss_quote_backtick_s f_string_ascii_grave_s #define f_fss_quote_double_s f_string_ascii_quote_double_s + #define f_fss_quote_grave_s f_string_ascii_grave_s #define f_fss_quote_single_s f_string_ascii_quote_single_s #define f_fss_s_s f_string_ascii_s_s #define f_fss_slash_s f_string_ascii_slash_backward_s diff --git a/level_0/f_fss/c/fss/quote.h b/level_0/f_fss/c/fss/quote.h index 19a73c5..45e4039 100644 --- a/level_0/f_fss/c/fss/quote.h +++ b/level_0/f_fss/c/fss/quote.h @@ -20,16 +20,16 @@ extern "C" { * Types for FSS quote. * * f_fss_quote_type_*: - * - none: Not a quote. - * - backtick: Quote type is a backtick. - * - double: Quote type is a double quote. - * - single: Quote type is a single quote. + * - none: Not a quote. + * - double: Quote type is a double quote (U+0022). + * - grave: Quote type is a grave (U+0060). + * - single: Quote type is a single quote (U+0027). */ #ifndef _di_f_fss_quote_type_e_ enum { f_fss_quote_type_none_e = 0, - f_fss_quote_type_backtick_e, f_fss_quote_type_double_e, + f_fss_quote_type_grave_e, f_fss_quote_type_single_e, }; // enum #endif // _di_f_fss_quote_type_e_ diff --git a/level_0/f_iki/c/iki.c b/level_0/f_iki/c/iki.c index 64742be..db637ba 100644 --- a/level_0/f_iki/c/iki.c +++ b/level_0/f_iki/c/iki.c @@ -9,7 +9,7 @@ extern "C" { f_status_t f_iki_content_is(const f_string_static_t content, const f_string_static_t quote) { #ifndef _di_level_0_parameter_checking_ if (!quote.used) return F_status_set_error(F_parameter); - if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_backtick_s.string[0]) return F_status_set_error(F_parameter); + if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_grave_s.string[0]) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (!content.used) return F_data_not; @@ -22,7 +22,7 @@ extern "C" { f_status_t f_iki_content_partial_is(const f_string_static_t content, const f_range_t range, const f_string_static_t quote) { #ifndef _di_level_0_parameter_checking_ if (!quote.used) return F_status_set_error(F_parameter); - if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_backtick_s.string[0]) return F_status_set_error(F_parameter); + if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_grave_s.string[0]) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (!content.used) return F_data_not; @@ -181,7 +181,7 @@ extern "C" { if (F_status_is_error(state->status) || range->start > range->stop || range->start >= buffer->used) break; // Found a valid vocabulary name. - if (buffer->string[range->start] == f_iki_syntax_quote_single_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_backtick_s.string[0]) { + if (buffer->string[range->start] == f_iki_syntax_quote_single_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_grave_s.string[0]) { state->status = F_true; quote = buffer->string[range->start]; } @@ -214,7 +214,7 @@ extern "C" { if (separator_found) { // Save delimit for a would-be valid IKI that is now delimited. - if (buffer->string[range->start] == f_iki_syntax_quote_single_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_backtick_s.string[0]) { + if (buffer->string[range->start] == f_iki_syntax_quote_single_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_grave_s.string[0]) { state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &data->delimits.array, &data->delimits.used, &data->delimits.size); if (F_status_is_error(state->status)) break; diff --git a/level_0/f_iki/c/iki.h b/level_0/f_iki/c/iki.h index f35c296..a109ea2 100644 --- a/level_0/f_iki/c/iki.h +++ b/level_0/f_iki/c/iki.h @@ -42,7 +42,7 @@ extern "C" { * The string to validate as an content name. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * * @return * F_true on success and string is a valid content name. @@ -66,7 +66,7 @@ extern "C" { * The range within the buffer that represents the content name. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * * @return * F_true on success and string is a valid content name. diff --git a/level_0/f_iki/c/iki/common.c b/level_0/f_iki/c/iki/common.c index 133944a..d87dcc6 100644 --- a/level_0/f_iki/c/iki/common.c +++ b/level_0/f_iki/c/iki/common.c @@ -14,14 +14,14 @@ extern "C" { const f_string_static_t f_iki_syntax_placeholder_s = macro_f_string_static_t_initialize_1(F_iki_syntax_placeholder_s, 0, F_iki_syntax_placeholder_s_length); #endif // _di_f_iki_syntax_placeholder_s_ - #ifndef _di_f_iki_syntax_quote_backtick_s_ - const f_string_static_t f_iki_syntax_quote_backtick_s = macro_f_string_static_t_initialize_1(F_iki_syntax_quote_backtick_s, 0, F_iki_syntax_quote_backtick_s_length); - #endif // _di_f_iki_syntax_quote_backtick_s_ - #ifndef _di_f_iki_syntax_quote_double_s_ const f_string_static_t f_iki_syntax_quote_double_s = macro_f_string_static_t_initialize_1(F_iki_syntax_quote_double_s, 0, F_iki_syntax_quote_double_s_length); #endif // _di_f_iki_syntax_quote_double_s_ + #ifndef _di_f_iki_syntax_quote_grave_s_ + const f_string_static_t f_iki_syntax_quote_grave_s = macro_f_string_static_t_initialize_1(F_iki_syntax_quote_grave_s, 0, F_iki_syntax_quote_grave_s_length); + #endif // _di_f_iki_syntax_quote_grave_s_ + #ifndef _di_f_iki_syntax_quote_single_s_ const f_string_static_t f_iki_syntax_quote_single_s = macro_f_string_static_t_initialize_1(F_iki_syntax_quote_single_s, 0, F_iki_syntax_quote_single_s_length); #endif // _di_f_iki_syntax_quote_single_s_ diff --git a/level_0/f_iki/c/iki/common.h b/level_0/f_iki/c/iki/common.h index 7c14834..eee3076 100644 --- a/level_0/f_iki/c/iki/common.h +++ b/level_0/f_iki/c/iki/common.h @@ -54,23 +54,23 @@ extern "C" { * IKI-specific syntax. */ #ifndef _di_f_iki_syntax_s_ - #define F_iki_syntax_separator_s F_string_ascii_colon_s - #define F_iki_syntax_placeholder_s F_string_placeholder_s - #define F_iki_syntax_quote_backtick_s F_string_ascii_grave_s - #define F_iki_syntax_quote_double_s F_string_ascii_quote_double_s - #define F_iki_syntax_quote_single_s F_string_ascii_quote_single_s - #define F_iki_syntax_slash_s F_string_ascii_slash_backward_s - #define F_iki_syntax_wrap_open_s F_string_ascii_bracket_open_s - #define F_iki_syntax_wrap_close_s F_string_ascii_bracket_close_s - - #define F_iki_syntax_separator_s_length F_string_ascii_colon_s_length - #define F_iki_syntax_placeholder_s_length F_string_placeholder_s_length - #define F_iki_syntax_quote_backtick_s_length F_string_ascii_grave_s_length - #define F_iki_syntax_quote_double_s_length F_string_ascii_quote_double_s_length - #define F_iki_syntax_quote_single_s_length F_string_ascii_quote_single_s_length - #define F_iki_syntax_slash_s_length F_string_ascii_slash_backward_s_length - #define F_iki_syntax_wrap_open_s_length F_string_ascii_bracket_open_s_length - #define F_iki_syntax_wrap_close_s_length F_string_ascii_bracket_close_s_length + #define F_iki_syntax_separator_s F_string_ascii_colon_s + #define F_iki_syntax_placeholder_s F_string_placeholder_s + #define F_iki_syntax_quote_double_s F_string_ascii_quote_double_s + #define F_iki_syntax_quote_grave_s F_string_ascii_grave_s + #define F_iki_syntax_quote_single_s F_string_ascii_quote_single_s + #define F_iki_syntax_slash_s F_string_ascii_slash_backward_s + #define F_iki_syntax_wrap_open_s F_string_ascii_bracket_open_s + #define F_iki_syntax_wrap_close_s F_string_ascii_bracket_close_s + + #define F_iki_syntax_separator_s_length F_string_ascii_colon_s_length + #define F_iki_syntax_placeholder_s_length F_string_placeholder_s_length + #define F_iki_syntax_quote_double_s_length F_string_ascii_quote_double_s_length + #define F_iki_syntax_quote_grave_s_length F_string_ascii_grave_s_length + #define F_iki_syntax_quote_single_s_length F_string_ascii_quote_single_s_length + #define F_iki_syntax_slash_s_length F_string_ascii_slash_backward_s_length + #define F_iki_syntax_wrap_open_s_length F_string_ascii_bracket_open_s_length + #define F_iki_syntax_wrap_close_s_length F_string_ascii_bracket_close_s_length #ifndef _di_f_iki_syntax_separator_s_ extern const f_string_static_t f_iki_syntax_separator_s; @@ -80,14 +80,14 @@ extern "C" { extern const f_string_static_t f_iki_syntax_placeholder_s; #endif // _di_f_iki_syntax_placeholder_s_ - #ifndef _di_f_iki_syntax_quote_backtick_s_ - extern const f_string_static_t f_iki_syntax_quote_backtick_s; - #endif // _di_f_iki_syntax_quote_backtick_s_ - #ifndef _di_f_iki_syntax_quote_double_s_ extern const f_string_static_t f_iki_syntax_quote_double_s; #endif // _di_f_iki_syntax_quote_double_s_ + #ifndef _di_f_iki_syntax_quote_grave_s_ + extern const f_string_static_t f_iki_syntax_quote_grave_s; + #endif // _di_f_iki_syntax_quote_grave_s_ + #ifndef _di_f_iki_syntax_quote_single_s_ extern const f_string_static_t f_iki_syntax_quote_single_s; #endif // _di_f_iki_syntax_quote_single_s_ diff --git a/level_0/f_iki/c/private-iki.h b/level_0/f_iki/c/private-iki.h index 36d588f..57a5bbc 100644 --- a/level_0/f_iki/c/private-iki.h +++ b/level_0/f_iki/c/private-iki.h @@ -28,7 +28,7 @@ extern "C" { * The range within the buffer that represents the content name. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * * @return * F_true on success and string is a valid content name. diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c index 6d3cc5a..343f085 100644 --- a/level_1/fl_fss/c/private-fss.c +++ b/level_1/fl_fss/c/private-fss.c @@ -255,7 +255,7 @@ extern "C" { return; } - if (buffer.string[range->start] == f_fss_quote_single_s.string[0] || buffer.string[range->start] == f_fss_quote_double_s.string[0] || buffer.string[range->start] == f_fss_quote_backtick_s.string[0] || (object_as && buffer.string[range->start] == f_fss_comment_s.string[0])) { + if (buffer.string[range->start] == f_fss_quote_single_s.string[0] || buffer.string[range->start] == f_fss_quote_double_s.string[0] || buffer.string[range->start] == f_fss_quote_grave_s.string[0] || (object_as && buffer.string[range->start] == f_fss_comment_s.string[0])) { // Only the first slash before a quote needs to be escaped (or not) as once there is a slash before a quote, this cannot ever be a quote object. // This simplifies the number of slashes needed. @@ -268,7 +268,7 @@ extern "C" { if (F_status_is_error(state->status)) return; } } - else if (buffer.string[range->start] == f_fss_quote_single_s.string[0] || buffer.string[range->start] == f_fss_quote_double_s.string[0] || buffer.string[range->start] == f_fss_quote_backtick_s.string[0]) { + else if (buffer.string[range->start] == f_fss_quote_single_s.string[0] || buffer.string[range->start] == f_fss_quote_double_s.string[0] || buffer.string[range->start] == f_fss_quote_grave_s.string[0]) { quote_found = buffer.string[range->start]; state->status = f_utf_buffer_increment(buffer, range, 1); @@ -371,8 +371,8 @@ extern "C" { else if (quote_found == f_fss_quote_single_s.string[0]) { *quote = f_fss_quote_type_single_e; } - else if (quote_found == f_fss_quote_backtick_s.string[0]) { - *quote = f_fss_quote_type_backtick_e; + else if (quote_found == f_fss_quote_grave_s.string[0]) { + *quote = f_fss_quote_type_grave_e; } else { *quote = f_fss_quote_type_none_e; @@ -544,8 +544,8 @@ extern "C" { else if (quote_found == f_fss_quote_single_s.string[0]) { *quote = f_fss_quote_type_single_e; } - else if (quote_found == f_fss_quote_backtick_s.string[0]) { - *quote = f_fss_quote_type_backtick_e; + else if (quote_found == f_fss_quote_grave_s.string[0]) { + *quote = f_fss_quote_type_grave_e; } else { *quote = f_fss_quote_type_none_e; diff --git a/level_2/fll_iki/c/iki.c b/level_2/fll_iki/c/iki.c index d8305d1..aaffabe 100644 --- a/level_2/fll_iki/c/iki.c +++ b/level_2/fll_iki/c/iki.c @@ -9,7 +9,7 @@ extern "C" { f_status_t fll_iki_content_escape(const f_string_static_t content, const f_string_static_t quote, f_string_dynamic_t * const escaped) { #ifndef _di_level_2_parameter_checking_ if (!quote.used) return F_status_set_error(F_parameter); - if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_backtick_s.string[0]) return F_status_set_error(F_parameter); + if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_grave_s.string[0]) return F_status_set_error(F_parameter); if (escaped->used > escaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -25,7 +25,7 @@ extern "C" { if (range.start > range.stop) return F_status_set_error(F_parameter); if (range.start >= content.used) return F_status_set_error(F_parameter); if (!quote.used) return F_status_set_error(F_parameter); - if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_backtick_s.string[0]) return F_status_set_error(F_parameter); + if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_grave_s.string[0]) return F_status_set_error(F_parameter); if (escaped->used > escaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { if (range.start > range.stop) return F_status_set_error(F_parameter); if (range.start >= content.used) return F_status_set_error(F_parameter); if (!quote.used) return F_status_set_error(F_parameter); - if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_backtick_s.string[0]) return F_status_set_error(F_parameter); + if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_grave_s.string[0]) return F_status_set_error(F_parameter); if (unescaped->used > unescaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -51,7 +51,7 @@ extern "C" { f_status_t fll_iki_content_unescape(const f_string_static_t content, const f_string_static_t quote, f_string_dynamic_t * const unescaped) { #ifndef _di_level_2_parameter_checking_ if (!quote.used) return F_status_set_error(F_parameter); - if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_backtick_s.string[0]) return F_status_set_error(F_parameter); + if (quote.string[0] != f_iki_syntax_quote_single_s.string[0] && quote.string[0] != f_iki_syntax_quote_double_s.string[0] && quote.string[0] != f_iki_syntax_quote_grave_s.string[0]) return F_status_set_error(F_parameter); if (unescaped->used > unescaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_iki/c/iki.h b/level_2/fll_iki/c/iki.h index 5346c91..89804eb 100644 --- a/level_2/fll_iki/c/iki.h +++ b/level_2/fll_iki/c/iki.h @@ -42,7 +42,7 @@ extern "C" { * The string to escape. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * @param escaped * The content whose data is escaped. * The escaped string data is appended to this, so set the escaped.used = 0 if "replace" behavior is desired. @@ -73,7 +73,7 @@ extern "C" { * The range within the buffer that represents the content. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * @param escaped * The content whose data is escaped. * The escaped string data is appended to this, so set the escaped.used = 0 if "replace" behavior is desired. @@ -104,7 +104,7 @@ extern "C" { * The range within the buffer that represents the content. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * @param unescaped * The content whose data is unescaped. * The unescaped string data is appended to this, so set the unescaped.used = 0 if "replace" behavior is desired. @@ -134,7 +134,7 @@ extern "C" { * The string to escape. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * @param unescaped * The content whose data is unescaped. * The unescaped string data is appended to this, so set the unescaped.used = 0 if "replace" behavior is desired. diff --git a/level_2/fll_iki/c/private-iki.h b/level_2/fll_iki/c/private-iki.h index 4546f2f..8bc2e63 100644 --- a/level_2/fll_iki/c/private-iki.h +++ b/level_2/fll_iki/c/private-iki.h @@ -26,7 +26,7 @@ extern "C" { * The range within the buffer that represents the content. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * @param escaped * The content whose data is escaped. * The escaped string data is appended to this, so set the escaped.used = 0 if "replace" behavior is desired. @@ -57,7 +57,7 @@ extern "C" { * The range within the buffer that represents the content. * @param quote * The quote character in use. - * This must be either a single quote (') (U+0027), double quote (") (U+0022), or backtick (`) (U+0060). + * This must be either a single quote (') (U+0027), double quote (") (U+0022), or grave (`) (U+0060). * @param unescaped * The content whose data is unescaped. * The unescaped string data is appended to this, so set the unescaped.used = 0 if "replace" behavior is desired. diff --git a/level_3/fss_read/c/main/print/data.c b/level_3/fss_read/c/main/print/data.c index c0ddc6a..e24ffaa 100644 --- a/level_3/fss_read/c/main/print/data.c +++ b/level_3/fss_read/c/main/print/data.c @@ -177,8 +177,8 @@ extern "C" { fll_print_dynamic_raw( type == f_fss_quote_type_single_e ? f_fss_quote_single_s - : type == f_fss_quote_type_backtick_e - ? f_fss_quote_backtick_s + : type == f_fss_quote_type_grave_e + ? f_fss_quote_grave_s : f_fss_quote_double_s, print->to ); diff --git a/level_3/fss_write/c/main/common.c b/level_3/fss_write/c/main/common.c index 203c3b3..ea116bb 100644 --- a/level_3/fss_write/c/main/common.c +++ b/level_3/fss_write/c/main/common.c @@ -677,35 +677,35 @@ extern "C" { if (main->program.parameters.array[fss_write_parameter_double_e].location < main->program.parameters.array[fss_write_parameter_single_e].location) { main->setting.quote = f_fss_quote_single_s; - if (main->program.parameters.array[fss_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[fss_write_parameter_single_e].location < main->program.parameters.array[fss_write_parameter_backtick_e].location) { - main->setting.quote = f_fss_quote_backtick_s; + if (main->program.parameters.array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[fss_write_parameter_single_e].location < main->program.parameters.array[fss_write_parameter_grave_e].location) { + main->setting.quote = f_fss_quote_grave_s; } } } - else if (main->program.parameters.array[fss_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[fss_write_parameter_double_e].location < main->program.parameters.array[fss_write_parameter_backtick_e].location) { - main->setting.quote = f_fss_quote_backtick_s; + else if (main->program.parameters.array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[fss_write_parameter_double_e].location < main->program.parameters.array[fss_write_parameter_grave_e].location) { + main->setting.quote = f_fss_quote_grave_s; } } } - else if (main->program.parameters.array[fss_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[fss_write_parameter_double_e].location < main->program.parameters.array[fss_write_parameter_backtick_e].location) { - main->setting.quote = f_fss_quote_backtick_s; + else if (main->program.parameters.array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[fss_write_parameter_double_e].location < main->program.parameters.array[fss_write_parameter_grave_e].location) { + main->setting.quote = f_fss_quote_grave_s; } } } else if (main->program.parameters.array[fss_write_parameter_single_e].result & f_console_result_found_e) { main->setting.quote = f_fss_quote_single_s; - if (main->program.parameters.array[fss_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[fss_write_parameter_single_e].location < main->program.parameters.array[fss_write_parameter_backtick_e].location) { - main->setting.quote = f_fss_quote_backtick_s; + if (main->program.parameters.array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[fss_write_parameter_single_e].location < main->program.parameters.array[fss_write_parameter_grave_e].location) { + main->setting.quote = f_fss_quote_grave_s; } } } - else if (main->program.parameters.array[fss_write_parameter_backtick_e].result & f_console_result_found_e) { - main->setting.quote = f_fss_quote_backtick_s; + else if (main->program.parameters.array[fss_write_parameter_grave_e].result & f_console_result_found_e) { + main->setting.quote = f_fss_quote_grave_s; } if (main->program.parameters.array[fss_write_parameter_trim_e].result & f_console_result_found_e) { diff --git a/level_3/fss_write/c/main/common/enumeration.h b/level_3/fss_write/c/main/common/enumeration.h index 7b2c33c..874347d 100644 --- a/level_3/fss_write/c/main/common/enumeration.h +++ b/level_3/fss_write/c/main/common/enumeration.h @@ -67,12 +67,12 @@ extern "C" { #ifndef _di_fss_write_parameter_e_ enum { fss_write_parameter_as_e = f_console_standard_parameter_last_e, - fss_write_parameter_backtick_e, fss_write_parameter_content_e, fss_write_parameter_content_end_e, fss_write_parameter_content_next_e, fss_write_parameter_double_e, fss_write_parameter_file_e, + fss_write_parameter_grave_e, fss_write_parameter_ignore_e, fss_write_parameter_object_e, fss_write_parameter_object_open_e, @@ -87,12 +87,12 @@ extern "C" { macro_fll_program_console_parameter_standard_initialize, \ \ macro_f_console_parameter_t_initialize_3(fss_write_short_as_s, fss_write_long_as_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(fss_write_short_backtick_s, fss_write_long_backtick_s, 0, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_content_s, fss_write_long_content_s, 1, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_content_end_s, fss_write_long_content_end_s, 0, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_content_next_s, fss_write_long_content_next_s, 0, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_double_s, fss_write_long_double_s, 0, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_file_s, fss_write_long_file_s, 1, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(fss_write_short_grave_s, fss_write_long_grave_s, 0, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_ignore_s, fss_write_long_ignore_s, 2, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_object_s, fss_write_long_object_s, 1, f_console_flag_normal_e), \ macro_f_console_parameter_t_initialize_3(fss_write_short_object_open_s, fss_write_long_object_open_s, 0, f_console_flag_normal_e), \ diff --git a/level_3/fss_write/c/main/common/string.c b/level_3/fss_write/c/main/common/string.c index 2df3dbd..389386a 100644 --- a/level_3/fss_write/c/main/common/string.c +++ b/level_3/fss_write/c/main/common/string.c @@ -25,12 +25,12 @@ extern "C" { #ifndef _di_fss_write_parameter_s_ const f_string_static_t fss_write_short_as_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_as_s, 0, FSS_WRITE_short_as_s_length); - const f_string_static_t fss_write_short_backtick_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_backtick_s, 0, FSS_WRITE_short_backtick_s_length); const f_string_static_t fss_write_short_content_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_content_s, 0, FSS_WRITE_short_content_s_length); const f_string_static_t fss_write_short_content_end_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_content_end_s, 0, FSS_WRITE_short_content_end_s_length); const f_string_static_t fss_write_short_content_next_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_content_next_s, 0, FSS_WRITE_short_content_next_s_length); const f_string_static_t fss_write_short_double_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_double_s, 0, FSS_WRITE_short_double_s_length); const f_string_static_t fss_write_short_file_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_file_s, 0, FSS_WRITE_short_file_s_length); + const f_string_static_t fss_write_short_grave_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_grave_s, 0, FSS_WRITE_short_grave_s_length); const f_string_static_t fss_write_short_ignore_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_ignore_s, 0, FSS_WRITE_short_ignore_s_length); const f_string_static_t fss_write_short_object_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_object_s, 0, FSS_WRITE_short_object_s_length); const f_string_static_t fss_write_short_object_open_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_object_open_s, 0, FSS_WRITE_short_object_open_s_length); @@ -40,12 +40,12 @@ extern "C" { const f_string_static_t fss_write_short_trim_s = macro_f_string_static_t_initialize_1(FSS_WRITE_short_trim_s, 0, FSS_WRITE_short_trim_s_length); const f_string_static_t fss_write_long_as_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_as_s, 0, FSS_WRITE_long_as_s_length); - const f_string_static_t fss_write_long_backtick_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_backtick_s, 0, FSS_WRITE_long_backtick_s_length); const f_string_static_t fss_write_long_content_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_content_s, 0, FSS_WRITE_long_content_s_length); const f_string_static_t fss_write_long_content_end_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_content_end_s, 0, FSS_WRITE_long_content_end_s_length); const f_string_static_t fss_write_long_content_next_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_content_next_s, 0, FSS_WRITE_long_content_next_s_length); const f_string_static_t fss_write_long_double_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_double_s, 0, FSS_WRITE_long_double_s_length); const f_string_static_t fss_write_long_file_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_file_s, 0, FSS_WRITE_long_file_s_length); + const f_string_static_t fss_write_long_grave_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_grave_s, 0, FSS_WRITE_long_grave_s_length); const f_string_static_t fss_write_long_ignore_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_ignore_s, 0, FSS_WRITE_long_ignore_s_length); const f_string_static_t fss_write_long_object_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_object_s, 0, FSS_WRITE_long_object_s_length); const f_string_static_t fss_write_long_object_open_s = macro_f_string_static_t_initialize_1(FSS_WRITE_long_object_open_s, 0, FSS_WRITE_long_object_open_s_length); diff --git a/level_3/fss_write/c/main/common/string.h b/level_3/fss_write/c/main/common/string.h index 81a2d4b..021b64a 100644 --- a/level_3/fss_write/c/main/common/string.h +++ b/level_3/fss_write/c/main/common/string.h @@ -104,12 +104,12 @@ extern "C" { */ #ifndef _di_fss_write_parameter_s_ #define FSS_WRITE_short_as_s "A" - #define FSS_WRITE_short_backtick_s "b" #define FSS_WRITE_short_content_s "c" #define FSS_WRITE_short_content_end_s "E" #define FSS_WRITE_short_content_next_s "N" #define FSS_WRITE_short_double_s "d" #define FSS_WRITE_short_file_s "f" + #define FSS_WRITE_short_grave_s "g" #define FSS_WRITE_short_ignore_s "I" #define FSS_WRITE_short_object_s "o" #define FSS_WRITE_short_object_open_s "O" @@ -119,12 +119,12 @@ extern "C" { #define FSS_WRITE_short_trim_s "T" #define FSS_WRITE_long_as_s "as" - #define FSS_WRITE_long_backtick_s "backtick" #define FSS_WRITE_long_content_s "content" #define FSS_WRITE_long_content_end_s "content_end" #define FSS_WRITE_long_content_next_s "content_next" #define FSS_WRITE_long_double_s "double" #define FSS_WRITE_long_file_s "file" + #define FSS_WRITE_long_grave_s "grave" #define FSS_WRITE_long_ignore_s "ignore" #define FSS_WRITE_long_object_s "object" #define FSS_WRITE_long_object_open_s "object_open" @@ -134,12 +134,12 @@ extern "C" { #define FSS_WRITE_long_trim_s "trim" #define FSS_WRITE_short_as_s_length 1 - #define FSS_WRITE_short_backtick_s_length 1 #define FSS_WRITE_short_content_s_length 1 #define FSS_WRITE_short_content_end_s_length 1 #define FSS_WRITE_short_content_next_s_length 1 #define FSS_WRITE_short_double_s_length 1 #define FSS_WRITE_short_file_s_length 1 + #define FSS_WRITE_short_grave_s_length 1 #define FSS_WRITE_short_ignore_s_length 1 #define FSS_WRITE_short_object_s_length 1 #define FSS_WRITE_short_object_open_s_length 1 @@ -149,12 +149,12 @@ extern "C" { #define FSS_WRITE_short_trim_s_length 1 #define FSS_WRITE_long_as_s_length 2 - #define FSS_WRITE_long_backtick_s_length 8 #define FSS_WRITE_long_content_s_length 7 #define FSS_WRITE_long_content_end_s_length 11 #define FSS_WRITE_long_content_next_s_length 12 #define FSS_WRITE_long_double_s_length 6 #define FSS_WRITE_long_file_s_length 4 + #define FSS_WRITE_long_grave_s_length 5 #define FSS_WRITE_long_ignore_s_length 6 #define FSS_WRITE_long_object_s_length 6 #define FSS_WRITE_long_object_open_s_length 11 @@ -164,12 +164,12 @@ extern "C" { #define FSS_WRITE_long_trim_s_length 4 extern const f_string_static_t fss_write_short_as_s; - extern const f_string_static_t fss_write_short_backtick_s; extern const f_string_static_t fss_write_short_content_s; extern const f_string_static_t fss_write_short_content_end_s; extern const f_string_static_t fss_write_short_content_next_s; extern const f_string_static_t fss_write_short_double_s; extern const f_string_static_t fss_write_short_file_s; + extern const f_string_static_t fss_write_short_grave_s; extern const f_string_static_t fss_write_short_ignore_s; extern const f_string_static_t fss_write_short_object_s; extern const f_string_static_t fss_write_short_object_open_s; @@ -179,12 +179,12 @@ extern "C" { extern const f_string_static_t fss_write_short_trim_s; extern const f_string_static_t fss_write_long_as_s; - extern const f_string_static_t fss_write_long_backtick_s; extern const f_string_static_t fss_write_long_content_s; extern const f_string_static_t fss_write_long_content_end_s; extern const f_string_static_t fss_write_long_content_next_s; extern const f_string_static_t fss_write_long_double_s; extern const f_string_static_t fss_write_long_file_s; + extern const f_string_static_t fss_write_long_grave_s; extern const f_string_static_t fss_write_long_ignore_s; extern const f_string_static_t fss_write_long_object_s; extern const f_string_static_t fss_write_long_object_open_s; diff --git a/level_3/fss_write/c/main/print/message.c b/level_3/fss_write/c/main/print/message.c index 3140447..2e5c349 100644 --- a/level_3/fss_write/c/main/print/message.c +++ b/level_3/fss_write/c/main/print/message.c @@ -13,12 +13,12 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, print->to); - fll_program_print_help_option(print, fss_write_short_backtick_s, fss_write_long_backtick_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use backticks to quote."); fll_program_print_help_option(print, fss_write_short_content_s, fss_write_long_content_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " The Content to write."); fll_program_print_help_option(print, fss_write_short_content_end_s, fss_write_long_content_end_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Write the end of Content characters."); fll_program_print_help_option(print, fss_write_short_content_next_s, fss_write_long_content_next_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, "Write the next Content characters (separates multi-Content apart)."); fll_program_print_help_option(print, fss_write_short_double_s, fss_write_long_double_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use double quotes (default)."); fll_program_print_help_option(print, fss_write_short_file_s, fss_write_long_file_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Specify a file to send data to."); + fll_program_print_help_option(print, fss_write_short_grave_s, fss_write_long_grave_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use graves to quote."); fll_program_print_help_option(print, fss_write_short_ignore_s, fss_write_long_ignore_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Ignore a given range within a Content."); fll_program_print_help_option(print, fss_write_short_object_s, fss_write_long_object_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " The Object to write."); fll_program_print_help_option(print, fss_write_short_object_open_s, fss_write_long_object_open_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Write the open Object characters."); diff --git a/level_3/iki_write/c/main/common.c b/level_3/iki_write/c/main/common.c index e21e33d..78d7df8 100644 --- a/level_3/iki_write/c/main/common.c +++ b/level_3/iki_write/c/main/common.c @@ -242,35 +242,35 @@ extern "C" { if (main->program.parameters.array[iki_write_parameter_double_e].location < main->program.parameters.array[iki_write_parameter_single_e].location) { main->setting.quote = f_iki_syntax_quote_single_s; - if (main->program.parameters.array[iki_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[iki_write_parameter_single_e].location < main->program.parameters.array[iki_write_parameter_backtick_e].location) { - main->setting.quote = f_iki_syntax_quote_backtick_s; + if (main->program.parameters.array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[iki_write_parameter_single_e].location < main->program.parameters.array[iki_write_parameter_grave_e].location) { + main->setting.quote = f_iki_syntax_quote_grave_s; } } } - else if (main->program.parameters.array[iki_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[iki_write_parameter_double_e].location < main->program.parameters.array[iki_write_parameter_backtick_e].location) { - main->setting.quote = f_iki_syntax_quote_backtick_s; + else if (main->program.parameters.array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[iki_write_parameter_double_e].location < main->program.parameters.array[iki_write_parameter_grave_e].location) { + main->setting.quote = f_iki_syntax_quote_grave_s; } } } - else if (main->program.parameters.array[iki_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[iki_write_parameter_double_e].location < main->program.parameters.array[iki_write_parameter_backtick_e].location) { - main->setting.quote = f_iki_syntax_quote_backtick_s; + else if (main->program.parameters.array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[iki_write_parameter_double_e].location < main->program.parameters.array[iki_write_parameter_grave_e].location) { + main->setting.quote = f_iki_syntax_quote_grave_s; } } } else if (main->program.parameters.array[iki_write_parameter_single_e].result & f_console_result_found_e) { main->setting.quote = f_iki_syntax_quote_single_s; - if (main->program.parameters.array[iki_write_parameter_backtick_e].result & f_console_result_found_e) { - if (main->program.parameters.array[iki_write_parameter_single_e].location < main->program.parameters.array[iki_write_parameter_backtick_e].location) { - main->setting.quote = f_iki_syntax_quote_backtick_s; + if (main->program.parameters.array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + if (main->program.parameters.array[iki_write_parameter_single_e].location < main->program.parameters.array[iki_write_parameter_grave_e].location) { + main->setting.quote = f_iki_syntax_quote_grave_s; } } } - else if (main->program.parameters.array[iki_write_parameter_backtick_e].result & f_console_result_found_e) { - main->setting.quote = f_iki_syntax_quote_backtick_s; + else if (main->program.parameters.array[iki_write_parameter_grave_e].result & f_console_result_found_e) { + main->setting.quote = f_iki_syntax_quote_grave_s; } } #endif // _di_iki_write_setting_load_ diff --git a/level_3/iki_write/c/main/common/enumeration.h b/level_3/iki_write/c/main/common/enumeration.h index 2cb00f8..a141a8f 100644 --- a/level_3/iki_write/c/main/common/enumeration.h +++ b/level_3/iki_write/c/main/common/enumeration.h @@ -54,10 +54,10 @@ extern "C" { */ #ifndef _di_iki_write_parameter_e_ enum { - iki_write_parameter_backtick_e = f_console_standard_parameter_last_e, - iki_write_parameter_content_e, + iki_write_parameter_content_e = f_console_standard_parameter_last_e, iki_write_parameter_double_e, iki_write_parameter_file_e, + iki_write_parameter_grave_e, iki_write_parameter_object_e, iki_write_parameter_single_e, iki_write_parameter_wrap_e, @@ -67,13 +67,13 @@ extern "C" { { \ macro_fll_program_console_parameter_standard_initialize, \ \ - macro_f_console_parameter_t_initialize_3(iki_write_short_backtick_s, iki_write_long_backtick_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_content_s, iki_write_long_content_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_double_s, iki_write_long_double_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_file_s, iki_write_long_file_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_object_s, iki_write_long_object_s, 1, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_single_s, iki_write_long_single_s, 0, f_console_flag_normal_e), \ - macro_f_console_parameter_t_initialize_3(iki_write_short_wrap_s, iki_write_long_wrap_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_content_s, iki_write_long_content_s, 1, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_double_s, iki_write_long_double_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_file_s, iki_write_long_file_s, 1, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_grave_s, iki_write_long_grave_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_object_s, iki_write_long_object_s, 1, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_single_s, iki_write_long_single_s, 0, f_console_flag_normal_e), \ + macro_f_console_parameter_t_initialize_3(iki_write_short_wrap_s, iki_write_long_wrap_s, 0, f_console_flag_normal_e), \ } #define iki_write_parameter_total_d 20 diff --git a/level_3/iki_write/c/main/common/string.c b/level_3/iki_write/c/main/common/string.c index c4e0ab0..eb4f925 100644 --- a/level_3/iki_write/c/main/common/string.c +++ b/level_3/iki_write/c/main/common/string.c @@ -18,18 +18,18 @@ extern "C" { #endif // _di_iki_write_s_ #ifndef _di_iki_write_parameter_s_ - const f_string_static_t iki_write_short_backtick_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_backtick_s, 0, IKI_WRITE_short_backtick_s_length); const f_string_static_t iki_write_short_content_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_content_s, 0, IKI_WRITE_short_content_s_length); const f_string_static_t iki_write_short_double_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_double_s, 0, IKI_WRITE_short_double_s_length); const f_string_static_t iki_write_short_file_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_file_s, 0, IKI_WRITE_short_file_s_length); + const f_string_static_t iki_write_short_grave_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_grave_s, 0, IKI_WRITE_short_grave_s_length); const f_string_static_t iki_write_short_object_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_object_s, 0, IKI_WRITE_short_object_s_length); const f_string_static_t iki_write_short_single_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_single_s, 0, IKI_WRITE_short_single_s_length); const f_string_static_t iki_write_short_wrap_s = macro_f_string_static_t_initialize_1(IKI_WRITE_short_wrap_s, 0, IKI_WRITE_short_wrap_s_length); - const f_string_static_t iki_write_long_backtick_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_backtick_s, 0, IKI_WRITE_long_backtick_s_length); const f_string_static_t iki_write_long_content_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_content_s, 0, IKI_WRITE_long_content_s_length); const f_string_static_t iki_write_long_double_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_double_s, 0, IKI_WRITE_long_double_s_length); const f_string_static_t iki_write_long_file_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_file_s, 0, IKI_WRITE_long_file_s_length); + const f_string_static_t iki_write_long_grave_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_grave_s, 0, IKI_WRITE_long_grave_s_length); const f_string_static_t iki_write_long_object_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_object_s, 0, IKI_WRITE_long_object_s_length); const f_string_static_t iki_write_long_single_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_single_s, 0, IKI_WRITE_long_single_s_length); const f_string_static_t iki_write_long_wrap_s = macro_f_string_static_t_initialize_1(IKI_WRITE_long_wrap_s, 0, IKI_WRITE_long_wrap_s_length); diff --git a/level_3/iki_write/c/main/common/string.h b/level_3/iki_write/c/main/common/string.h index 12f7360..c1468f5 100644 --- a/level_3/iki_write/c/main/common/string.h +++ b/level_3/iki_write/c/main/common/string.h @@ -74,50 +74,50 @@ extern "C" { * The main program parameters. */ #ifndef _di_iki_write_parameter_s_ - #define IKI_WRITE_short_backtick_s "b" - #define IKI_WRITE_short_content_s "c" - #define IKI_WRITE_short_double_s "d" - #define IKI_WRITE_short_file_s "f" - #define IKI_WRITE_short_object_s "o" - #define IKI_WRITE_short_single_s "s" - #define IKI_WRITE_short_wrap_s "w" - - #define IKI_WRITE_long_backtick_s "backtick" - #define IKI_WRITE_long_content_s "content" - #define IKI_WRITE_long_double_s "double" - #define IKI_WRITE_long_file_s "file" - #define IKI_WRITE_long_object_s "object" - #define IKI_WRITE_long_single_s "single" - #define IKI_WRITE_long_wrap_s "wrap" - - #define IKI_WRITE_short_backtick_s_length 1 - #define IKI_WRITE_short_content_s_length 1 - #define IKI_WRITE_short_double_s_length 1 - #define IKI_WRITE_short_file_s_length 1 - #define IKI_WRITE_short_object_s_length 1 - #define IKI_WRITE_short_single_s_length 1 - #define IKI_WRITE_short_wrap_s_length 1 - - #define IKI_WRITE_long_backtick_s_length 8 - #define IKI_WRITE_long_content_s_length 7 - #define IKI_WRITE_long_double_s_length 6 - #define IKI_WRITE_long_file_s_length 4 - #define IKI_WRITE_long_object_s_length 6 - #define IKI_WRITE_long_single_s_length 6 - #define IKI_WRITE_long_wrap_s_length 4 - - extern const f_string_static_t iki_write_short_backtick_s; + #define IKI_WRITE_short_content_s "c" + #define IKI_WRITE_short_double_s "d" + #define IKI_WRITE_short_file_s "f" + #define IKI_WRITE_short_grave_s "g" + #define IKI_WRITE_short_object_s "o" + #define IKI_WRITE_short_single_s "s" + #define IKI_WRITE_short_wrap_s "w" + + #define IKI_WRITE_long_content_s "content" + #define IKI_WRITE_long_double_s "double" + #define IKI_WRITE_long_file_s "file" + #define IKI_WRITE_long_grave_s "grave" + #define IKI_WRITE_long_object_s "object" + #define IKI_WRITE_long_single_s "single" + #define IKI_WRITE_long_wrap_s "wrap" + + #define IKI_WRITE_short_content_s_length 1 + #define IKI_WRITE_short_double_s_length 1 + #define IKI_WRITE_short_file_s_length 1 + #define IKI_WRITE_short_grave_s_length 1 + #define IKI_WRITE_short_object_s_length 1 + #define IKI_WRITE_short_single_s_length 1 + #define IKI_WRITE_short_wrap_s_length 1 + + #define IKI_WRITE_long_content_s_length 7 + #define IKI_WRITE_long_double_s_length 6 + #define IKI_WRITE_long_file_s_length 4 + #define IKI_WRITE_long_grave_s_length 5 + #define IKI_WRITE_long_object_s_length 6 + #define IKI_WRITE_long_single_s_length 6 + #define IKI_WRITE_long_wrap_s_length 4 + extern const f_string_static_t iki_write_short_content_s; extern const f_string_static_t iki_write_short_double_s; extern const f_string_static_t iki_write_short_file_s; + extern const f_string_static_t iki_write_short_grave_s; extern const f_string_static_t iki_write_short_object_s; extern const f_string_static_t iki_write_short_single_s; extern const f_string_static_t iki_write_short_wrap_s; - extern const f_string_static_t iki_write_long_backtick_s; extern const f_string_static_t iki_write_long_content_s; extern const f_string_static_t iki_write_long_double_s; extern const f_string_static_t iki_write_long_file_s; + extern const f_string_static_t iki_write_long_grave_s; extern const f_string_static_t iki_write_long_object_s; extern const f_string_static_t iki_write_long_single_s; extern const f_string_static_t iki_write_long_wrap_s; diff --git a/level_3/iki_write/c/main/print/message.c b/level_3/iki_write/c/main/print/message.c index 63f66f6..038afbc 100644 --- a/level_3/iki_write/c/main/print/message.c +++ b/level_3/iki_write/c/main/print/message.c @@ -26,13 +26,13 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, print->to); - fll_program_print_help_option(print, iki_write_short_backtick_s, iki_write_long_backtick_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, "Use backtick for quotes."); - fll_program_print_help_option(print, iki_write_short_content_s, iki_write_long_content_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " The Content to write."); - fll_program_print_help_option(print, iki_write_short_double_s, iki_write_long_double_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use double quotes (default)."); - fll_program_print_help_option(print, iki_write_short_file_s, iki_write_long_file_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Specify a file to send data to."); - fll_program_print_help_option(print, iki_write_short_object_s, iki_write_long_object_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " The Object to write."); - fll_program_print_help_option(print, iki_write_short_single_s, iki_write_long_single_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use single quotes."); - fll_program_print_help_option(print, iki_write_short_wrap_s, iki_write_long_wrap_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Wrap the vocabulary name."); + fll_program_print_help_option(print, iki_write_short_content_s, iki_write_long_content_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, "The Content to write."); + fll_program_print_help_option(print, iki_write_short_double_s, iki_write_long_double_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use double quotes (U+0022) (default)."); + fll_program_print_help_option(print, iki_write_short_file_s, iki_write_long_file_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Specify a file to send data to."); + fll_program_print_help_option(print, iki_write_short_grave_s, iki_write_long_grave_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use grave (U+0060) for quotes."); + fll_program_print_help_option(print, iki_write_short_object_s, iki_write_long_object_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " The Object to write."); + fll_program_print_help_option(print, iki_write_short_single_s, iki_write_long_single_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Use single quotes (U+0027)."); + fll_program_print_help_option(print, iki_write_short_wrap_s, iki_write_long_wrap_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Wrap the vocabulary name."); f_print_dynamic_raw(f_string_eol_s, print->to); diff --git a/specifications/fss-0000.txt b/specifications/fss-0000.txt index fd181dc..38bf775 100644 --- a/specifications/fss-0000.txt +++ b/specifications/fss-0000.txt @@ -15,7 +15,7 @@ Featureless Settings Specification: 0000 - Basic: White space separates an Object from the Content. An Object may be preceded by a new line character, in which case means that the Object has no Content. If only printing white spaces or non-printable characters follow a valid Object, then that Object is considered to have no Content. - An Object may be quoted to include white space where a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a backtick character:'`' (unicode:"U+0060") are used to quote. + An Object may be quoted to include white space where a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a grave character:'`' (unicode:"U+0060") are used to quote. An Object is only considered quoted if the first and last character of the Object are the same quote. Any quote characters in a non-quoted Object are treated as part of the Object rather than as a quote. An Object that properly starts with a quote character but is not properly terminated before the new line is reached is considered to be an Object terminating at the end of the line. diff --git a/specifications/fss-0001.txt b/specifications/fss-0001.txt index e1deb32..07eab5a 100644 --- a/specifications/fss-0001.txt +++ b/specifications/fss-0001.txt @@ -15,7 +15,7 @@ Featureless Settings Specification: 0001 - Extended: White space separates an Object from the Content. An Object may be followed by a new line, in which case means that the Object has no Content. If only printing white spaces or non-printable characters follow a valid Object, then that Object is considered to have no Content. - An Object may be quoted to include white space where a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a backtick character:'`' (unicode:"U+0060") are used to quote. + An Object may be quoted to include white space where a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a grave character:'`' (unicode:"U+0060") are used to quote. An Object is only considered quoted if the first and last character of the Object are the same quote. Any quote characters in a non-quoted Object are treated as part of the Object rather than as a quote. An Object that properly starts with a quote character but is not properly terminated before the new line is reached is considered to be an Object terminating at the end of the line. diff --git a/specifications/fss-0002.txt b/specifications/fss-0002.txt index d47f9ae..ba08abf 100644 --- a/specifications/fss-0002.txt +++ b/specifications/fss-0002.txt @@ -18,7 +18,7 @@ Featureless Settings Specification: 0002 - Basic List: Content is represented as a single Content column of every line following a valid object until the end of file (or string) or until the next valid Object is found. Any Content that could be interpreted as a valid Object must have the colon delimited. - There is no single-quote, double-quote, or backtick delimitation in this specification. + There is no single-quote (unicode:"U+0027"), double-quote (unicode:"U+0022"), or grave (unicode:"U+0060") delimitation in this specification. Only a colon character:":" (unicode:"U+003A") that would result in a valid Object can be delimited. Empty Objects are allowed, that is, the length of the object may be zero. diff --git a/specifications/fss-0003.txt b/specifications/fss-0003.txt index 5507725..a81a001 100644 --- a/specifications/fss-0003.txt +++ b/specifications/fss-0003.txt @@ -20,7 +20,7 @@ Featureless Settings Specification: 0003 - Extended List: Any Content column that could be interpreted as an end of Content must be delimited if it should be part of the Content. White space may follow a valid close-brace character:"}" (unicode:"U+007D") but a terminating new line must be present to designate a valid end of Content. - There is no single-quote, double-quote, or backtick delimitation in this specification. + There is no single-quote (unicode:"U+0027"), double-quote (unicode:"U+0022"), or grave (unicode:"U+0060") delimitation in this specification. Only an open-brace character:"{" (unicode:"U+007B") that would result in a valid Object or the close-brace character:"}" (unicode:"U+007D") that would terminate valid Content can be delimited. When inside potentially valid Content (which follows a valid Object) the open-brace character:"{" (unicode:"U+007B") cannot be delimited because this standard is not-recursive. When not inside any potentially valid Content (that is, there is no previous unclosed Object), then the Object may be delimited. diff --git a/specifications/fss.txt b/specifications/fss.txt index 2d9f17a..a3a7bbf 100644 --- a/specifications/fss.txt +++ b/specifications/fss.txt @@ -61,7 +61,7 @@ Featureless Settings Specifications: Unless otherwise specified, white space immediately both before (and after, outside of the terminating quote) an Object is not considered part of the Object. This simplifies identifying the object, use quoted Objects to support white space before/after an object for styling purposes. - Unless otherwise specified, quotes may only be a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a backtick character:'`' (unicode:"U+0060") and only a backslash character:"\\" (unicode:"U+005C") may be used as a delimiter. + Unless otherwise specified, quotes may only be a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a grave character:'`' (unicode:"U+0060") and only a backslash character:"\\" (unicode:"U+005C") may be used as a delimiter. For example, code:"FSS-0000 (Basic)"\: \"Object 1" has content starting at the '1', with an Object named '"Object'. \\"Object 1" has content starting at the '1', with an Object named '\"Object'. diff --git a/specifications/iki.txt b/specifications/iki.txt index 0640281..6343356 100644 --- a/specifications/iki.txt +++ b/specifications/iki.txt @@ -30,7 +30,7 @@ IKI Specifications: White space, non-word, and non character:"_" (unicode:"U+005F"), character:"-" (unicode:"U+002D"), character:"+" (unicode:"U+002B")) character punctuations may not exist as part of the variable name. The only Unicode dash-like characters allowed as a "dash" are those intended to connect, such as the Unicode hyphens (unicode:"U+2010" and unicode:"U+2011"). - Any potential IKI data must be escaped to make it treated as non-IKI data by prepending a backslash character:"\\" before the colon character:":" that is before the opening quote (single, double, or backtic). Potential IKI data refers to any valid IKI sequence without considering the closing single quote character:"'" (unicode:"U+0027"), closing double quote character:'"' (unicode:"U+0022"), or closing backtick character:'`' (unicode:"U+0060"). + Any potential IKI data must be escaped to make it treated as non-IKI data by prepending a backslash character:"\\" before the colon character:":" that is before the opening quote (single, double, or backtic). Potential IKI data refers to any valid IKI sequence without considering the closing single quote character:"'" (unicode:"U+0027"), closing double quote character:'"' (unicode:"U+0022"), or closing grave character:'`' (unicode:"U+0060"). Unicode punctuation connector characters are supported just like character:"_", except when they connect outside the current line (such as unicode:"U+FE33" character:"︳"). Unicode invisible punctuations (such as invisible plus: unicode:"U+2064") are not considered a punctuations in this standard (because they a zero-width characters), therefore they are not to be considered a valid character:"_", character:"-", or character:"+" Unicode equivalents. @@ -38,7 +38,7 @@ IKI Specifications: Key\: code:"\o" = any printable word character, including character:"_", character:"-", character:"+" (and Unicode equivalents). code:"\c" = any character, including white space and non-printing, and any delimited quote (used as the opening quote) or a any quote (undelimited) not used as the opening quote. - code:"\q" = either a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a backtick character:'`' (unicode:"U+0060"). + code:"\q" = either a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a grave character:'`' (unicode:"U+0060"). code:"\x" = any character. code:"\W" = any non-word character, discluding character:"_", character:"-", character:"+" (and Unicode equivalents). code:"\e" = an optional escape sequence of any number of backslashes, such as character:"\\". -- 1.8.3.1