From: Kevin Day Date: Mon, 24 Aug 2026 02:18:50 +0000 (-0500) Subject: Progress: Update unit tests and stand alone builds. X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=e22990499e297befa952a5a6be12b8a9616172c7;p=fll Progress: Update unit tests and stand alone builds. The `f_fss_skip_past_combining()` is replaced with `f_fss_skip_past_combining_joiner()`. --- diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h index 07c5bf881..7ea22f192 100644 --- a/build/stand_alone/fake.config.h +++ b/build/stand_alone/fake.config.h @@ -1812,7 +1812,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1821,7 +1821,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_identify.config.h b/build/stand_alone/fss_identify.config.h index 11c204fc7..c5ec66144 100644 --- a/build/stand_alone/fss_identify.config.h +++ b/build/stand_alone/fss_identify.config.h @@ -416,8 +416,8 @@ #define _di_f_fss_count_lines_range_ //#define _di_f_fss_default_d_ #define _di_f_fss_e_ -#define _di_f_fss_fail_utf_ -#define _di_f_fss_fail_utf_to_false_ +//#define _di_f_fss_fail_utf_ +//#define _di_f_fss_fail_utf_to_false_ #define _di_f_fss_header_s_ #define _di_f_fss_is_combining_ #define _di_f_fss_is_graph_ @@ -469,7 +469,7 @@ #define _di_f_fss_payload_object_total_s_ #define _di_f_fss_payload_object_type_s_ #define _di_f_fss_payload_s_ -#define _di_f_fss_placeholder_s_ +//#define _di_f_fss_placeholder_s_ #define _di_f_fss_quote_double_null_s_ #define _di_f_fss_quote_grave_null_s_ #define _di_f_fss_quote_single_null_s_ @@ -513,7 +513,7 @@ #define _di_f_fss_skip_past_combining_ #define _di_f_fss_skip_past_delimit_ #define _di_f_fss_skip_past_space_ -#define _di_f_fss_state_flag_e_ +//#define _di_f_fss_state_flag_e_ #define _di_f_fss_status_code_e_ //#define _di_f_fss_type_s_ #define _di_f_gid_t_ @@ -1141,8 +1141,8 @@ #define _di_f_string_mash_nulless_ #define _di_f_string_mish_ #define _di_f_string_mish_nulless_ -#define _di_f_string_null_s_ -#define _di_f_string_placeholder_s_ +//#define _di_f_string_null_s_ +//#define _di_f_string_placeholder_s_ #define _di_f_string_prepend_ #define _di_f_string_prepend_assure_ #define _di_f_string_prepend_assure_nulless_ @@ -1515,7 +1515,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1524,7 +1524,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ #define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_read.config.fss_basic.h b/build/stand_alone/fss_read.config.fss_basic.h index 982b5152d..c13faf7e4 100644 --- a/build/stand_alone/fss_read.config.fss_basic.h +++ b/build/stand_alone/fss_read.config.fss_basic.h @@ -1586,7 +1586,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1595,7 +1595,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_read.config.fss_basic_list.h b/build/stand_alone/fss_read.config.fss_basic_list.h index 61ccb4491..a9c09672b 100644 --- a/build/stand_alone/fss_read.config.fss_basic_list.h +++ b/build/stand_alone/fss_read.config.fss_basic_list.h @@ -1586,7 +1586,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1595,7 +1595,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_read.config.fss_embedded_list.h b/build/stand_alone/fss_read.config.fss_embedded_list.h index ab49238c9..76d4432d8 100644 --- a/build/stand_alone/fss_read.config.fss_embedded_list.h +++ b/build/stand_alone/fss_read.config.fss_embedded_list.h @@ -1586,7 +1586,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1595,7 +1595,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_read.config.fss_extended.h b/build/stand_alone/fss_read.config.fss_extended.h index 775aea20e..4afaa2f39 100644 --- a/build/stand_alone/fss_read.config.fss_extended.h +++ b/build/stand_alone/fss_read.config.fss_extended.h @@ -1586,7 +1586,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1595,7 +1595,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_read.config.fss_extended_list.h b/build/stand_alone/fss_read.config.fss_extended_list.h index 06bda9390..f20d0b8a7 100644 --- a/build/stand_alone/fss_read.config.fss_extended_list.h +++ b/build/stand_alone/fss_read.config.fss_extended_list.h @@ -1586,7 +1586,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1595,7 +1595,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_read.config.fss_payload.h b/build/stand_alone/fss_read.config.fss_payload.h index 74bfd57a7..fe4e52a70 100644 --- a/build/stand_alone/fss_read.config.fss_payload.h +++ b/build/stand_alone/fss_read.config.fss_payload.h @@ -1586,7 +1586,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1595,7 +1595,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_read.config.h b/build/stand_alone/fss_read.config.h index 2716bb300..454818307 100644 --- a/build/stand_alone/fss_read.config.h +++ b/build/stand_alone/fss_read.config.h @@ -1586,7 +1586,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1595,7 +1595,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_write.config.fss_basic.h b/build/stand_alone/fss_write.config.fss_basic.h index d45a69d20..8a08814bd 100644 --- a/build/stand_alone/fss_write.config.fss_basic.h +++ b/build/stand_alone/fss_write.config.fss_basic.h @@ -419,7 +419,7 @@ //#define _di_f_fss_fail_utf_ //#define _di_f_fss_fail_utf_to_false_ //#define _di_f_fss_header_s_ -#define _di_f_fss_is_combining_ +//#define _di_f_fss_is_combining_ //#define _di_f_fss_is_graph_ //#define _di_f_fss_is_space_ //#define _di_f_fss_is_zero_width_ @@ -1529,7 +1529,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1538,7 +1538,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_write.config.fss_basic_list.h b/build/stand_alone/fss_write.config.fss_basic_list.h index f33fd2773..dd8ca1d55 100644 --- a/build/stand_alone/fss_write.config.fss_basic_list.h +++ b/build/stand_alone/fss_write.config.fss_basic_list.h @@ -419,7 +419,7 @@ //#define _di_f_fss_fail_utf_ //#define _di_f_fss_fail_utf_to_false_ //#define _di_f_fss_header_s_ -#define _di_f_fss_is_combining_ +//#define _di_f_fss_is_combining_ //#define _di_f_fss_is_graph_ //#define _di_f_fss_is_space_ //#define _di_f_fss_is_zero_width_ @@ -1529,7 +1529,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1538,7 +1538,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_write.config.fss_embedded_list.h b/build/stand_alone/fss_write.config.fss_embedded_list.h index bfcdffcaf..e75dcc953 100644 --- a/build/stand_alone/fss_write.config.fss_embedded_list.h +++ b/build/stand_alone/fss_write.config.fss_embedded_list.h @@ -419,7 +419,7 @@ //#define _di_f_fss_fail_utf_ //#define _di_f_fss_fail_utf_to_false_ //#define _di_f_fss_header_s_ -#define _di_f_fss_is_combining_ +//#define _di_f_fss_is_combining_ //#define _di_f_fss_is_graph_ //#define _di_f_fss_is_space_ //#define _di_f_fss_is_zero_width_ @@ -1529,7 +1529,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1538,7 +1538,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_write.config.fss_extended.h b/build/stand_alone/fss_write.config.fss_extended.h index c5a29b777..1df9742f3 100644 --- a/build/stand_alone/fss_write.config.fss_extended.h +++ b/build/stand_alone/fss_write.config.fss_extended.h @@ -419,7 +419,7 @@ //#define _di_f_fss_fail_utf_ //#define _di_f_fss_fail_utf_to_false_ //#define _di_f_fss_header_s_ -#define _di_f_fss_is_combining_ +//#define _di_f_fss_is_combining_ //#define _di_f_fss_is_graph_ //#define _di_f_fss_is_space_ //#define _di_f_fss_is_zero_width_ @@ -1529,7 +1529,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1538,7 +1538,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_write.config.fss_extended_list.h b/build/stand_alone/fss_write.config.fss_extended_list.h index 2b46edf13..7115d1ab7 100644 --- a/build/stand_alone/fss_write.config.fss_extended_list.h +++ b/build/stand_alone/fss_write.config.fss_extended_list.h @@ -419,7 +419,7 @@ //#define _di_f_fss_fail_utf_ //#define _di_f_fss_fail_utf_to_false_ //#define _di_f_fss_header_s_ -#define _di_f_fss_is_combining_ +//#define _di_f_fss_is_combining_ //#define _di_f_fss_is_graph_ //#define _di_f_fss_is_space_ //#define _di_f_fss_is_zero_width_ @@ -1529,7 +1529,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1538,7 +1538,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_write.config.fss_payload.h b/build/stand_alone/fss_write.config.fss_payload.h index 4ab9d178c..8a0154dcd 100644 --- a/build/stand_alone/fss_write.config.fss_payload.h +++ b/build/stand_alone/fss_write.config.fss_payload.h @@ -419,7 +419,7 @@ //#define _di_f_fss_fail_utf_ //#define _di_f_fss_fail_utf_to_false_ //#define _di_f_fss_header_s_ -#define _di_f_fss_is_combining_ +//#define _di_f_fss_is_combining_ //#define _di_f_fss_is_graph_ //#define _di_f_fss_is_space_ //#define _di_f_fss_is_zero_width_ @@ -1529,7 +1529,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1538,7 +1538,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/fss_write.config.h b/build/stand_alone/fss_write.config.h index b44dcde98..35818b99d 100644 --- a/build/stand_alone/fss_write.config.h +++ b/build/stand_alone/fss_write.config.h @@ -419,7 +419,7 @@ //#define _di_f_fss_fail_utf_ //#define _di_f_fss_fail_utf_to_false_ //#define _di_f_fss_header_s_ -#define _di_f_fss_is_combining_ +//#define _di_f_fss_is_combining_ //#define _di_f_fss_is_graph_ //#define _di_f_fss_is_space_ //#define _di_f_fss_is_zero_width_ @@ -1529,7 +1529,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1538,7 +1538,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ //#define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/build/stand_alone/status_code.config.fss.h b/build/stand_alone/status_code.config.fss.h index e20ceaf5c..006894472 100644 --- a/build/stand_alone/status_code.config.fss.h +++ b/build/stand_alone/status_code.config.fss.h @@ -416,8 +416,8 @@ #define _di_f_fss_count_lines_range_ #define _di_f_fss_default_d_ #define _di_f_fss_e_ -#define _di_f_fss_fail_utf_ -#define _di_f_fss_fail_utf_to_false_ +//#define _di_f_fss_fail_utf_ +//#define _di_f_fss_fail_utf_to_false_ #define _di_f_fss_header_s_ #define _di_f_fss_is_combining_ #define _di_f_fss_is_graph_ @@ -469,7 +469,7 @@ #define _di_f_fss_payload_object_total_s_ #define _di_f_fss_payload_object_type_s_ #define _di_f_fss_payload_s_ -#define _di_f_fss_placeholder_s_ +//#define _di_f_fss_placeholder_s_ #define _di_f_fss_quote_double_null_s_ #define _di_f_fss_quote_grave_null_s_ #define _di_f_fss_quote_single_null_s_ @@ -513,9 +513,9 @@ #define _di_f_fss_skip_past_combining_ #define _di_f_fss_skip_past_delimit_ #define _di_f_fss_skip_past_space_ -#define _di_f_fss_state_flag_e_ +//#define _di_f_fss_state_flag_e_ //#define _di_f_fss_status_code_e_ -#define _di_f_fss_type_s_ +//#define _di_f_fss_type_s_ #define _di_f_gid_t_ #define _di_f_gids_t_ #define _di_f_gidss_delete_callback_ @@ -1125,8 +1125,8 @@ #define _di_f_string_mash_nulless_ #define _di_f_string_mish_ #define _di_f_string_mish_nulless_ -#define _di_f_string_null_s_ -#define _di_f_string_placeholder_s_ +//#define _di_f_string_null_s_ +//#define _di_f_string_placeholder_s_ #define _di_f_string_prepend_ #define _di_f_string_prepend_assure_ #define _di_f_string_prepend_assure_nulless_ @@ -1499,7 +1499,7 @@ #define _di_f_utf_is_alphabetic_numeric_ #define _di_f_utf_is_ascii_ //#define _di_f_utf_is_combining_ -#define _di_f_utf_is_combining_joiner_ +//#define _di_f_utf_is_combining_joiner_ //#define _di_f_utf_is_control_ #define _di_f_utf_is_control_code_ #define _di_f_utf_is_control_format_ @@ -1508,7 +1508,7 @@ #define _di_f_utf_is_emoji_ #define _di_f_utf_is_fragment_ #define _di_f_utf_is_graph_ -#define _di_f_utf_is_joiner_ +//#define _di_f_utf_is_joiner_ #define _di_f_utf_is_numeric_ #define _di_f_utf_is_phonetic_ #define _di_f_utf_is_private_ diff --git a/level_0/f_fss/data/build/settings-tests b/level_0/f_fss/data/build/settings-tests index 95d91a853..2a032c55f 100644 --- a/level_0/f_fss/data/build/settings-tests +++ b/level_0/f_fss/data/build/settings-tests @@ -25,7 +25,7 @@ build_language c build_libraries -lc -lcmocka build_libraries-individual -lf_memory -lf_string -lf_type_array -lf_utf -lf_fss -build_sources_program test-fss-apply_delimit.c test-fss-apply_delimit_range.c test-fss-count_lines.c test-fss-count_lines_range.c test-fss-fail_utf.c test-fss-fail_utf_to_false.c test-fss-is_combining.c test-fss-is_graph.c test-fss-is_space.c test-fss-is_zero_width.c test-fss-seek_to_eol.c test-fss-skip_past_combining.c test-fss-skip_past_delimit.c test-fss-skip_past_space.c +build_sources_program test-fss-apply_delimit.c test-fss-apply_delimit_range.c test-fss-count_lines.c test-fss-count_lines_range.c test-fss-fail_utf.c test-fss-fail_utf_to_false.c test-fss-is_combining.c test-fss-is_graph.c test-fss-is_space.c test-fss-is_zero_width.c test-fss-seek_to_eol.c test-fss-skip_past_combining_joiner.c test-fss-skip_past_delimit.c test-fss-skip_past_space.c build_sources_program test-fss-item_delete.c test-fss-item_destroy.c build_sources_program test-fss-items_delete_callback.c test-fss-items_destroy_callback.c test-fss-itemss_delete_callback.c test-fss-itemss_destroy_callback.c build_sources_program test-fss-named_delete.c test-fss-named_destroy.c diff --git a/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining.h b/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining.h deleted file mode 100644 index 886fcfb9d..000000000 --- a/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: FSS - * API Version: 0.8 - * Licenses: lgpl-2.1-or-later - * - * Test skip past combining in the fss project. - */ -#ifndef _TEST__F_fss__skip_past_combining -#define _TEST__F_fss__skip_past_combining - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_fss_skip_past_combining() - */ -extern void test__f_fss_skip_past_combining__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_fss_skip_past_combining() - */ -extern void test__f_fss_skip_past_combining__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_fss_skip_past_combining() - */ -extern void test__f_fss_skip_past_combining__works(void **state); - -#endif // _TEST__F_fss__skip_past_combining diff --git a/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining.c b/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining_joiner.c similarity index 84% rename from level_0/f_fss/tests/unit/c/test-fss-skip_past_combining.c rename to level_0/f_fss/tests/unit/c/test-fss-skip_past_combining_joiner.c index e503c41e5..90c0ffb2f 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining.c +++ b/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining_joiner.c @@ -1,23 +1,23 @@ #include "test-fss.h" -#include "test-fss-skip_past_combining.h" +#include "test-fss-skip_past_combining_joiner.h" #ifdef __cplusplus extern "C" { #endif -void test__f_fss_skip_past_combining__parameter_checking(void **state) { +void test__f_fss_skip_past_combining_joiner__parameter_checking(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 4, 0); f_state_t state_data = f_state_t_initialize; { - f_fss_skip_past_combining(test, 0, &state_data); + f_fss_skip_past_combining_joiner(test, 0, &state_data); assert_int_equal(state_data.status, F_status_set_error(F_parameter)); } } -void test__f_fss_skip_past_combining__returns_data_not(void **state) { +void test__f_fss_skip_past_combining_joiner__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 4, 0); f_state_t state_data = f_state_t_initialize; @@ -25,7 +25,7 @@ void test__f_fss_skip_past_combining__returns_data_not(void **state) { { f_range_t range = f_range_t_initialize; - f_fss_skip_past_combining(f_string_empty_s, &range, &state_data); + f_fss_skip_past_combining_joiner(f_string_empty_s, &range, &state_data); assert_int_equal(state_data.status, F_data_not); } @@ -33,7 +33,7 @@ void test__f_fss_skip_past_combining__returns_data_not(void **state) { { f_range_t range = f_range_t_initialize; - f_fss_skip_past_combining(test, &range, &state_data); + f_fss_skip_past_combining_joiner(test, &range, &state_data); assert_int_equal(state_data.status, F_data_not); } @@ -41,7 +41,7 @@ void test__f_fss_skip_past_combining__returns_data_not(void **state) { { f_range_t range = macro_f_range_t_initialize_1(0, test.used - 1); - f_fss_skip_past_combining(f_string_empty_s, &range, &state_data); + f_fss_skip_past_combining_joiner(f_string_empty_s, &range, &state_data); assert_int_equal(state_data.status, F_data_not); } @@ -49,13 +49,13 @@ void test__f_fss_skip_past_combining__returns_data_not(void **state) { { f_range_t range = macro_f_range_t_initialize_1(test.used, test.used + 2); - f_fss_skip_past_combining(test, &range, &state_data); + f_fss_skip_past_combining_joiner(test, &range, &state_data); assert_int_equal(state_data.status, F_data_not); } } -void test__f_fss_skip_past_combining__works(void **state) { +void test__f_fss_skip_past_combining_joiner__works(void **state) { f_state_t state_data = f_state_t_initialize; @@ -162,7 +162,7 @@ void test__f_fss_skip_past_combining__works(void **state) { f_range_t range = macro_f_range_t_initialize_1(0, tests[i].used - 1); - f_fss_skip_past_combining(tests[i], &range, &state_data); + f_fss_skip_past_combining_joiner(tests[i], &range, &state_data); if (state_data.status != statuss[i]) { printf("[ -------> ] --- [00] Expected %u in state.status but got %u at index %d for string '%s'.\n", statuss[i], state_data.status, i, tests[i].used ? tests[i].string : ""); diff --git a/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining_joiner.h b/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining_joiner.h new file mode 100644 index 000000000..1d2453baf --- /dev/null +++ b/level_0/f_fss/tests/unit/c/test-fss-skip_past_combining_joiner.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: FSS + * API Version: 0.8 + * Licenses: lgpl-2.1-or-later + * + * Test skip past combining joiner in the fss project. + */ +#ifndef _TEST__F_fss__skip_past_combining_joiner +#define _TEST__F_fss__skip_past_combining_joiner + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_fss_skip_past_combining_joiner() + */ +extern void test__f_fss_skip_past_combining_joiner__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_fss_skip_past_combining_joiner() + */ +extern void test__f_fss_skip_past_combining_joiner__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_fss_skip_past_combining_joiner() + */ +extern void test__f_fss_skip_past_combining_joiner__works(void **state); + +#endif // _TEST__F_fss__skip_past_combining_joiner diff --git a/level_0/f_fss/tests/unit/c/test-fss.c b/level_0/f_fss/tests/unit/c/test-fss.c index 399fe451f..95f7030a9 100644 --- a/level_0/f_fss/tests/unit/c/test-fss.c +++ b/level_0/f_fss/tests/unit/c/test-fss.c @@ -24,7 +24,7 @@ int main(void) { cmocka_unit_test(test__f_fss_count_lines__returns_data_not), cmocka_unit_test(test__f_fss_count_lines_range__returns_data_not), cmocka_unit_test(test__f_fss_seek_to_eol__returns_data_not), - cmocka_unit_test(test__f_fss_skip_past_combining__returns_data_not), + cmocka_unit_test(test__f_fss_skip_past_combining_joiner__returns_data_not), cmocka_unit_test(test__f_fss_skip_past_delimit__returns_data_not), cmocka_unit_test(test__f_fss_skip_past_space__returns_data_not), @@ -37,7 +37,7 @@ int main(void) { cmocka_unit_test(test__f_fss_is_space__works), cmocka_unit_test(test__f_fss_is_zero_width__works), cmocka_unit_test(test__f_fss_seek_to_eol__works), - cmocka_unit_test(test__f_fss_skip_past_combining__works), + cmocka_unit_test(test__f_fss_skip_past_combining_joiner__works), cmocka_unit_test(test__f_fss_skip_past_delimit__works), cmocka_unit_test(test__f_fss_skip_past_space__works), @@ -154,7 +154,7 @@ int main(void) { // f_fss_is_space() doesn't use parameter checking. // f_fss_is_zero_width() doesn't use parameter checking. cmocka_unit_test(test__f_fss_seek_to_eol__parameter_checking), - cmocka_unit_test(test__f_fss_skip_past_combining__parameter_checking), + cmocka_unit_test(test__f_fss_skip_past_combining_joiner__parameter_checking), cmocka_unit_test(test__f_fss_skip_past_delimit__parameter_checking), cmocka_unit_test(test__f_fss_skip_past_space__parameter_checking), diff --git a/level_0/f_fss/tests/unit/c/test-fss.h b/level_0/f_fss/tests/unit/c/test-fss.h index 964c18ede..680707a8b 100644 --- a/level_0/f_fss/tests/unit/c/test-fss.h +++ b/level_0/f_fss/tests/unit/c/test-fss.h @@ -76,7 +76,7 @@ #include "test-fss-simple_packets_destroy_callback.h" #include "test-fss-simple_packetss_delete_callback.h" #include "test-fss-simple_packetss_destroy_callback.h" -#include "test-fss-skip_past_combining.h" +#include "test-fss-skip_past_combining_joiner.h" #include "test-fss-skip_past_delimit.h" #include "test-fss-skip_past_space.h" diff --git a/level_1/fl_fss/c/private-fss.h b/level_1/fl_fss/c/private-fss.h index 05b3b01fd..6bab137e7 100644 --- a/level_1/fl_fss/c/private-fss.h +++ b/level_1/fl_fss/c/private-fss.h @@ -143,7 +143,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * * Errors (with error bit) from: f_fss_is_space(). - * Errors (with error bit) from: f_fss_skip_past_combining(). + * Errors (with error bit) from: f_fss_skip_past_combining_joiner(). * Errors (with error bit) from: f_fss_skip_past_delimit(). * Errors (with error bit) from: f_fss_skip_past_space(). * Errors (with error bit) from: f_memory_array_increase(). @@ -155,7 +155,7 @@ extern "C" { * Set to NULL to not use. * * @see f_fss_is_space() - * @see f_fss_skip_past_combining_joiner() + * @see f_fss_skip_past_combining_joiner_joiner() * @see f_fss_skip_past_delimit() * @see f_fss_skip_past_space() * @see f_memory_array_increase()