Cleanup: Rename bytecode to bytesequence.

The term "bytecode" already exists and is used for a slighty different purpoe (representing compiled or partially compiled data).
This is a different context.
To avoid using the term improperly, switch to a more proper term "bytesequence" (as one word).
A byte sequence is a term representing a sequence of bytes.
This is more specific than binary and effectively emphasis that this is in regards to bytes.
Avoiding the term binary, however correct or not the term may be, helps avoid confusion due to "binary" and "text" data being considered two separate things.

diff --git a/level_3/utf8/c/common.c b/level_3/utf8/c/common.c
index 4f81c0f9306824090ddbe2e6db3b9daa432fb7f7..bf06d6049905278208af7c5ea547da5c5e01d87c 100644 (file)
--- a/level_3/utf8/c/common.c
+++ b/level_3/utf8/c/common.c
@@ -40,7 +40,7 @@ extern "C" {
 #endif // _di_utf8_defines_
 
 #ifndef _di_utf8_parameters_
-  const f_string_static_t utf8_short_from_bytecode_s = macro_f_string_static_t_initialize(UTF8_short_from_bytecode_s, 0, UTF8_short_from_bytecode_s_length);
+  const f_string_static_t utf8_short_from_bytesequence_s = macro_f_string_static_t_initialize(UTF8_short_from_bytesequence_s, 0, UTF8_short_from_bytesequence_s_length);
   const f_string_static_t utf8_short_from_codepoint_s = macro_f_string_static_t_initialize(UTF8_short_from_codepoint_s, 0, UTF8_short_from_codepoint_s_length);
   const f_string_static_t utf8_short_from_file_s = macro_f_string_static_t_initialize(UTF8_short_from_file_s, 0, UTF8_short_from_file_s_length);
 
@@ -49,13 +49,13 @@ extern "C" {
   const f_string_static_t utf8_short_strip_invalid_s = macro_f_string_static_t_initialize(UTF8_short_strip_invalid_s, 0, UTF8_short_strip_invalid_s_length);
   const f_string_static_t utf8_short_verify_s = macro_f_string_static_t_initialize(UTF8_short_verify_s, 0, UTF8_short_verify_s_length);
 
-  const f_string_static_t utf8_short_to_bytecode_s = macro_f_string_static_t_initialize(UTF8_short_to_bytecode_s, 0, UTF8_short_to_bytecode_s_length);
+  const f_string_static_t utf8_short_to_bytesequence_s = macro_f_string_static_t_initialize(UTF8_short_to_bytesequence_s, 0, UTF8_short_to_bytesequence_s_length);
   const f_string_static_t utf8_short_to_codepoint_s = macro_f_string_static_t_initialize(UTF8_short_to_codepoint_s, 0, UTF8_short_to_codepoint_s_length);
   const f_string_static_t utf8_short_to_combining_s = macro_f_string_static_t_initialize(UTF8_short_to_combining_s, 0, UTF8_short_to_combining_s_length);
   const f_string_static_t utf8_short_to_file_s = macro_f_string_static_t_initialize(UTF8_short_to_file_s, 0, UTF8_short_to_file_s_length);
   const f_string_static_t utf8_short_to_width_s = macro_f_string_static_t_initialize(UTF8_short_to_width_s, 0, UTF8_short_to_width_s_length);
 
-  const f_string_static_t utf8_long_from_bytecode_s = macro_f_string_static_t_initialize(UTF8_long_from_bytecode_s, 0, UTF8_long_from_bytecode_s_length);
+  const f_string_static_t utf8_long_from_bytesequence_s = macro_f_string_static_t_initialize(UTF8_long_from_bytesequence_s, 0, UTF8_long_from_bytesequence_s_length);
   const f_string_static_t utf8_long_from_codepoint_s = macro_f_string_static_t_initialize(UTF8_long_from_codepoint_s, 0, UTF8_long_from_codepoint_s_length);
   const f_string_static_t utf8_long_from_file_s = macro_f_string_static_t_initialize(UTF8_long_from_file_s, 0, UTF8_long_from_file_s_length);
 
@@ -64,7 +64,7 @@ extern "C" {
   const f_string_static_t utf8_long_strip_invalid_s = macro_f_string_static_t_initialize(UTF8_long_strip_invalid_s, 0, UTF8_long_strip_invalid_s_length);
   const f_string_static_t utf8_long_verify_s = macro_f_string_static_t_initialize(UTF8_long_verify_s, 0, UTF8_long_verify_s_length);
 
-  const f_string_static_t utf8_long_to_bytecode_s = macro_f_string_static_t_initialize(UTF8_long_to_bytecode_s, 0, UTF8_long_to_bytecode_s_length);
+  const f_string_static_t utf8_long_to_bytesequence_s = macro_f_string_static_t_initialize(UTF8_long_to_bytesequence_s, 0, UTF8_long_to_bytesequence_s_length);
   const f_string_static_t utf8_long_to_codepoint_s = macro_f_string_static_t_initialize(UTF8_long_to_codepoint_s, 0, UTF8_long_to_codepoint_s_length);
   const f_string_static_t utf8_long_to_combining_s = macro_f_string_static_t_initialize(UTF8_long_to_combining_s, 0, UTF8_long_to_combining_s_length);
   const f_string_static_t utf8_long_to_file_s = macro_f_string_static_t_initialize(UTF8_long_to_file_s, 0, UTF8_long_to_file_s_length);

diff --git a/level_3/utf8/c/common.h b/level_3/utf8/c/common.h
index 1a477d002f55ade0245d6ec264b5c21f58798286..2852a159c3e8e7d24c4eeb4f67925a2321b7188c 100644 (file)
--- a/level_3/utf8/c/common.h
+++ b/level_3/utf8/c/common.h
@@ -147,37 +147,37 @@ extern "C" {
  * The main program parameters.
  */
 #ifndef _di_utf8_parameters_
-  #define UTF8_short_from_bytecode_s  "b"
-  #define UTF8_short_from_codepoint_s "c"
-  #define UTF8_short_from_file_s      "f"
+  #define UTF8_short_from_bytesequence_s "b"
+  #define UTF8_short_from_codepoint_s    "c"
+  #define UTF8_short_from_file_s         "f"
 
   #define UTF8_short_headers_s       "H"
   #define UTF8_short_separate_s      "S"
   #define UTF8_short_strip_invalid_s "s"
   #define UTF8_short_verify_s        "v"
 
-  #define UTF8_short_to_bytecode_s  "B"
-  #define UTF8_short_to_codepoint_s "C"
-  #define UTF8_short_to_combining_s "O"
-  #define UTF8_short_to_file_s      "F"
-  #define UTF8_short_to_width_s     "W"
+  #define UTF8_short_to_bytesequence_s "B"
+  #define UTF8_short_to_codepoint_s    "C"
+  #define UTF8_short_to_combining_s    "O"
+  #define UTF8_short_to_file_s         "F"
+  #define UTF8_short_to_width_s        "W"
 
-  #define UTF8_long_from_bytecode_s  "from_bytecode"
-  #define UTF8_long_from_codepoint_s "from_codepoint"
-  #define UTF8_long_from_file_s      "from_file"
+  #define UTF8_long_from_bytesequence_s "from_bytesequence"
+  #define UTF8_long_from_codepoint_s    "from_codepoint"
+  #define UTF8_long_from_file_s         "from_file"
 
   #define UTF8_long_headers_s       "headers"
   #define UTF8_long_separate_s      "separate"
   #define UTF8_long_strip_invalid_s "strip_invalid"
   #define UTF8_long_verify_s        "verify"
 
-  #define UTF8_long_to_bytecode_s  "to_bytecode"
-  #define UTF8_long_to_codepoint_s "to_codepoint"
-  #define UTF8_long_to_combining_s "to_combining"
-  #define UTF8_long_to_file_s      "to_file"
-  #define UTF8_long_to_width_s     "to_width"
+  #define UTF8_long_to_bytesequence_s "to_bytesequence"
+  #define UTF8_long_to_codepoint_s    "to_codepoint"
+  #define UTF8_long_to_combining_s    "to_combining"
+  #define UTF8_long_to_file_s         "to_file"
+  #define UTF8_long_to_width_s        "to_width"
 
-  #define UTF8_short_from_bytecode_s_length  1
+  #define UTF8_short_from_bytesequence_s_length  1
   #define UTF8_short_from_codepoint_s_length 1
   #define UTF8_short_from_file_s_length      1
 
@@ -186,28 +186,28 @@ extern "C" {
   #define UTF8_short_strip_invalid_s_length 1
   #define UTF8_short_verify_s_length        1
 
-  #define UTF8_short_to_bytecode_s_length  1
+  #define UTF8_short_to_bytesequence_s_length  1
   #define UTF8_short_to_codepoint_s_length 1
   #define UTF8_short_to_combining_s_length 1
   #define UTF8_short_to_file_s_length      1
   #define UTF8_short_to_width_s_length     1
 
-  #define UTF8_long_from_bytecode_s_length  13
-  #define UTF8_long_from_codepoint_s_length 14
-  #define UTF8_long_from_file_s_length      9
+  #define UTF8_long_from_bytesequence_s_length 17
+  #define UTF8_long_from_codepoint_s_length    14
+  #define UTF8_long_from_file_s_length         9
 
   #define UTF8_long_headers_s_length       7
   #define UTF8_long_separate_s_length      8
   #define UTF8_long_strip_invalid_s_length 13
   #define UTF8_long_verify_s_length        6
 
-  #define UTF8_long_to_bytecode_s_length  11
-  #define UTF8_long_to_codepoint_s_length 12
-  #define UTF8_long_to_combining_s_length 12
-  #define UTF8_long_to_file_s_length      7
-  #define UTF8_long_to_width_s_length     8
+  #define UTF8_long_to_bytesequence_s_length 15
+  #define UTF8_long_to_codepoint_s_length    12
+  #define UTF8_long_to_combining_s_length    12
+  #define UTF8_long_to_file_s_length         7
+  #define UTF8_long_to_width_s_length        8
 
-  extern const f_string_static_t utf8_short_from_bytecode_s;
+  extern const f_string_static_t utf8_short_from_bytesequence_s;
   extern const f_string_static_t utf8_short_from_codepoint_s;
   extern const f_string_static_t utf8_short_from_file_s;
 
@@ -216,13 +216,13 @@ extern "C" {
   extern const f_string_static_t utf8_short_strip_invalid_s;
   extern const f_string_static_t utf8_short_verify_s;
 
-  extern const f_string_static_t utf8_short_to_bytecode_s;
+  extern const f_string_static_t utf8_short_to_bytesequence_s;
   extern const f_string_static_t utf8_short_to_codepoint_s;
   extern const f_string_static_t utf8_short_to_combining_s;
   extern const f_string_static_t utf8_short_to_file_s;
   extern const f_string_static_t utf8_short_to_width_s;
 
-  extern const f_string_static_t utf8_long_from_bytecode_s;
+  extern const f_string_static_t utf8_long_from_bytesequence_s;
   extern const f_string_static_t utf8_long_from_codepoint_s;
   extern const f_string_static_t utf8_long_from_file_s;
 
@@ -231,7 +231,7 @@ extern "C" {
   extern const f_string_static_t utf8_long_strip_invalid_s;
   extern const f_string_static_t utf8_long_verify_s;
 
-  extern const f_string_static_t utf8_long_to_bytecode_s;
+  extern const f_string_static_t utf8_long_to_bytesequence_s;
   extern const f_string_static_t utf8_long_to_codepoint_s;
   extern const f_string_static_t utf8_long_to_combining_s;
   extern const f_string_static_t utf8_long_to_file_s;
@@ -248,7 +248,7 @@ extern "C" {
     utf8_parameter_verbosity_debug_e,
     utf8_parameter_version_e,
 
-    utf8_parameter_from_bytecode_e,
+    utf8_parameter_from_bytesequence_e,
     utf8_parameter_from_codepoint_e,
     utf8_parameter_from_file_e,
 
@@ -256,7 +256,7 @@ extern "C" {
     utf8_parameter_separate_e,
     utf8_parameter_strip_invalid_e,
 
-    utf8_parameter_to_bytecode_e,
+    utf8_parameter_to_bytesequence_e,
     utf8_parameter_to_codepoint_e,
     utf8_parameter_to_combining_e,
     utf8_parameter_to_file_e,
@@ -276,13 +276,13 @@ extern "C" {
       macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \
       macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \
       macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \
-      macro_f_console_parameter_t_initialize(utf8_short_from_bytecode_s.string, utf8_long_from_bytecode_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(utf8_short_from_bytesequence_s.string, utf8_long_from_bytesequence_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_from_codepoint_s.string, utf8_long_from_codepoint_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_from_file_s.string, utf8_long_from_file_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_headers_s.string, utf8_long_headers_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_separate_s.string, utf8_long_headers_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_strip_invalid_s.string, utf8_long_strip_invalid_s.string, 0, 0, f_console_type_normal_e), \
-      macro_f_console_parameter_t_initialize(utf8_short_to_bytecode_s.string, utf8_long_to_bytecode_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(utf8_short_to_bytesequence_s.string, utf8_long_to_bytesequence_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_to_codepoint_s.string, utf8_long_to_codepoint_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_to_combining_s.string, utf8_long_to_combining_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(utf8_short_to_file_s.string, utf8_long_to_file_s.string, 0, 1, f_console_type_normal_e), \
@@ -297,19 +297,19 @@ extern "C" {
  * Modes used to designate how to the input and output are to be processed.
  *
  * utf8_mode_from_*:
- *   - bytecode:  The input format is bytecode.
+ *   - bytesequence:  The input format is bytesequence.
  *   - codepoint: The input format is codepoint (U+XXXX or U+XXXXXX).
  *
  * utf8_mode_to_*:
- *   - bytecode:  The outout format is bytecode.
+ *   - bytesequence:  The outout format is bytesequence.
  *   - codepoint: The outout format is codepoint (U+XXXX or U+XXXXXX).
  *   - combining: The outout format is whether or not character is combining (may be used with "width").
  *   - width:     The outout format is how wide the character is (may be used with "combining").
  */
 #ifndef _di_utf8_modes_
-  #define utf8_mode_from_bytecode_d  0x1
+  #define utf8_mode_from_bytesequence_d  0x1
   #define utf8_mode_from_codepoint_d 0x2
-  #define utf8_mode_to_bytecode_d    0x4
+  #define utf8_mode_to_bytesequence_d    0x4
   #define utf8_mode_to_codepoint_d   0x8
   #define utf8_mode_to_combining_d   0x10
   #define utf8_mode_to_width_d       0x20

diff --git a/level_3/utf8/c/private-common.h b/level_3/utf8/c/private-common.h
index 1226c1bb70442c999faeb79565198047e4b2f8cf..12ca56ed3f8ff4ff2e4d7029c39669c215288713 100644 (file)
--- a/level_3/utf8/c/private-common.h
+++ b/level_3/utf8/c/private-common.h
@@ -82,7 +82,7 @@ extern "C" {
       0, \
       0, \
       f_file_t_initialize, \
-      utf8_mode_from_bytecode_d | utf8_mode_to_codepoint_d, \
+      utf8_mode_from_bytesequence_d | utf8_mode_to_codepoint_d, \
       f_color_set_t_initialize, \
       f_color_set_t_initialize, \
       f_string_static_t_initialize, \

diff --git a/level_3/utf8/c/private-print.c b/level_3/utf8/c/private-print.c
index 7a6fcb1f56fcd3e80fe6f516c6718a93bd9bf289..4f7a9aa84e0412df66acc22c64ddf0c84c74e942 100644 (file)
--- a/level_3/utf8/c/private-print.c
+++ b/level_3/utf8/c/private-print.c
@@ -6,12 +6,12 @@
 extern "C" {
 #endif
 
-#ifndef _di_utf8_print_bytecode_
-  void utf8_print_bytecode(utf8_data_t * const data, const f_string_static_t character) {
+#ifndef _di_utf8_print_bytesequence_
+  void utf8_print_bytesequence(utf8_data_t * const data, const f_string_static_t character) {
 
     fl_print_format("%r%r%r", data->file.stream, data->prepend, character, data->append);
   }
-#endif // _di_utf8_print_bytecode_
+#endif // _di_utf8_print_bytesequence_
 
 #ifndef _di_utf8_print_character_invalid_
   void utf8_print_character_invalid(utf8_data_t * const data, const f_string_static_t character) {
@@ -24,7 +24,7 @@ extern "C" {
     if ((data->mode & utf8_mode_to_combining_d) || (data->mode & utf8_mode_to_width_d)) {
       utf8_print_combining_or_width(data, character);
     }
-    else if (data->mode & utf8_mode_to_bytecode_d) {
+    else if (data->mode & utf8_mode_to_bytesequence_d) {
       fl_print_format("%r%[%r%]%r", data->file.stream, data->prepend, data->valid_not, character, data->valid_not, data->append);
     }
     else if (data->mode & utf8_mode_from_codepoint_d) {
@@ -209,8 +209,8 @@ extern "C" {
   }
 #endif // _di_utf8_print_error_parameter_file_to_too_many_
 
-#ifndef _di_utf8_print_raw_bytecode_
-  void utf8_print_raw_bytecode(utf8_data_t * const data, const f_utf_char_t raw, const uint8_t width) {
+#ifndef _di_utf8_print_raw_bytesequence_
+  void utf8_print_raw_bytesequence(utf8_data_t * const data, const f_utf_char_t raw, const uint8_t width) {
 
     if (data->main->parameters.array[utf8_parameter_strip_invalid_e].result == f_console_result_found_e) return;
     if (data->main->parameters.array[utf8_parameter_verify_e].result == f_console_result_found_e) return;
@@ -264,7 +264,7 @@ extern "C" {
 
     fl_print_format("%r%[%r%]%r", data->file.stream, data->prepend, data->valid_not, character, data->valid_not, data->append);
   }
-#endif // _di_utf8_print_raw_bytecode_
+#endif // _di_utf8_print_raw_bytesequence_
 
 #ifndef _di_utf8_print_raw_codepoint_
   void utf8_print_raw_codepoint(utf8_data_t * const data, const f_string_static_t raw) {

diff --git a/level_3/utf8/c/private-print.h b/level_3/utf8/c/private-print.h
index c6f794d8149b67c76d6d215ff4a3d070062ba697..8b3b3c8270e337ae4db0f4164c24a9411d2bda09 100644 (file)
--- a/level_3/utf8/c/private-print.h
+++ b/level_3/utf8/c/private-print.h
@@ -13,7 +13,7 @@ extern "C" {
 #endif
 
 /**
- * Print the bytecode character (such as '豸').
+ * Print the bytesequence character (such as '豸').
  *
  * @param data
  *   The program data.
@@ -21,12 +21,12 @@ extern "C" {
  *   The character to print.
  *   This is a string that represents a single character.
  */
-#ifndef _di_utf8_print_bytecode_
-  extern void utf8_print_bytecode(utf8_data_t * const data, const f_string_static_t character) F_attribute_visibility_internal_d;
-#endif // _di_utf8_print_bytecode_
+#ifndef _di_utf8_print_bytesequence_
+  extern void utf8_print_bytesequence(utf8_data_t * const data, const f_string_static_t character) F_attribute_visibility_internal_d;
+#endif // _di_utf8_print_bytesequence_
 
 /**
- * Print an invalid character either as a Unicode codeblock or as a bytecode.
+ * Print an invalid character either as a Unicode codeblock or as a bytesequence.
  *
  * This handles whether or not the invalid character should be printed or not based on program parameters.
  *
@@ -152,7 +152,7 @@ extern "C" {
 #endif // _di_utf8_print_error_parameter_file_to_too_many_
 
 /**
- * Print the raw character data (binary / bytecode).
+ * Print the raw character data (binary / bytesequence).
  *
  * @param data
  *   The program data.
@@ -161,9 +161,9 @@ extern "C" {
  * @param width
  *   The width the raw character represents (a value inclusively from 1 to 4).
  */
-#ifndef _di_utf8_print_raw_bytecode_
-  extern void utf8_print_raw_bytecode(utf8_data_t * const data, const f_utf_char_t raw, const uint8_t width) F_attribute_visibility_internal_d;
-#endif // _di_utf8_print_raw_bytecode_
+#ifndef _di_utf8_print_raw_bytesequence_
+  extern void utf8_print_raw_bytesequence(utf8_data_t * const data, const f_utf_char_t raw, const uint8_t width) F_attribute_visibility_internal_d;
+#endif // _di_utf8_print_raw_bytesequence_
 
 /**
  * Print the raw character data (codepoint).

diff --git a/level_3/utf8/c/private-utf8.c b/level_3/utf8/c/private-utf8.c
index e159450a849bf72f1f9223263b7d14a7794d2f74..939b601002e7f072d0f7e3fbaf4ebd1ba68d9a39 100644 (file)
--- a/level_3/utf8/c/private-utf8.c
+++ b/level_3/utf8/c/private-utf8.c
@@ -2,7 +2,7 @@
 #include "private-common.h"
 #include "private-print.h"
 #include "private-utf8.h"
-#include "private-utf8_bytecode.h"
+#include "private-utf8_bytesequence.h"
 #include "private-utf8_codepoint.h"
 
 #ifdef __cplusplus
@@ -40,8 +40,8 @@ extern "C" {
 
       status = F_none;
 
-      if (data->mode & utf8_mode_from_bytecode_d) {
-        status = utf8_convert_bytecode(data, text);
+      if (data->mode & utf8_mode_from_bytesequence_d) {
+        status = utf8_convert_bytesequence(data, text);
       }
       else {
         status = utf8_detect_codepoint(data, text, &mode_codepoint);
@@ -65,7 +65,7 @@ extern "C" {
       utf8_process_text_width(&text);
     } // for
 
-    if (F_status_is_error_not(status) && !(data->mode & utf8_mode_from_bytecode_d)) {
+    if (F_status_is_error_not(status) && !(data->mode & utf8_mode_from_bytesequence_d)) {
       if (mode_codepoint != utf8_codepoint_mode_ready_e && mode_codepoint != utf8_codepoint_mode_end_e && mode_codepoint != utf8_codepoint_mode_bad_end_e && mode_codepoint != utf8_codepoint_mode_raw_end_e) {
         if (mode_codepoint == utf8_codepoint_mode_number_e) {
           mode_codepoint = utf8_codepoint_mode_end_e;

diff --git a/level_3/utf8/c/private-utf8.h b/level_3/utf8/c/private-utf8.h
index 9fbad005c8182ad2b581a7cd22abe568bdc9d294..43ec9ee43f632f8fe82b9b894e1aaef9bdb1c0be 100644 (file)
--- a/level_3/utf8/c/private-utf8.h
+++ b/level_3/utf8/c/private-utf8.h
@@ -26,11 +26,11 @@ extern "C" {
  *   F_false on success and contains invalid sequences.
  *   F_interrupt on (exit) signal received.
  *
- *   Errors (with error bit) from: utf8_convert_bytecode()
+ *   Errors (with error bit) from: utf8_convert_bytesequence()
  *   Errors (with error bit) from: utf8_convert_codepoint()
  *   Errors (with error bit) from: utf8_detect_codepoint()
  *
- * @see utf8_convert_bytecode()
+ * @see utf8_convert_bytesequence()
  * @see utf8_convert_codepoint()
  * @see utf8_detect_codepoint()
  * @see utf8_signal_received()

diff --git a/level_3/utf8/c/private-utf8_bytecode.c b/level_3/utf8/c/private-utf8_bytesequence.c
similarity index 83%
rename from level_3/utf8/c/private-utf8_bytecode.c
rename to level_3/utf8/c/private-utf8_bytesequence.c
index 6628d39c07f83c3f922a894aa6b6dd14a2637896..1024121cf099d8124072a841f1179e9bd90a1cfd 100644 (file)
--- a/level_3/utf8/c/private-utf8_bytecode.c
+++ b/level_3/utf8/c/private-utf8_bytesequence.c
@@ -2,15 +2,15 @@
 #include "private-common.h"
 #include "private-print.h"
 #include "private-utf8.h"
-#include "private-utf8_bytecode.h"
+#include "private-utf8_bytesequence.h"
 #include "private-utf8_codepoint.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _di_utf8_convert_bytecode_
-  f_status_t utf8_convert_bytecode(utf8_data_t * const data, const f_string_static_t character) {
+#ifndef _di_utf8_convert_bytesequence_
+  f_status_t utf8_convert_bytesequence(utf8_data_t * const data, const f_string_static_t character) {
 
     f_status_t status = F_none;
     bool valid_not = F_false;
@@ -41,8 +41,8 @@ extern "C" {
       }
     }
     else if (data->main->parameters.array[utf8_parameter_verify_e].result == f_console_result_none_e) {
-      if (data->mode & utf8_mode_to_bytecode_d) {
-        utf8_print_bytecode(data, character);
+      if (data->mode & utf8_mode_to_bytesequence_d) {
+        utf8_print_bytesequence(data, character);
       }
       else if (data->mode & utf8_mode_to_codepoint_d) {
         utf8_print_codepoint(data, codepoint);
@@ -58,10 +58,10 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_utf8_convert_bytecode_
+#endif // _di_utf8_convert_bytesequence_
 
-#ifndef _di_utf8_process_file_bytecode_
-  f_status_t utf8_process_file_bytecode(utf8_data_t * const data, const f_file_t file) {
+#ifndef _di_utf8_process_file_bytesequence_
+  f_status_t utf8_process_file_bytesequence(utf8_data_t * const data, const f_file_t file) {
 
     f_status_t status = F_none;
 
@@ -107,8 +107,8 @@ extern "C" {
         } // for
 
         if (j == character.used) {
-          if (data->mode & utf8_mode_from_bytecode_d) {
-            status = utf8_convert_bytecode(data, character);
+          if (data->mode & utf8_mode_from_bytesequence_d) {
+            status = utf8_convert_bytesequence(data, character);
           }
           else {
             status = utf8_detect_codepoint(data, character, &mode_codepoint);
@@ -136,8 +136,8 @@ extern "C" {
     if (F_status_is_error_not(status) && status != F_interrupt && next == F_false) {
       character.used = j;
 
-      if (data->mode & utf8_mode_from_bytecode_d) {
-        status = utf8_convert_bytecode(data, character);
+      if (data->mode & utf8_mode_from_bytesequence_d) {
+        status = utf8_convert_bytesequence(data, character);
       }
       else {
         status = utf8_detect_codepoint(data, character, &mode_codepoint);
@@ -160,7 +160,7 @@ extern "C" {
 
     return valid;
   }
-#endif // _di_utf8_process_file_bytecode_
+#endif // _di_utf8_process_file_bytesequence_
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/level_3/utf8/c/private-utf8_bytecode.h b/level_3/utf8/c/private-utf8_bytesequence.h
similarity index 58%
rename from level_3/utf8/c/private-utf8_bytecode.h
rename to level_3/utf8/c/private-utf8_bytesequence.h
index 12168440ad4623d5afff76b4cd4ce236dba6b645..127d6b28f2b9d257772aaf70cd4879a83a63028c 100644 (file)
--- a/level_3/utf8/c/private-utf8_bytecode.h
+++ b/level_3/utf8/c/private-utf8_bytesequence.h
@@ -5,15 +5,15 @@
  * API Version: 0.5
  * Licenses: lgpl-2.1-or-later
  */
-#ifndef _PRIVATE_utf8_bytecode_h
-#define _PRIVATE_utf8_bytecode_h
+#ifndef _PRIVATE_utf8_bytesequence_h
+#define _PRIVATE_utf8_bytesequence_h
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * Convert a bytecode character to another format.
+ * Convert a bytesequence character to another format.
  *
  * This automatically determines the output format and is also handles the verify process.
  *
@@ -31,12 +31,12 @@ extern "C" {
  *
  *   Errors (with error bit) from: f_utf_unicode_to()
  */
-#ifndef _di_utf8_convert_bytecode_
-  extern f_status_t utf8_convert_bytecode(utf8_data_t * const data, const f_string_static_t character) F_attribute_visibility_internal_d;
-#endif // _di_utf8_convert_bytecode_
+#ifndef _di_utf8_convert_bytesequence_
+  extern f_status_t utf8_convert_bytesequence(utf8_data_t * const data, const f_string_static_t character) F_attribute_visibility_internal_d;
+#endif // _di_utf8_convert_bytesequence_
 
 /**
- * Process file as a bytecode input, handling conversion or verification as appropriate.
+ * Process file as a bytesequence input, handling conversion or verification as appropriate.
  *
  * @param data
  *   The program data.
@@ -49,19 +49,19 @@ extern "C" {
  *   F_false on success and contains invalid sequences.
  *   F_interrupt on (exit) signal received.
  *
- *   Errors (with error bit) from: utf8_convert_bytecode()
+ *   Errors (with error bit) from: utf8_convert_bytesequence()
  *   Errors (with error bit) from: utf8_detect_codepoint()
  *
  * @see fll_program_standard_signal_received()
- * @see utf8_convert_bytecode()
+ * @see utf8_convert_bytesequence()
  * @see utf8_detect_codepoint()
  */
-#ifndef _di_utf8_process_file_bytecode_
-  extern f_status_t utf8_process_file_bytecode(utf8_data_t * const data, const f_file_t file) F_attribute_visibility_internal_d;
-#endif // _di_utf8_process_file_bytecode_
+#ifndef _di_utf8_process_file_bytesequence_
+  extern f_status_t utf8_process_file_bytesequence(utf8_data_t * const data, const f_file_t file) F_attribute_visibility_internal_d;
+#endif // _di_utf8_process_file_bytesequence_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _PRIVATE_utf8_bytecode_h
+#endif // _PRIVATE_utf8_bytesequence_h

diff --git a/level_3/utf8/c/private-utf8_codepoint.c b/level_3/utf8/c/private-utf8_codepoint.c
index d0fdd6cf7a6d43136b34c2b8b9763333cfc18f3f..20b89a4c9ddb254a2a47c52ae4b2f10e8c787cc1 100644 (file)
--- a/level_3/utf8/c/private-utf8_codepoint.c
+++ b/level_3/utf8/c/private-utf8_codepoint.c
@@ -2,7 +2,7 @@
 #include "private-common.h"
 #include "private-print.h"
 #include "private-utf8.h"
-#include "private-utf8_bytecode.h"
+#include "private-utf8_bytesequence.h"
 #include "private-utf8_codepoint.h"
 
 #ifdef __cplusplus
@@ -48,7 +48,7 @@ extern "C" {
         }
       }
       else if (data->main->parameters.array[utf8_parameter_verify_e].result == f_console_result_none_e) {
-        if (data->mode & utf8_mode_to_bytecode_d) {
+        if (data->mode & utf8_mode_to_bytesequence_d) {
           f_char_t byte[4] = { 0, 0, 0, 0 };
           f_string_static_t character = macro_f_string_static_t_initialize(byte, 0, 4);
 
@@ -61,7 +61,7 @@ extern "C" {
             status = F_none;
             character.used = macro_f_utf_byte_width(character.string[0]);
 
-            utf8_print_bytecode(data, character);
+            utf8_print_bytesequence(data, character);
           }
         }
         else if (data->mode & utf8_mode_to_codepoint_d) {
@@ -145,8 +145,8 @@ extern "C" {
           ++width;
         }
 
-        if (data->mode & utf8_mode_to_bytecode_d) {
-          utf8_print_raw_bytecode(data, raw, width);
+        if (data->mode & utf8_mode_to_bytesequence_d) {
+          utf8_print_raw_bytesequence(data, raw, width);
         }
         else if (data->mode & utf8_mode_to_codepoint_d) {
           utf8_print_raw_codepoint(data, data->text);
@@ -343,8 +343,8 @@ extern "C" {
         } // for
 
         if (j == character.used) {
-          if (data->mode & utf8_mode_from_bytecode_d) {
-            status = utf8_convert_bytecode(data, character);
+          if (data->mode & utf8_mode_from_bytesequence_d) {
+            status = utf8_convert_bytesequence(data, character);
           }
           else {
             status = utf8_detect_codepoint(data, character, &mode_codepoint);
@@ -380,8 +380,8 @@ extern "C" {
     if (F_status_is_error_not(status) && status != F_interrupt && next == F_false) {
       character.used = j;
 
-      if (data->mode & utf8_mode_from_bytecode_d) {
-        status = utf8_convert_bytecode(data, character);
+      if (data->mode & utf8_mode_from_bytesequence_d) {
+        status = utf8_convert_bytesequence(data, character);
       }
       else {
         status = utf8_detect_codepoint(data, character, &mode_codepoint);

diff --git a/level_3/utf8/c/private-utf8_codepoint.h b/level_3/utf8/c/private-utf8_codepoint.h
index 199895e22ee3f460166ba4e523e5e4eeecc3341f..1b48fb60125c5a197d2d3fa685ad1171b46856b9 100644 (file)
--- a/level_3/utf8/c/private-utf8_codepoint.h
+++ b/level_3/utf8/c/private-utf8_codepoint.h
@@ -98,11 +98,11 @@ extern "C" {
  *   F_false on success and contains invalid sequences.
  *   F_interrupt on (exit) signal received.
  *
- *   Errors (with error bit) from: utf8_convert_bytecode()
+ *   Errors (with error bit) from: utf8_convert_bytesequence()
  *   Errors (with error bit) from: utf8_detect_codepoint()
  *
  * @see fll_program_standard_signal_received()
- * @see utf8_convert_bytecode()
+ * @see utf8_convert_bytesequence()
  * @see utf8_detect_codepoint()
  */
 #ifndef _di_utf8_process_file_codepoint_

diff --git a/level_3/utf8/c/utf8.c b/level_3/utf8/c/utf8.c
index 4b2f1703ab565b5aeedcb3484886580c1ef37048..0855b57cd92e48a4e4f510cff79b0326f16b8f01 100644 (file)
--- a/level_3/utf8/c/utf8.c
+++ b/level_3/utf8/c/utf8.c
@@ -2,7 +2,7 @@
 #include "private-common.h"
 #include "private-print.h"
 #include "private-utf8.h"
-#include "private-utf8_bytecode.h"
+#include "private-utf8_bytesequence.h"
 #include "private-utf8_codepoint.h"
 
 #ifdef __cplusplus
@@ -28,17 +28,17 @@ extern "C" {
 
     f_print_dynamic_raw(f_string_eol_s, file.stream);
 
-    fll_program_print_help_option(file, context, utf8_short_from_bytecode_s, utf8_long_from_bytecode_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The expected input format is byte code (character data).");
-    fll_program_print_help_option(file, context, utf8_short_from_codepoint_s, utf8_long_from_codepoint_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The expected input format is codepoint (such as U+0000).");
-    fll_program_print_help_option(file, context, utf8_short_from_file_s, utf8_long_from_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Use the given file as the input source.");
+    fll_program_print_help_option(file, context, utf8_short_from_bytesequence_s, utf8_long_from_bytesequence_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The expected input format is byte sequence (character data).");
+    fll_program_print_help_option(file, context, utf8_short_from_codepoint_s, utf8_long_from_codepoint_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   The expected input format is codepoint (such as U+0000).");
+    fll_program_print_help_option(file, context, utf8_short_from_file_s, utf8_long_from_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "        Use the given file as the input source.");
 
     f_print_dynamic_raw(f_string_eol_s, file.stream);
 
-    fll_program_print_help_option(file, context, utf8_short_to_bytecode_s, utf8_long_to_bytecode_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The output format is byte code (character data).");
-    fll_program_print_help_option(file, context, utf8_short_to_codepoint_s, utf8_long_to_codepoint_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The output format is codepoint (such as U+0000).");
-    fll_program_print_help_option(file, context, utf8_short_to_combining_s, utf8_long_to_combining_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The output format is to print whether or not character is combining or not.");
-    fll_program_print_help_option(file, context, utf8_short_to_file_s, utf8_long_to_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Use the given file as the output destination.");
-    fll_program_print_help_option(file, context, utf8_short_to_width_s, utf8_long_to_width_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    The output format is to print the width of a character (either 0, 1, or 2).");
+    fll_program_print_help_option(file, context, utf8_short_to_bytesequence_s, utf8_long_to_bytesequence_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The output format is byte sequence (character data).");
+    fll_program_print_help_option(file, context, utf8_short_to_codepoint_s, utf8_long_to_codepoint_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   The output format is codepoint (such as U+0000).");
+    fll_program_print_help_option(file, context, utf8_short_to_combining_s, utf8_long_to_combining_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   The output format is to print whether or not character is combining or not.");
+    fll_program_print_help_option(file, context, utf8_short_to_file_s, utf8_long_to_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "        Use the given file as the output destination.");
+    fll_program_print_help_option(file, context, utf8_short_to_width_s, utf8_long_to_width_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "       The output format is to print the width of a character (either 0, 1, or 2).");
 
     f_print_dynamic_raw(f_string_eol_s, file.stream);
 
@@ -49,7 +49,7 @@ extern "C" {
 
     fll_program_print_help_usage(file, context, utf8_program_name_s, utf8_program_help_parameters_s);
 
-    fl_print_format("  The default behavior is to assume the expected input is byte code from the command line to be output to the screen as codepoints.%r%r", file.stream, f_string_eol_s, f_string_eol_s);
+    fl_print_format("  The default behavior is to assume the expected input is byte sequence from the command line to be output to the screen as codepoints.%r%r", file.stream, f_string_eol_s, f_string_eol_s);
 
     fl_print_format("  Multiple input sources are allowed but only a single output destination is allowed.%r%r", file.stream, f_string_eol_s, f_string_eol_s);
 
@@ -150,7 +150,7 @@ extern "C" {
 
     // Identify and prioritize from mode parameters.
     {
-      f_console_parameter_id_t ids[2] = { utf8_parameter_from_bytecode_e, utf8_parameter_from_codepoint_e };
+      f_console_parameter_id_t ids[2] = { utf8_parameter_from_bytesequence_e, utf8_parameter_from_codepoint_e };
       f_console_parameter_id_t choice = 0;
       const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 2);
 
@@ -164,16 +164,16 @@ extern "C" {
         return status;
       }
 
-      if (choice == utf8_parameter_from_bytecode_e) {
+      if (choice == utf8_parameter_from_bytesequence_e) {
         if (data.mode & utf8_mode_from_codepoint_d) {
           data.mode -= utf8_mode_from_codepoint_d;
         }
 
-        data.mode |= utf8_mode_from_bytecode_d;
+        data.mode |= utf8_mode_from_bytesequence_d;
       }
       else if (choice == utf8_parameter_from_codepoint_e) {
-        if (data.mode & utf8_mode_from_bytecode_d) {
-          data.mode -= utf8_mode_from_bytecode_d;
+        if (data.mode & utf8_mode_from_bytesequence_d) {
+          data.mode -= utf8_mode_from_bytesequence_d;
         }
 
         data.mode |= utf8_mode_from_codepoint_d;
@@ -182,7 +182,7 @@ extern "C" {
 
     // Identify and prioritize to mode parameters.
     {
-      f_console_parameter_id_t ids[4] = { utf8_parameter_to_bytecode_e, utf8_parameter_to_codepoint_e, utf8_parameter_to_combining_e, utf8_parameter_to_width_e };
+      f_console_parameter_id_t ids[4] = { utf8_parameter_to_bytesequence_e, utf8_parameter_to_codepoint_e, utf8_parameter_to_combining_e, utf8_parameter_to_width_e };
       f_console_parameter_id_t choice = 0;
       const f_console_parameter_ids_t choices = macro_f_console_parameter_ids_t_initialize(ids, 4);
 
@@ -196,7 +196,7 @@ extern "C" {
         return status;
       }
 
-      if (choice == utf8_parameter_to_bytecode_e) {
+      if (choice == utf8_parameter_to_bytesequence_e) {
         if (data.mode & utf8_mode_to_codepoint_d) {
           data.mode -= utf8_mode_to_codepoint_d;
         }
@@ -209,11 +209,11 @@ extern "C" {
           data.mode -= utf8_mode_to_width_d;
         }
 
-        data.mode |= utf8_mode_to_bytecode_d;
+        data.mode |= utf8_mode_to_bytesequence_d;
       }
       else if (choice == utf8_parameter_to_codepoint_e) {
-        if (data.mode & utf8_mode_to_bytecode_d) {
-          data.mode -= utf8_mode_to_bytecode_d;
+        if (data.mode & utf8_mode_to_bytesequence_d) {
+          data.mode -= utf8_mode_to_bytesequence_d;
         }
 
         if (data.mode & utf8_mode_to_combining_d) {
@@ -227,8 +227,8 @@ extern "C" {
         data.mode |= utf8_mode_to_codepoint_d;
       }
       else if (choice == utf8_parameter_to_combining_e) {
-        if (data.mode & utf8_mode_to_bytecode_d) {
-          data.mode -= utf8_mode_to_bytecode_d;
+        if (data.mode & utf8_mode_to_bytesequence_d) {
+          data.mode -= utf8_mode_to_bytesequence_d;
         }
 
         if (data.mode & utf8_mode_to_codepoint_d) {
@@ -243,8 +243,8 @@ extern "C" {
         data.mode |= utf8_mode_to_combining_d;
       }
       else if (choice == utf8_parameter_to_width_e) {
-        if (data.mode & utf8_mode_to_bytecode_d) {
-          data.mode -= utf8_mode_to_bytecode_d;
+        if (data.mode & utf8_mode_to_bytesequence_d) {
+          data.mode -= utf8_mode_to_bytesequence_d;
         }
 
         if (data.mode & utf8_mode_to_codepoint_d) {
@@ -354,7 +354,7 @@ extern "C" {
         status = F_status_set_error(F_parameter);
       }
 
-      if (!(data.mode & utf8_mode_to_bytecode_d)) {
+      if (!(data.mode & utf8_mode_to_bytesequence_d)) {
         if (main->parameters.array[utf8_parameter_separate_e].result == f_console_result_found_e || main->parameters.array[utf8_parameter_headers_e].result == f_console_result_found_e) {
           data.prepend = utf8_string_prepend_padding_s;
           data.append = f_string_eol_s;
@@ -378,15 +378,15 @@ extern "C" {
 
         utf8_print_section_header_pipe(&data);
 
-        if (data.mode & utf8_mode_from_bytecode_d) {
-          status = utf8_process_file_bytecode(&data, file);
+        if (data.mode & utf8_mode_from_bytesequence_d) {
+          status = utf8_process_file_bytesequence(&data, file);
         }
         else {
           status = utf8_process_file_codepoint(&data, file);
         }
 
         if (F_status_is_error(status) && F_status_set_fine(status) != F_utf_fragment && F_status_set_fine(status) != F_complete_not_utf) {
-          fll_error_file_print(main->error, F_status_set_fine(status), data.mode & utf8_mode_from_bytecode_d ? "utf8_process_file_bytecode" : "utf8_process_file_codepoint", F_true, f_string_empty_s, f_file_operation_process_s, fll_error_file_type_pipe_e);
+          fll_error_file_print(main->error, F_status_set_fine(status), data.mode & utf8_mode_from_bytesequence_d ? "utf8_process_file_bytesequence" : "utf8_process_file_codepoint", F_true, f_string_empty_s, f_file_operation_process_s, fll_error_file_type_pipe_e);
         }
       }
 
@@ -420,8 +420,8 @@ extern "C" {
             break;
           }
 
-          if (data.mode & utf8_mode_from_bytecode_d) {
-            status = utf8_process_file_bytecode(&data, file);
+          if (data.mode & utf8_mode_from_bytesequence_d) {
+            status = utf8_process_file_bytesequence(&data, file);
           }
           else {
             status = utf8_process_file_codepoint(&data, file);
@@ -436,7 +436,7 @@ extern "C" {
           }
 
           if (F_status_is_error(status) && F_status_set_fine(status) != F_utf_fragment && F_status_set_fine(status) != F_complete_not_utf) {
-            fll_error_file_print(main->error, F_status_set_fine(status), data.mode & utf8_mode_from_bytecode_d ? "utf8_process_file_bytecode" : "utf8_process_file_codepoint", F_true, data.argv[index], f_file_operation_process_s, fll_error_file_type_file_e);
+            fll_error_file_print(main->error, F_status_set_fine(status), data.mode & utf8_mode_from_bytesequence_d ? "utf8_process_file_bytesequence" : "utf8_process_file_codepoint", F_true, data.argv[index], f_file_operation_process_s, fll_error_file_type_file_e);
 
             break;
           }

diff --git a/level_3/utf8/c/utf8.h b/level_3/utf8/c/utf8.h
index 8d02b14c5d1b12e072289432b5260b87a28cd1f1..3682401f8fc05f620e1599f3dc6cb81e534b6fcf 100644 (file)
--- a/level_3/utf8/c/utf8.h
+++ b/level_3/utf8/c/utf8.h
@@ -8,10 +8,10 @@
  * This is intendend to support Unicode 14.0.
  *
  * This is a program for handling basic UTF-8 related conversions.
- *   - Convert from UTF-8 character to bytecode.
- *   - Convert from Unicode Codepoint (such as U+0000) to bytecode.
- *   - Convert from UTF-8 bytecode to character.
- *   - Convert from UTF-8 bytecode to Unicode Codepoint (such as U+0000).
+ *   - Convert from UTF-8 character to bytesequence.
+ *   - Convert from Unicode Codepoint (such as U+0000) to bytesequence.
+ *   - Convert from UTF-8 bytesequence to character.
+ *   - Convert from UTF-8 bytesequence to Unicode Codepoint (such as U+0000).
  */
 #ifndef _utf8_h
 #define _utf8_h

diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings
index edc77170a19cc4a9eea88ea0dbd44ab70bde6669..f8a3e11710d09ec1ac77435e672f43cfce28c1ea 100644 (file)
--- a/level_3/utf8/data/build/settings
+++ b/level_3/utf8/data/build/settings
@@ -22,7 +22,7 @@ build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_conversion
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
-build_sources_library utf8.c common.c private-common.c private-print.c private-utf8.c private-utf8_bytecode.c private-utf8_codepoint.c
+build_sources_library utf8.c common.c private-common.c private-print.c private-utf8.c private-utf8_bytesequence.c private-utf8_codepoint.c
 
 build_sources_program main.c