From 0d4c580f920ec08f7d9fcfae0ae7d2307805e83d Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 3 Dec 2023 21:43:06 -0600 Subject: [PATCH] Refactor: The f_string_range_t to f_range_t and f_string_range_double_t to f_range_double_t. --- build/level_0/settings | 10 +- build/monolithic/settings | 10 +- build/stand_alone/byte_dump.settings | 4 +- build/stand_alone/fake.config.h | 40 +++--- build/stand_alone/fake.settings | 4 +- build/stand_alone/firewall.settings | 4 +- build/stand_alone/utf8.settings | 4 +- level_0/f_abstruse/c/abstruse/enum.h | 4 +- level_0/f_abstruse/c/abstruse/private-abstruse.c | 4 +- level_0/f_abstruse/c/abstruse/type.h | 4 +- .../unit/c/test-abstruse-maps_delete_callback.c | 4 +- .../unit/c/test-abstruse-maps_destroy_callback.c | 4 +- .../unit/c/test-abstruse-mapss_delete_callback.c | 2 +- .../unit/c/test-abstruse-mapss_destroy_callback.c | 2 +- .../tests/unit/c/test-abstruse-s_delete_callback.c | 4 +- .../unit/c/test-abstruse-s_destroy_callback.c | 4 +- .../unit/c/test-abstruse-ss_delete_callback.c | 2 +- .../unit/c/test-abstruse-ss_destroy_callback.c | 2 +- level_0/f_compare/c/compare.c | 24 ++-- level_0/f_compare/c/compare.h | 25 ++-- level_0/f_compare/c/compare/utf.c | 24 ++-- level_0/f_compare/c/compare/utf.h | 24 ++-- level_0/f_compare/data/build/dependencies | 1 + level_0/f_compare/data/build/settings | 2 +- level_0/f_compare/data/build/settings-tests | 2 +- .../tests/unit/c/test-compare-dynamic_partial.c | 10 +- .../unit/c/test-compare-dynamic_partial_dynamic.c | 6 +- .../unit/c/test-compare-dynamic_partial_except.c | 8 +- .../test-compare-dynamic_partial_except_dynamic.c | 6 +- .../c/test-compare-dynamic_partial_except_string.c | 8 +- .../c/test-compare-dynamic_partial_except_trim.c | 8 +- ...t-compare-dynamic_partial_except_trim_dynamic.c | 6 +- ...st-compare-dynamic_partial_except_trim_string.c | 8 +- .../unit/c/test-compare-dynamic_partial_string.c | 8 +- .../unit/c/test-compare-dynamic_partial_trim.c | 10 +- .../c/test-compare-dynamic_partial_trim_dynamic.c | 6 +- .../c/test-compare-dynamic_partial_trim_string.c | 8 +- .../unit/c/test-compare-utf_dynamic_partial.c | 10 +- .../c/test-compare-utf_dynamic_partial_dynamic.c | 6 +- .../c/test-compare-utf_dynamic_partial_except.c | 8 +- ...st-compare-utf_dynamic_partial_except_dynamic.c | 6 +- ...est-compare-utf_dynamic_partial_except_string.c | 8 +- .../test-compare-utf_dynamic_partial_except_trim.c | 8 +- ...mpare-utf_dynamic_partial_except_trim_dynamic.c | 6 +- ...ompare-utf_dynamic_partial_except_trim_string.c | 8 +- .../c/test-compare-utf_dynamic_partial_string.c | 8 +- .../unit/c/test-compare-utf_dynamic_partial_trim.c | 10 +- ...test-compare-utf_dynamic_partial_trim_dynamic.c | 6 +- .../test-compare-utf_dynamic_partial_trim_string.c | 8 +- level_0/f_file/c/file.c | 2 +- level_0/f_file/c/file.h | 2 +- level_0/f_file/c/file/stream.c | 2 +- level_0/f_file/c/file/stream.h | 2 +- .../tests/unit/c/test-file-stream_write_range.c | 18 +-- .../f_file/tests/unit/c/test-file-write_range.c | 18 +-- level_0/f_fss/c/fss.c | 18 +-- level_0/f_fss/c/fss.h | 18 +-- level_0/f_fss/c/fss/item.c | 12 +- level_0/f_fss/c/fss/item.h | 10 +- level_0/f_fss/c/fss/named.c | 24 ++-- level_0/f_fss/c/fss/named.h | 16 +-- level_0/f_fss/c/fss/nest.c | 12 +- level_0/f_fss/c/fss/set.c | 24 ++-- level_0/f_fss/c/fss/set.h | 10 +- level_0/f_fss/c/fss/set_quote.c | 24 ++-- level_0/f_fss/c/fss/set_quote.h | 10 +- level_0/f_fss/c/fss/simple_packet.h | 4 +- .../tests/unit/c/test-fss-apply_delimit_range.c | 10 +- .../tests/unit/c/test-fss-count_lines_range.c | 10 +- level_0/f_fss/tests/unit/c/test-fss-is_combining.c | 8 +- level_0/f_fss/tests/unit/c/test-fss-is_graph.c | 8 +- level_0/f_fss/tests/unit/c/test-fss-is_space.c | 8 +- .../f_fss/tests/unit/c/test-fss-is_zero_width.c | 8 +- level_0/f_fss/tests/unit/c/test-fss-item_delete.c | 2 +- level_0/f_fss/tests/unit/c/test-fss-item_destroy.c | 2 +- .../tests/unit/c/test-fss-items_delete_callback.c | 8 +- .../tests/unit/c/test-fss-items_destroy_callback.c | 8 +- .../tests/unit/c/test-fss-itemss_delete_callback.c | 8 +- .../unit/c/test-fss-itemss_destroy_callback.c | 8 +- level_0/f_fss/tests/unit/c/test-fss-named_delete.c | 16 +-- .../f_fss/tests/unit/c/test-fss-named_destroy.c | 16 +-- .../tests/unit/c/test-fss-nameds_delete_callback.c | 16 +-- .../unit/c/test-fss-nameds_destroy_callback.c | 16 +-- .../unit/c/test-fss-namedss_delete_callback.c | 14 +- .../unit/c/test-fss-namedss_destroy_callback.c | 14 +- level_0/f_fss/tests/unit/c/test-fss-nest_delete.c | 2 +- level_0/f_fss/tests/unit/c/test-fss-nest_destroy.c | 2 +- .../tests/unit/c/test-fss-nests_delete_callback.c | 8 +- .../tests/unit/c/test-fss-nests_destroy_callback.c | 8 +- .../tests/unit/c/test-fss-nestss_delete_callback.c | 2 +- .../unit/c/test-fss-nestss_destroy_callback.c | 2 +- level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c | 34 ++--- level_0/f_fss/tests/unit/c/test-fss-set_delete.c | 16 +-- level_0/f_fss/tests/unit/c/test-fss-set_destroy.c | 16 +-- .../f_fss/tests/unit/c/test-fss-set_quote_delete.c | 16 +-- .../tests/unit/c/test-fss-set_quote_destroy.c | 16 +-- .../unit/c/test-fss-set_quotes_delete_callback.c | 16 +-- .../unit/c/test-fss-set_quotes_destroy_callback.c | 16 +-- .../unit/c/test-fss-set_quotess_delete_callback.c | 14 +- .../unit/c/test-fss-set_quotess_destroy_callback.c | 14 +- .../tests/unit/c/test-fss-sets_delete_callback.c | 16 +-- .../tests/unit/c/test-fss-sets_destroy_callback.c | 16 +-- .../tests/unit/c/test-fss-setss_delete_callback.c | 14 +- .../tests/unit/c/test-fss-setss_destroy_callback.c | 14 +- .../tests/unit/c/test-fss-skip_past_delimit.c | 10 +- .../f_fss/tests/unit/c/test-fss-skip_past_space.c | 10 +- level_0/f_iki/c/iki.c | 22 +-- level_0/f_iki/c/iki.h | 6 +- level_0/f_iki/c/iki/common.h | 18 +-- level_0/f_iki/c/iki/data.c | 42 +++--- level_0/f_iki/c/iki/data.h | 8 +- level_0/f_iki/c/iki/private-data.c | 6 +- level_0/f_iki/c/iki/private-data.h | 4 +- .../tests/unit/c/test-iki-content_partial_is.c | 50 +++---- level_0/f_iki/tests/unit/c/test-iki-datas_append.c | 6 +- .../f_iki/tests/unit/c/test-iki-datas_append_all.c | 6 +- .../tests/unit/c/test-iki-datas_delete_callback.c | 18 +-- .../tests/unit/c/test-iki-datas_destroy_callback.c | 18 +-- .../f_iki/tests/unit/c/test-iki-datass_append.c | 6 +- .../tests/unit/c/test-iki-datass_append_all.c | 6 +- .../tests/unit/c/test-iki-datass_delete_callback.c | 18 +-- .../unit/c/test-iki-datass_destroy_callback.c | 18 +-- .../tests/unit/c/test-iki-object_partial_is.c | 48 +++---- level_0/f_iki/tests/unit/c/test-iki-read.c | 150 ++++++++++----------- level_0/f_network/c/network.c | 4 +- level_0/f_network/c/network.h | 2 +- level_0/f_parse/c/parse.c | 18 +-- level_0/f_parse/c/parse.h | 18 +-- level_0/f_parse/c/parse/utf.c | 16 +-- level_0/f_parse/c/parse/utf.h | 16 +-- level_0/f_print/c/print.c | 40 +++--- level_0/f_print/c/print.h | 40 +++--- level_0/f_print/c/print/common.h | 4 +- level_0/f_print/c/print/private-to.c | 8 +- level_0/f_print/c/print/private-to.h | 8 +- level_0/f_print/c/print/to.c | 40 +++--- level_0/f_print/c/print/to.h | 40 +++--- level_0/f_print/c/private-print.c | 8 +- level_0/f_print/c/private-print.h | 8 +- .../tests/unit/c/test-print-dynamic_partial.c | 8 +- .../tests/unit/c/test-print-dynamic_partial_raw.c | 8 +- .../unit/c/test-print-dynamic_partial_raw_safely.c | 8 +- .../unit/c/test-print-dynamic_partial_safely.c | 8 +- .../unit/c/test-print-except_dynamic_partial.c | 8 +- .../unit/c/test-print-except_dynamic_partial_raw.c | 8 +- .../test-print-except_dynamic_partial_raw_safely.c | 8 +- .../c/test-print-except_dynamic_partial_safely.c | 8 +- .../f_print/tests/unit/c/test-print-except_in.c | 16 +-- .../tests/unit/c/test-print-except_in_dynamic.c | 14 +- .../unit/c/test-print-except_in_dynamic_partial.c | 22 +-- .../c/test-print-except_in_dynamic_partial_raw.c | 22 +-- ...st-print-except_in_dynamic_partial_raw_safely.c | 22 +-- .../test-print-except_in_dynamic_partial_safely.c | 22 +-- .../unit/c/test-print-except_in_dynamic_raw.c | 14 +- .../c/test-print-except_in_dynamic_raw_safely.c | 14 +- .../unit/c/test-print-except_in_dynamic_safely.c | 14 +- .../tests/unit/c/test-print-except_in_raw.c | 16 +-- .../tests/unit/c/test-print-except_in_raw_safely.c | 16 +-- .../tests/unit/c/test-print-except_in_safely.c | 16 +-- .../tests/unit/c/test-print-to_dynamic_partial.c | 8 +- .../unit/c/test-print-to_dynamic_partial_raw.c | 8 +- .../c/test-print-to_dynamic_partial_raw_safely.c | 8 +- .../unit/c/test-print-to_dynamic_partial_safely.c | 8 +- .../unit/c/test-print-to_except_dynamic_partial.c | 8 +- .../c/test-print-to_except_dynamic_partial_raw.c | 8 +- ...st-print-to_except_dynamic_partial_raw_safely.c | 8 +- .../test-print-to_except_dynamic_partial_safely.c | 8 +- .../f_print/tests/unit/c/test-print-to_except_in.c | 16 +-- .../tests/unit/c/test-print-to_except_in_dynamic.c | 14 +- .../c/test-print-to_except_in_dynamic_partial.c | 22 +-- .../test-print-to_except_in_dynamic_partial_raw.c | 22 +-- ...print-to_except_in_dynamic_partial_raw_safely.c | 22 +-- ...est-print-to_except_in_dynamic_partial_safely.c | 22 +-- .../unit/c/test-print-to_except_in_dynamic_raw.c | 14 +- .../c/test-print-to_except_in_dynamic_raw_safely.c | 14 +- .../c/test-print-to_except_in_dynamic_safely.c | 14 +- .../tests/unit/c/test-print-to_except_in_raw.c | 16 +-- .../unit/c/test-print-to_except_in_raw_safely.c | 16 +-- .../tests/unit/c/test-print-to_except_in_safely.c | 16 +-- level_0/f_rip/c/rip.c | 4 +- level_0/f_rip/c/rip.h | 4 +- level_0/f_rip/c/rip/utf.c | 4 +- level_0/f_rip/c/rip/utf.h | 4 +- level_0/f_serialize/c/private-serialize.c | 2 +- level_0/f_serialize/c/private-serialize.h | 2 +- level_0/f_serialize/c/serialize.c | 14 +- level_0/f_serialize/c/serialize.h | 4 +- .../unit/c/test-serialize-from_simple_range.c | 20 +-- .../unit/c/test-serialize-from_simple_select.c | 6 +- level_0/f_string/c/string.c | 6 +- level_0/f_string/c/string.h | 12 +- level_0/f_string/c/string/dynamic.c | 30 ++--- level_0/f_string/c/string/dynamic.h | 30 ++--- level_0/f_string/c/string/quantity.h | 2 +- level_0/f_string/c/string/range.c | 14 -- level_0/f_string/c/string/range.h | 59 -------- level_0/f_string/c/string/range_double.c | 14 -- level_0/f_string/c/string/range_double.h | 65 --------- level_0/f_string/c/string/range_doubles.h | 90 ------------- level_0/f_string/c/string/range_doubless.c | 124 ----------------- level_0/f_string/c/string/ranges.h | 90 ------------- level_0/f_string/c/string/tripless.c | 2 +- level_0/f_string/data/build/settings | 4 - level_0/f_string/data/build/settings-mocks | 4 - level_0/f_string/data/build/settings-tests | 4 - .../unit/c/test-string-dynamic_partial_append.c | 4 +- .../c/test-string-dynamic_partial_append_assure.c | 4 +- ...-string-dynamic_partial_append_assure_nulless.c | 4 +- .../c/test-string-dynamic_partial_append_nulless.c | 4 +- .../unit/c/test-string-dynamic_partial_mash.c | 4 +- .../c/test-string-dynamic_partial_mash_nulless.c | 4 +- .../unit/c/test-string-dynamic_partial_mish.c | 4 +- .../c/test-string-dynamic_partial_mish_nulless.c | 4 +- .../unit/c/test-string-dynamic_partial_prepend.c | 4 +- .../c/test-string-dynamic_partial_prepend_assure.c | 4 +- ...string-dynamic_partial_prepend_assure_nulless.c | 4 +- .../test-string-dynamic_partial_prepend_nulless.c | 4 +- .../tests/unit/c/test-string-dynamic_seek_line.c | 8 +- .../unit/c/test-string-dynamic_seek_line_to.c | 10 +- .../tests/unit/c/test-string-dynamic_seek_to.c | 8 +- .../unit/c/test-string-range_doubles_append.c | 38 ------ .../unit/c/test-string-range_doubles_append.h | 27 ---- .../unit/c/test-string-range_doubles_append_all.c | 76 ----------- .../unit/c/test-string-range_doubles_append_all.h | 34 ----- .../unit/c/test-string-range_doubless_append.c | 76 ----------- .../unit/c/test-string-range_doubless_append.h | 34 ----- .../unit/c/test-string-range_doubless_append_all.c | 93 ------------- .../unit/c/test-string-range_doubless_append_all.h | 34 ----- .../c/test-string-range_doubless_delete_callback.c | 57 -------- .../c/test-string-range_doubless_delete_callback.h | 27 ---- .../test-string-range_doubless_destroy_callback.c | 57 -------- .../test-string-range_doubless_destroy_callback.h | 27 ---- .../tests/unit/c/test-string-ranges_append.c | 38 ------ .../tests/unit/c/test-string-ranges_append.h | 27 ---- .../tests/unit/c/test-string-ranges_append_all.c | 76 ----------- .../tests/unit/c/test-string-ranges_append_all.h | 34 ----- .../tests/unit/c/test-string-rangess_append.c | 76 ----------- .../tests/unit/c/test-string-rangess_append.h | 34 ----- .../tests/unit/c/test-string-rangess_append_all.c | 93 ------------- .../tests/unit/c/test-string-rangess_append_all.h | 34 ----- .../unit/c/test-string-rangess_delete_callback.c | 57 -------- .../unit/c/test-string-rangess_delete_callback.h | 27 ---- .../unit/c/test-string-rangess_destroy_callback.c | 57 -------- .../unit/c/test-string-rangess_destroy_callback.h | 27 ---- .../f_string/tests/unit/c/test-string-seek_line.c | 6 +- .../tests/unit/c/test-string-seek_line_to.c | 8 +- .../f_string/tests/unit/c/test-string-seek_to.c | 6 +- level_0/f_string/tests/unit/c/test-string.c | 22 --- level_0/f_string/tests/unit/c/test-string.h | 6 - level_0/f_type/c/type.h | 6 +- level_0/f_type/c/type/range.h | 104 ++++++++++++++ level_0/f_type/c/type/range_double.h | 110 +++++++++++++++ level_0/f_type/data/build/settings | 2 +- level_0/f_type_array/c/type_array.h | 6 + level_0/f_type_array/c/type_array/range.c | 14 ++ level_0/f_type_array/c/type_array/range.h | 32 +++++ level_0/f_type_array/c/type_array/range_double.c | 14 ++ level_0/f_type_array/c/type_array/range_double.h | 32 +++++ .../c/type_array}/range_doubles.c | 20 +-- level_0/f_type_array/c/type_array/range_doubles.h | 63 +++++++++ .../c/type_array/range_doubless.c} | 60 +++++---- .../c/type_array/range_doubless.h} | 67 +++------ .../string => f_type_array/c/type_array}/ranges.c | 20 +-- level_0/f_type_array/c/type_array/ranges.h | 63 +++++++++ level_0/f_type_array/c/type_array/rangess.c | 120 +++++++++++++++++ .../c/type_array/rangess.h} | 67 +++------ level_0/f_type_array/data/build/settings | 4 +- level_0/f_type_array/data/build/settings-mocks | 4 +- level_0/f_type_array/data/build/settings-tests | 4 + .../unit/c/test-type_array-range_doubles_append.c | 40 ++++++ .../unit/c/test-type_array-range_doubles_append.h | 27 ++++ .../c/test-type_array-range_doubles_append_all.c | 78 +++++++++++ .../c/test-type_array-range_doubles_append_all.h | 34 +++++ .../unit/c/test-type_array-range_doubless_append.c | 78 +++++++++++ .../unit/c/test-type_array-range_doubless_append.h | 34 +++++ .../c/test-type_array-range_doubless_append_all.c | 95 +++++++++++++ .../c/test-type_array-range_doubless_append_all.h | 34 +++++ ...est-type_array-range_doubless_delete_callback.c | 57 ++++++++ ...est-type_array-range_doubless_delete_callback.h | 27 ++++ ...st-type_array-range_doubless_destroy_callback.c | 57 ++++++++ ...st-type_array-range_doubless_destroy_callback.h | 27 ++++ .../tests/unit/c/test-type_array-ranges_append.c | 38 ++++++ .../tests/unit/c/test-type_array-ranges_append.h | 27 ++++ .../unit/c/test-type_array-ranges_append_all.c | 76 +++++++++++ .../unit/c/test-type_array-ranges_append_all.h | 34 +++++ .../tests/unit/c/test-type_array-rangess_append.c | 76 +++++++++++ .../tests/unit/c/test-type_array-rangess_append.h | 34 +++++ .../unit/c/test-type_array-rangess_append_all.c | 93 +++++++++++++ .../unit/c/test-type_array-rangess_append_all.h | 34 +++++ .../c/test-type_array-rangess_delete_callback.c | 57 ++++++++ .../c/test-type_array-rangess_delete_callback.h | 27 ++++ .../c/test-type_array-rangess_destroy_callback.c | 57 ++++++++ .../c/test-type_array-rangess_destroy_callback.h | 27 ++++ .../f_type_array/tests/unit/c/test-type_array.c | 22 +++ .../f_type_array/tests/unit/c/test-type_array.h | 6 + level_0/f_utf/c/utf.c | 4 +- level_0/f_utf/c/utf.h | 4 +- level_0/f_utf/c/utf/dynamic.c | 30 ++--- level_0/f_utf/c/utf/dynamic.h | 30 ++--- level_0/f_utf/c/utf/string.c | 6 +- level_0/f_utf/c/utf/string.h | 6 +- level_0/f_utf/c/utf/strings.c | 6 +- level_0/f_utf/c/utf/strings.h | 6 +- level_0/f_utf/c/utf/stringss.c | 6 +- level_0/f_utf/c/utf/stringss.h | 6 +- .../tests/unit/c/test-utf-dynamic_partial_append.c | 4 +- .../c/test-utf-dynamic_partial_append_assure.c | 4 +- ...est-utf-dynamic_partial_append_assure_nulless.c | 4 +- .../c/test-utf-dynamic_partial_append_nulless.c | 4 +- .../tests/unit/c/test-utf-dynamic_partial_mash.c | 4 +- .../unit/c/test-utf-dynamic_partial_mash_nulless.c | 4 +- .../tests/unit/c/test-utf-dynamic_partial_mish.c | 4 +- .../unit/c/test-utf-dynamic_partial_mish_nulless.c | 4 +- .../unit/c/test-utf-dynamic_partial_prepend.c | 4 +- .../c/test-utf-dynamic_partial_prepend_assure.c | 4 +- ...st-utf-dynamic_partial_prepend_assure_nulless.c | 4 +- .../c/test-utf-dynamic_partial_prepend_nulless.c | 4 +- .../tests/unit/c/test-utf-dynamic_seek_line.c | 8 +- .../tests/unit/c/test-utf-dynamic_seek_line_to.c | 10 +- .../f_utf/tests/unit/c/test-utf-dynamic_seek_to.c | 14 +- level_0/f_utf/tests/unit/c/test-utf-seek_line.c | 6 +- level_0/f_utf/tests/unit/c/test-utf-seek_line_to.c | 8 +- level_0/f_utf/tests/unit/c/test-utf-seek_to.c | 8 +- level_1/fl_conversion/c/conversion.c | 8 +- level_1/fl_conversion/c/conversion.h | 8 +- level_1/fl_fss/c/fss/basic.c | 10 +- level_1/fl_fss/c/fss/basic.h | 8 +- level_1/fl_fss/c/fss/basic_list.c | 12 +- level_1/fl_fss/c/fss/basic_list.h | 8 +- level_1/fl_fss/c/fss/embedded_list.c | 54 ++++---- level_1/fl_fss/c/fss/embedded_list.h | 8 +- level_1/fl_fss/c/fss/extended.c | 12 +- level_1/fl_fss/c/fss/extended.h | 8 +- level_1/fl_fss/c/fss/extended_list.c | 12 +- level_1/fl_fss/c/fss/extended_list.h | 8 +- level_1/fl_fss/c/fss/payload/type.h | 8 +- level_1/fl_fss/c/private-fss.c | 12 +- level_1/fl_fss/c/private-fss.h | 6 +- level_1/fl_iki/c/iki.c | 2 +- level_1/fl_iki/c/iki.h | 2 +- level_1/fl_print/c/print.c | 64 ++++----- level_1/fl_print/c/print.h | 44 +++--- level_1/fl_print/c/private-print.c | 64 ++++----- level_1/fl_print/c/private-print.h | 8 +- level_1/fl_utf_file/c/utf_file.c | 2 +- level_1/fl_utf_file/c/utf_file.h | 2 +- level_2/fll_fss/c/fss.c | 24 ++-- level_2/fll_fss/c/fss.h | 22 +-- level_2/fll_fss/c/fss/basic.c | 12 +- level_2/fll_fss/c/fss/basic.h | 2 +- level_2/fll_fss/c/fss/basic_list.c | 12 +- level_2/fll_fss/c/fss/basic_list.h | 2 +- level_2/fll_fss/c/fss/embedded_list.c | 6 +- level_2/fll_fss/c/fss/embedded_list.h | 4 +- level_2/fll_fss/c/fss/extended.c | 10 +- level_2/fll_fss/c/fss/extended.h | 2 +- level_2/fll_fss/c/fss/extended_list.c | 14 +- level_2/fll_fss/c/fss/extended_list.h | 4 +- level_2/fll_fss/c/fss/payload.c | 16 +-- level_2/fll_fss/c/fss/payload.h | 2 +- level_2/fll_iki/c/iki.c | 8 +- level_2/fll_iki/c/iki.h | 4 +- level_2/fll_iki/c/private-iki.c | 4 +- level_2/fll_iki/c/private-iki.h | 4 +- level_2/fll_print/c/print.c | 80 +++++------ level_2/fll_print/c/print.h | 80 +++++------ level_3/control/c/main/common.c | 4 +- level_3/control/c/main/common/type.c | 12 +- level_3/control/c/main/common/type.h | 28 ++-- level_3/control/c/main/packet.c | 12 +- level_3/control/c/main/print/debug.c | 4 +- level_3/control/c/main/print/debug.h | 4 +- level_3/controller/c/common/private-cache.c | 12 +- level_3/controller/c/common/private-cache.h | 28 ++-- .../controller/c/controller/private-controller.c | 14 +- .../controller/c/controller/private-controller.h | 6 +- level_3/controller/c/entry/private-entry.c | 14 +- level_3/controller/c/entry/private-entry.h | 6 +- level_3/controller/c/entry/private-entry_print.c | 2 +- level_3/controller/c/entry/private-entry_print.h | 2 +- level_3/controller/c/rule/private-rule.c | 26 ++-- level_3/controller/c/rule/private-rule.h | 8 +- level_3/controller/c/rule/private-rule_print.c | 2 +- level_3/controller/c/rule/private-rule_print.h | 2 +- level_3/fake/c/main/build/load.c | 12 +- level_3/fake/c/main/build/load.h | 2 +- level_3/fake/c/main/common.c | 6 +- level_3/fake/c/main/make.c | 4 +- level_3/fake/c/main/make/load_fakefile.c | 40 +++--- level_3/fake/c/main/make/load_fakefile.h | 12 +- level_3/fake/c/main/make/operate.c | 12 +- level_3/fake/c/main/make/operate.h | 8 +- level_3/fake/c/main/make/operate_process.c | 2 +- level_3/fake/c/main/make/operate_process.h | 2 +- level_3/fake/c/main/make/operate_process_type.c | 2 +- level_3/fake/c/main/make/operate_validate.c | 2 +- level_3/fake/c/main/make/operate_validate.h | 2 +- level_3/fake/c/main/make/operate_validate_type.c | 2 +- level_3/fake/c/main/make/print/error.c | 2 +- level_3/fake/c/main/make/print/error.h | 2 +- level_3/fake/c/main/make/print/warning.c | 4 +- level_3/fake/c/main/make/print/warning.h | 4 +- level_3/fake/c/main/print/error.c | 8 +- level_3/fake/c/main/print/error.h | 8 +- level_3/firewall/c/firewall.c | 2 +- level_3/firewall/c/private-common.h | 16 +-- level_3/firewall/c/private-firewall.c | 30 ++--- level_3/firewall/c/private-firewall.h | 2 +- level_3/fss_identify/c/main/common/type.h | 4 +- level_3/fss_identify/c/main/process.c | 2 +- level_3/fss_read/c/main/common/type.c | 6 +- level_3/fss_read/c/main/common/type.h | 22 +-- level_3/fss_read/c/main/print/data.c | 2 +- level_3/fss_read/c/main/print/data.h | 2 +- level_3/fss_read/c/main/process_normal.c | 2 +- level_3/fss_write/c/main/common.c | 8 +- level_3/fss_write/c/main/common/type.h | 10 +- level_3/fss_write/c/main/fss_write.c | 6 +- level_3/fss_write/c/payload/fss_write.c | 4 +- level_3/iki_read/c/main/identify.c | 2 +- level_3/iki_read/c/main/identify.h | 2 +- level_3/iki_read/c/main/print/data.c | 8 +- level_3/iki_read/c/main/process.c | 12 +- level_3/iki_read/c/main/process.h | 6 +- level_3/iki_write/c/main/iki_write.c | 2 +- 425 files changed, 3819 insertions(+), 3775 deletions(-) delete mode 100644 level_0/f_string/c/string/range.c delete mode 100644 level_0/f_string/c/string/range.h delete mode 100644 level_0/f_string/c/string/range_double.c delete mode 100644 level_0/f_string/c/string/range_double.h delete mode 100644 level_0/f_string/c/string/range_doubles.h delete mode 100644 level_0/f_string/c/string/range_doubless.c delete mode 100644 level_0/f_string/c/string/ranges.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubles_append.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubles_append.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_append.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_append.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-ranges_append.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-ranges_append.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-ranges_append_all.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-ranges_append_all.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_append.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_append.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_append_all.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_append_all.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.h delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.c delete mode 100644 level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.h create mode 100644 level_0/f_type/c/type/range.h create mode 100644 level_0/f_type/c/type/range_double.h create mode 100644 level_0/f_type_array/c/type_array/range.c create mode 100644 level_0/f_type_array/c/type_array/range.h create mode 100644 level_0/f_type_array/c/type_array/range_double.c create mode 100644 level_0/f_type_array/c/type_array/range_double.h rename level_0/{f_string/c/string => f_type_array/c/type_array}/range_doubles.c (65%) create mode 100644 level_0/f_type_array/c/type_array/range_doubles.h rename level_0/{f_string/c/string/rangess.c => f_type_array/c/type_array/range_doubless.c} (60%) rename level_0/{f_string/c/string/rangess.h => f_type_array/c/type_array/range_doubless.h} (58%) rename level_0/{f_string/c/string => f_type_array/c/type_array}/ranges.c (62%) create mode 100644 level_0/f_type_array/c/type_array/ranges.h create mode 100644 level_0/f_type_array/c/type_array/rangess.c rename level_0/{f_string/c/string/range_doubless.h => f_type_array/c/type_array/rangess.h} (52%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.h diff --git a/build/level_0/settings b/build/level_0/settings index 1ddd942..c6cd04d 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -67,12 +67,10 @@ build_sources_library string/dynamic.c string/dynamics.c string/dynamicss.c build_sources_library string/map.c string/maps.c string/mapss.c build_sources_library string/map_multi.c string/map_multis.c string/map_multiss.c build_sources_library string/quantity.c string/quantitys.c string/quantityss.c -build_sources_library string/range.c string/ranges.c string/rangess.c -build_sources_library string/range_double.c string/range_doubles.c string/range_doubless.c build_sources_library string/static.c string/statics.c string/staticss.c build_sources_library string/triple.c string/triples.c string/tripless.c build_sources_library time.c -build_sources_library type_array/cell.c type_array/file.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_signed.c type_array/number_unsigned.c type_array/poll.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c +build_sources_library type_array/cell.c type_array/file.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_signed.c type_array/number_unsigned.c type_array/poll.c type_array/range.c type_array/ranges.c type_array/rangess.c type_array/range_double.c type_array/range_doubles.c type_array/range_doubless.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c build_sources_library utf.c private-utf.c private-utf_alphabetic.c private-utf_combining.c private-utf_control.c private-utf_digit.c private-utf_emoji.c private-utf_numeric.c private-utf_phonetic.c private-utf_private.c private-utf_punctuation.c private-utf_subscript.c private-utf_superscript.c private-utf_symbol.c private-utf_unassigned.c private-utf_valid.c private-utf_whitespace.c private-utf_wide.c private-utf_word.c private-utf_zero_width.c build_sources_library utf/common.c utf/convert.c build_sources_library utf/dynamic.c utf/dynamics.c utf/dynamicss.c @@ -117,13 +115,11 @@ build_sources_headers string/dynamic.h string/dynamics.h string/dynamicss.h build_sources_headers string/map.h string/maps.h string/mapss.h build_sources_headers string/map_multi.h string/map_multis.h string/map_multiss.h build_sources_headers string/quantity.h string/quantitys.h string/quantityss.h -build_sources_headers string/range.h string/ranges.h string/rangess.h -build_sources_headers string/range_double.h string/range_doubles.h string/range_doubless.h build_sources_headers string/static.h string/statics.h string/staticss.h build_sources_headers string/triple.h string/triples.h string/tripless.h build_sources_headers time.h -build_sources_headers type.h type/cell.h type/file.h type/fll.h type/mode.h type/number.h type/state.h type/status.h type/time.h -build_sources_headers type_array.h type_array_file.h type_array/common.h type_array/cell.h type_array/file.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_signed.h type_array/number_unsigned.h type_array/poll.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h +build_sources_headers type.h type/cell.h type/file.h type/fll.h type/mode.h type/number.h type/range.h type/range_double.h type/state.h type/status.h type/time.h +build_sources_headers type_array.h type_array_file.h type_array/common.h type_array/cell.h type_array/file.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_signed.h type_array/number_unsigned.h type_array/poll.h type_array/range.h type_array/ranges.h type_array/rangess.h type_array/range_double.h type_array/range_doubles.h type_array/range_doubless.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h build_sources_headers utf.h utf/common.h utf/convert.h utf/dynamic.h utf/dynamics.h utf/dynamicss.h utf/is.h utf/is_character.h utf/map.h utf/maps.h utf/mapss.h utf/map_multi.h utf/map_multis.h utf/map_multiss.h utf/static.h utf/statics.h utf/staticss.h utf/string.h utf/triple.h utf/triples.h utf/tripless.h build_sources_headers-thread thread.h thread/attribute.h thread/barrier.h thread/barrier_attribute.h thread/condition.h thread/condition_attribute.h thread/id.h thread/key.h thread/lock.h thread/lock_attribute.h thread/mutex.h thread/mutex_attribute.h thread/once.h thread/semaphore.h thread/set.h thread/spin.h diff --git a/build/monolithic/settings b/build/monolithic/settings index 54839ef..b5a6303 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -67,12 +67,10 @@ build_sources_library level_0/string/dynamic.c level_0/string/dynamics.c level_0 build_sources_library level_0/string/map.c level_0/string/maps.c level_0/string/mapss.c build_sources_library level_0/string/map_multi.c level_0/string/map_multis.c level_0/string/map_multiss.c build_sources_library level_0/string/quantity.c level_0/string/quantitys.c level_0/string/quantityss.c -build_sources_library level_0/string/range.c level_0/string/ranges.c level_0/string/rangess.c -build_sources_library level_0/string/range_double.c level_0/string/range_doubles.c level_0/string/range_doubless.c build_sources_library level_0/string/static.c level_0/string/statics.c level_0/string/staticss.c build_sources_library level_0/string/triple.c level_0/string/triples.c level_0/string/tripless.c build_sources_library level_0/time.c -build_sources_library level_0/type_array/cell.c level_0/type_array/file.c level_0/type_array/fll_id.c level_0/type_array/int8.c level_0/type_array/int16.c level_0/type_array/int32.c level_0/type_array/int64.c level_0/type_array/int128.c level_0/type_array/number_signed.c level_0/type_array/number_unsigned.c level_0/type_array/poll.c level_0/type_array/state.c level_0/type_array/status.c level_0/type_array/uint8.c level_0/type_array/uint16.c level_0/type_array/uint32.c level_0/type_array/uint64.c level_0/type_array/uint128.c +build_sources_library level_0/type_array/cell.c level_0/type_array/file.c level_0/type_array/fll_id.c level_0/type_array/int8.c level_0/type_array/int16.c level_0/type_array/int32.c level_0/type_array/int64.c level_0/type_array/int128.c level_0/type_array/number_signed.c level_0/type_array/number_unsigned.c level_0/type_array/poll.c level_0/type_array/range.c level_0/type_array/ranges.c level_0/type_array/rangess.c level_0/type_array/range_double.c level_0/type_array/range_doubles.c level_0/type_array/range_doubless.c level_0/type_array/state.c level_0/type_array/status.c level_0/type_array/uint8.c level_0/type_array/uint16.c level_0/type_array/uint32.c level_0/type_array/uint64.c level_0/type_array/uint128.c build_sources_library level_0/utf.c level_0/private-utf.c level_0/private-utf_alphabetic.c level_0/private-utf_combining.c level_0/private-utf_control.c level_0/private-utf_digit.c level_0/private-utf_emoji.c level_0/private-utf_numeric.c level_0/private-utf_phonetic.c level_0/private-utf_private.c level_0/private-utf_punctuation.c level_0/private-utf_subscript.c level_0/private-utf_superscript.c level_0/private-utf_symbol.c level_0/private-utf_unassigned.c level_0/private-utf_valid.c level_0/private-utf_whitespace.c level_0/private-utf_wide.c level_0/private-utf_word.c level_0/private-utf_zero_width.c build_sources_library level_0/utf/common.c level_0/utf/convert.c build_sources_library level_0/utf/dynamic.c level_0/utf/dynamics.c level_0/utf/dynamicss.c @@ -138,13 +136,11 @@ build_sources_headers level_0/string/dynamic.h level_0/string/dynamics.h level_0 build_sources_headers level_0/string/map.h level_0/string/maps.h level_0/string/mapss.h build_sources_headers level_0/string/map_multi.h level_0/string/map_multis.h level_0/string/map_multiss.h build_sources_headers level_0/string/quantity.h level_0/string/quantitys.h level_0/string/quantityss.h -build_sources_headers level_0/string/range.h level_0/string/ranges.h level_0/string/rangess.h -build_sources_headers level_0/string/range_double.h level_0/string/range_doubles.h level_0/string/range_doubless.h build_sources_headers level_0/string/static.h level_0/string/statics.h level_0/string/staticss.h build_sources_headers level_0/string/triple.h level_0/string/triples.h level_0/string/tripless.h build_sources_headers level_0/time.h -build_sources_headers level_0/type.h level_0/type/cell.h level_0/type/file.h level_0/type/fll.h level_0/type/mode.h level_0/type/number.h level_0/type/state.h level_0/type/status.h level_0/type/time.h -build_sources_headers level_0/type_array.h level_0/type_array_file.h level_0/type_array/common.h level_0/type_array/cell.h level_0/type_array/file.h level_0/type_array/fll_id.h level_0/type_array/int8.h level_0/type_array/int16.h level_0/type_array/int32.h level_0/type_array/int64.h level_0/type_array/int128.h level_0/type_array/number_signed.h level_0/type_array/number_unsigned.h level_0/type_array/poll.h level_0/type_array/state.h level_0/type_array/status.h level_0/type_array/uint8.h level_0/type_array/uint16.h level_0/type_array/uint32.h level_0/type_array/uint64.h level_0/type_array/uint128.h +build_sources_headers level_0/type.h level_0/type/cell.h level_0/type/file.h level_0/type/fll.h level_0/type/mode.h level_0/type/number.h level_0/type/range.h level_0/type/range_double.h level_0/type/state.h level_0/type/status.h level_0/type/time.h +build_sources_headers level_0/type_array.h level_0/type_array_file.h level_0/type_array/common.h level_0/type_array/cell.h level_0/type_array/file.h level_0/type_array/fll_id.h level_0/type_array/int8.h level_0/type_array/int16.h level_0/type_array/int32.h level_0/type_array/int64.h level_0/type_array/int128.h level_0/type_array/number_signed.h level_0/type_array/number_unsigned.h level_0/type_array/poll.h level_0/type_array/range.h level_0/type_array/ranges.h level_0/type_array/rangess.h level_0/type_array/range_double.h level_0/type_array/range_doubles.h level_0/type_array/range_doubless.h level_0/type_array/state.h level_0/type_array/status.h level_0/type_array/uint8.h level_0/type_array/uint16.h level_0/type_array/uint32.h level_0/type_array/uint64.h level_0/type_array/uint128.h build_sources_headers level_0/utf.h level_0/utf/common.h level_0/utf/convert.h level_0/utf/dynamic.h level_0/utf/dynamics.h level_0/utf/dynamicss.h level_0/utf/is.h level_0/utf/is_character.h level_0/utf/map.h level_0/utf/maps.h level_0/utf/mapss.h level_0/utf/map_multi.h level_0/utf/map_multis.h level_0/utf/map_multiss.h level_0/utf/static.h level_0/utf/statics.h level_0/utf/staticss.h level_0/utf/string.h level_0/utf/triple.h level_0/utf/triples.h level_0/utf/tripless.h build_sources_headers level_1/control_group.h diff --git a/build/stand_alone/byte_dump.settings b/build/stand_alone/byte_dump.settings index ea0e683..a2e05d3 100644 --- a/build/stand_alone/byte_dump.settings +++ b/build/stand_alone/byte_dump.settings @@ -31,8 +31,8 @@ build_sources_program fll/level_0/memory.c fll/level_0/private-memory.c fll/leve build_sources_program fll/level_0/pipe.c build_sources_program fll/level_0/print.c fll/level_0/private-print.c fll/level_0/print/common.c fll/level_0/print/to.c fll/level_0/print/private-to.c build_sources_program fll/level_0/signal.c -build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/dynamic.c fll/level_0/string/map.c fll/level_0/string/map_multi.cfll/level_0/string/quantity.c fll/level_0/string/range.c fll/level_0/string/static.c fll/level_0/string/triple.c -build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/dynamic.c fll/level_0/string/map.c fll/level_0/string/map_multi.cfll/level_0/string/quantity.c fll/level_0/string/static.c fll/level_0/string/triple.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/range.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/map_multi.c fll/level_0/utf/static.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/private-dynamic.c fll/level_0/utf/private-map.c fll/level_0/utf/private-map_multi.c fll/level_0/utf/private-triple.c fll/level_0/utf/private-string.c diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h index a779d20..2c2d1bd 100644 --- a/build/stand_alone/fake.config.h +++ b/build/stand_alone/fake.config.h @@ -1460,26 +1460,26 @@ #define _di_f_string_quantityss_t_ #define _di_f_string_quantitys_t_ #define _di_f_string_quantity_t_ -#define _di_f_string_range_double_empty_c_ -#define _di_f_string_range_doubles_append_ -#define _di_f_string_range_doubles_append_all_ -#define _di_f_string_range_doubless_append_ -#define _di_f_string_range_doubless_append_all_ -#define _di_f_string_range_doubless_delete_callback_ -#define _di_f_string_range_doubless_destroy_callback_ -#define _di_f_string_range_doubless_t_ -#define _di_f_string_range_doubles_t_ -#define _di_f_string_range_double_t_ -#define _di_f_string_range_empty_c_ -#define _di_f_string_ranges_append_ -#define _di_f_string_ranges_append_all_ -#define _di_f_string_rangess_append_ -#define _di_f_string_rangess_append_all_ -//#define _di_f_string_rangess_delete_callback_ -#define _di_f_string_rangess_destroy_callback_ -//#define _di_f_string_rangess_t_ -//#define _di_f_string_ranges_t_ -//#define _di_f_string_range_t_ +#define _di_f_range_double_empty_c_ +#define _di_f_range_doubles_append_ +#define _di_f_range_doubles_append_all_ +#define _di_f_range_doubless_append_ +#define _di_f_range_doubless_append_all_ +#define _di_f_range_doubless_delete_callback_ +#define _di_f_range_doubless_destroy_callback_ +#define _di_f_range_doubless_t_ +#define _di_f_range_doubles_t_ +#define _di_f_range_double_t_ +#define _di_f_range_empty_c_ +#define _di_f_ranges_append_ +#define _di_f_ranges_append_all_ +#define _di_f_rangess_append_ +#define _di_f_rangess_append_all_ +//#define _di_f_rangess_delete_callback_ +#define _di_f_rangess_destroy_callback_ +//#define _di_f_rangess_t_ +//#define _di_f_ranges_t_ +//#define _di_f_range_t_ #define _di_f_string_seek_line_ #define _di_f_string_seek_line_to_ #define _di_f_string_seek_to_ diff --git a/build/stand_alone/fake.settings b/build/stand_alone/fake.settings index 5d17a15..872b63b 100644 --- a/build/stand_alone/fake.settings +++ b/build/stand_alone/fake.settings @@ -56,8 +56,8 @@ build_sources_program fll/level_0/print.c fll/level_0/private-print.c fll/level_ build_sources_program fll/level_0/rip.c fll/level_0/rip/utf.c fll/level_0/private-rip.c fll/level_0/rip/private-utf.c build_sources_program fll/level_0/signal.c build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c -build_sources_program fll/level_0/string/dynamic.c fll/level_0/string/dynamics.c fll/level_0/string/dynamicss.c fll/level_0/string/map.c fll/level_0/string/maps.c fll/level_0/string/mapss.c fll/level_0/string/map_multi.c fll/level_0/string/map_multis.c fll/level_0/string/map_multiss.c fll/level_0/string/quantity.c fll/level_0/string/quantitys.c fll/level_0/string/quantityss.c fll/level_0/string/range.c fll/level_0/string/ranges.c fll/level_0/string/rangess.c fll/level_0/string/static.c fll/level_0/string/statics.c fll/level_0/string/staticss.c fll/level_0/string/triple.c fll/level_0/string/triples.c fll/level_0/string/tripless.c -build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/string/dynamic.c fll/level_0/string/dynamics.c fll/level_0/string/dynamicss.c fll/level_0/string/map.c fll/level_0/string/maps.c fll/level_0/string/mapss.c fll/level_0/string/map_multi.c fll/level_0/string/map_multis.c fll/level_0/string/map_multiss.c fll/level_0/string/quantity.c fll/level_0/string/quantitys.c fll/level_0/string/quantityss.c fll/level_0/string/static.c fll/level_0/string/statics.c fll/level_0/string/staticss.c fll/level_0/string/triple.c fll/level_0/string/triples.c fll/level_0/string/tripless.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/range.c fll/level_0/type_array/ranges.c fll/level_0/type_array/rangess.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/dynamics.c fll/level_0/utf/dynamicss.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/maps.c fll/level_0/utf/mapss.c fll/level_0/utf/map_multi.c fll/level_0/utf/map_multis.c fll/level_0/utf/map_multiss.c fll/level_0/utf/static.c fll/level_0/utf/statics.c fll/level_0/utf/staticss.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/triples.c fll/level_0/utf/tripless.c build_sources_program fll/level_0/utf/private-dynamics.c fll/level_0/utf/private-maps.c fll/level_0/utf/private-map_multis.c fll/level_0/utf/private-string.c fll/level_0/utf/private-triples.c diff --git a/build/stand_alone/firewall.settings b/build/stand_alone/firewall.settings index 6ec5594..a24372d 100644 --- a/build/stand_alone/firewall.settings +++ b/build/stand_alone/firewall.settings @@ -40,9 +40,9 @@ build_sources_program fll/level_0/path.c fll/level_0/private-path.c fll/level_0/ build_sources_program fll/level_0/pipe.c build_sources_program fll/level_0/print.c fll/level_0/private-print.c fll/level_0/print/common.c fll/level_0/print/to.c fll/level_0/print/private-to.c build_sources_program fll/level_0/signal.c -build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/dynamic.c fll/level_0/string/map.c fll/level_0/string/map_multi.c fll/level_0/string/quantity.c fll/level_0/string/range.c fll/level_0/string/static.c fll/level_0/string/triple.c +build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/dynamic.c fll/level_0/string/map.c fll/level_0/string/map_multi.c fll/level_0/string/quantity.c fll/level_0/string/static.c fll/level_0/string/triple.c build_sources_program fll/level_0/thread.c fll/level_0/private-thread.c fll/level_0/thread/attribute.c fll/level_0/thread/barrier.c fll/level_0/thread/barrier_attribute.c fll/level_0/thread/condition.c fll/level_0/thread/condition_attribute.c fll/level_0/thread/id.c fll/level_0/thread/key.c fll/level_0/thread/lock.c fll/level_0/thread/lock_attribute.c fll/level_0/thread/mutex.c fll/level_0/thread/mutex_attribute.c fll/level_0/thread/once.c fll/level_0/thread/semaphore.c fll/level_0/thread/set.c fll/level_0/thread/spin.c -build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/range.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/map_multi.c fll/level_0/utf/static.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/private-dynamic.c fll/level_0/utf/private-map.c fll/level_0/utf/private-map_multi.c fll/level_0/utf/private-triple.c fll/level_0/utf/private-string.c diff --git a/build/stand_alone/utf8.settings b/build/stand_alone/utf8.settings index 459c7d2..c775e2c 100644 --- a/build/stand_alone/utf8.settings +++ b/build/stand_alone/utf8.settings @@ -32,8 +32,8 @@ build_sources_program fll/level_0/pipe.c build_sources_program fll/level_0/print.c fll/level_0/private-print.c fll/level_0/print/common.c fll/level_0/print/to.c fll/level_0/print/private-to.c build_sources_program fll/level_0/signal.c build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c -build_sources_program fll/level_0/string/dynamic.c fll/level_0/string/dynamics.c fll/level_0/string/dynamicss.c fll/level_0/string/map.c fll/level_0/string/maps.c fll/level_0/string/mapss.c fll/level_0/string/map_multi.c fll/level_0/string/map_multis.c fll/level_0/string/map_multiss.c fll/level_0/string/quantity.c fll/level_0/string/quantitys.c fll/level_0/string/quantityss.c fll/level_0/string/range.c fll/level_0/string/ranges.c fll/level_0/string/rangess.c fll/level_0/string/static.c fll/level_0/string/statics.c fll/level_0/string/staticss.c fll/level_0/string/triple.c fll/level_0/string/triples.c fll/level_0/string/tripless.c -build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/string/dynamic.c fll/level_0/string/dynamics.c fll/level_0/string/dynamicss.c fll/level_0/string/map.c fll/level_0/string/maps.c fll/level_0/string/mapss.c fll/level_0/string/map_multi.c fll/level_0/string/map_multis.c fll/level_0/string/map_multiss.c fll/level_0/string/quantity.c fll/level_0/string/quantitys.c fll/level_0/string/quantityss.c fll/level_0/string/static.c fll/level_0/string/statics.c fll/level_0/string/staticss.c fll/level_0/string/triple.c fll/level_0/string/triples.c fll/level_0/string/tripless.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/file.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_signed.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/poll.c fll/level_0/type_array/range.c fll/level_0/type_array/ranges.c fll/level_0/type_array/rangess.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/dynamics.c fll/level_0/utf/dynamicss.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/maps.c fll/level_0/utf/mapss.c fll/level_0/utf/map_multi.c fll/level_0/utf/map_multis.c fll/level_0/utf/map_multiss.c fll/level_0/utf/static.c fll/level_0/utf/statics.c fll/level_0/utf/staticss.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/triples.c fll/level_0/utf/tripless.c build_sources_program fll/level_0/utf/private-dynamics.c fll/level_0/utf/private-maps.c fll/level_0/utf/private-map_multis.c fll/level_0/utf/private-string.c fll/level_0/utf/private-triples.c diff --git a/level_0/f_abstruse/c/abstruse/enum.h b/level_0/f_abstruse/c/abstruse/enum.h index 001440c..35260bb 100644 --- a/level_0/f_abstruse/c/abstruse/enum.h +++ b/level_0/f_abstruse/c/abstruse/enum.h @@ -45,8 +45,8 @@ extern "C" { * - map_multis: Maps to f_string_map_multis_t. * - quantity: Maps to f_string_quantity_t. * - quantitys: Maps to f_string_quantitys_t. - * - range: Maps to f_string_range_t. - * - ranges: Maps to f_string_ranges_t. + * - range: Maps to f_range_t. + * - ranges: Maps to f_ranges_t. * - triple: Maps to f_string_triple_t. * - triples: Maps to f_string_triples_t. * - void: Maps to (void *). diff --git a/level_0/f_abstruse/c/abstruse/private-abstruse.c b/level_0/f_abstruse/c/abstruse/private-abstruse.c index 50de219..c94594c 100644 --- a/level_0/f_abstruse/c/abstruse/private-abstruse.c +++ b/level_0/f_abstruse/c/abstruse/private-abstruse.c @@ -138,7 +138,7 @@ extern "C" { case f_abstruse_ranges_e: if (abstruse->is.a_quantitys.size) { - return f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &abstruse->is.a_ranges.array, &abstruse->is.a_ranges.used, &abstruse->is.a_ranges.size); + return f_memory_array_resize(0, sizeof(f_range_t), (void **) &abstruse->is.a_ranges.array, &abstruse->is.a_ranges.used, &abstruse->is.a_ranges.size); } break; @@ -306,7 +306,7 @@ extern "C" { case f_abstruse_ranges_e: if (abstruse->is.a_quantitys.size) { - return f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &abstruse->is.a_ranges.array, &abstruse->is.a_ranges.used, &abstruse->is.a_ranges.size); + return f_memory_array_adjust(0, sizeof(f_range_t), (void **) &abstruse->is.a_ranges.array, &abstruse->is.a_ranges.used, &abstruse->is.a_ranges.size); } break; diff --git a/level_0/f_abstruse/c/abstruse/type.h b/level_0/f_abstruse/c/abstruse/type.h index 879f02d..f5c2e9c 100644 --- a/level_0/f_abstruse/c/abstruse/type.h +++ b/level_0/f_abstruse/c/abstruse/type.h @@ -38,6 +38,8 @@ extern "C" { f_number_signeds_t a_signeds; f_number_unsigned_t a_unsigned; f_number_unsigneds_t a_unsigneds; + f_range_t a_range; + f_ranges_t a_ranges; f_string_t a_string; f_string_t * a_strings; f_string_dynamic_t a_dynamic; @@ -48,8 +50,6 @@ extern "C" { f_string_map_multis_t a_map_multis; f_string_quantity_t a_quantity; f_string_quantitys_t a_quantitys; - f_string_range_t a_range; - f_string_ranges_t a_ranges; f_string_triple_t a_triple; f_string_triples_t a_triples; void * a_void; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_delete_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_delete_callback.c index 3014452..019daa3 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_delete_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_delete_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_maps_delete_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; @@ -52,7 +52,7 @@ void test__f_abstruse_maps_delete_callback__works(void **state) { mock_unwrap_f_memory = 1; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_destroy_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_destroy_callback.c index c8ae558..2efa2ac 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_destroy_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-maps_destroy_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_maps_destroy_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; @@ -52,7 +52,7 @@ void test__f_abstruse_maps_destroy_callback__works(void **state) { mock_unwrap_f_memory = 1; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_delete_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_delete_callback.c index bd4b58d..2acf8c1 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_delete_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_delete_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_mapss_delete_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_destroy_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_destroy_callback.c index 9104f24..c5f7f4d 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_destroy_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-mapss_destroy_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_mapss_destroy_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-s_delete_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-s_delete_callback.c index 4153479..52e078a 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-s_delete_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-s_delete_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_s_delete_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; @@ -46,7 +46,7 @@ void test__f_abstruse_s_delete_callback__works(void **state) { mock_unwrap_f_memory = 1; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-s_destroy_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-s_destroy_callback.c index 4481c89..1a948b1 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-s_destroy_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-s_destroy_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_s_destroy_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; @@ -46,7 +46,7 @@ void test__f_abstruse_s_destroy_callback__works(void **state) { mock_unwrap_f_memory = 1; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_delete_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_delete_callback.c index 4e112da..949ef70 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_delete_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_delete_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_ss_delete_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_destroy_callback.c b/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_destroy_callback.c index 5b5e47d..6205996 100644 --- a/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_destroy_callback.c +++ b/level_0/f_abstruse/tests/unit/c/test-abstruse-ss_destroy_callback.c @@ -11,7 +11,7 @@ void test__f_abstruse_ss_destroy_callback__fails(void **state) { mock_unwrap_f_memory = 0; f_string_t a_string = "example"; - f_string_range_t a_range = macro_f_string_range_t_initialize_1(1, 2); + f_range_t a_range = macro_f_range_t_initialize_1(1, 2); f_string_static_t a_static = macro_f_string_static_t_initialize_1(a_string, 0, 7); f_string_dynamic_t a_dynamic = f_string_dynamic_t_initialize; diff --git a/level_0/f_compare/c/compare.c b/level_0/f_compare/c/compare.c index 625fb88..3af44b8 100644 --- a/level_0/f_compare/c/compare.c +++ b/level_0/f_compare/c/compare.c @@ -83,7 +83,7 @@ extern "C" { #endif // _di_f_compare_dynamic_trim_string_ #ifndef _di_f_compare_dynamic_partial_ - f_status_t f_compare_dynamic_partial(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2) { return private_f_compare( string1.string, @@ -101,7 +101,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_ #ifndef _di_f_compare_dynamic_partial_dynamic_ - f_status_t f_compare_dynamic_partial_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2) { return private_f_compare( string1.string, @@ -117,7 +117,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_dynamic_ #ifndef _di_f_compare_dynamic_partial_string_ - f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2) { return private_f_compare( string1, @@ -133,7 +133,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_string_ #ifndef _di_f_compare_dynamic_partial_except_ - f_status_t f_compare_dynamic_partial_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_dynamic_partial_except(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except( string1.string, @@ -153,7 +153,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_ #ifndef _di_f_compare_dynamic_partial_except_dynamic_ - f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except( string1.string, @@ -171,7 +171,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_dynamic_ #ifndef _di_f_compare_dynamic_partial_except_string_ - f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except( string1, @@ -189,7 +189,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_string_ #ifndef _di_f_compare_dynamic_partial_except_trim_ - f_status_t f_compare_dynamic_partial_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_dynamic_partial_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim( string1.string, @@ -209,7 +209,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_trim_ #ifndef _di_f_compare_dynamic_partial_except_trim_dynamic_ - f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim( string1.string, @@ -227,7 +227,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_trim_dynamic_ #ifndef _di_f_compare_dynamic_partial_except_trim_string_ - f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim( string1, @@ -245,7 +245,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_trim_string_ #ifndef _di_f_compare_dynamic_partial_trim_ - f_status_t f_compare_dynamic_partial_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial_trim(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2) { return private_f_compare_trim( string1.string, @@ -263,7 +263,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_trim_ #ifndef _di_f_compare_dynamic_partial_trim_dynamic_ - f_status_t f_compare_dynamic_partial_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2) { return private_f_compare_trim( string1.string, @@ -279,7 +279,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_trim_dynamic_ #ifndef _di_f_compare_dynamic_partial_trim_string_ - f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2) { return private_f_compare_trim( string1, diff --git a/level_0/f_compare/c/compare.h b/level_0/f_compare/c/compare.h index 8f725c7..d86dc20 100644 --- a/level_0/f_compare/c/compare.h +++ b/level_0/f_compare/c/compare.h @@ -18,6 +18,7 @@ #include #include #include +#include // FLL-0 compare includes. #include @@ -396,7 +397,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_ - extern f_status_t f_compare_dynamic_partial(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2); #endif // _di_f_compare_dynamic_partial_ /** @@ -419,7 +420,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_dynamic_ - extern f_status_t f_compare_dynamic_partial_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2); #endif // _di_f_compare_dynamic_partial_dynamic_ /** @@ -451,7 +452,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_except_ - extern f_status_t f_compare_dynamic_partial_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_dynamic_partial_except(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_ /** @@ -481,7 +482,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_except_dynamic_ - extern f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_dynamic_ /** @@ -515,7 +516,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_except_string_ - extern f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_string_ /** @@ -554,7 +555,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_except_trim_ - extern f_status_t f_compare_dynamic_partial_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_dynamic_partial_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_trim_ /** @@ -591,7 +592,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_except_trim_dynamic_ - extern f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_trim_dynamic_ /** @@ -632,7 +633,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_except_trim_string_ - extern f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_trim_string_ /** @@ -659,7 +660,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_string_ - extern f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2); #endif // _di_f_compare_dynamic_partial_string_ /** @@ -691,7 +692,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_trim_ - extern f_status_t f_compare_dynamic_partial_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial_trim(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range1, const f_range_t range2); #endif // _di_f_compare_dynamic_partial_trim_ /** @@ -721,7 +722,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_trim_dynamic_ - extern f_status_t f_compare_dynamic_partial_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_range_t range2); #endif // _di_f_compare_dynamic_partial_trim_dynamic_ /** @@ -755,7 +756,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_trim_string_ - extern f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2); #endif // _di_f_compare_dynamic_partial_trim_string_ /** diff --git a/level_0/f_compare/c/compare/utf.c b/level_0/f_compare/c/compare/utf.c index 216220e..6d0151b 100644 --- a/level_0/f_compare/c/compare/utf.c +++ b/level_0/f_compare/c/compare/utf.c @@ -69,7 +69,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_trim_string_ #ifndef _di_f_compare_utf_dynamic_partial_ - f_status_t f_compare_utf_dynamic_partial(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2) { return private_f_compare_utf( string1.string, @@ -87,7 +87,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_ #ifndef _di_f_compare_utf_dynamic_partial_dynamic_ - f_status_t f_compare_utf_dynamic_partial_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2) { return private_f_compare_utf( string1.string, @@ -103,7 +103,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_string_ - f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2) { return private_f_compare_utf( string1, @@ -119,7 +119,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_string_ #ifndef _di_f_compare_utf_dynamic_partial_except_ - f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except( string1.string, @@ -139,7 +139,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_ #ifndef _di_f_compare_utf_dynamic_partial_except_dynamic_ - f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except( string1.string, @@ -157,7 +157,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_except_string_ - f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except( string1, @@ -175,7 +175,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_string_ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_ - f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim( string1.string, @@ -195,7 +195,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_trim_ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ - f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim( string1.string, @@ -213,7 +213,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_string_ - f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim( string1, @@ -231,7 +231,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_trim_string_ #ifndef _di_f_compare_utf_dynamic_partial_trim_ - f_status_t f_compare_utf_dynamic_partial_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2) { return private_f_compare_utf_trim( string1.string, @@ -249,7 +249,7 @@ extern "C" { #endif // _di_f_compare_utf_utf_string_dynamic_partial_trim_ #ifndef _di_f_compare_utf_dynamic_partial_trim_dynamic_ - f_status_t f_compare_utf_dynamic_partial_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2) { return private_f_compare_utf_trim( string1.string, @@ -265,7 +265,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_trim_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_trim_string_ - f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2) { return private_f_compare_utf_trim( string1, diff --git a/level_0/f_compare/c/compare/utf.h b/level_0/f_compare/c/compare/utf.h index bc628f0..9f33581 100644 --- a/level_0/f_compare/c/compare/utf.h +++ b/level_0/f_compare/c/compare/utf.h @@ -315,7 +315,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_ - extern f_status_t f_compare_utf_dynamic_partial(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_ /** @@ -338,7 +338,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_dynamic_ - extern f_status_t f_compare_utf_dynamic_partial_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_dynamic_ /** @@ -370,7 +370,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_except_ - extern f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_ /** @@ -400,7 +400,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_except_dynamic_ - extern f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_dynamic_ /** @@ -434,7 +434,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_except_string_ - extern f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_string_ /** @@ -473,7 +473,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_ - extern f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_trim_ /** @@ -510,7 +510,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ - extern f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ /** @@ -551,7 +551,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_string_ - extern f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_trim_string_ /** @@ -578,7 +578,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_string_ - extern f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_string_ /** @@ -610,7 +610,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_trim_ - extern f_status_t f_compare_utf_dynamic_partial_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range1, const f_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_trim_ /** @@ -640,7 +640,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_trim_dynamic_ - extern f_status_t f_compare_utf_dynamic_partial_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_trim_dynamic_ /** @@ -674,7 +674,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_trim_string_ - extern f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_trim_string_ /** diff --git a/level_0/f_compare/data/build/dependencies b/level_0/f_compare/data/build/dependencies index deb9037..64a75fa 100644 --- a/level_0/f_compare/data/build/dependencies +++ b/level_0/f_compare/data/build/dependencies @@ -5,3 +5,4 @@ f_status f_memory f_string f_utf +f_type_array diff --git a/level_0/f_compare/data/build/settings b/level_0/f_compare/data/build/settings index 73b1628..8d7bf7b 100644 --- a/level_0/f_compare/data/build/settings +++ b/level_0/f_compare/data/build/settings @@ -30,7 +30,7 @@ build_indexer_arguments rcs build_language c build_libraries -lc -build_libraries-individual -lf_memory -lf_string -lf_utf +build_libraries-individual -lf_memory -lf_string -lf_type_array -lf_utf build_sources_library compare.c compare/utf.c private-compare.c compare/private-utf.c diff --git a/level_0/f_compare/data/build/settings-tests b/level_0/f_compare/data/build/settings-tests index dceba14..3c6e1e2 100644 --- a/level_0/f_compare/data/build/settings-tests +++ b/level_0/f_compare/data/build/settings-tests @@ -23,7 +23,7 @@ build_indexer_arguments rcs build_language c build_libraries -lc -lcmocka -build_libraries-individual -lf_memory -lf_string -lf_utf -lf_compare +build_libraries-individual -lf_memory -lf_string -lf_type_array -lf_utf -lf_compare build_sources_program test-compare-.c test-compare-dynamic.c test-compare-dynamic_string.c build_sources_program test-compare-dynamic_partial.c test-compare-dynamic_partial_dynamic.c test-compare-dynamic_partial_string.c diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial.c index 13a1e0b..4b8f362 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial.c @@ -173,8 +173,8 @@ void test__f_compare_dynamic_partial__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -266,12 +266,12 @@ void test__f_compare_dynamic_partial__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial(string_1s[i], string_2s[i], f_string_range_empty_c, f_string_range_empty_c); + status = f_compare_dynamic_partial(string_1s[i], string_2s[i], f_range_empty_c, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; - status = f_compare_dynamic_partial(string_1s[i], string_2s[i], f_string_range_empty_c, range_2); + status = f_compare_dynamic_partial(string_1s[i], string_2s[i], f_range_empty_c, range_2); } assert_int_equal(status, expects[i]); @@ -282,7 +282,7 @@ void test__f_compare_dynamic_partial__works(void **state) { range_1.stop = string_1s[i].used - 4; if (i % 8 == 0) { - status = f_compare_dynamic_partial(string_1s[i], string_2s[i], range_1, f_string_range_empty_c); + status = f_compare_dynamic_partial(string_1s[i], string_2s[i], range_1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_dynamic.c index 757d2b6..c00e207 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_dynamic.c @@ -173,7 +173,7 @@ void test__f_compare_dynamic_partial_dynamic__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -265,7 +265,7 @@ void test__f_compare_dynamic_partial_dynamic__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c); + status = f_compare_dynamic_partial_dynamic(string_1s[i], string_2s[i], f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -279,7 +279,7 @@ void test__f_compare_dynamic_partial_dynamic__works(void **state) { for (; i < 64; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c); + status = f_compare_dynamic_partial_dynamic(string_1s[i], string_2s[i], f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c index 8e682bf..bdbe400 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c @@ -90,8 +90,8 @@ void test__f_compare_dynamic_partial_except__works(void **state) { macro_f_string_static_t_initialize_1("SKIPone\0", 0, 8), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -271,7 +271,7 @@ void test__f_compare_dynamic_partial_except__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except(string_1s[i], string_2s[i], range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except(string_1s[i], string_2s[i], range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -287,7 +287,7 @@ void test__f_compare_dynamic_partial_except__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_dynamic_partial_except(string_1s[i], string_2s[i], range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except(string_1s[i], string_2s[i], range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c index 5aaa4f0..f92d015 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c @@ -90,7 +90,7 @@ void test__f_compare_dynamic_partial_except_dynamic__works(void **state) { macro_f_string_static_t_initialize_1("SKIPone\0", 0, 8), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -270,7 +270,7 @@ void test__f_compare_dynamic_partial_except_dynamic__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_dynamic(string_1s[i], string_2s[i], f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -284,7 +284,7 @@ void test__f_compare_dynamic_partial_except_dynamic__works(void **state) { for (; i < 64; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_dynamic(string_1s[i], string_2s[i], f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c index 0de3ecb..c35b08d 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c @@ -173,8 +173,8 @@ void test__f_compare_dynamic_partial_except_string__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -271,7 +271,7 @@ void test__f_compare_dynamic_partial_except_string__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_string(string_1s[i].string, string_2s[i], 0, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_string(string_1s[i].string, string_2s[i], 0, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -287,7 +287,7 @@ void test__f_compare_dynamic_partial_except_string__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_string(string_1s[i].string, string_2s[i], range_1.stop + 1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_string(string_1s[i].string, string_2s[i], range_1.stop + 1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c index 111869b..43c6e52 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c @@ -103,8 +103,8 @@ void test__f_compare_dynamic_partial_except_trim__works(void **state) { macro_f_string_static_t_initialize_1("SKIPone\0\0\0\t", 0, 11), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -284,7 +284,7 @@ void test__f_compare_dynamic_partial_except_trim__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_trim(string_1s[i], string_2s[i], range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_trim(string_1s[i], string_2s[i], range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -300,7 +300,7 @@ void test__f_compare_dynamic_partial_except_trim__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_trim(string_1s[i], string_2s[i], range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_trim(string_1s[i], string_2s[i], range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c index 151cda5..dddbce3 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c @@ -103,7 +103,7 @@ void test__f_compare_dynamic_partial_except_trim_dynamic__works(void **state) { macro_f_string_static_t_initialize_1("SKIPone\0\0\0\t", 0, 11), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -283,7 +283,7 @@ void test__f_compare_dynamic_partial_except_trim_dynamic__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_trim_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_trim_dynamic(string_1s[i], string_2s[i], f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -297,7 +297,7 @@ void test__f_compare_dynamic_partial_except_trim_dynamic__works(void **state) { for (; i < 64; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_trim_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_trim_dynamic(string_1s[i], string_2s[i], f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c index 9a9bedd..e6bd491 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c @@ -186,8 +186,8 @@ void test__f_compare_dynamic_partial_except_trim_string__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -284,7 +284,7 @@ void test__f_compare_dynamic_partial_except_trim_string__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_trim_string(string_1s[i].string, string_2s[i], 0, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_trim_string(string_1s[i].string, string_2s[i], 0, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -300,7 +300,7 @@ void test__f_compare_dynamic_partial_except_trim_string__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_dynamic_partial_except_trim_string(string_1s[i].string, string_2s[i], range_1.stop + 1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_dynamic_partial_except_trim_string(string_1s[i].string, string_2s[i], range_1.stop + 1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_string.c index 59470d8..cb118b6 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_string.c @@ -173,8 +173,8 @@ void test__f_compare_dynamic_partial_string__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -266,7 +266,7 @@ void test__f_compare_dynamic_partial_string__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_string(string_1s[i].string, string_2s[i], 0, f_string_range_empty_c); + status = f_compare_dynamic_partial_string(string_1s[i].string, string_2s[i], 0, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -282,7 +282,7 @@ void test__f_compare_dynamic_partial_string__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_dynamic_partial_string(string_1s[i].string + range_1.start, string_2s[i], (range_1.stop - range_1.start) + 1, f_string_range_empty_c); + status = f_compare_dynamic_partial_string(string_1s[i].string + range_1.start, string_2s[i], (range_1.stop - range_1.start) + 1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim.c index 390dabf..c5721bc 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim.c @@ -186,8 +186,8 @@ void test__f_compare_dynamic_partial_trim__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -279,12 +279,12 @@ void test__f_compare_dynamic_partial_trim__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_trim(string_1s[i], string_2s[i], f_string_range_empty_c, f_string_range_empty_c); + status = f_compare_dynamic_partial_trim(string_1s[i], string_2s[i], f_range_empty_c, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; - status = f_compare_dynamic_partial_trim(string_1s[i], string_2s[i], f_string_range_empty_c, range_2); + status = f_compare_dynamic_partial_trim(string_1s[i], string_2s[i], f_range_empty_c, range_2); } assert_int_equal(status, expects[i]); @@ -295,7 +295,7 @@ void test__f_compare_dynamic_partial_trim__works(void **state) { range_1.stop = string_1s[i].used - 4; if (i % 8 == 0) { - status = f_compare_dynamic_partial_trim(string_1s[i], string_2s[i], range_1, f_string_range_empty_c); + status = f_compare_dynamic_partial_trim(string_1s[i], string_2s[i], range_1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_dynamic.c index 787b31a..2a92cb5 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_dynamic.c @@ -186,7 +186,7 @@ void test__f_compare_dynamic_partial_trim_dynamic__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -278,7 +278,7 @@ void test__f_compare_dynamic_partial_trim_dynamic__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_trim_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c); + status = f_compare_dynamic_partial_trim_dynamic(string_1s[i], string_2s[i], f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -292,7 +292,7 @@ void test__f_compare_dynamic_partial_trim_dynamic__works(void **state) { for (; i < 64; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_trim_dynamic(string_1s[i], string_2s[i], f_string_range_empty_c); + status = f_compare_dynamic_partial_trim_dynamic(string_1s[i], string_2s[i], f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_string.c index e08eeb0..56beb09 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_trim_string.c @@ -186,8 +186,8 @@ void test__f_compare_dynamic_partial_trim_string__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -279,7 +279,7 @@ void test__f_compare_dynamic_partial_trim_string__works(void **state) { for (; i < 8; ++i) { if (i % 8 == 0) { - status = f_compare_dynamic_partial_trim_string(string_1s[i].string, string_2s[i], 0, f_string_range_empty_c); + status = f_compare_dynamic_partial_trim_string(string_1s[i].string, string_2s[i], 0, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -295,7 +295,7 @@ void test__f_compare_dynamic_partial_trim_string__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_dynamic_partial_trim_string(string_1s[i].string + range_1.start, string_2s[i], (range_1.stop - range_1.start) + 1, f_string_range_empty_c); + status = f_compare_dynamic_partial_trim_string(string_1s[i].string + range_1.start, string_2s[i], (range_1.stop - range_1.start) + 1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial.c index 3d00387..1b94a4e 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial.c @@ -173,8 +173,8 @@ void test__f_compare_utf_dynamic_partial__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -278,12 +278,12 @@ void test__f_compare_utf_dynamic_partial__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial(utf_string_1, utf_string_2, f_string_range_empty_c, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial(utf_string_1, utf_string_2, f_range_empty_c, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; - status = f_compare_utf_dynamic_partial(utf_string_1, utf_string_2, f_string_range_empty_c, range_2); + status = f_compare_utf_dynamic_partial(utf_string_1, utf_string_2, f_range_empty_c, range_2); } assert_int_equal(status, expects[i]); @@ -303,7 +303,7 @@ void test__f_compare_utf_dynamic_partial__works(void **state) { range_1.stop = string_1s[i].used - 4; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial(utf_string_1, utf_string_2, range_1, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial(utf_string_1, utf_string_2, range_1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_dynamic.c index 8386309..7d94ca0 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_dynamic.c @@ -173,7 +173,7 @@ void test__f_compare_utf_dynamic_partial_dynamic__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -277,7 +277,7 @@ void test__f_compare_utf_dynamic_partial_dynamic__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_dynamic(utf_string_1, utf_string_2, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -300,7 +300,7 @@ void test__f_compare_utf_dynamic_partial_dynamic__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_dynamic(utf_string_1, utf_string_2, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c index e8a7ae4..43a0758 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c @@ -90,8 +90,8 @@ void test__f_compare_utf_dynamic_partial_except__works(void **state) { macro_f_string_static_t_initialize_1("SKIPone\0", 0, 8), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -283,7 +283,7 @@ void test__f_compare_utf_dynamic_partial_except__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except(utf_string_1, utf_string_2, range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except(utf_string_1, utf_string_2, range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -308,7 +308,7 @@ void test__f_compare_utf_dynamic_partial_except__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except(utf_string_1, utf_string_2, range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except(utf_string_1, utf_string_2, range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c index 9ee8c58..0da8f6f 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c @@ -90,7 +90,7 @@ void test__f_compare_utf_dynamic_partial_except_dynamic__works(void **state) { macro_f_string_static_t_initialize_1("SKIPone\0", 0, 8), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -282,7 +282,7 @@ void test__f_compare_utf_dynamic_partial_except_dynamic__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_dynamic(utf_string_1, utf_string_2, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -305,7 +305,7 @@ void test__f_compare_utf_dynamic_partial_except_dynamic__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_dynamic(utf_string_1, utf_string_2, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c index 494e131..ed6142c 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c @@ -173,8 +173,8 @@ void test__f_compare_utf_dynamic_partial_except_string__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -283,7 +283,7 @@ void test__f_compare_utf_dynamic_partial_except_string__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_string(utf_string_1.string, utf_string_2, 0, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_string(utf_string_1.string, utf_string_2, 0, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -308,7 +308,7 @@ void test__f_compare_utf_dynamic_partial_except_string__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_string(utf_string_1.string, utf_string_2, range_1.stop + 1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_string(utf_string_1.string, utf_string_2, range_1.stop + 1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c index f491a29..271b35d 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c @@ -103,8 +103,8 @@ void test__f_compare_utf_dynamic_partial_except_trim__works(void **state) { macro_f_string_static_t_initialize_1("SKIPone\0\0\0\t", 0, 11), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -296,7 +296,7 @@ void test__f_compare_utf_dynamic_partial_except_trim__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_trim(utf_string_1, utf_string_2, range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_trim(utf_string_1, utf_string_2, range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -321,7 +321,7 @@ void test__f_compare_utf_dynamic_partial_except_trim__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_trim(utf_string_1, utf_string_2, range_1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_trim(utf_string_1, utf_string_2, range_1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c index 608eeb6..520fc44 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c @@ -103,7 +103,7 @@ void test__f_compare_utf_dynamic_partial_except_trim_dynamic__works(void **state macro_f_string_static_t_initialize_1("SKIPone\0\0\0\t", 0, 11), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_string_static_t string_2s[] = { @@ -295,7 +295,7 @@ void test__f_compare_utf_dynamic_partial_except_trim_dynamic__works(void **state assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_trim_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_trim_dynamic(utf_string_1, utf_string_2, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -318,7 +318,7 @@ void test__f_compare_utf_dynamic_partial_except_trim_dynamic__works(void **state assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_trim_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_trim_dynamic(utf_string_1, utf_string_2, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c index 8b4f3bc..64cbaf9 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c @@ -186,8 +186,8 @@ void test__f_compare_utf_dynamic_partial_except_trim_string__works(void **state) macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -296,7 +296,7 @@ void test__f_compare_utf_dynamic_partial_except_trim_string__works(void **state) assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_trim_string(utf_string_1.string, utf_string_2, 0, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_trim_string(utf_string_1.string, utf_string_2, 0, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; @@ -321,7 +321,7 @@ void test__f_compare_utf_dynamic_partial_except_trim_string__works(void **state) range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_except_trim_string(utf_string_1.string, utf_string_2, range_1.stop + 1, f_string_range_empty_c, excepts_1, excepts_2); + status = f_compare_utf_dynamic_partial_except_trim_string(utf_string_1.string, utf_string_2, range_1.stop + 1, f_range_empty_c, excepts_1, excepts_2); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_string.c index b756dda..5e95dfe 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_string.c @@ -173,8 +173,8 @@ void test__f_compare_utf_dynamic_partial_string__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -278,7 +278,7 @@ void test__f_compare_utf_dynamic_partial_string__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_string(utf_string_1.string, utf_string_2, 0, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_string(utf_string_1.string, utf_string_2, 0, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -303,7 +303,7 @@ void test__f_compare_utf_dynamic_partial_string__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_string(utf_string_1.string + range_1.start, utf_string_2, (range_1.stop - range_1.start) + 1, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_string(utf_string_1.string + range_1.start, utf_string_2, (range_1.stop - range_1.start) + 1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim.c index 1d7010a..3252152 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim.c @@ -186,8 +186,8 @@ void test__f_compare_utf_dynamic_partial_trim__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -291,12 +291,12 @@ void test__f_compare_utf_dynamic_partial_trim__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_trim(utf_string_1, utf_string_2, f_string_range_empty_c, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_trim(utf_string_1, utf_string_2, f_range_empty_c, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; - status = f_compare_utf_dynamic_partial_trim(utf_string_1, utf_string_2, f_string_range_empty_c, range_2); + status = f_compare_utf_dynamic_partial_trim(utf_string_1, utf_string_2, f_range_empty_c, range_2); } assert_int_equal(status, expects[i]); @@ -316,7 +316,7 @@ void test__f_compare_utf_dynamic_partial_trim__works(void **state) { range_1.stop = string_1s[i].used - 4; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_trim(utf_string_1, utf_string_2, range_1, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_trim(utf_string_1, utf_string_2, range_1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_dynamic.c index e15a643..57d26b5 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_dynamic.c @@ -186,7 +186,7 @@ void test__f_compare_utf_dynamic_partial_trim_dynamic__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -290,7 +290,7 @@ void test__f_compare_utf_dynamic_partial_trim_dynamic__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_trim_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_trim_dynamic(utf_string_1, utf_string_2, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -313,7 +313,7 @@ void test__f_compare_utf_dynamic_partial_trim_dynamic__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_trim_dynamic(utf_string_1, utf_string_2, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_trim_dynamic(utf_string_1, utf_string_2, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_string.c index 544b15c..a68fcd8 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_trim_string.c @@ -186,8 +186,8 @@ void test__f_compare_utf_dynamic_partial_trim_string__works(void **state) { macro_f_string_static_t_initialize_1("aaone\0", 0, 6), }; - f_string_range_t range_1 = macro_f_string_range_t_initialize_1(3, 9); - f_string_range_t range_2 = macro_f_string_range_t_initialize_1(2, 0); + f_range_t range_1 = macro_f_range_t_initialize_1(3, 9); + f_range_t range_2 = macro_f_range_t_initialize_1(2, 0); const f_status_t expects[] = { @@ -291,7 +291,7 @@ void test__f_compare_utf_dynamic_partial_trim_string__works(void **state) { assert_int_equal(status, F_okay); if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_trim_string(utf_string_1.string, utf_string_2, 0, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_trim_string(utf_string_1.string, utf_string_2, 0, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; @@ -316,7 +316,7 @@ void test__f_compare_utf_dynamic_partial_trim_string__works(void **state) { range_1.stop = string_1s[i].used - 1; if (i % 8 == 0) { - status = f_compare_utf_dynamic_partial_trim_string(utf_string_1.string + range_1.start, utf_string_2, (range_1.stop - range_1.start) + 1, f_string_range_empty_c); + status = f_compare_utf_dynamic_partial_trim_string(utf_string_1.string + range_1.start, utf_string_2, (range_1.stop - range_1.start) + 1, f_range_empty_c); } else { range_2.stop = string_2s[i].used - 1; diff --git a/level_0/f_file/c/file.c b/level_0/f_file/c/file.c index 6fabdd7..4380424 100644 --- a/level_0/f_file/c/file.c +++ b/level_0/f_file/c/file.c @@ -2307,7 +2307,7 @@ extern "C" { #endif // _di_f_file_write_until_ #ifndef _di_f_file_write_range_ - f_status_t f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const written) { + f_status_t f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const written) { if (file.id == -1 || !buffer.used || range.start > range.stop || range.start >= buffer.used || !file.size_write) { if (written) { diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h index 24f4489..d770a77 100644 --- a/level_0/f_file/c/file.h +++ b/level_0/f_file/c/file.h @@ -2578,7 +2578,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_range_ - extern f_status_t f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const written); + extern f_status_t f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const written); #endif // _di_f_file_write_range_ #ifdef __cplusplus diff --git a/level_0/f_file/c/file/stream.c b/level_0/f_file/c/file/stream.c index 471accd..4f5f692 100644 --- a/level_0/f_file/c/file/stream.c +++ b/level_0/f_file/c/file/stream.c @@ -527,7 +527,7 @@ extern "C" { #endif // _di_f_file_stream_write_until_ #ifndef _di_f_file_stream_write_range_ - f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const written) { + f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const written) { if (!file.stream || !buffer.used || range.start > range.stop || range.start >= buffer.used || !file.size_write) { if (written) { diff --git a/level_0/f_file/c/file/stream.h b/level_0/f_file/c/file/stream.h index be5814d..0a31372 100644 --- a/level_0/f_file/c/file/stream.h +++ b/level_0/f_file/c/file/stream.h @@ -518,7 +518,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_file_stream_write_range_ - extern f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const written); + extern f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const written); #endif // _di_f_file_stream_write_range_ #ifdef __cplusplus diff --git a/level_0/f_file/tests/unit/c/test-file-stream_write_range.c b/level_0/f_file/tests/unit/c/test-file-stream_write_range.c index 4023087..541fd9a 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_write_range.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_write_range.c @@ -8,7 +8,7 @@ extern "C" { void test__f_file_stream_write_range__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); { f_file_t file = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -27,7 +27,7 @@ void test__f_file_stream_write_range__fails(void **state) { void test__f_file_stream_write_range__returns_stream_not(void **state) { const f_file_t file = f_file_t_initialize; - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; { const f_status_t status = f_file_stream_write_range(file, f_string_empty_s, range, 0); @@ -41,7 +41,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { f_file_t file = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_file_stream_write_range(file, f_string_empty_s, range, 0); @@ -49,7 +49,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_status_t status = f_file_stream_write_range(file, test, range, 0); @@ -58,7 +58,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); const f_status_t status = f_file_stream_write_range(file, f_string_empty_s, range, 0); @@ -66,7 +66,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; f_number_unsigned_t written = 1; @@ -77,7 +77,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); f_number_unsigned_t written = 1; @@ -89,7 +89,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); f_number_unsigned_t written = 1; @@ -103,7 +103,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { void test__f_file_stream_write_range__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); { f_file_t file = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); diff --git a/level_0/f_file/tests/unit/c/test-file-write_range.c b/level_0/f_file/tests/unit/c/test-file-write_range.c index 0c17787..641140a 100644 --- a/level_0/f_file/tests/unit/c/test-file-write_range.c +++ b/level_0/f_file/tests/unit/c/test-file-write_range.c @@ -8,7 +8,7 @@ extern "C" { void test__f_file_write_range__fails(void **state) { const f_string_static_t path = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); int errnos[] = { EAGAIN, @@ -52,7 +52,7 @@ void test__f_file_write_range__fails(void **state) { void test__f_file_write_range__returns_file_descriptor_not(void **state) { f_file_t file = f_file_t_initialize; - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; file.size_write = 1; @@ -68,7 +68,7 @@ void test__f_file_write_range__returns_data_not(void **state) { const f_file_t file = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_file_write_range(file, f_string_empty_s, range, 0); @@ -76,7 +76,7 @@ void test__f_file_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_string_static_t path = macro_f_string_static_t_initialize_1("test", 0, 4); const f_status_t status = f_file_write_range(file, path, range, 0); @@ -85,7 +85,7 @@ void test__f_file_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); const f_status_t status = f_file_write_range(file, f_string_empty_s, range, 0); @@ -93,7 +93,7 @@ void test__f_file_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; f_number_unsigned_t written = 1; @@ -104,7 +104,7 @@ void test__f_file_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_string_static_t path = macro_f_string_static_t_initialize_1("test", 0, 4); f_number_unsigned_t written = 1; @@ -116,7 +116,7 @@ void test__f_file_write_range__returns_data_not(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); f_number_unsigned_t written = 1; @@ -130,7 +130,7 @@ void test__f_file_write_range__returns_data_not(void **state) { void test__f_file_write_range__works(void **state) { const f_string_static_t path = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); + const f_range_t range = macro_f_range_t_initialize_1(0, 0); { f_file_t file = f_file_t_initialize; diff --git a/level_0/f_fss/c/fss.c b/level_0/f_fss/c/fss.c index 3f5fc11..3bf7cda 100644 --- a/level_0/f_fss/c/fss.c +++ b/level_0/f_fss/c/fss.c @@ -34,7 +34,7 @@ extern "C" { #endif // _di_f_fss_apply_delimit_ #ifndef _di_f_fss_apply_delimit_range_ - void f_fss_apply_delimit_range(const f_number_unsigneds_t delimits, const f_string_range_t range, f_string_static_t * const buffer, f_state_t * const state) { + void f_fss_apply_delimit_range(const f_number_unsigneds_t delimits, const f_range_t range, f_string_static_t * const buffer, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_fss_count_lines_ #ifndef _di_f_fss_count_lines_range_ - void f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const line, f_state_t * const state) { + void f_fss_count_lines_range(const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const line, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; @@ -153,7 +153,7 @@ extern "C" { #endif // _di_f_fss_fail_utf_to_false_ #ifndef _di_f_fss_is_combining_ - f_status_t f_fss_is_combining(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state) { + f_status_t f_fss_is_combining(const f_string_static_t buffer, const f_range_t range, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -180,7 +180,7 @@ extern "C" { #endif // _di_f_fss_is_combining_ #ifndef _di_f_fss_is_graph_ - f_status_t f_fss_is_graph(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state) { + f_status_t f_fss_is_graph(const f_string_static_t buffer, const f_range_t range, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -207,7 +207,7 @@ extern "C" { #endif // _di_f_fss_is_graph_ #ifndef _di_f_fss_is_space_ - f_status_t f_fss_is_space(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state) { + f_status_t f_fss_is_space(const f_string_static_t buffer, const f_range_t range, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -246,7 +246,7 @@ extern "C" { #endif // _di_f_fss_is_space_ #ifndef _di_f_fss_is_zero_width_ - f_status_t f_fss_is_zero_width(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state) { + f_status_t f_fss_is_zero_width(const f_string_static_t buffer, const f_range_t range, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -273,7 +273,7 @@ extern "C" { #endif // _di_f_fss_is_zero_width_ #ifndef _di_f_fss_seek_to_eol_ - void f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_string_range_t * const range, f_state_t * const state) { + void f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_range_t * const range, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; @@ -312,7 +312,7 @@ extern "C" { #endif // _di_f_fss_seek_to_eol_ #ifndef _di_f_fss_skip_past_delimit_ - void f_fss_skip_past_delimit(const f_string_static_t buffer, f_string_range_t * const range, f_state_t * const state) { + void f_fss_skip_past_delimit(const f_string_static_t buffer, f_range_t * const range, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; @@ -351,7 +351,7 @@ extern "C" { #endif // _di_f_fss_skip_past_delimit_ #ifndef _di_f_fss_skip_past_space_ - void f_fss_skip_past_space(const f_string_static_t buffer, f_string_range_t * const range, f_state_t * const state) { + void f_fss_skip_past_space(const f_string_static_t buffer, f_range_t * const range, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h index 48b9e8b..6927693 100644 --- a/level_0/f_fss/c/fss.h +++ b/level_0/f_fss/c/fss.h @@ -79,7 +79,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_apply_delimit_range_ - extern void f_fss_apply_delimit_range(const f_number_unsigneds_t delimits, const f_string_range_t range, f_string_static_t * const buffer, f_state_t * const state); + extern void f_fss_apply_delimit_range(const f_number_unsigneds_t delimits, const f_range_t range, f_string_static_t * const buffer, f_state_t * const state); #endif // _di_f_fss_apply_delimit_range_ /** @@ -135,7 +135,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_count_lines_range_ - extern void f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const line, f_state_t * const state); + extern void f_fss_count_lines_range(const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const line, f_state_t * const state); #endif // _di_f_fss_count_lines_range_ /** @@ -217,7 +217,7 @@ extern "C" { * @see f_utf_is_combining() */ #ifndef _di_f_fss_is_combining_ - extern f_status_t f_fss_is_combining(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state); + extern f_status_t f_fss_is_combining(const f_string_static_t buffer, const f_range_t range, f_state_t * const state); #endif // _di_f_fss_is_combining_ /** @@ -248,7 +248,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_f_fss_is_graph_ - extern f_status_t f_fss_is_graph(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state); + extern f_status_t f_fss_is_graph(const f_string_static_t buffer, const f_range_t range, f_state_t * const state); #endif // _di_f_fss_is_graph_ /** @@ -282,7 +282,7 @@ extern "C" { * @see f_utf_is_zero_width() */ #ifndef _di_f_fss_is_space_ - extern f_status_t f_fss_is_space(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state); + extern f_status_t f_fss_is_space(const f_string_static_t buffer, const f_range_t range, f_state_t * const state); #endif // _di_f_fss_is_space_ /** @@ -315,7 +315,7 @@ extern "C" { * @see f_utf_is_zero_width() */ #ifndef _di_f_fss_is_zero_width_ - extern f_status_t f_fss_is_zero_width(const f_string_static_t buffer, const f_string_range_t range, f_state_t * const state); + extern f_status_t f_fss_is_zero_width(const f_string_static_t buffer, const f_range_t range, f_state_t * const state); #endif // _di_f_fss_is_zero_width_ /** @@ -343,7 +343,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_seek_to_eol_ - extern void f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_string_range_t * const range, f_state_t * const state); + extern void f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_range_t * const range, f_state_t * const state); #endif // _di_f_fss_seek_to_eol_ /** @@ -366,7 +366,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_skip_past_delimit_ - extern void f_fss_skip_past_delimit(const f_string_static_t buffer, f_string_range_t * const range, f_state_t * const state); + extern void f_fss_skip_past_delimit(const f_string_static_t buffer, f_range_t * const range, f_state_t * const state); #endif // _di_f_fss_skip_past_delimit_ /** @@ -406,7 +406,7 @@ extern "C" { * @see f_utf_is_zero_width() */ #ifndef _di_f_fss_skip_past_space_ - extern void f_fss_skip_past_space(const f_string_static_t buffer, f_string_range_t * const range, f_state_t * const state); + extern void f_fss_skip_past_space(const f_string_static_t buffer, f_range_t * const range, f_state_t * const state); #endif // _di_f_fss_skip_past_space_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss/item.c b/level_0/f_fss/c/fss/item.c index 9512981..bdc5eca 100644 --- a/level_0/f_fss/c/fss/item.c +++ b/level_0/f_fss/c/fss/item.c @@ -10,7 +10,7 @@ extern "C" { if (!item) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - return f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &item->content.array, &item->content.used, &item->content.size); + return f_memory_array_resize(0, sizeof(f_range_t), (void **) &item->content.array, &item->content.used, &item->content.size); } #endif // _di_f_fss_item_delete_ @@ -20,7 +20,7 @@ extern "C" { if (!item) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - return f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &item->content.array, &item->content.used, &item->content.size); + return f_memory_array_adjust(0, sizeof(f_range_t), (void **) &item->content.array, &item->content.used, &item->content.size); } #endif // _di_f_fss_item_destroy_ @@ -34,7 +34,7 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].content.size && array[i].content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); if (F_status_is_error(status)) return status; } } // for @@ -54,7 +54,7 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].content.size && array[i].content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); if (F_status_is_error(status)) return status; } } // for @@ -77,7 +77,7 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); if (F_status_is_error(status)) return status; } } // for @@ -106,7 +106,7 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); if (F_status_is_error(status)) return status; } } // for diff --git a/level_0/f_fss/c/fss/item.h b/level_0/f_fss/c/fss/item.h index c3ccb51..e866d26 100644 --- a/level_0/f_fss/c/fss/item.h +++ b/level_0/f_fss/c/fss/item.h @@ -34,19 +34,19 @@ extern "C" { */ #ifndef _di_f_fss_item_t_ typedef struct { - f_string_range_t object; - f_string_ranges_t content; + f_range_t object; + f_ranges_t content; f_number_unsigned_t parent; } f_fss_item_t; - #define f_fss_item_t_initialize { f_string_range_t_initialize, f_string_ranges_t_initialize, 0 } + #define f_fss_item_t_initialize { f_range_t_initialize, f_ranges_t_initialize, 0 } #define macro_f_fss_item_t_initialize_1(object, content, parent) macro_f_number_unsigneds_t_initialize_1(object, content, parent) #define macro_f_fss_item_t_clear(item) \ - macro_f_string_range_t_clear(item.object); \ - macro_f_string_ranges_t_clear(item.content); \ + macro_f_range_t_clear(item.object); \ + macro_f_ranges_t_clear(item.content); \ item.parent = 0; #endif // _di_f_fss_item_t_ diff --git a/level_0/f_fss/c/fss/named.c b/level_0/f_fss/c/fss/named.c index b08c5d2..b6e9f04 100644 --- a/level_0/f_fss/c/fss/named.c +++ b/level_0/f_fss/c/fss/named.c @@ -14,12 +14,12 @@ extern "C" { f_status_t status = F_okay; if (named->objects.size && named->objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &named->objects.array, &named->objects.used, &named->objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &named->objects.array, &named->objects.used, &named->objects.size); if (F_status_is_error(status)) return status; } if (named->contents.size && named->contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &named->contents.array, &named->contents.used, &named->contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &named->contents.array, &named->contents.used, &named->contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } @@ -43,12 +43,12 @@ extern "C" { f_status_t status = F_okay; if (named->objects.size && named->objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &named->objects.array, &named->objects.used, &named->objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &named->objects.array, &named->objects.used, &named->objects.size); if (F_status_is_error(status)) return status; } if (named->contents.size && named->contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &named->contents.array, &named->contents.used, &named->contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &named->contents.array, &named->contents.used, &named->contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } @@ -72,12 +72,12 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); if (F_status_is_error(status)) return status; } if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } @@ -102,12 +102,12 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); if (F_status_is_error(status)) return status; } if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } @@ -135,12 +135,12 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } @@ -174,12 +174,12 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } diff --git a/level_0/f_fss/c/fss/named.h b/level_0/f_fss/c/fss/named.h index d048b13..096dd97 100644 --- a/level_0/f_fss/c/fss/named.h +++ b/level_0/f_fss/c/fss/named.h @@ -30,22 +30,22 @@ extern "C" { */ #ifndef _di_f_fss_named_t_ typedef struct { - f_string_range_t name; + f_range_t name; - f_string_ranges_t objects; - f_string_rangess_t contents; + f_ranges_t objects; + f_rangess_t contents; f_uint8ss_t quotess; } f_fss_named_t; - #define f_fss_named_t_initialize { f_string_range_t_initialize, f_string_ranges_t_initialize, f_string_rangess_t_initialize, f_uint8ss_t_initialize } + #define f_fss_named_t_initialize { f_range_t_initialize, f_ranges_t_initialize, f_rangess_t_initialize, f_uint8ss_t_initialize } #define macro_f_fss_named_t_initialize_1(name, objects, contents, quotess) macro_f_number_unsigneds_t_initialize_1(name, objects, contents, quotess) - #define macro_f_fss_named_t_initialize_2(name) macro_f_number_unsigneds_t_initialize_1(name, f_string_ranges_t_initialize, f_string_rangess_t_initialize, f_uint8ss_t_initialize) + #define macro_f_fss_named_t_initialize_2(name) macro_f_number_unsigneds_t_initialize_1(name, f_ranges_t_initialize, f_rangess_t_initialize, f_uint8ss_t_initialize) #define macro_f_fss_named_t_clear(named) \ - macro_f_string_range_t_clear(named.name) \ - macro_f_string_ranges_t_clear(named.objects) \ - macro_f_string_rangess_t_clear(named.contents) \ + macro_f_range_t_clear(named.name) \ + macro_f_ranges_t_clear(named.objects) \ + macro_f_rangess_t_clear(named.contents) \ macro_f_uint8ss_t_clear(named.quotess) #endif // _di_f_fss_named_t_ diff --git a/level_0/f_fss/c/fss/nest.c b/level_0/f_fss/c/fss/nest.c index 376a411..96b112a 100644 --- a/level_0/f_fss/c/fss/nest.c +++ b/level_0/f_fss/c/fss/nest.c @@ -19,7 +19,7 @@ extern "C" { for (j = 0; j < nest->depth[i].size; ++j) { if (nest->depth[i].array[j].content.size && nest->depth[i].array[j].content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &nest->depth[i].array[j].content.array, &nest->depth[i].array[j].content.used, &nest->depth[i].array[j].content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &nest->depth[i].array[j].content.array, &nest->depth[i].array[j].content.used, &nest->depth[i].array[j].content.size); if (F_status_is_error(status)) return status; } } // for @@ -54,7 +54,7 @@ extern "C" { for (j = 0; j < nest->depth[i].size; ++j) { if (nest->depth[i].array[j].content.size && nest->depth[i].array[j].content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &nest->depth[i].array[j].content.array, &nest->depth[i].array[j].content.used, &nest->depth[i].array[j].content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &nest->depth[i].array[j].content.array, &nest->depth[i].array[j].content.used, &nest->depth[i].array[j].content.size); if (F_status_is_error(status)) return status; } } // for @@ -90,7 +90,7 @@ extern "C" { for (k = 0; k < array[i].depth[j].size; ++k) { if (array[i].depth[j].array[k].content.size && array[i].depth[j].array[k].content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); if (F_status_is_error(status)) return status; } } // for @@ -128,7 +128,7 @@ extern "C" { for (k = 0; k < array[i].depth[j].size; ++k) { if (array[i].depth[j].array[k].content.size && array[i].depth[j].array[k].content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); if (F_status_is_error(status)) return status; } } // for @@ -169,7 +169,7 @@ extern "C" { for (l = 0; l < array[i].array[j].depth[k].size; ++l) { if (array[i].array[j].depth[k].array[l].content.size && array[i].array[j].depth[k].array[l].content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); if (F_status_is_error(status)) return status; } } // for @@ -216,7 +216,7 @@ extern "C" { for (l = 0; l < array[i].array[j].depth[k].size; ++l) { if (array[i].array[j].depth[k].array[l].content.size && array[i].array[j].depth[k].array[l].content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); if (F_status_is_error(status)) return status; } } // for diff --git a/level_0/f_fss/c/fss/set.c b/level_0/f_fss/c/fss/set.c index 1b25f99..a18d0a6 100644 --- a/level_0/f_fss/c/fss/set.c +++ b/level_0/f_fss/c/fss/set.c @@ -14,12 +14,12 @@ extern "C" { f_status_t status = F_okay; if (set->objects.size && set->objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &set->objects.array, &set->objects.used, &set->objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &set->objects.array, &set->objects.used, &set->objects.size); if (F_status_is_error(status)) return status; } if (set->contents.size && set->contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &set->contents.array, &set->contents.used, &set->contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &set->contents.array, &set->contents.used, &set->contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } } @@ -38,12 +38,12 @@ extern "C" { f_status_t status = F_okay; if (set->objects.size && set->objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &set->objects.array, &set->objects.used, &set->objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &set->objects.array, &set->objects.used, &set->objects.size); if (F_status_is_error(status)) return status; } if (set->contents.size && set->contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &set->contents.array, &set->contents.used, &set->contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &set->contents.array, &set->contents.used, &set->contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } } @@ -62,12 +62,12 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); if (F_status_is_error(status)) return status; } if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } } // for @@ -87,12 +87,12 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); if (F_status_is_error(status)) return status; } if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } } // for @@ -115,12 +115,12 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } } // for @@ -149,12 +149,12 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } } // for diff --git a/level_0/f_fss/c/fss/set.h b/level_0/f_fss/c/fss/set.h index fdd98ec..5572155 100644 --- a/level_0/f_fss/c/fss/set.h +++ b/level_0/f_fss/c/fss/set.h @@ -28,17 +28,17 @@ extern "C" { */ #ifndef _di_f_fss_set_t_ typedef struct { - f_string_ranges_t objects; - f_string_rangess_t contents; + f_ranges_t objects; + f_rangess_t contents; } f_fss_set_t; - #define f_fss_set_t_initialize { f_string_ranges_t_initialize, f_string_rangess_t_initialize } + #define f_fss_set_t_initialize { f_ranges_t_initialize, f_rangess_t_initialize } #define macro_f_fss_set_t_initialize_1(objects, contents) { objects, contents } #define macro_f_fss_set_t_clear(set) \ - macro_f_string_ranges_t_clear(set.objects) \ - macro_f_string_rangess_t_clear(set.contents) + macro_f_ranges_t_clear(set.objects) \ + macro_f_rangess_t_clear(set.contents) #endif // _di_f_fss_set_t_ /** diff --git a/level_0/f_fss/c/fss/set_quote.c b/level_0/f_fss/c/fss/set_quote.c index 4bf780f..62f7a79 100644 --- a/level_0/f_fss/c/fss/set_quote.c +++ b/level_0/f_fss/c/fss/set_quote.c @@ -14,12 +14,12 @@ extern "C" { f_status_t status = F_okay; if (set_quote->objects.size && set_quote->objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &set_quote->objects.array, &set_quote->objects.used, &set_quote->objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &set_quote->objects.array, &set_quote->objects.used, &set_quote->objects.size); if (F_status_is_error(status)) return status; } if (set_quote->contents.size && set_quote->contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &set_quote->contents.array, &set_quote->contents.used, &set_quote->contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &set_quote->contents.array, &set_quote->contents.used, &set_quote->contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } @@ -48,12 +48,12 @@ extern "C" { f_status_t status = F_okay; if (set_quote->objects.size && set_quote->objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &set_quote->objects.array, &set_quote->objects.used, &set_quote->objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &set_quote->objects.array, &set_quote->objects.used, &set_quote->objects.size); if (F_status_is_error(status)) return status; } if (set_quote->contents.size && set_quote->contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &set_quote->contents.array, &set_quote->contents.used, &set_quote->contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &set_quote->contents.array, &set_quote->contents.used, &set_quote->contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } @@ -82,12 +82,12 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); if (F_status_is_error(status)) return status; } if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } @@ -117,12 +117,12 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); if (F_status_is_error(status)) return status; } if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } @@ -155,12 +155,12 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_string_rangess_delete_callback); + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } @@ -199,12 +199,12 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_string_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_string_rangess_destroy_callback); + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } diff --git a/level_0/f_fss/c/fss/set_quote.h b/level_0/f_fss/c/fss/set_quote.h index 70093ef..53abde6 100644 --- a/level_0/f_fss/c/fss/set_quote.h +++ b/level_0/f_fss/c/fss/set_quote.h @@ -30,20 +30,20 @@ extern "C" { */ #ifndef _di_f_fss_set_quote_t_ typedef struct { - f_string_ranges_t objects; - f_string_rangess_t contents; + f_ranges_t objects; + f_rangess_t contents; f_uint8s_t objects_quote; f_uint8ss_t contents_quote; } f_fss_set_quote_t; - #define f_fss_set_quote_t_initialize { f_string_ranges_t_initialize, f_string_rangess_t_initialize, f_uint8s_t_initialize, f_uint8ss_t_initialize } + #define f_fss_set_quote_t_initialize { f_ranges_t_initialize, f_rangess_t_initialize, f_uint8s_t_initialize, f_uint8ss_t_initialize } #define macro_f_fss_set_quote_t_initialize_1(objects, contents, objects_quote, contents_quote) { objects, contents, objects_quote, contents_quote } #define macro_f_fss_set_quote_t_clear(set) \ - macro_f_string_ranges_t_clear(set.objects) \ - macro_f_string_rangess_t_clear(set.contents) \ + macro_f_ranges_t_clear(set.objects) \ + macro_f_rangess_t_clear(set.contents) \ macro_f_uint8s_t_clear(set.objects_quote) \ macro_f_uint8ss_t_clear(set.contents_quote) #endif // _di_f_fss_set_quote_t_ diff --git a/level_0/f_fss/c/fss/simple_packet.h b/level_0/f_fss/c/fss/simple_packet.h index 1ca285b..0a9257e 100644 --- a/level_0/f_fss/c/fss/simple_packet.h +++ b/level_0/f_fss/c/fss/simple_packet.h @@ -129,13 +129,13 @@ extern "C" { typedef struct { uint8_t control; uint32_t size; - f_string_range_t payload; + f_range_t payload; } f_fss_simple_packet_range_t; #define f_fss_simple_packet_range_t_initialize { \ 0, \ 0, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ } #define macro_f_fss_simple_packet_range_t_initialize_1(control, size, payload) { \ diff --git a/level_0/f_fss/tests/unit/c/test-fss-apply_delimit_range.c b/level_0/f_fss/tests/unit/c/test-fss-apply_delimit_range.c index 6d58fd1..aefc8c6 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-apply_delimit_range.c +++ b/level_0/f_fss/tests/unit/c/test-fss-apply_delimit_range.c @@ -9,7 +9,7 @@ void test__f_fss_apply_delimit_range__parameter_checking(void **state) { const f_number_unsigneds_t delimits = f_number_unsigneds_t_initialize; f_state_t state_data = f_state_t_initialize; - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; { f_fss_apply_delimit_range(delimits, range, 0, &state_data); @@ -25,7 +25,7 @@ void test__f_fss_apply_delimit_range__returns_data_not(void **state) { f_state_t state_data = f_state_t_initialize; { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; f_string_static_t empty = f_string_static_t_initialize; f_fss_apply_delimit_range(delimits, range, &empty, &state_data); @@ -34,7 +34,7 @@ void test__f_fss_apply_delimit_range__returns_data_not(void **state) { } { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; f_fss_apply_delimit_range(delimits, range, &test, &state_data); @@ -42,7 +42,7 @@ void test__f_fss_apply_delimit_range__returns_data_not(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, test.used - 1); + const f_range_t range = macro_f_range_t_initialize_1(0, test.used - 1); f_string_static_t empty = f_string_static_t_initialize; f_fss_apply_delimit_range(delimits, range, &empty, &state_data); @@ -133,7 +133,7 @@ void test__f_fss_apply_delimit_range__works(void **state) { for (uint8_t i = 0; i < 7; ++i) { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, tests[i].used - 1); + const f_range_t range = macro_f_range_t_initialize_1(0, tests[i].used - 1); f_fss_apply_delimit_range(delimitss[i], range, &tests[i], &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c b/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c index 774ef44..e91f7f6 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c +++ b/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c @@ -8,7 +8,7 @@ extern "C" { void test__f_fss_count_lines_range__parameter_checking(void **state) { f_state_t state_data = f_state_t_initialize; - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; { f_fss_count_lines_range(f_string_empty_s, range, 0, &state_data); @@ -24,7 +24,7 @@ void test__f_fss_count_lines_range__returns_data_not(void **state) { { f_number_unsigned_t line = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_count_lines_range(f_string_empty_s, range, &line, &state_data); @@ -33,7 +33,7 @@ void test__f_fss_count_lines_range__returns_data_not(void **state) { { f_number_unsigned_t line = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_count_lines_range(test, range, &line, &state_data); @@ -42,7 +42,7 @@ void test__f_fss_count_lines_range__returns_data_not(void **state) { { f_number_unsigned_t line = 0; - f_string_range_t range = macro_f_string_range_t_initialize_1(0, test.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, test.used - 1); f_fss_count_lines_range(f_string_empty_s, range, &line, &state_data); @@ -67,7 +67,7 @@ void test__f_fss_count_lines_range__works(void **state) { for (uint8_t i = 0; i < 5; expect += ++i) { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, buffers[i].used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, buffers[i].used - 1); f_fss_count_lines_range(buffers[i], range, &line, &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_combining.c b/level_0/f_fss/tests/unit/c/test-fss-is_combining.c index 73560cd..83817a0 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_combining.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_combining.c @@ -54,7 +54,7 @@ void test__f_fss_is_combining__works(void **state) { for (f_number_unsigned_t i = 0; i < 11; ++i) { - const f_string_range_t range = macro_f_string_range_t_initialize_1(offset[i], tests[i].used - 1); + const f_range_t range = macro_f_range_t_initialize_1(offset[i], tests[i].used - 1); const f_status_t status = f_fss_is_combining(tests[i], range, &state_data); @@ -62,7 +62,7 @@ void test__f_fss_is_combining__works(void **state) { } // for { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_combining(f_string_empty_s, range, &state_data); @@ -70,7 +70,7 @@ void test__f_fss_is_combining__works(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t range = macro_f_range_t_initialize_1(0, 2); const f_status_t status = f_fss_is_combining(f_string_empty_s, range, &state_data); @@ -79,7 +79,7 @@ void test__f_fss_is_combining__works(void **state) { { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_combining(test, range, &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_graph.c b/level_0/f_fss/tests/unit/c/test-fss-is_graph.c index 06bae1e..2985d45 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_graph.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_graph.c @@ -41,7 +41,7 @@ void test__f_fss_is_graph__works(void **state) { for (f_number_unsigned_t i = 0; i < 12; ++i) { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, tests[i].used - 1); + const f_range_t range = macro_f_range_t_initialize_1(0, tests[i].used - 1); const f_status_t status = f_fss_is_graph(tests[i], range, &state_data); @@ -49,7 +49,7 @@ void test__f_fss_is_graph__works(void **state) { } // for { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_graph(f_string_empty_s, range, &state_data); @@ -57,7 +57,7 @@ void test__f_fss_is_graph__works(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t range = macro_f_range_t_initialize_1(0, 2); const f_status_t status = f_fss_is_graph(f_string_empty_s, range, &state_data); @@ -66,7 +66,7 @@ void test__f_fss_is_graph__works(void **state) { { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_graph(test, range, &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_space.c b/level_0/f_fss/tests/unit/c/test-fss-is_space.c index 16dba3d..b1a4a4b 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_space.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_space.c @@ -41,7 +41,7 @@ void test__f_fss_is_space__works(void **state) { for (f_number_unsigned_t i = 0; i < 12; ++i) { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, tests[i].used - 1); + const f_range_t range = macro_f_range_t_initialize_1(0, tests[i].used - 1); const f_status_t status = f_fss_is_space(tests[i], range, &state_data); @@ -49,7 +49,7 @@ void test__f_fss_is_space__works(void **state) { } // for { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_space(f_string_empty_s, range, &state_data); @@ -57,7 +57,7 @@ void test__f_fss_is_space__works(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t range = macro_f_range_t_initialize_1(0, 2); const f_status_t status = f_fss_is_space(f_string_empty_s, range, &state_data); @@ -66,7 +66,7 @@ void test__f_fss_is_space__works(void **state) { { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_space(test, range, &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c b/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c index 7cb28bf..efa97ae 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c @@ -44,7 +44,7 @@ void test__f_fss_is_zero_width__works(void **state) { }; // Use range to designate which part of a string is to be tested. - f_string_range_t ranges[] = { + f_range_t ranges[] = { { .start = 0, .stop = tests[0].used }, { .start = 0, .stop = tests[1].used }, { .start = 0, .stop = tests[2].used }, @@ -69,7 +69,7 @@ void test__f_fss_is_zero_width__works(void **state) { } // for { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_zero_width(f_string_empty_s, range, &state_data); @@ -77,7 +77,7 @@ void test__f_fss_is_zero_width__works(void **state) { } { - const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t range = macro_f_range_t_initialize_1(0, 2); const f_status_t status = f_fss_is_zero_width(f_string_empty_s, range, &state_data); @@ -86,7 +86,7 @@ void test__f_fss_is_zero_width__works(void **state) { { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_fss_is_zero_width(test, range, &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-item_delete.c b/level_0/f_fss/tests/unit/c/test-fss-item_delete.c index 4c310f4..11a3645 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-item_delete.c +++ b/level_0/f_fss/tests/unit/c/test-fss-item_delete.c @@ -41,7 +41,7 @@ void test__f_fss_item_delete__works(void **state) { f_fss_item_t data = f_fss_item_t_initialize; { - const f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.content.array, &data.content.used, &data.content.size); + const f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.content.array, &data.content.used, &data.content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-item_destroy.c b/level_0/f_fss/tests/unit/c/test-fss-item_destroy.c index 5731daf..a91f25a 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-item_destroy.c +++ b/level_0/f_fss/tests/unit/c/test-fss-item_destroy.c @@ -41,7 +41,7 @@ void test__f_fss_item_destroy__works(void **state) { f_fss_item_t data = f_fss_item_t_initialize; { - const f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.content.array, &data.content.used, &data.content.size); + const f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.content.array, &data.content.used, &data.content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-items_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-items_delete_callback.c index 2f81e49..160d6e7 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-items_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-items_delete_callback.c @@ -10,9 +10,9 @@ void test__f_fss_items_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; f_fss_item_t data = { .content = bases }; f_fss_item_t data_array[] = { data }; @@ -40,7 +40,7 @@ void test__f_fss_items_delete_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_item_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-items_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-items_destroy_callback.c index 220eda1..8121b83 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-items_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-items_destroy_callback.c @@ -10,9 +10,9 @@ void test__f_fss_items_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; f_fss_item_t data = { .content = bases }; f_fss_item_t data_array[] = { data }; @@ -40,7 +40,7 @@ void test__f_fss_items_destroy_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_item_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-itemss_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-itemss_delete_callback.c index 3e06f00..abd97ea 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-itemss_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-itemss_delete_callback.c @@ -10,9 +10,9 @@ void test__f_fss_itemss_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; f_fss_item_t data = { .content = bases }; f_fss_item_t data_array[] = { data }; @@ -61,7 +61,7 @@ void test__f_fss_itemss_delete_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-itemss_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-itemss_destroy_callback.c index dbbcebf..0ee4300 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-itemss_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-itemss_destroy_callback.c @@ -10,9 +10,9 @@ void test__f_fss_itemss_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; f_fss_item_t data = { .content = bases }; f_fss_item_t data_array[] = { data }; @@ -61,7 +61,7 @@ void test__f_fss_itemss_destroy_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-named_delete.c b/level_0/f_fss/tests/unit/c/test-fss-named_delete.c index b7c8a9d..fc277cb 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-named_delete.c +++ b/level_0/f_fss/tests/unit/c/test-fss-named_delete.c @@ -10,11 +10,11 @@ void test__f_fss_named_delete__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -87,13 +87,13 @@ void test__f_fss_named_delete__works(void **state) { f_fss_named_t data = f_fss_named_t_initialize; { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); + f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_uint8s_t), (void **) &data.quotess.array, &data.quotess.used, &data.quotess.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-named_destroy.c b/level_0/f_fss/tests/unit/c/test-fss-named_destroy.c index bdee6d7..bdc274a 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-named_destroy.c +++ b/level_0/f_fss/tests/unit/c/test-fss-named_destroy.c @@ -10,11 +10,11 @@ void test__f_fss_named_destroy__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -87,13 +87,13 @@ void test__f_fss_named_destroy__works(void **state) { f_fss_named_t data = f_fss_named_t_initialize; { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); + f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_uint8s_t), (void **) &data.quotess.array, &data.quotess.used, &data.quotess.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-nameds_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-nameds_delete_callback.c index d45261e..1e2e50f 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nameds_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nameds_delete_callback.c @@ -10,11 +10,11 @@ void test__f_fss_nameds_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -82,13 +82,13 @@ void test__f_fss_nameds_delete_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_named_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_uint8s_t), (void **) &datas.array[0].quotess.array, &datas.array[0].quotess.used, &datas.array[0].quotess.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-nameds_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-nameds_destroy_callback.c index 93540f8..ac15a30 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nameds_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nameds_destroy_callback.c @@ -10,11 +10,11 @@ void test__f_fss_nameds_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -82,13 +82,13 @@ void test__f_fss_nameds_destroy_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_named_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_uint8s_t), (void **) &datas.array[0].quotess.array, &datas.array[0].quotess.used, &datas.array[0].quotess.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-namedss_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-namedss_delete_callback.c index 001eede..c2dfae6 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-namedss_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-namedss_delete_callback.c @@ -10,11 +10,11 @@ void test__f_fss_namedss_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -89,10 +89,10 @@ void test__f_fss_namedss_delete_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_named_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_uint8s_t), (void **) &datass.array[0].array[0].quotess.array, &datass.array[0].array[0].quotess.used, &datass.array[0].array[0].quotess.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-namedss_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-namedss_destroy_callback.c index ba993ea..0e94852 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-namedss_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-namedss_destroy_callback.c @@ -10,11 +10,11 @@ void test__f_fss_namedss_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -89,10 +89,10 @@ void test__f_fss_namedss_destroy_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_named_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_uint8s_t), (void **) &datass.array[0].array[0].quotess.array, &datass.array[0].array[0].quotess.used, &datass.array[0].array[0].quotess.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-nest_delete.c b/level_0/f_fss/tests/unit/c/test-fss-nest_delete.c index 7b9c9f6..680dfee 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nest_delete.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nest_delete.c @@ -63,7 +63,7 @@ void test__f_fss_nest_delete__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &data.depth[0].array, &data.depth[0].used, &data.depth[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.depth[0].array[0].content.array, &data.depth[0].array[0].content.used, &data.depth[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.depth[0].array[0].content.array, &data.depth[0].array[0].content.used, &data.depth[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-nest_destroy.c b/level_0/f_fss/tests/unit/c/test-fss-nest_destroy.c index 7546dac..fa3ae1e 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nest_destroy.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nest_destroy.c @@ -63,7 +63,7 @@ void test__f_fss_nest_destroy__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &data.depth[0].array, &data.depth[0].used, &data.depth[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.depth[0].array[0].content.array, &data.depth[0].array[0].content.used, &data.depth[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.depth[0].array[0].content.array, &data.depth[0].array[0].content.used, &data.depth[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-nests_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-nests_delete_callback.c index 03dcae3..188106b 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nests_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nests_delete_callback.c @@ -10,9 +10,9 @@ void test__f_fss_nests_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; f_fss_item_t item = { .content = bases }; f_fss_item_t item_array[] = { item }; @@ -86,7 +86,7 @@ void test__f_fss_nests_delete_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &datas.array[0].depth[0].array, &datas.array[0].depth[0].used, &datas.array[0].depth[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].depth[0].array[0].content.array, &datas.array[0].depth[0].array[0].content.used, &datas.array[0].depth[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].depth[0].array[0].content.array, &datas.array[0].depth[0].array[0].content.used, &datas.array[0].depth[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-nests_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-nests_destroy_callback.c index edf3c92..9ddb53a 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nests_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nests_destroy_callback.c @@ -10,9 +10,9 @@ void test__f_fss_nests_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; f_fss_item_t item = { .content = bases }; f_fss_item_t item_array[] = { item }; @@ -86,7 +86,7 @@ void test__f_fss_nests_destroy_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &datas.array[0].depth[0].array, &datas.array[0].depth[0].used, &datas.array[0].depth[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].depth[0].array[0].content.array, &datas.array[0].depth[0].array[0].content.used, &datas.array[0].depth[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].depth[0].array[0].content.array, &datas.array[0].depth[0].array[0].content.used, &datas.array[0].depth[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-nestss_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-nestss_delete_callback.c index 8367776..6288655 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nestss_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nestss_delete_callback.c @@ -63,7 +63,7 @@ void test__f_fss_nestss_delete_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &datass.array[0].array[0].depth[0].array, &datass.array[0].array[0].depth[0].used, &datass.array[0].array[0].depth[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].depth[0].array[0].content.array, &datass.array[0].array[0].depth[0].array[0].content.used, &datass.array[0].array[0].depth[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].depth[0].array[0].content.array, &datass.array[0].array[0].depth[0].array[0].content.used, &datass.array[0].array[0].depth[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-nestss_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-nestss_destroy_callback.c index e5ea694..9abb9ba 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-nestss_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-nestss_destroy_callback.c @@ -63,7 +63,7 @@ void test__f_fss_nestss_destroy_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_item_t), (void **) &datass.array[0].array[0].depth[0].array, &datass.array[0].array[0].depth[0].used, &datass.array[0].array[0].depth[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].depth[0].array[0].content.array, &datass.array[0].array[0].depth[0].array[0].content.used, &datass.array[0].array[0].depth[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].depth[0].array[0].content.array, &datass.array[0].array[0].depth[0].array[0].content.used, &datass.array[0].array[0].depth[0].array[0].content.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c b/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c index eaa6c2f..e51ab92 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c +++ b/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c @@ -23,7 +23,7 @@ void test__f_fss_seek_to_eol__returns_data_not(void **state) { f_state_t state_data = f_state_t_initialize; { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_seek_to_eol(f_string_empty_s, &range, &state_data); @@ -31,7 +31,7 @@ void test__f_fss_seek_to_eol__returns_data_not(void **state) { } { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_seek_to_eol(test, &range, &state_data); @@ -39,7 +39,7 @@ void test__f_fss_seek_to_eol__returns_data_not(void **state) { } { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, 1); + f_range_t range = macro_f_range_t_initialize_1(0, 1); f_fss_seek_to_eol(f_string_empty_s, &range, &state_data); @@ -66,19 +66,19 @@ void test__f_fss_seek_to_eol__works(void **state) { macro_f_string_static_t_initialize_1("\ntest\n\n", 0, 7), }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, tests[0].used - 1), - macro_f_string_range_t_initialize_1(0, tests[1].used - 1), - macro_f_string_range_t_initialize_1(0, tests[2].used - 1), - macro_f_string_range_t_initialize_1(0, tests[3].used - 1), - macro_f_string_range_t_initialize_1(0, tests[4].used - 1), - macro_f_string_range_t_initialize_1(0, tests[5].used - 1), - macro_f_string_range_t_initialize_1(0, tests[6].used - 2), - macro_f_string_range_t_initialize_1(0, tests[7].used - 2), - macro_f_string_range_t_initialize_1(0, tests[8].used - 2), - macro_f_string_range_t_initialize_1(0, tests[9].used - 2), - macro_f_string_range_t_initialize_1(0, tests[10].used - 2), - macro_f_string_range_t_initialize_1(1, tests[11].used - 2), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, tests[0].used - 1), + macro_f_range_t_initialize_1(0, tests[1].used - 1), + macro_f_range_t_initialize_1(0, tests[2].used - 1), + macro_f_range_t_initialize_1(0, tests[3].used - 1), + macro_f_range_t_initialize_1(0, tests[4].used - 1), + macro_f_range_t_initialize_1(0, tests[5].used - 1), + macro_f_range_t_initialize_1(0, tests[6].used - 2), + macro_f_range_t_initialize_1(0, tests[7].used - 2), + macro_f_range_t_initialize_1(0, tests[8].used - 2), + macro_f_range_t_initialize_1(0, tests[9].used - 2), + macro_f_range_t_initialize_1(0, tests[10].used - 2), + macro_f_range_t_initialize_1(1, tests[11].used - 2), }; f_number_unsigned_t expects[] = { @@ -113,7 +113,7 @@ void test__f_fss_seek_to_eol__works(void **state) { for (uint8_t i = 0; i < 12; ++i) { - f_string_range_t range = ranges[i]; + f_range_t range = ranges[i]; f_fss_seek_to_eol(tests[i], &range, &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_delete.c b/level_0/f_fss/tests/unit/c/test-fss-set_delete.c index 9eba7dd..5ef95bf 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_delete.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_delete.c @@ -10,11 +10,11 @@ void test__f_fss_set_delete__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; f_fss_set_t data = { .objects = objects, .contents = contents }; @@ -47,13 +47,13 @@ void test__f_fss_set_delete__works(void **state) { f_fss_set_t data = f_fss_set_t_initialize; { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); + f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_destroy.c b/level_0/f_fss/tests/unit/c/test-fss-set_destroy.c index e4cc5b6..347651e 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_destroy.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_destroy.c @@ -10,11 +10,11 @@ void test__f_fss_set_destroy__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; f_fss_set_t data = { .objects = objects, .contents = contents }; @@ -47,13 +47,13 @@ void test__f_fss_set_destroy__works(void **state) { f_fss_set_t data = f_fss_set_t_initialize; { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); + f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_quote_delete.c b/level_0/f_fss/tests/unit/c/test-fss-set_quote_delete.c index 6076729..5de75d3 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_quote_delete.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_quote_delete.c @@ -10,11 +10,11 @@ void test__f_fss_set_quote_delete__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -52,13 +52,13 @@ void test__f_fss_set_quote_delete__works(void **state) { f_fss_set_quote_t data = f_fss_set_quote_t_initialize; { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); + f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(uint8_t), (void **) &data.objects_quote.array, &data.objects_quote.used, &data.objects_quote.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_quote_destroy.c b/level_0/f_fss/tests/unit/c/test-fss-set_quote_destroy.c index ecc527e..fc1a61c 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_quote_destroy.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_quote_destroy.c @@ -10,11 +10,11 @@ void test__f_fss_set_quote_destroy__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -52,13 +52,13 @@ void test__f_fss_set_quote_destroy__works(void **state) { f_fss_set_quote_t data = f_fss_set_quote_t_initialize; { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); + f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &data.objects.array, &data.objects.used, &data.objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &data.contents.array, &data.contents.used, &data.contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &data.contents.array[0].array, &data.contents.array[0].used, &data.contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(uint8_t), (void **) &data.objects_quote.array, &data.objects_quote.used, &data.objects_quote.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_quotes_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-set_quotes_delete_callback.c index ddc8f39..9a0a39f 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_quotes_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_quotes_delete_callback.c @@ -10,11 +10,11 @@ void test__f_fss_set_quotes_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -107,13 +107,13 @@ void test__f_fss_set_quotes_delete_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_set_quote_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(uint8_t), (void **) &datas.array[0].objects_quote.array, &datas.array[0].objects_quote.used, &datas.array[0].objects_quote.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_quotes_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-set_quotes_destroy_callback.c index 2714a67..bed1628 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_quotes_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_quotes_destroy_callback.c @@ -10,11 +10,11 @@ void test__f_fss_set_quotes_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -107,13 +107,13 @@ void test__f_fss_set_quotes_destroy_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_set_quote_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(uint8_t), (void **) &datas.array[0].objects_quote.array, &datas.array[0].objects_quote.used, &datas.array[0].objects_quote.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_quotess_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-set_quotess_delete_callback.c index 6e114a1..6a03d3f 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_quotess_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_quotess_delete_callback.c @@ -10,11 +10,11 @@ void test__f_fss_set_quotess_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -115,10 +115,10 @@ void test__f_fss_set_quotess_delete_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_set_quote_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(uint8_t), (void **) &datass.array[0].array[0].objects_quote.array, &datass.array[0].array[0].objects_quote.used, &datass.array[0].array[0].objects_quote.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-set_quotess_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-set_quotess_destroy_callback.c index a866bf4..ebb4da3 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-set_quotess_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-set_quotess_destroy_callback.c @@ -10,11 +10,11 @@ void test__f_fss_set_quotess_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; uint8_t quote_array[] = { 0 }; f_uint8s_t quotes = { .array = quote_array, .used = 0, .size = 1 }; @@ -115,10 +115,10 @@ void test__f_fss_set_quotess_destroy_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_set_quote_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(uint8_t), (void **) &datass.array[0].array[0].objects_quote.array, &datass.array[0].array[0].objects_quote.used, &datass.array[0].array[0].objects_quote.size); diff --git a/level_0/f_fss/tests/unit/c/test-fss-sets_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-sets_delete_callback.c index d5f306d..d61934d 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-sets_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-sets_delete_callback.c @@ -10,11 +10,11 @@ void test__f_fss_sets_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; f_fss_set_t data = { .objects = objects, .contents = contents }; f_fss_set_t data_array[] = { data }; @@ -57,13 +57,13 @@ void test__f_fss_sets_delete_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_set_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-sets_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-sets_destroy_callback.c index 1e0a846..982e7fb 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-sets_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-sets_destroy_callback.c @@ -10,11 +10,11 @@ void test__f_fss_sets_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; f_fss_set_t data = { .objects = objects, .contents = contents }; f_fss_set_t data_array[] = { data }; @@ -57,13 +57,13 @@ void test__f_fss_sets_destroy_callback__works(void **state) { f_status_t status = f_memory_array_resize(length, sizeof(f_fss_set_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].objects.array, &datas.array[0].objects.used, &datas.array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datas.array[0].contents.array, &datas.array[0].contents.used, &datas.array[0].contents.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].contents.array[0].array, &datas.array[0].contents.array[0].used, &datas.array[0].contents.array[0].size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-setss_delete_callback.c b/level_0/f_fss/tests/unit/c/test-fss-setss_delete_callback.c index 28d6150..5733992 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-setss_delete_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-setss_delete_callback.c @@ -10,11 +10,11 @@ void test__f_fss_setss_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; f_fss_set_t data = { .objects = objects, .contents = contents }; f_fss_set_t data_array[] = { data }; @@ -63,10 +63,10 @@ void test__f_fss_setss_delete_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_set_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-setss_destroy_callback.c b/level_0/f_fss/tests/unit/c/test-fss-setss_destroy_callback.c index 88edcb7..57deb6d 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-setss_destroy_callback.c +++ b/level_0/f_fss/tests/unit/c/test-fss-setss_destroy_callback.c @@ -10,11 +10,11 @@ void test__f_fss_setss_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = f_string_range_t_initialize; - f_string_range_t base_array[] = { base }; - f_string_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t objects_array[] = { objects }; - f_string_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; + f_range_t base = f_range_t_initialize; + f_range_t base_array[] = { base }; + f_ranges_t objects = { .array = base_array, .used = 0, .size = 1 }; + f_ranges_t objects_array[] = { objects }; + f_rangess_t contents = { .array = objects_array, .used = 0, .size = 1 }; f_fss_set_t data = { .objects = objects, .contents = contents }; f_fss_set_t data_array[] = { data }; @@ -63,10 +63,10 @@ void test__f_fss_setss_destroy_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_fss_set_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].objects.array, &datass.array[0].array[0].objects.used, &datass.array[0].array[0].objects.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); + status = f_memory_array_resize(1, sizeof(f_ranges_t), (void **) &datass.array[0].array[0].contents.array, &datass.array[0].array[0].contents.used, &datass.array[0].array[0].contents.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c b/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c index 8894699..c0581bf 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c +++ b/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c @@ -23,7 +23,7 @@ void test__f_fss_skip_past_delimit__returns_data_not(void **state) { f_state_t state_data = f_state_t_initialize; { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_skip_past_delimit(f_string_empty_s, &range, &state_data); @@ -31,7 +31,7 @@ void test__f_fss_skip_past_delimit__returns_data_not(void **state) { } { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_skip_past_delimit(test, &range, &state_data); @@ -39,7 +39,7 @@ void test__f_fss_skip_past_delimit__returns_data_not(void **state) { } { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, test.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, test.used - 1); f_fss_skip_past_delimit(f_string_empty_s, &range, &state_data); @@ -47,7 +47,7 @@ void test__f_fss_skip_past_delimit__returns_data_not(void **state) { } { - f_string_range_t range = macro_f_string_range_t_initialize_1(test.used, test.used + 2); + f_range_t range = macro_f_range_t_initialize_1(test.used, test.used + 2); f_fss_skip_past_delimit(test, &range, &state_data); @@ -75,7 +75,7 @@ void test__f_fss_skip_past_delimit__works(void **state) { for (uint8_t i = 0; i < 4; ++i) { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, tests[i].used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, tests[i].used - 1); f_fss_skip_past_delimit(tests[i], &range, &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c b/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c index 5f33f1f..726eceb 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c +++ b/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c @@ -23,7 +23,7 @@ void test__f_fss_skip_past_space__returns_data_not(void **state) { f_state_t state_data = f_state_t_initialize; { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_skip_past_space(f_string_empty_s, &range, &state_data); @@ -31,7 +31,7 @@ void test__f_fss_skip_past_space__returns_data_not(void **state) { } { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_fss_skip_past_space(test, &range, &state_data); @@ -39,7 +39,7 @@ void test__f_fss_skip_past_space__returns_data_not(void **state) { } { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, test.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, test.used - 1); f_fss_skip_past_space(f_string_empty_s, &range, &state_data); @@ -47,7 +47,7 @@ void test__f_fss_skip_past_space__returns_data_not(void **state) { } { - f_string_range_t range = macro_f_string_range_t_initialize_1(test.used, test.used + 2); + f_range_t range = macro_f_range_t_initialize_1(test.used, test.used + 2); f_fss_skip_past_space(test, &range, &state_data); @@ -81,7 +81,7 @@ void test__f_fss_skip_past_space__works(void **state) { for (uint8_t i = 0; i < 7; ++i) { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, tests[i].used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, tests[i].used - 1); f_fss_skip_past_space(tests[i], &range, &state_data); diff --git a/level_0/f_iki/c/iki.c b/level_0/f_iki/c/iki.c index 811847e..64742be 100644 --- a/level_0/f_iki/c/iki.c +++ b/level_0/f_iki/c/iki.c @@ -19,7 +19,7 @@ extern "C" { #endif // _di_f_iki_content_is_ #ifndef _di_f_iki_content_partial_is_ - f_status_t f_iki_content_partial_is(const f_string_static_t content, const f_string_range_t range, const f_string_static_t quote) { + 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); @@ -43,7 +43,7 @@ extern "C" { #endif // _di_f_iki_object_is_ #ifndef _di_f_iki_object_partial_is_ - f_status_t f_iki_object_partial_is(const f_string_static_t object, const f_string_range_t range) { + f_status_t f_iki_object_partial_is(const f_string_static_t object, const f_range_t range) { if (!object.used) return F_data_not; if (range.start > range.stop) return F_data_not_stop; @@ -54,7 +54,7 @@ extern "C" { #endif // _di_f_iki_object_partial_is_ #ifndef _di_f_iki_read_ - void f_iki_read(f_string_static_t * const buffer, f_string_range_t * const range, f_iki_data_t * const data, f_state_t * const state) { + void f_iki_read(f_string_static_t * const buffer, f_range_t * const range, f_iki_data_t * const data, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; @@ -89,7 +89,7 @@ extern "C" { width_max = buffer->used - range->start; } - f_string_range_t found_vocabulary = f_string_range_t_initialize; + f_range_t found_vocabulary = f_range_t_initialize; f_number_unsigned_t found_content = 0; f_number_unsigned_t vocabulary_slash_first = 0; const f_number_unsigned_t delimits_used = data->delimits.used; @@ -322,13 +322,13 @@ extern "C" { } if (buffer->string[range->start] == quote) { - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); if (F_status_is_error(state->status)) break; data->variable.array[data->variable.used].start = found_vocabulary.start; @@ -367,7 +367,7 @@ extern "C" { if (buffer->string[range->start] == quote) { f_number_unsigned_t content_slash_delimits = content_slash_total / 2; - f_string_range_t content_range = f_string_range_t_initialize; + f_range_t content_range = f_range_t_initialize; f_number_unsigned_t i = 0; if (content_slash_total % 2) { @@ -395,13 +395,13 @@ extern "C" { // Valid content's ending quote is not delimited, save and return. if (content_slash_total % 2 == 0) { - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); if (F_status_is_error(state->status)) break; data->variable.array[data->variable.used].start = found_vocabulary.start; diff --git a/level_0/f_iki/c/iki.h b/level_0/f_iki/c/iki.h index fcfc266..f35c296 100644 --- a/level_0/f_iki/c/iki.h +++ b/level_0/f_iki/c/iki.h @@ -78,7 +78,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_iki_content_partial_is_ - extern f_status_t f_iki_content_partial_is(const f_string_static_t content, const f_string_range_t range, const f_string_static_t quote); + extern 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); #endif // _di_f_iki_content_partial_is_ /** @@ -120,7 +120,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_word_dash_plus(). */ #ifndef _di_f_iki_object_partial_is_ - extern f_status_t f_iki_object_partial_is(const f_string_static_t object, const f_string_range_t range); + extern f_status_t f_iki_object_partial_is(const f_string_static_t object, const f_range_t range); #endif // _di_f_iki_object_partial_is_ /** @@ -174,7 +174,7 @@ extern "C" { * @see f_memory_array_increase_by() */ #ifndef _di_f_iki_read_ - extern void f_iki_read(f_string_static_t * const buffer, f_string_range_t * const range, f_iki_data_t * const data, f_state_t * const state); + extern void f_iki_read(f_string_static_t * const buffer, f_range_t * const range, f_iki_data_t * const data, f_state_t * const state); #endif // _di_f_iki_read_ #ifdef __cplusplus diff --git a/level_0/f_iki/c/iki/common.h b/level_0/f_iki/c/iki/common.h index 7fd7e9b..7c14834 100644 --- a/level_0/f_iki/c/iki/common.h +++ b/level_0/f_iki/c/iki/common.h @@ -202,26 +202,26 @@ extern "C" { */ #ifndef _di_f_iki_data_t_ typedef struct { - f_string_ranges_t content; + f_ranges_t content; f_number_unsigneds_t delimits; - f_string_ranges_t variable; - f_string_ranges_t vocabulary; + f_ranges_t variable; + f_ranges_t vocabulary; } f_iki_data_t; #define f_iki_data_t_initialize { \ - f_string_ranges_t_initialize, \ + f_ranges_t_initialize, \ f_number_unsigneds_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_ranges_t_initialize, \ + f_ranges_t_initialize, \ + f_ranges_t_initialize, \ } #define macro_f_iki_data_t_initialize_1(content, delimits, variable, vocabulary) { content, delimits, variable, vocabulary } #define macro_f_iki_data_t_clear(data) \ - f_string_ranges_t_clear(data.content) \ + f_ranges_t_clear(data.content) \ f_number_unsigneds_t_clear(data.delimits) \ - f_string_ranges_t_clear(data.variable) \ - f_string_ranges_t_clear(data.vocabulary) + f_ranges_t_clear(data.variable) \ + f_ranges_t_clear(data.vocabulary) #endif // _di_f_iki_data_t_ /** diff --git a/level_0/f_iki/c/iki/data.c b/level_0/f_iki/c/iki/data.c index 788cfb2..e5e7d73 100644 --- a/level_0/f_iki/c/iki/data.c +++ b/level_0/f_iki/c/iki/data.c @@ -16,7 +16,7 @@ extern "C" { f_status_t status = F_okay; if (data->content.size && data->content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); if (F_status_is_error(status)) return status; } @@ -26,12 +26,12 @@ extern "C" { } if (data->variable.size && data->variable.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); if (F_status_is_error(status)) return status; } if (data->vocabulary.size && data->vocabulary.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); if (F_status_is_error(status)) return status; } } @@ -50,7 +50,7 @@ extern "C" { f_status_t status = F_okay; if (data->content.size && data->content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); if (F_status_is_error(status)) return status; } @@ -60,12 +60,12 @@ extern "C" { } if (data->variable.size && data->variable.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); if (F_status_is_error(status)) return status; } if (data->vocabulary.size && data->vocabulary.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &data->vocabulary.array, &data->vocabulary.used, &data->vocabulary.size); if (F_status_is_error(status)) return status; } } @@ -90,7 +90,7 @@ extern "C" { destination->array[destination->used].vocabulary.used = 0; if (source.content.used) { - status = f_string_ranges_append_all(source.content, &destination->array[destination->used].content); + status = f_ranges_append_all(source.content, &destination->array[destination->used].content); if (F_status_is_error(status)) return status; } @@ -103,12 +103,12 @@ extern "C" { } if (source.variable.used) { - status = f_string_ranges_append_all(source.variable, &destination->array[destination->used].variable); + status = f_ranges_append_all(source.variable, &destination->array[destination->used].variable); if (F_status_is_error(status)) return status; } if (source.vocabulary.used) { - status = f_string_ranges_append_all(source.vocabulary, &destination->array[destination->used].vocabulary); + status = f_ranges_append_all(source.vocabulary, &destination->array[destination->used].vocabulary); if (F_status_is_error(status)) return status; } } @@ -141,7 +141,7 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].content.size && array[i].content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); if (F_status_is_error(status)) return status; } @@ -151,12 +151,12 @@ extern "C" { } if (array[i].variable.size && array[i].variable.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); if (F_status_is_error(status)) return status; } if (array[i].vocabulary.size && array[i].vocabulary.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); if (F_status_is_error(status)) return status; } } // for @@ -176,7 +176,7 @@ extern "C" { for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].content.size && array[i].content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); if (F_status_is_error(status)) return status; } @@ -186,12 +186,12 @@ extern "C" { } if (array[i].variable.size && array[i].variable.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); if (F_status_is_error(status)) return status; } if (array[i].vocabulary.size && array[i].vocabulary.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); if (F_status_is_error(status)) return status; } } // for @@ -263,7 +263,7 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); if (F_status_is_error(status)) return status; } @@ -273,12 +273,12 @@ extern "C" { } if (array[i].array[j].variable.size && array[i].array[j].variable.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].vocabulary.size && array[i].array[j].vocabulary.array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); if (F_status_is_error(status)) return status; } } // for @@ -307,7 +307,7 @@ extern "C" { for (j = 0; j < array[i].size; ++j) { if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); if (F_status_is_error(status)) return status; } @@ -317,12 +317,12 @@ extern "C" { } if (array[i].array[j].variable.size && array[i].array[j].variable.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); if (F_status_is_error(status)) return status; } if (array[i].array[j].vocabulary.size && array[i].array[j].vocabulary.array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); if (F_status_is_error(status)) return status; } } // for diff --git a/level_0/f_iki/c/iki/data.h b/level_0/f_iki/c/iki/data.h index 51de838..7241899 100644 --- a/level_0/f_iki/c/iki/data.h +++ b/level_0/f_iki/c/iki/data.h @@ -70,11 +70,11 @@ extern "C" { * * Errors (with error bit) from: f_memory_array_append(). * Errors (with error bit) from: f_memory_array_increase(). - * Errors (with error bit) from: f_string_ranges_append_all(). + * Errors (with error bit) from: f_ranges_append_all(). * * @see f_memory_array_append() * @see f_memory_array_increase() - * @see f_string_ranges_append_all() + * @see f_ranges_append_all() */ #ifndef _di_f_iki_datas_append_ extern f_status_t f_iki_datas_append(const f_iki_data_t source, f_iki_datas_t * const destination); @@ -96,11 +96,11 @@ extern "C" { * * Errors (with error bit) from: f_memory_array_append(). * Errors (with error bit) from: f_memory_array_increase_by(). - * Errors (with error bit) from: f_string_ranges_append_all(). + * Errors (with error bit) from: f_ranges_append_all(). * * @see f_memory_array_append() * @see f_memory_array_increase_by() - * @see f_string_ranges_append_all() + * @see f_ranges_append_all() */ #ifndef _di_f_iki_datas_append_all_ extern f_status_t f_iki_datas_append_all(const f_iki_datas_t source, f_iki_datas_t * const destination); diff --git a/level_0/f_iki/c/iki/private-data.c b/level_0/f_iki/c/iki/private-data.c index 82feac2..f5459ec 100644 --- a/level_0/f_iki/c/iki/private-data.c +++ b/level_0/f_iki/c/iki/private-data.c @@ -22,7 +22,7 @@ extern "C" { destination->array[destination->used].vocabulary.used = 0; if (source.array[i].content.used) { - status = f_string_ranges_append_all(source.array[i].content, &destination->array[destination->used].content); + status = f_ranges_append_all(source.array[i].content, &destination->array[destination->used].content); if (F_status_is_error(status)) return status; } @@ -33,12 +33,12 @@ extern "C" { } // for if (source.array[i].variable.used) { - status = f_string_ranges_append_all(source.array[i].variable, &destination->array[destination->used].variable); + status = f_ranges_append_all(source.array[i].variable, &destination->array[destination->used].variable); if (F_status_is_error(status)) return status; } if (source.array[i].vocabulary.used) { - status = f_string_ranges_append_all(source.array[i].vocabulary, &destination->array[destination->used].vocabulary); + status = f_ranges_append_all(source.array[i].vocabulary, &destination->array[destination->used].vocabulary); if (F_status_is_error(status)) return status; } } // for diff --git a/level_0/f_iki/c/iki/private-data.h b/level_0/f_iki/c/iki/private-data.h index b25adf4..48f3a79 100644 --- a/level_0/f_iki/c/iki/private-data.h +++ b/level_0/f_iki/c/iki/private-data.h @@ -30,11 +30,11 @@ extern "C" { * * Errors (with error bit) from: f_memory_array_append(). * Errors (with error bit) from: f_memory_array_increase_by(). - * Errors (with error bit) from: f_string_ranges_append_all(). + * Errors (with error bit) from: f_ranges_append_all(). * * @see f_memory_array_append() * @see f_memory_array_increase_by() - * @see f_string_ranges_append_all() + * @see f_ranges_append_all() * * @see f_iki_datass_append() * @see f_iki_datass_append_all() diff --git a/level_0/f_iki/tests/unit/c/test-iki-content_partial_is.c b/level_0/f_iki/tests/unit/c/test-iki-content_partial_is.c index c1d5324..da14f29 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-content_partial_is.c +++ b/level_0/f_iki/tests/unit/c/test-iki-content_partial_is.c @@ -21,18 +21,18 @@ void test__f_iki_content_partial_is__returns_false(void **state) { macro_f_string_static_t_initialize_1("xxxx\"false\"xxxx", 0, 15), }; - const f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(4, 10), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 10), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 5), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 10), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 5), + const f_range_t ranges[] = { + macro_f_range_t_initialize_1(4, 10), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 10), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 5), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 10), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 5), }; const f_string_static_t quotes[] = { @@ -60,7 +60,7 @@ void test__f_iki_content_partial_is__returns_false(void **state) { void test__f_iki_content_partial_is__parameter_checking(void **state) { { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_iki_content_partial_is(f_string_empty_s, range, f_string_empty_s); @@ -71,7 +71,7 @@ void test__f_iki_content_partial_is__parameter_checking(void **state) { void test__f_iki_content_partial_is__returns_data_not(void **state) { { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_iki_content_partial_is(f_string_empty_s, range, f_string_ascii_quote_single_s); @@ -82,7 +82,7 @@ void test__f_iki_content_partial_is__returns_data_not(void **state) { void test__f_iki_content_partial_is__returns_data_not_eos(void **state) { { - const f_string_range_t range = macro_f_string_range_t_initialize_1(f_string_ascii_a_s.used, f_string_ascii_a_s.used); + const f_range_t range = macro_f_range_t_initialize_1(f_string_ascii_a_s.used, f_string_ascii_a_s.used); const f_status_t status = f_iki_content_partial_is(f_string_ascii_a_s, range, f_string_ascii_quote_single_s); @@ -93,7 +93,7 @@ void test__f_iki_content_partial_is__returns_data_not_eos(void **state) { void test__f_iki_content_partial_is__returns_data_not_stop(void **state) { { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_iki_content_partial_is(f_string_ascii_a_s, range, f_string_ascii_quote_single_s); @@ -114,15 +114,15 @@ void test__f_iki_content_partial_is__returns_true(void **state) { macro_f_string_static_t_initialize_1("xxxx\\\"work\\\"s\\\"xxxx", 0, 19), }; - const f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(4, 8), - macro_f_string_range_t_initialize_1(4, 13), - macro_f_string_range_t_initialize_1(4, 12), - macro_f_string_range_t_initialize_1(4, 13), - macro_f_string_range_t_initialize_1(4, 14), - macro_f_string_range_t_initialize_1(4, 12), - macro_f_string_range_t_initialize_1(4, 13), - macro_f_string_range_t_initialize_1(4, 14), + const f_range_t ranges[] = { + macro_f_range_t_initialize_1(4, 8), + macro_f_range_t_initialize_1(4, 13), + macro_f_range_t_initialize_1(4, 12), + macro_f_range_t_initialize_1(4, 13), + macro_f_range_t_initialize_1(4, 14), + macro_f_range_t_initialize_1(4, 12), + macro_f_range_t_initialize_1(4, 13), + macro_f_range_t_initialize_1(4, 14), }; const f_string_static_t quotes[] = { diff --git a/level_0/f_iki/tests/unit/c/test-iki-datas_append.c b/level_0/f_iki/tests/unit/c/test-iki-datas_append.c index 7d39944..f6cf316 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datas_append.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datas_append.c @@ -14,7 +14,7 @@ void test__f_iki_datas_append__works(void **state) { { f_number_unsigned_t i = 1; - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.content.array, &source.content.used, &source.content.size); + f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.content.array, &source.content.used, &source.content.size); assert_int_equal(status, F_okay); assert_int_equal(source.content.size, length); @@ -24,12 +24,12 @@ void test__f_iki_datas_append__works(void **state) { assert_int_equal(status, F_okay); assert_int_equal(source.delimits.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.variable.array, &source.variable.used, &source.variable.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.variable.array, &source.variable.used, &source.variable.size); assert_int_equal(status, F_okay); assert_int_equal(source.variable.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.vocabulary.array, &source.vocabulary.used, &source.vocabulary.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.vocabulary.array, &source.vocabulary.used, &source.vocabulary.size); assert_int_equal(status, F_okay); assert_int_equal(source.vocabulary.size, length); diff --git a/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c b/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c index 3866f4c..64a2d44 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c @@ -22,7 +22,7 @@ void test__f_iki_datas_append_all__works(void **state) { for (; j < 2; ++j) { - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[j].content.array, &source.array[j].content.used, &source.array[j].content.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[j].content.array, &source.array[j].content.used, &source.array[j].content.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[j].content.size, length); @@ -32,12 +32,12 @@ void test__f_iki_datas_append_all__works(void **state) { assert_int_equal(status, F_okay); assert_int_equal(source.array[j].delimits.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[j].variable.array, &source.array[j].variable.used, &source.array[j].variable.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[j].variable.array, &source.array[j].variable.used, &source.array[j].variable.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[j].variable.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[j].vocabulary.array, &source.array[j].vocabulary.used, &source.array[j].vocabulary.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[j].vocabulary.array, &source.array[j].vocabulary.used, &source.array[j].vocabulary.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[j].vocabulary.size, length); diff --git a/level_0/f_iki/tests/unit/c/test-iki-datas_delete_callback.c b/level_0/f_iki/tests/unit/c/test-iki-datas_delete_callback.c index 1b55bba..902816f 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datas_delete_callback.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datas_delete_callback.c @@ -10,15 +10,15 @@ void test__f_iki_datas_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t content = bases; + f_ranges_t content = bases; f_number_unsigned_t delimit_array[] = { 0 }; f_number_unsigneds_t delimits = { .array = delimit_array, .used = 0, .size = 1 }; - f_string_ranges_t variable = bases; - f_string_ranges_t vocabulary = bases; + f_ranges_t variable = bases; + f_ranges_t vocabulary = bases; f_iki_data_t data = { .content = content, .delimits = delimits, .variable = variable, .vocabulary = vocabulary }; f_iki_data_t data_array[] = { data }; @@ -106,16 +106,16 @@ void test__f_iki_datas_delete_callback__works(void **state) { f_status_t status = f_memory_array_resize(1, sizeof(f_iki_data_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_number_unsigned_t), (void **) &datas.array[0].delimits.array, &datas.array[0].delimits.used, &datas.array[0].delimits.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].variable.array, &datas.array[0].variable.used, &datas.array[0].variable.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].variable.array, &datas.array[0].variable.used, &datas.array[0].variable.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].vocabulary.array, &datas.array[0].vocabulary.used, &datas.array[0].vocabulary.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].vocabulary.array, &datas.array[0].vocabulary.used, &datas.array[0].vocabulary.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_iki/tests/unit/c/test-iki-datas_destroy_callback.c b/level_0/f_iki/tests/unit/c/test-iki-datas_destroy_callback.c index 5a1bd56..3439b42 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datas_destroy_callback.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datas_destroy_callback.c @@ -10,15 +10,15 @@ void test__f_iki_datas_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t content = bases; + f_ranges_t content = bases; f_number_unsigned_t delimit_array[] = { 0 }; f_number_unsigneds_t delimits = { .array = delimit_array, .used = 0, .size = 1 }; - f_string_ranges_t variable = bases; - f_string_ranges_t vocabulary = bases; + f_ranges_t variable = bases; + f_ranges_t vocabulary = bases; f_iki_data_t data = { .content = content, .delimits = delimits, .variable = variable, .vocabulary = vocabulary }; f_iki_data_t data_array[] = { data }; @@ -106,16 +106,16 @@ void test__f_iki_datas_destroy_callback__works(void **state) { f_status_t status = f_memory_array_resize(1, sizeof(f_iki_data_t), (void **) &datas.array, &datas.used, &datas.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].content.array, &datas.array[0].content.used, &datas.array[0].content.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_number_unsigned_t), (void **) &datas.array[0].delimits.array, &datas.array[0].delimits.used, &datas.array[0].delimits.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].variable.array, &datas.array[0].variable.used, &datas.array[0].variable.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].variable.array, &datas.array[0].variable.used, &datas.array[0].variable.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datas.array[0].vocabulary.array, &datas.array[0].vocabulary.used, &datas.array[0].vocabulary.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datas.array[0].vocabulary.array, &datas.array[0].vocabulary.used, &datas.array[0].vocabulary.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_iki/tests/unit/c/test-iki-datass_append.c b/level_0/f_iki/tests/unit/c/test-iki-datass_append.c index f9ab654..b912e3e 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datass_append.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datass_append.c @@ -22,7 +22,7 @@ void test__f_iki_datass_append__works(void **state) { for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[j].content.array, &source.array[j].content.used, &source.array[j].content.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[j].content.array, &source.array[j].content.used, &source.array[j].content.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[j].content.size, length); @@ -32,12 +32,12 @@ void test__f_iki_datass_append__works(void **state) { assert_int_equal(status, F_okay); assert_int_equal(source.array[j].delimits.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[j].variable.array, &source.array[j].variable.used, &source.array[j].variable.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[j].variable.array, &source.array[j].variable.used, &source.array[j].variable.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[j].variable.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[j].vocabulary.array, &source.array[j].vocabulary.used, &source.array[j].vocabulary.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[j].vocabulary.array, &source.array[j].vocabulary.used, &source.array[j].vocabulary.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[j].vocabulary.size, length); diff --git a/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c b/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c index 7281c40..b675710 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c @@ -31,7 +31,7 @@ void test__f_iki_datass_append_all__works(void **state) { for (j = 0; j < length_inner; ++j) { - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[source.used].array[j].content.array, &source.array[source.used].array[j].content.used, &source.array[source.used].array[j].content.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[source.used].array[j].content.array, &source.array[source.used].array[j].content.used, &source.array[source.used].array[j].content.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[source.used].array[j].content.size, length); @@ -41,12 +41,12 @@ void test__f_iki_datass_append_all__works(void **state) { assert_int_equal(status, F_okay); assert_int_equal(source.array[source.used].array[j].delimits.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[source.used].array[j].variable.array, &source.array[source.used].array[j].variable.used, &source.array[source.used].array[j].variable.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[source.used].array[j].variable.array, &source.array[source.used].array[j].variable.used, &source.array[source.used].array[j].variable.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[source.used].array[j].variable.size, length); - status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array[source.used].array[j].vocabulary.array, &source.array[source.used].array[j].vocabulary.used, &source.array[source.used].array[j].vocabulary.size); + status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array[source.used].array[j].vocabulary.array, &source.array[source.used].array[j].vocabulary.used, &source.array[source.used].array[j].vocabulary.size); assert_int_equal(status, F_okay); assert_int_equal(source.array[source.used].array[j].vocabulary.size, length); diff --git a/level_0/f_iki/tests/unit/c/test-iki-datass_delete_callback.c b/level_0/f_iki/tests/unit/c/test-iki-datass_delete_callback.c index 6bd0cde..a942937 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datass_delete_callback.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datass_delete_callback.c @@ -10,15 +10,15 @@ void test__f_iki_datass_delete_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t content = bases; + f_ranges_t content = bases; f_number_unsigned_t delimit_array[] = { 0 }; f_number_unsigneds_t delimits = { .array = delimit_array, .used = 0, .size = 1 }; - f_string_ranges_t variable = bases; - f_string_ranges_t vocabulary = bases; + f_ranges_t variable = bases; + f_ranges_t vocabulary = bases; f_iki_data_t data = { .content = content, .delimits = delimits, .variable = variable, .vocabulary = vocabulary }; f_iki_data_t data_array[] = { data }; @@ -141,16 +141,16 @@ void test__f_iki_datass_delete_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_iki_data_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_number_unsigned_t), (void **) &datass.array[0].array[0].delimits.array, &datass.array[0].array[0].delimits.used, &datass.array[0].array[0].delimits.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].variable.array, &datass.array[0].array[0].variable.used, &datass.array[0].array[0].variable.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].variable.array, &datass.array[0].array[0].variable.used, &datass.array[0].array[0].variable.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].vocabulary.array, &datass.array[0].array[0].vocabulary.used, &datass.array[0].array[0].vocabulary.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].vocabulary.array, &datass.array[0].array[0].vocabulary.used, &datass.array[0].array[0].vocabulary.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_iki/tests/unit/c/test-iki-datass_destroy_callback.c b/level_0/f_iki/tests/unit/c/test-iki-datass_destroy_callback.c index 8422b7f..5511021 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datass_destroy_callback.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datass_destroy_callback.c @@ -10,15 +10,15 @@ void test__f_iki_datass_destroy_callback__fails(void **state) { mock_unwrap = 0; mock_unwrap_f_memory = 0; - f_string_range_t base = macro_f_string_range_t_initialize_1(1, 0); - f_string_range_t base_array[] = { base }; - f_string_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; + f_range_t base = macro_f_range_t_initialize_1(1, 0); + f_range_t base_array[] = { base }; + f_ranges_t bases = { .array = base_array, .used = 0, .size = 1 }; - f_string_ranges_t content = bases; + f_ranges_t content = bases; f_number_unsigned_t delimit_array[] = { 0 }; f_number_unsigneds_t delimits = { .array = delimit_array, .used = 0, .size = 1 }; - f_string_ranges_t variable = bases; - f_string_ranges_t vocabulary = bases; + f_ranges_t variable = bases; + f_ranges_t vocabulary = bases; f_iki_data_t data = { .content = content, .delimits = delimits, .variable = variable, .vocabulary = vocabulary }; f_iki_data_t data_array[] = { data }; @@ -141,16 +141,16 @@ void test__f_iki_datass_destroy_callback__works(void **state) { status = f_memory_array_resize(1, sizeof(f_iki_data_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].content.array, &datass.array[0].array[0].content.used, &datass.array[0].array[0].content.size); assert_int_equal(status, F_okay); status = f_memory_array_resize(1, sizeof(f_number_unsigned_t), (void **) &datass.array[0].array[0].delimits.array, &datass.array[0].array[0].delimits.used, &datass.array[0].array[0].delimits.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].variable.array, &datass.array[0].array[0].variable.used, &datass.array[0].array[0].variable.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].variable.array, &datass.array[0].array[0].variable.used, &datass.array[0].array[0].variable.size); assert_int_equal(status, F_okay); - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array[0].vocabulary.array, &datass.array[0].array[0].vocabulary.used, &datass.array[0].array[0].vocabulary.size); + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array[0].vocabulary.array, &datass.array[0].array[0].vocabulary.used, &datass.array[0].array[0].vocabulary.size); assert_int_equal(status, F_okay); } diff --git a/level_0/f_iki/tests/unit/c/test-iki-object_partial_is.c b/level_0/f_iki/tests/unit/c/test-iki-object_partial_is.c index ed27fbf..3989ca4 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-object_partial_is.c +++ b/level_0/f_iki/tests/unit/c/test-iki-object_partial_is.c @@ -24,21 +24,21 @@ void test__f_iki_object_partial_is__returns_false(void **state) { macro_f_string_static_t_initialize_1("xxxx'false'xxxx", 0, 15), }; - const f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 10), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 10), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 10), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 10), + const f_range_t ranges[] = { + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 10), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 10), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 10), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 10), }; for (uint8_t i = 0; i < 14; ++i) { @@ -52,7 +52,7 @@ void test__f_iki_object_partial_is__returns_false(void **state) { void test__f_iki_object_partial_is__returns_data_not(void **state) { { - const f_string_range_t range = f_string_range_t_initialize; + const f_range_t range = f_range_t_initialize; const f_status_t status = f_iki_object_partial_is(f_string_empty_s, range); @@ -63,7 +63,7 @@ void test__f_iki_object_partial_is__returns_data_not(void **state) { void test__f_iki_object_partial_is__returns_data_not_eos(void **state) { { - const f_string_range_t range = macro_f_string_range_t_initialize_1(f_string_ascii_a_s.used, f_string_ascii_a_s.used); + const f_range_t range = macro_f_range_t_initialize_1(f_string_ascii_a_s.used, f_string_ascii_a_s.used); const f_status_t status = f_iki_object_partial_is(f_string_ascii_a_s, range); @@ -74,7 +74,7 @@ void test__f_iki_object_partial_is__returns_data_not_eos(void **state) { void test__f_iki_object_partial_is__returns_data_not_stop(void **state) { { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_iki_object_partial_is(f_string_ascii_a_s, range); @@ -92,12 +92,12 @@ void test__f_iki_object_partial_is__returns_true(void **state) { macro_f_string_static_t_initialize_1("xxxxw_-+sxxxx", 0, 13), }; - const f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(4, 8), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 9), - macro_f_string_range_t_initialize_1(4, 10), - macro_f_string_range_t_initialize_1(4, 8), + const f_range_t ranges[] = { + macro_f_range_t_initialize_1(4, 8), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 9), + macro_f_range_t_initialize_1(4, 10), + macro_f_range_t_initialize_1(4, 8), }; for (uint8_t i = 0; i < 5; ++i) { diff --git a/level_0/f_iki/tests/unit/c/test-iki-read.c b/level_0/f_iki/tests/unit/c/test-iki-read.c index eabffaf..d1f7f39 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-read.c +++ b/level_0/f_iki/tests/unit/c/test-iki-read.c @@ -11,7 +11,7 @@ void test__f_iki_read__parameter_checking(void **state) { f_string_static_t empty = macro_f_string_static_t_initialize_1(f_string_empty_s.string, f_string_empty_s.size, f_string_empty_s.used); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_iki_data_t iki = f_iki_data_t_initialize; f_iki_read(0, &range, &iki, &state_data); @@ -28,7 +28,7 @@ void test__f_iki_read__parameter_checking(void **state) { } { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_iki_read(&empty, &range, 0, &state_data); @@ -42,7 +42,7 @@ void test__f_iki_read__returns_data_not(void **state) { f_string_static_t empty = macro_f_string_static_t_initialize_1(f_string_empty_s.string, f_string_empty_s.size, f_string_empty_s.used); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_iki_data_t iki = f_iki_data_t_initialize; f_iki_read(&empty, &range, &iki, &state_data); @@ -57,7 +57,7 @@ void test__f_iki_read__returns_data_not_eos(void **state) { f_string_static_t ascii_a = macro_f_string_static_t_initialize_1(f_string_ascii_a_s.string, f_string_ascii_a_s.size, f_string_ascii_a_s.used); { - f_string_range_t range = macro_f_string_range_t_initialize_1(f_string_ascii_a_s.used, f_string_ascii_a_s.used); + f_range_t range = macro_f_range_t_initialize_1(f_string_ascii_a_s.used, f_string_ascii_a_s.used); f_iki_data_t iki = f_iki_data_t_initialize; f_iki_read(&ascii_a, &range, &iki, &state_data); @@ -72,7 +72,7 @@ void test__f_iki_read__returns_data_not_stop(void **state) { f_string_static_t ascii_a = macro_f_string_static_t_initialize_1(f_string_ascii_a_s.string, f_string_ascii_a_s.size, f_string_ascii_a_s.used); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_iki_data_t iki = f_iki_data_t_initialize; f_iki_read(&ascii_a, &range, &iki, &state_data); @@ -164,84 +164,84 @@ void test__f_iki_read__works(void **state) { F_okay, }; - const f_string_range_t variables[][22] = { - { f_string_range_t_initialize, f_string_range_t_initialize }, - { f_string_range_t_initialize, f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(0, 8), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 12), macro_f_string_range_t_initialize_1(14, 33) }, - { macro_f_string_range_t_initialize_1(0, 8), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 12), macro_f_string_range_t_initialize_1(14, 33) }, - { macro_f_string_range_t_initialize_1(24, 36), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(24, 36), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 22), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 22), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 23), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 21), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 22), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 22), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 23), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 21), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 42), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 42), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 43), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 43), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(0, 66), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(0, 66), f_string_range_t_initialize }, + const f_range_t variables[][22] = { + { f_range_t_initialize, f_range_t_initialize }, + { f_range_t_initialize, f_range_t_initialize }, + { macro_f_range_t_initialize_1(0, 8), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 12), macro_f_range_t_initialize_1(14, 33) }, + { macro_f_range_t_initialize_1(0, 8), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 12), macro_f_range_t_initialize_1(14, 33) }, + { macro_f_range_t_initialize_1(24, 36), f_range_t_initialize }, + { macro_f_range_t_initialize_1(24, 36), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 22), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 22), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 23), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 21), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 22), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 22), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 23), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 21), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 42), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 42), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 43), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 43), f_range_t_initialize }, + { macro_f_range_t_initialize_1(0, 66), f_range_t_initialize }, + { macro_f_range_t_initialize_1(0, 66), f_range_t_initialize }, }; - const f_string_range_t vocabularys[][22] = { - { f_string_range_t_initialize, f_string_range_t_initialize }, - { f_string_range_t_initialize, f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(0, 2), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 6), macro_f_string_range_t_initialize_1(14, 16) }, - { macro_f_string_range_t_initialize_1(0, 2), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 6), macro_f_string_range_t_initialize_1(14, 16) }, - { macro_f_string_range_t_initialize_1(24, 27), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(24, 27), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 11), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 9), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 11), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 9), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(4, 10), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(0, 2), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(0, 2), f_string_range_t_initialize }, + const f_range_t vocabularys[][22] = { + { f_range_t_initialize, f_range_t_initialize }, + { f_range_t_initialize, f_range_t_initialize }, + { macro_f_range_t_initialize_1(0, 2), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 6), macro_f_range_t_initialize_1(14, 16) }, + { macro_f_range_t_initialize_1(0, 2), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 6), macro_f_range_t_initialize_1(14, 16) }, + { macro_f_range_t_initialize_1(24, 27), f_range_t_initialize }, + { macro_f_range_t_initialize_1(24, 27), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 11), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 9), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 11), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 9), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(4, 10), f_range_t_initialize }, + { macro_f_range_t_initialize_1(0, 2), f_range_t_initialize }, + { macro_f_range_t_initialize_1(0, 2), f_range_t_initialize }, }; - const f_string_range_t contents[][22] = { - { f_string_range_t_initialize, f_string_range_t_initialize }, - { f_string_range_t_initialize, f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 7), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(9, 11), macro_f_string_range_t_initialize_1(19, 32) }, - { macro_f_string_range_t_initialize_1(5, 7), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(9, 11), macro_f_string_range_t_initialize_1(19, 32) }, - { macro_f_string_range_t_initialize_1(30, 35), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(30, 35), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 21), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 21), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(14, 22), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(12, 20), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 21), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 21), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(14, 22), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(12, 20), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 41), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 41), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 42), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(13, 42), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 65), f_string_range_t_initialize }, - { macro_f_string_range_t_initialize_1(5, 65), f_string_range_t_initialize }, + const f_range_t contents[][22] = { + { f_range_t_initialize, f_range_t_initialize }, + { f_range_t_initialize, f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 7), f_range_t_initialize }, + { macro_f_range_t_initialize_1(9, 11), macro_f_range_t_initialize_1(19, 32) }, + { macro_f_range_t_initialize_1(5, 7), f_range_t_initialize }, + { macro_f_range_t_initialize_1(9, 11), macro_f_range_t_initialize_1(19, 32) }, + { macro_f_range_t_initialize_1(30, 35), f_range_t_initialize }, + { macro_f_range_t_initialize_1(30, 35), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 21), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 21), f_range_t_initialize }, + { macro_f_range_t_initialize_1(14, 22), f_range_t_initialize }, + { macro_f_range_t_initialize_1(12, 20), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 21), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 21), f_range_t_initialize }, + { macro_f_range_t_initialize_1(14, 22), f_range_t_initialize }, + { macro_f_range_t_initialize_1(12, 20), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 41), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 41), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 42), f_range_t_initialize }, + { macro_f_range_t_initialize_1(13, 42), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 65), f_range_t_initialize }, + { macro_f_range_t_initialize_1(5, 65), f_range_t_initialize }, }; for (uint8_t i = 0; i < 22; ++i) { - f_string_range_t range = macro_f_string_range_t_initialize_2(buffers[i].used); + f_range_t range = macro_f_range_t_initialize_2(buffers[i].used); f_iki_data_t iki = f_iki_data_t_initialize; f_iki_read(&buffers[i], &range, &iki, &state_data); diff --git a/level_0/f_network/c/network.c b/level_0/f_network/c/network.c index 2dedc5b..dd0f22a 100644 --- a/level_0/f_network/c/network.c +++ b/level_0/f_network/c/network.c @@ -112,7 +112,7 @@ extern "C" { #endif // _di_f_network_from_ip_string_ #ifndef _di_f_network_is_ip_address_ - void f_network_is_ip_address(const f_string_static_t address, f_string_range_double_t * const where, f_state_t * const state) { + void f_network_is_ip_address(const f_string_static_t address, f_range_double_t * const where, f_state_t * const state) { if (!state) return; @@ -126,7 +126,7 @@ extern "C" { uint8_t flag = 0x0; // 0x1 == is IPv6. uint8_t set = 0; uint8_t count = 0; - f_string_range_double_t at = f_string_range_double_t_initialize; + f_range_double_t at = f_range_double_t_initialize; for (; i < address.used; ++i) { diff --git a/level_0/f_network/c/network.h b/level_0/f_network/c/network.h index 63a73bf..a3b7dd5 100644 --- a/level_0/f_network/c/network.h +++ b/level_0/f_network/c/network.h @@ -205,7 +205,7 @@ extern "C" { * F_interrupt (with or without error bit) if stopping due to an interrupt. */ #ifndef _di_f_network_is_ip_address_ - extern void f_network_is_ip_address(const f_string_static_t address, f_string_range_double_t * const where, f_state_t * const state); + extern void f_network_is_ip_address(const f_string_static_t address, f_range_double_t * const where, f_state_t * const state); #endif // _di_f_network_is_ip_address_ /** diff --git a/level_0/f_parse/c/parse.c b/level_0/f_parse/c/parse.c index 6b3e1ac..84308d1 100644 --- a/level_0/f_parse/c/parse.c +++ b/level_0/f_parse/c/parse.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_f_parse_dynamic_seek_line_to_utf_character_ - f_status_t f_parse_dynamic_seek_line_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range) { + f_status_t f_parse_dynamic_seek_line_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -60,7 +60,7 @@ extern "C" { #endif // _di_f_parse_dynamic_seek_line_to_utf_character_ #ifndef _di_f_parse_dynamic_seek_line_until_graph_ - f_status_t f_parse_dynamic_seek_line_until_graph(const f_string_static_t buffer, const uint8_t placeholder, f_string_range_t * const range) { + f_status_t f_parse_dynamic_seek_line_until_graph(const f_string_static_t buffer, const uint8_t placeholder, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -109,7 +109,7 @@ extern "C" { #endif // _di_f_parse_dynamic_seek_line_until_graph_ #ifndef _di_f_parse_dynamic_seek_line_until_graph_non_ - f_status_t f_parse_dynamic_seek_line_until_graph_non(const f_string_static_t buffer, const uint8_t placeholder, f_string_range_t * const range) { + f_status_t f_parse_dynamic_seek_line_until_graph_non(const f_string_static_t buffer, const uint8_t placeholder, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -158,7 +158,7 @@ extern "C" { #endif // _di_f_parse_dynamic_seek_line_until_graph_non_ #ifndef _di_f_parse_dynamic_seek_to_utf_character_ - f_status_t f_parse_dynamic_seek_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range) { + f_status_t f_parse_dynamic_seek_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -215,7 +215,7 @@ extern "C" { #endif // _di_f_parse_dynamic_seek_to_utf_character_ #ifndef _di_f_parse_dynamic_partial_fll_identify_ - f_status_t f_parse_dynamic_partial_fll_identify(const f_string_static_t buffer, f_string_range_t * const range, f_fll_id_t * const id) { + f_status_t f_parse_dynamic_partial_fll_identify(const f_string_static_t buffer, f_range_t * const range, f_fll_id_t * const id) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -468,7 +468,7 @@ extern "C" { #endif // _di_f_parse_dynamic_partial_fll_identify_ #ifndef _di_f_parse_seek_line_to_utf_character_ - f_status_t f_parse_seek_line_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_parse_seek_line_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -516,7 +516,7 @@ extern "C" { #endif // _di_f_parse_seek_line_to_utf_character_ #ifndef _di_f_parse_seek_line_until_graph_ - f_status_t f_parse_seek_line_until_graph(const f_string_t string, const uint8_t placeholder, f_string_range_t * const range) { + f_status_t f_parse_seek_line_until_graph(const f_string_t string, const uint8_t placeholder, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -561,7 +561,7 @@ extern "C" { #endif // _di_f_parse_seek_line_until_graph_ #ifndef _di_f_parse_seek_line_until_graph_non_ - f_status_t f_parse_seek_line_until_graph_non(const f_string_t string, const uint8_t placeholder, f_string_range_t * const range) { + f_status_t f_parse_seek_line_until_graph_non(const f_string_t string, const uint8_t placeholder, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -607,7 +607,7 @@ extern "C" { #endif // _di_f_parse_seek_line_until_graph_non_ #ifndef _di_f_parse_seek_to_utf_character_ - f_status_t f_parse_seek_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_parse_seek_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_parse/c/parse.h b/level_0/f_parse/c/parse.h index 539d946..18aae5a 100644 --- a/level_0/f_parse/c/parse.h +++ b/level_0/f_parse/c/parse.h @@ -57,7 +57,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_f_parse_dynamic_seek_line_to_utf_character_ - extern f_status_t f_parse_dynamic_seek_line_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range); + extern f_status_t f_parse_dynamic_seek_line_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range); #endif // _di_f_parse_dynamic_seek_line_to_utf_character_ /** @@ -90,7 +90,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_f_parse_dynamic_seek_line_until_graph_ - extern f_status_t f_parse_dynamic_seek_line_until_graph(const f_string_static_t buffer, const uint8_t placeholder, f_string_range_t * const range); + extern f_status_t f_parse_dynamic_seek_line_until_graph(const f_string_static_t buffer, const uint8_t placeholder, f_range_t * const range); #endif // _di_f_parse_dynamic_seek_line_until_graph_ /** @@ -123,7 +123,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_f_parse_dynamic_seek_line_until_graph_non_ - extern f_status_t f_parse_dynamic_seek_line_until_graph_non(const f_string_static_t buffer, const uint8_t placeholder, f_string_range_t * const range); + extern f_status_t f_parse_dynamic_seek_line_until_graph_non(const f_string_static_t buffer, const uint8_t placeholder, f_range_t * const range); #endif // _di_f_parse_dynamic_seek_line_until_graph_non_ /** @@ -157,7 +157,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_f_parse_dynamic_seek_to_utf_character_ - extern f_status_t f_parse_dynamic_seek_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range); + extern f_status_t f_parse_dynamic_seek_to_utf_character(const f_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range); #endif // _di_f_parse_dynamic_seek_to_utf_character_ /** @@ -213,7 +213,7 @@ extern "C" { * @see f_utf_is_word() */ #ifndef _di_f_parse_dynamic_partial_fll_identify_ - extern f_status_t f_parse_dynamic_partial_fll_identify(const f_string_static_t buffer, f_string_range_t * const range, f_fll_id_t * const id); + extern f_status_t f_parse_dynamic_partial_fll_identify(const f_string_static_t buffer, f_range_t * const range, f_fll_id_t * const id); #endif // _di_f_parse_dynamic_partial_fll_identify_ /** @@ -242,7 +242,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_f_parse_seek_line_to_utf_character_ - extern f_status_t f_parse_seek_line_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_parse_seek_line_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_parse_seek_line_to_utf_character_ /** @@ -271,7 +271,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_f_parse_seek_line_until_graph_ - extern f_status_t f_parse_seek_line_until_graph(const f_string_t string, const uint8_t placeholder, f_string_range_t * const range); + extern f_status_t f_parse_seek_line_until_graph(const f_string_t string, const uint8_t placeholder, f_range_t * const range); #endif // _di_f_parse_seek_line_until_graph_ /** @@ -303,7 +303,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_parse_seek_line_until_graph_non_ - extern f_status_t f_parse_seek_line_until_graph_non(const f_string_t string, const uint8_t placeholder, f_string_range_t * const range); + extern f_status_t f_parse_seek_line_until_graph_non(const f_string_t string, const uint8_t placeholder, f_range_t * const range); #endif // _di_f_parse_seek_line_until_graph_non_ /** @@ -332,7 +332,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_f_parse_seek_to_utf_character_ - extern f_status_t f_parse_seek_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_parse_seek_to_utf_character(const f_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_parse_seek_to_utf_character_ #ifdef __cplusplus diff --git a/level_0/f_parse/c/parse/utf.c b/level_0/f_parse/c/parse/utf.c index 0310853..d18c5ef 100644 --- a/level_0/f_parse/c/parse/utf.c +++ b/level_0/f_parse/c/parse/utf.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_f_parse_utf_dynamic_seek_line_to_char_ - f_status_t f_parse_utf_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_char_t seek_to_this) { + f_status_t f_parse_utf_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_range_t * const range, const f_char_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -44,7 +44,7 @@ extern "C" { #endif // _di_f_parse_utf_dynamic_seek_line_to_char_ #ifndef _di_f_parse_utf_dynamic_seek_line_until_graph_ - f_status_t f_parse_utf_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_utf_char_t placeholder) { + f_status_t f_parse_utf_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_range_t * const range, const f_utf_char_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -91,7 +91,7 @@ extern "C" { #endif // _di_f_parse_utf_dynamic_seek_line_until_graph_ #ifndef _di_f_parse_utf_dynamic_seek_line_until_graph_non_ - f_status_t f_parse_utf_dynamic_seek_line_until_graph_non(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_utf_char_t placeholder) { + f_status_t f_parse_utf_dynamic_seek_line_until_graph_non(const f_utf_string_static_t buffer, f_range_t * const range, const f_utf_char_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -128,7 +128,7 @@ extern "C" { #endif // _di_f_parse_utf_dynamic_seek_line_until_graph_non_ #ifndef _di_f_parse_utf_dynamic_seek_to_char_ - f_status_t f_parse_utf_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_char_t seek_to_this) { + f_status_t f_parse_utf_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_range_t * const range, const f_char_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -165,7 +165,7 @@ extern "C" { #endif // _di_f_parse_utf_dynamic_seek_to_char_ #ifndef _di_f_parse_utf_seek_line_to_char_ - f_status_t f_parse_utf_seek_line_to_char(const f_utf_string_t string, f_string_range_t * const range, const f_char_t seek_to_this) { + f_status_t f_parse_utf_seek_line_to_char(const f_utf_string_t string, f_range_t * const range, const f_char_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -196,7 +196,7 @@ extern "C" { #endif // _di_f_parse_utf_seek_line_to_char_ #ifndef _di_f_parse_utf_seek_line_until_graph_ - f_status_t f_parse_utf_seek_line_until_graph(const f_utf_string_t string, f_string_range_t * const range, const f_utf_char_t placeholder) { + f_status_t f_parse_utf_seek_line_until_graph(const f_utf_string_t string, f_range_t * const range, const f_utf_char_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -239,7 +239,7 @@ extern "C" { #endif // _di_f_parse_utf_seek_line_until_graph_ #ifndef _di_f_parse_utf_seek_line_until_graph_non_ - f_status_t f_parse_utf_seek_line_until_graph_non(const f_utf_string_t string, f_string_range_t * const range, const f_utf_char_t placeholder) { + f_status_t f_parse_utf_seek_line_until_graph_non(const f_utf_string_t string, f_range_t * const range, const f_utf_char_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -282,7 +282,7 @@ extern "C" { #endif // _di_f_parse_utf_seek_line_until_graph_non_ #ifndef _di_f_parse_utf_seek_to_char_ - f_status_t f_parse_utf_seek_to_char(const f_utf_string_t string, f_string_range_t * const range, const f_char_t seek_to_this) { + f_status_t f_parse_utf_seek_to_char(const f_utf_string_t string, f_range_t * const range, const f_char_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_0/f_parse/c/parse/utf.h b/level_0/f_parse/c/parse/utf.h index 208e263..dc85c65 100644 --- a/level_0/f_parse/c/parse/utf.h +++ b/level_0/f_parse/c/parse/utf.h @@ -36,7 +36,7 @@ extern "C" { * F_utf_fragment (with error bit) if character is a UTF-8 fragment. */ #ifndef _di_f_parse_utf_dynamic_seek_line_to_char_ - extern f_status_t f_parse_utf_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_char_t seek_to_this); + extern f_status_t f_parse_utf_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_range_t * const range, const f_char_t seek_to_this); #endif // _di_f_parse_utf_dynamic_seek_line_to_char_ /** @@ -64,7 +64,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_f_parse_utf_dynamic_seek_line_until_graph_ - extern f_status_t f_parse_utf_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_utf_char_t placeholder); + extern f_status_t f_parse_utf_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_range_t * const range, const f_utf_char_t placeholder); #endif // _di_f_parse_utf_dynamic_seek_line_until_graph_ /** @@ -93,7 +93,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_f_parse_utf_dynamic_seek_line_until_graph_non_ - extern f_status_t f_parse_utf_dynamic_seek_line_until_graph_non(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_utf_char_t placeholder); + extern f_status_t f_parse_utf_dynamic_seek_line_until_graph_non(const f_utf_string_static_t buffer, f_range_t * const range, const f_utf_char_t placeholder); #endif // _di_f_parse_utf_dynamic_seek_line_until_graph_non_ /** @@ -118,7 +118,7 @@ extern "C" { * F_utf_fragment (with error bit) if character is a UTF-8 fragment. */ #ifndef _di_f_parse_utf_dynamic_seek_to_char_ - extern f_status_t f_parse_utf_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_string_range_t * const range, const f_char_t seek_to_this); + extern f_status_t f_parse_utf_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_range_t * const range, const f_char_t seek_to_this); #endif // _di_f_parse_utf_dynamic_seek_to_char_ /** @@ -142,7 +142,7 @@ extern "C" { * F_utf_fragment (with error bit) if character is a UTF-8 fragment. */ #ifndef _di_f_parse_utf_seek_line_to_char_ - extern f_status_t f_parse_utf_seek_line_to_char(const f_utf_string_t string, f_string_range_t * const range, const f_char_t seek_to_this); + extern f_status_t f_parse_utf_seek_line_to_char(const f_utf_string_t string, f_range_t * const range, const f_char_t seek_to_this); #endif // _di_f_parse_utf_seek_line_to_char_ /** @@ -169,7 +169,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_f_parse_utf_seek_line_until_graph_ - extern f_status_t f_parse_utf_seek_line_until_graph(const f_utf_string_t string, f_string_range_t * const range, const f_utf_char_t placeholder); + extern f_status_t f_parse_utf_seek_line_until_graph(const f_utf_string_t string, f_range_t * const range, const f_utf_char_t placeholder); #endif // _di_f_parse_utf_seek_line_until_graph_ /** @@ -197,7 +197,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_f_parse_utf_seek_line_until_graph_non_ - extern f_status_t f_parse_utf_seek_line_until_graph_non(const f_utf_string_t string, f_string_range_t * const range, const f_utf_char_t placeholder); + extern f_status_t f_parse_utf_seek_line_until_graph_non(const f_utf_string_t string, f_range_t * const range, const f_utf_char_t placeholder); #endif // _di_f_parse_utf_seek_line_until_graph_non_ /** @@ -221,7 +221,7 @@ extern "C" { * F_utf_fragment (with error bit) if character is a UTF-8 fragment. */ #ifndef _di_f_parse_utf_seek_to_character_ - extern f_status_t f_parse_utf_seek_to_char(const f_utf_string_t string, f_string_range_t * const range, const f_char_t seek_to_this); + extern f_status_t f_parse_utf_seek_to_char(const f_utf_string_t string, f_range_t * const range, const f_char_t seek_to_this); #endif // _di_fl_utf_string__seek_to_character_ #ifdef __cplusplus diff --git a/level_0/f_print/c/print.c b/level_0/f_print/c/print.c index a50861d..0e1dee1 100644 --- a/level_0/f_print/c/print.c +++ b/level_0/f_print/c/print.c @@ -102,7 +102,7 @@ extern "C" { #endif // _di_f_print_dynamic_ #ifndef _di_f_print_dynamic_partial_ - f_status_t f_print_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -118,7 +118,7 @@ extern "C" { #endif // _di_f_print_dynamic_partial_ #ifndef _di_f_print_dynamic_partial_raw_ - f_status_t f_print_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -134,7 +134,7 @@ extern "C" { #endif // _di_f_print_dynamic_partial_raw_ #ifndef _di_f_print_dynamic_partial_raw_safely_ - f_status_t f_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -150,7 +150,7 @@ extern "C" { #endif // _di_f_print_dynamic_partial_raw_safely_ #ifndef _di_f_print_dynamic_partial_safely_ - f_status_t f_print_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -216,7 +216,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_ #ifndef _di_f_print_except_dynamic_partial_ - f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -232,7 +232,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_ #ifndef _di_f_print_except_dynamic_partial_raw_ - f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -248,7 +248,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_raw_ #ifndef _di_f_print_except_dynamic_partial_raw_safely_ - f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_raw_safely_ #ifndef _di_f_print_except_dynamic_partial_safely_ - f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -310,7 +310,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_safely_ #ifndef _di_f_print_except_in_ - f_status_t f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -320,7 +320,7 @@ extern "C" { #endif // _di_f_print_except_in_ #ifndef _di_f_print_except_in_dynamic_ - f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -330,7 +330,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_ #ifndef _di_f_print_except_in_dynamic_partial_ - f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -346,7 +346,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_ #ifndef _di_f_print_except_in_dynamic_partial_raw_ - f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -362,7 +362,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_raw_ #ifndef _di_f_print_except_in_dynamic_partial_raw_safely_ - f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -378,7 +378,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_raw_safely_ #ifndef _di_f_print_except_in_dynamic_partial_safely_ - f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -394,7 +394,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_safely_ #ifndef _di_f_print_except_in_dynamic_raw_ - f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -404,7 +404,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_raw_ #ifndef _di_f_print_except_in_dynamic_raw_safely_ - f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -414,7 +414,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_raw_safely_ #ifndef _di_f_print_except_in_dynamic_safely_ - f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -424,7 +424,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_safely_ #ifndef _di_f_print_except_in_raw_ - f_status_t f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -434,7 +434,7 @@ extern "C" { #endif // _di_f_print_except_in_raw_ #ifndef _di_f_print_except_in_raw_safely_ - f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -444,7 +444,7 @@ extern "C" { #endif // _di_f_print_except_in_raw_safely_ #ifndef _di_f_print_except_in_safely_ - f_status_t f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h index 8cd1f98..914c337 100644 --- a/level_0/f_print/c/print.h +++ b/level_0/f_print/c/print.h @@ -221,7 +221,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_dynamic_partial_ - extern f_status_t f_print_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_dynamic_partial_ /** @@ -256,7 +256,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_dynamic_partial_raw_ - extern f_status_t f_print_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_dynamic_partial_raw_ /** @@ -296,7 +296,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_dynamic_partial_raw_safely_ - extern f_status_t f_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_dynamic_partial_raw_safely_ /** @@ -334,7 +334,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_dynamic_partial_safely_ - extern f_status_t f_print_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_dynamic_partial_safely_ /** @@ -554,7 +554,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_dynamic_partial_ - extern f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_ /** @@ -593,7 +593,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_dynamic_partial_raw_ - extern f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_raw_ /** @@ -637,7 +637,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_dynamic_partial_raw_safely_ - extern f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_raw_safely_ /** @@ -679,7 +679,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_dynamic_partial_safely_ - extern f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_safely_ /** @@ -843,7 +843,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_ - extern f_status_t f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_ /** @@ -882,7 +882,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_ - extern f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_ /** @@ -923,7 +923,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_partial_ - extern f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_ /** @@ -966,7 +966,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_partial_raw_ - extern f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_raw_ /** @@ -1011,7 +1011,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_partial_raw_safely_ - extern f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_raw_safely_ /** @@ -1054,7 +1054,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_partial_safely_ - extern f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_safely_ /** @@ -1095,7 +1095,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_raw_ - extern f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_raw_ /** @@ -1141,7 +1141,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_raw_safely_ - extern f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_raw_safely_ /** @@ -1184,7 +1184,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_safely_ - extern f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_safely_ /** @@ -1231,7 +1231,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_raw_ - extern f_status_t f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_raw_ /** @@ -1283,7 +1283,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_raw_safely_ - extern f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_raw_safely_ /** @@ -1333,7 +1333,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_safely_ - extern f_status_t f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_safely_ /** diff --git a/level_0/f_print/c/print/common.h b/level_0/f_print/c/print/common.h index 0feef3b..6b7d45d 100644 --- a/level_0/f_print/c/print/common.h +++ b/level_0/f_print/c/print/common.h @@ -284,10 +284,10 @@ extern "C" { * - exponent_either: Use either exponent or decimila for printing double values. * - exponent_upper: When using exponent, display the exponent 'e' as uppercase 'E'. * - ignore_index: ";", Ignore characters in the given positions from a f_number_unsigned_t (only applies to static/dynamic string arguments but not character arguments). - * - ignore_range: ":", Ignore characters in the given ranges from a f_string_range_t (only applies to static/dynamic string arguments but not character arguments). + * - ignore_range: ":", Ignore characters in the given ranges from a f_range_t (only applies to static/dynamic string arguments but not character arguments). * - precision: ".*", Designates that a precision is in use. * - precision_value: Designates that a precision is specified in the function value (parameter). - * - range: "/", Print only the given range of a string, specified by f_string_range_t (only applies to static/dynamic string arguments but not character arguments). + * - range: "/", Print only the given range of a string, specified by f_range_t (only applies to static/dynamic string arguments but not character arguments). * - sign_always: "+", Always show the signs (+ or -). * - sign_pad: " ", Add a space where a sign would be if the sign is not displayed. * - trim: "=", Trim leading and trailing whitespaces (only applies to static/dynamic string arguments but not character arguments). diff --git a/level_0/f_print/c/print/private-to.c b/level_0/f_print/c/print/private-to.c index c2aed09..8651aac 100644 --- a/level_0/f_print/c/print/private-to.c +++ b/level_0/f_print/c/print/private-to.c @@ -320,7 +320,7 @@ extern "C" { #endif // !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_safely_) #if !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_in_dynamic_) || !defined(_di_f_print_to_except_in_dynamic_partial_) - f_status_t private_f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const int id) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; @@ -392,7 +392,7 @@ extern "C" { #endif // !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_in_dynamic_) || !defined(_di_f_print_to_except_in_dynamic_partial_) #if !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) - f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const int id) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; @@ -462,7 +462,7 @@ extern "C" { #endif // !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) #if !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) - f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const int id) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; @@ -555,7 +555,7 @@ extern "C" { #endif // !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) #if !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) - f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const int id) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; diff --git a/level_0/f_print/c/print/private-to.h b/level_0/f_print/c/print/private-to.h index a5909f8..c988a72 100644 --- a/level_0/f_print/c/print/private-to.h +++ b/level_0/f_print/c/print/private-to.h @@ -186,7 +186,7 @@ extern "C" { * @see f_print_to_except_in_dynamic_partial() */ #if !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_dynamic_in_) || !defined(_di_f_print_to_except_in_dynamic_partial_) - extern f_status_t private_f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_dynamic_in_) || !defined(_di_f_print_to_except_in_dynamic_partial_) /** @@ -223,7 +223,7 @@ extern "C" { * @see f_print_to_except_in_dynamic_partial_raw() */ #if !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_dynamic_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) - extern f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_dynamic_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) /** @@ -261,7 +261,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_dynamic_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) - extern f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_dynamic_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) /** @@ -299,7 +299,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_dynamic_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) - extern f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_dynamic_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) /** diff --git a/level_0/f_print/c/print/to.c b/level_0/f_print/c/print/to.c index b0d8ab7..52254c8 100644 --- a/level_0/f_print/c/print/to.c +++ b/level_0/f_print/c/print/to.c @@ -77,7 +77,7 @@ extern "C" { #endif // _di_f_print_to_dynamic_ #ifndef _di_f_print_to_dynamic_partial_ - f_status_t f_print_to_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_to_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_print_to_dynamic_partial_ #ifndef _di_f_print_to_dynamic_partial_raw_ - f_status_t f_print_to_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_to_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -109,7 +109,7 @@ extern "C" { #endif // _di_f_print_to_dynamic_partial_raw_ #ifndef _di_f_print_to_dynamic_partial_raw_safely_ - f_status_t f_print_to_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_to_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_print_to_dynamic_partial_raw_safely_ #ifndef _di_f_print_to_dynamic_partial_safely_ - f_status_t f_print_to_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t f_print_to_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -191,7 +191,7 @@ extern "C" { #endif // _di_f_print_to_except_dynamic_ #ifndef _di_f_print_to_except_dynamic_partial_ - f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { @@ -209,7 +209,7 @@ extern "C" { #endif // _di_f_print_to_except_dynamic_partial_ #ifndef _di_f_print_to_except_dynamic_partial_raw_ - f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { @@ -227,7 +227,7 @@ extern "C" { #endif // _di_f_print_to_except_dynamic_partial_raw_ #ifndef _di_f_print_to_except_dynamic_partial_raw_safely_ - f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { @@ -245,7 +245,7 @@ extern "C" { #endif // _di_f_print_to_except_dynamic_partial_raw_safely_ #ifndef _di_f_print_to_except_dynamic_partial_safely_ - f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { @@ -293,7 +293,7 @@ extern "C" { #endif // _di_f_print_to_except_dynamic_safely_ #ifndef _di_f_print_to_except_in_ - f_status_t f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -303,7 +303,7 @@ extern "C" { #endif // _di_f_print_to_except_in_ #ifndef _di_f_print_to_except_in_dynamic_ - f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.string || !buffer.used) return F_data_not; @@ -313,7 +313,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_ #ifndef _di_f_print_to_except_in_dynamic_partial_ - f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { @@ -331,7 +331,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_partial_ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_ - f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { @@ -349,7 +349,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_partial_raw_ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_safely_ - f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -365,7 +365,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_partial_raw_safely_ #ifndef _di_f_print_to_except_in_dynamic_partial_safely_ - f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; @@ -381,7 +381,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_partial_safely_ #ifndef _di_f_print_to_except_in_dynamic_raw_ - f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -391,7 +391,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_raw_ #ifndef _di_f_print_to_except_in_dynamic_raw_safely_ - f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -401,7 +401,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_raw_safely_ #ifndef _di_f_print_to_except_in_dynamic_safely_ - f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -411,7 +411,7 @@ extern "C" { #endif // _di_f_print_to_except_in_dynamic_safely_ #ifndef _di_f_print_to_except_in_raw_ - f_status_t f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -421,7 +421,7 @@ extern "C" { #endif // _di_f_print_to_except_in_raw_ #ifndef _di_f_print_to_except_in_raw_safely_ - f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -431,7 +431,7 @@ extern "C" { #endif // _di_f_print_to_except_in_raw_safely_ #ifndef _di_f_print_to_except_in_safely_ - f_status_t f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; diff --git a/level_0/f_print/c/print/to.h b/level_0/f_print/c/print/to.h index 1f1225a..c9d62a9 100644 --- a/level_0/f_print/c/print/to.h +++ b/level_0/f_print/c/print/to.h @@ -214,7 +214,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_dynamic_partial_ - extern f_status_t f_print_to_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_to_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_to_dynamic_partial_ /** @@ -257,7 +257,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_dynamic_partial_raw_ - extern f_status_t f_print_to_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_to_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_to_dynamic_partial_raw_ /** @@ -305,7 +305,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_dynamic_partial_raw_safely_ - extern f_status_t f_print_to_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_to_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_to_dynamic_partial_raw_safely_ /** @@ -349,7 +349,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_dynamic_partial_safely_ - extern f_status_t f_print_to_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t f_print_to_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_f_print_to_dynamic_partial_safely_ /** @@ -613,7 +613,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_ - extern f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_ /** @@ -660,7 +660,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_raw_ - extern f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_raw_ /** @@ -712,7 +712,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_raw_safely_ - extern f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_raw_safely_ /** @@ -760,7 +760,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_safely_ - extern f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_safely_ /** @@ -956,7 +956,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_ - extern f_status_t f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_ /** @@ -1005,7 +1005,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_ - extern f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_ /** @@ -1056,7 +1056,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_partial_ - extern f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_ /** @@ -1109,7 +1109,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_ - extern f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_raw_ /** @@ -1162,7 +1162,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_safely_ - extern f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_raw_safely_ /** @@ -1215,7 +1215,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_to_except_in_dynamic_partial_safely_ - extern f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_safely_ /** @@ -1266,7 +1266,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_raw_ - extern f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_raw_ /** @@ -1320,7 +1320,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_raw_safely_ - extern f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_raw_safely_ /** @@ -1374,7 +1374,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_to_except_in_dynamic_safely_ - extern f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_safely_ /** @@ -1431,7 +1431,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_raw_ - extern f_status_t f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_raw_ /** @@ -1491,7 +1491,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_raw_safely_ - extern f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_raw_safely_ /** @@ -1551,7 +1551,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_to_except_in_safely_ - extern f_status_t f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_safely_ /** diff --git a/level_0/f_print/c/private-print.c b/level_0/f_print/c/private-print.c index e438b35..09e0ecf 100644 --- a/level_0/f_print/c/private-print.c +++ b/level_0/f_print/c/private-print.c @@ -128,7 +128,7 @@ extern "C" { #endif // !defined(_di_f_print_except_) || !defined(_di_f_print_except_dynamic_) || !defined(_di_f_print_except_dynamic_partial_) #if !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) - f_status_t private_f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; @@ -217,7 +217,7 @@ extern "C" { #endif // !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) #if !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) - f_status_t private_f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; @@ -304,7 +304,7 @@ extern "C" { #endif // !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) #if !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) - f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; @@ -436,7 +436,7 @@ extern "C" { #endif // !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) #if !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) - f_status_t private_f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t at = 0; diff --git a/level_0/f_print/c/private-print.h b/level_0/f_print/c/private-print.h index b8352d6..0a2c3f1 100644 --- a/level_0/f_print/c/private-print.h +++ b/level_0/f_print/c/private-print.h @@ -184,7 +184,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial() */ #if !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) - extern f_status_t private_f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) /** @@ -221,7 +221,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw() */ #if !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) - extern f_status_t private_f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) /** @@ -258,7 +258,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw_safely() */ #if !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) - extern f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) /** @@ -295,7 +295,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_safely() */ #if !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) - extern f_status_t private_f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) /** diff --git a/level_0/f_print/tests/unit/c/test-print-dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-dynamic_partial.c index 14cee87..ee17640 100644 --- a/level_0/f_print/tests/unit/c/test-print-dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-dynamic_partial.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_dynamic_partial__fails(void **state) { void test__f_print_dynamic_partial__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_dynamic_partial__returns_data_not(void **state) { void test__f_print_dynamic_partial__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_dynamic_partial__returns_stream_not(void **state) { void test__f_print_dynamic_partial__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw.c index 52bdafa..654b68d 100644 --- a/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_dynamic_partial_raw__fails(void **state) { void test__f_print_dynamic_partial_raw__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_dynamic_partial_raw__returns_data_not(void **state) { void test__f_print_dynamic_partial_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_dynamic_partial_raw__returns_stream_not(void **state) { void test__f_print_dynamic_partial_raw__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw_safely.c index e37acec..9ad0011 100644 --- a/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-dynamic_partial_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_dynamic_partial_raw_safely__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_dynamic_partial_raw_safely__returns_data_not(void **state) { void test__f_print_dynamic_partial_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_dynamic_partial_raw_safely__returns_stream_not(void **state) void test__f_print_dynamic_partial_raw_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-dynamic_partial_safely.c index 15f67fc..7fcd560 100644 --- a/level_0/f_print/tests/unit/c/test-print-dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-dynamic_partial_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_dynamic_partial_safely__fails(void **state) { void test__f_print_dynamic_partial_safely__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_dynamic_partial_safely__returns_data_not(void **state) { void test__f_print_dynamic_partial_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_dynamic_partial_safely__returns_stream_not(void **state) { void test__f_print_dynamic_partial_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c index 6dbfcd6..2549f18 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c @@ -9,7 +9,7 @@ void test__f_print_except_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_dynamic_partial__fails(void **state) { void test__f_print_except_dynamic_partial__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_dynamic_partial__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic_partial__returns_stream_not(void **state) { void test__f_print_except_dynamic_partial__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c index 7f7d1dc..8ae4d0c 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c @@ -9,7 +9,7 @@ void test__f_print_except_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_dynamic_partial_raw__fails(void **state) { void test__f_print_except_dynamic_partial_raw__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_dynamic_partial_raw__returns_stream_not(void **state) const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic_partial_raw__returns_stream_not(void **state) void test__f_print_except_dynamic_partial_raw__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c index 04970dd..3ec7b70 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c @@ -9,7 +9,7 @@ void test__f_print_except_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_except_dynamic_partial_raw_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_dynamic_partial_raw_safely__returns_stream_not(void ** const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic_partial_raw_safely__returns_stream_not(void ** void test__f_print_except_dynamic_partial_raw_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c index 3a8f88d..94be1b6 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c @@ -9,7 +9,7 @@ void test__f_print_except_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_dynamic_partial_safely__fails(void **state) { void test__f_print_except_dynamic_partial_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_dynamic_partial_safely__returns_stream_not(void **stat const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic_partial_safely__returns_stream_not(void **stat void test__f_print_except_dynamic_partial_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-except_in.c b/level_0/f_print/tests/unit/c/test-print-except_in.c index b38252e..98374c2 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in.c @@ -9,7 +9,7 @@ void test__f_print_except_in__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,7 +27,7 @@ void test__f_print_except_in__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_in__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -70,7 +70,7 @@ void test__f_print_except_in__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -83,7 +83,7 @@ void test__f_print_except_in__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -96,11 +96,11 @@ void test__f_print_except_in__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c index 25cc6d3..f558273 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c @@ -9,7 +9,7 @@ void test__f_print_except_in_dynamic__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic__fails(void **state) { void test__f_print_except_in_dynamic__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_in_dynamic__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -57,7 +57,7 @@ void test__f_print_except_in_dynamic__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -70,11 +70,11 @@ void test__f_print_except_in_dynamic__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c index e2098ba..a99da98 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c @@ -9,8 +9,8 @@ void test__f_print_except_in_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,8 +27,8 @@ void test__f_print_except_in_dynamic_partial__fails(void **state) { void test__f_print_except_in_dynamic_partial__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -42,8 +42,8 @@ void test__f_print_except_in_dynamic_partial__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -56,12 +56,12 @@ void test__f_print_except_in_dynamic_partial__returns_stream_not(void **state) { void test__f_print_except_in_dynamic_partial__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -74,11 +74,11 @@ void test__f_print_except_in_dynamic_partial__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c index 7ae7f8a..dc02eeb 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c @@ -9,8 +9,8 @@ void test__f_print_except_in_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,8 +27,8 @@ void test__f_print_except_in_dynamic_partial_raw__fails(void **state) { void test__f_print_except_in_dynamic_partial_raw__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -42,8 +42,8 @@ void test__f_print_except_in_dynamic_partial_raw__returns_stream_not(void **stat const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -56,12 +56,12 @@ void test__f_print_except_in_dynamic_partial_raw__returns_stream_not(void **stat void test__f_print_except_in_dynamic_partial_raw__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -74,11 +74,11 @@ void test__f_print_except_in_dynamic_partial_raw__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c index d000b69..8ebcba6 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c @@ -9,8 +9,8 @@ void test__f_print_except_in_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,8 +27,8 @@ void test__f_print_except_in_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_except_in_dynamic_partial_raw_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -42,8 +42,8 @@ void test__f_print_except_in_dynamic_partial_raw_safely__returns_stream_not(void const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -56,12 +56,12 @@ void test__f_print_except_in_dynamic_partial_raw_safely__returns_stream_not(void void test__f_print_except_in_dynamic_partial_raw_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -74,11 +74,11 @@ void test__f_print_except_in_dynamic_partial_raw_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c index f243ef8..0229d6b 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c @@ -9,8 +9,8 @@ void test__f_print_except_in_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,8 +27,8 @@ void test__f_print_except_in_dynamic_partial_safely__fails(void **state) { void test__f_print_except_in_dynamic_partial_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -42,8 +42,8 @@ void test__f_print_except_in_dynamic_partial_safely__returns_stream_not(void **s const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -56,12 +56,12 @@ void test__f_print_except_in_dynamic_partial_safely__returns_stream_not(void **s void test__f_print_except_in_dynamic_partial_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -74,11 +74,11 @@ void test__f_print_except_in_dynamic_partial_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c index 70c78a3..126e2f5 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c @@ -9,7 +9,7 @@ void test__f_print_except_in_dynamic_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic_raw__fails(void **state) { void test__f_print_except_in_dynamic_raw__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_in_dynamic_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -57,7 +57,7 @@ void test__f_print_except_in_dynamic_raw__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -70,11 +70,11 @@ void test__f_print_except_in_dynamic_raw__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c index 5a434bd..459e69c 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c @@ -9,7 +9,7 @@ void test__f_print_except_in_dynamic_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic_raw_safely__fails(void **state) { void test__f_print_except_in_dynamic_raw_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_in_dynamic_raw_safely__returns_stream_not(void **state const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -57,7 +57,7 @@ void test__f_print_except_in_dynamic_raw_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -70,11 +70,11 @@ void test__f_print_except_in_dynamic_raw_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c index 94ddd78..c5e19c1 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c @@ -9,7 +9,7 @@ void test__f_print_except_in_dynamic_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic_safely__fails(void **state) { void test__f_print_except_in_dynamic_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -40,7 +40,7 @@ void test__f_print_except_in_dynamic_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -57,7 +57,7 @@ void test__f_print_except_in_dynamic_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -70,11 +70,11 @@ void test__f_print_except_in_dynamic_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_raw.c b/level_0/f_print/tests/unit/c/test-print-except_in_raw.c index b6a2378..b34825c 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_raw.c @@ -9,7 +9,7 @@ void test__f_print_except_in_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,7 +27,7 @@ void test__f_print_except_in_raw__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_in_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -70,7 +70,7 @@ void test__f_print_except_in_raw__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -83,7 +83,7 @@ void test__f_print_except_in_raw__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -96,11 +96,11 @@ void test__f_print_except_in_raw__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c index 698c000..63804ea 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c @@ -9,7 +9,7 @@ void test__f_print_except_in_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,7 +27,7 @@ void test__f_print_except_in_raw_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_in_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -70,7 +70,7 @@ void test__f_print_except_in_raw_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -83,7 +83,7 @@ void test__f_print_except_in_raw_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -96,11 +96,11 @@ void test__f_print_except_in_raw_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_safely.c index 80c4414..eefdb97 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_safely.c @@ -9,7 +9,7 @@ void test__f_print_except_in_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -27,7 +27,7 @@ void test__f_print_except_in_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_in_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -70,7 +70,7 @@ void test__f_print_except_in_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -83,7 +83,7 @@ void test__f_print_except_in_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -96,11 +96,11 @@ void test__f_print_except_in_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, 1); diff --git a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial.c index d8ed613..f3d0c2c 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_dynamic_partial__fails(void **state) { void test__f_print_to_dynamic_partial__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_dynamic_partial__returns_data_not(void **state) { void test__f_print_to_dynamic_partial__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_dynamic_partial__returns_file_descriptor_not(void **state) void test__f_print_to_dynamic_partial__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw.c index a148a1e..64a7451 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_dynamic_partial_raw__fails(void **state) { void test__f_print_to_dynamic_partial_raw__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_dynamic_partial_raw__returns_data_not(void **state) { void test__f_print_to_dynamic_partial_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_dynamic_partial_raw__returns_file_descriptor_not(void **st void test__f_print_to_dynamic_partial_raw__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw_safely.c index 31250b0..55274de 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_to_dynamic_partial_raw_safely__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_dynamic_partial_raw_safely__returns_data_not(void **state) void test__f_print_to_dynamic_partial_raw_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_dynamic_partial_raw_safely__returns_file_descriptor_not(vo void test__f_print_to_dynamic_partial_raw_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_safely.c index a05969f..4d6e7c0 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_dynamic_partial_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_dynamic_partial_safely__fails(void **state) { void test__f_print_to_dynamic_partial_safely__returns_data_not(void **state) { - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_dynamic_partial_safely__returns_data_not(void **state) { void test__f_print_to_dynamic_partial_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_dynamic_partial_safely__returns_file_descriptor_not(void * void test__f_print_to_dynamic_partial_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c index 880b055..9026ecc 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c @@ -9,7 +9,7 @@ void test__f_print_to_except_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_dynamic_partial__fails(void **state) { void test__f_print_to_except_dynamic_partial__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_dynamic_partial__returns_file_descriptor_not(void * const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic_partial__returns_file_descriptor_not(void * void test__f_print_to_except_dynamic_partial__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c index 60261a1..02789ab 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c @@ -9,7 +9,7 @@ void test__f_print_to_except_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_dynamic_partial_raw__fails(void **state) { void test__f_print_to_except_dynamic_partial_raw__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_dynamic_partial_raw__returns_file_descriptor_not(vo const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic_partial_raw__returns_file_descriptor_not(vo void test__f_print_to_except_dynamic_partial_raw__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c index ea6141e..cb83f85 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c @@ -9,7 +9,7 @@ void test__f_print_to_except_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_to_except_dynamic_partial_raw_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_dynamic_partial_raw_safely__returns_file_descriptor const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic_partial_raw_safely__returns_file_descriptor void test__f_print_to_except_dynamic_partial_raw_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c index 6aa916b..01aa1e7 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c @@ -9,7 +9,7 @@ void test__f_print_to_except_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_dynamic_partial_safely__fails(void **state) { void test__f_print_to_except_dynamic_partial_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_dynamic_partial_safely__returns_file_descriptor_not const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic_partial_safely__returns_file_descriptor_not void test__f_print_to_except_dynamic_partial_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in.c b/level_0/f_print/tests/unit/c/test-print-to_except_in.c index 33a0a5d..1cfb29a 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,7 +61,7 @@ void test__f_print_to_except_in__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_in__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -104,7 +104,7 @@ void test__f_print_to_except_in__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -116,7 +116,7 @@ void test__f_print_to_except_in__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -128,11 +128,11 @@ void test__f_print_to_except_in__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c index 85426b0..52666cc 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in_dynamic__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic__fails(void **state) { void test__f_print_to_except_in_dynamic__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_in_dynamic__returns_file_descriptor_not(void **stat const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -91,7 +91,7 @@ void test__f_print_to_except_in_dynamic__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -103,11 +103,11 @@ void test__f_print_to_except_in_dynamic__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c index fe1e649..13be823 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c @@ -9,8 +9,8 @@ void test__f_print_to_except_in_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,8 +61,8 @@ void test__f_print_to_except_in_dynamic_partial__fails(void **state) { void test__f_print_to_except_in_dynamic_partial__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -76,8 +76,8 @@ void test__f_print_to_except_in_dynamic_partial__returns_file_descriptor_not(voi const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -90,12 +90,12 @@ void test__f_print_to_except_in_dynamic_partial__returns_file_descriptor_not(voi void test__f_print_to_except_in_dynamic_partial__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -107,11 +107,11 @@ void test__f_print_to_except_in_dynamic_partial__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c index afaf755..f11897b 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c @@ -9,8 +9,8 @@ void test__f_print_to_except_in_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,8 +61,8 @@ void test__f_print_to_except_in_dynamic_partial_raw__fails(void **state) { void test__f_print_to_except_in_dynamic_partial_raw__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -76,8 +76,8 @@ void test__f_print_to_except_in_dynamic_partial_raw__returns_file_descriptor_not const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -90,12 +90,12 @@ void test__f_print_to_except_in_dynamic_partial_raw__returns_file_descriptor_not void test__f_print_to_except_in_dynamic_partial_raw__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -107,11 +107,11 @@ void test__f_print_to_except_in_dynamic_partial_raw__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c index d713bad..e1ff66c 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c @@ -9,8 +9,8 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__fails(void **state) const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,8 +61,8 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__fails(void **state) void test__f_print_to_except_in_dynamic_partial_raw_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -76,8 +76,8 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__returns_file_descrip const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -90,12 +90,12 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__returns_file_descrip void test__f_print_to_except_in_dynamic_partial_raw_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -107,11 +107,11 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__works(void **state) { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c index bc6ddb6..c0aa185 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c @@ -9,8 +9,8 @@ void test__f_print_to_except_in_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,8 +61,8 @@ void test__f_print_to_except_in_dynamic_partial_safely__fails(void **state) { void test__f_print_to_except_in_dynamic_partial_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -76,8 +76,8 @@ void test__f_print_to_except_in_dynamic_partial_safely__returns_file_descriptor_ const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_ranges_t range = f_ranges_t_initialize; + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -90,12 +90,12 @@ void test__f_print_to_except_in_dynamic_partial_safely__returns_file_descriptor_ void test__f_print_to_except_in_dynamic_partial_safely__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); + const f_range_t partial = macro_f_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -107,11 +107,11 @@ void test__f_print_to_except_in_dynamic_partial_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c index 1c3b7eb..fe0d35d 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in_dynamic_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic_raw__fails(void **state) { void test__f_print_to_except_in_dynamic_raw__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_in_dynamic_raw__returns_file_descriptor_not(void ** const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -91,7 +91,7 @@ void test__f_print_to_except_in_dynamic_raw__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -103,11 +103,11 @@ void test__f_print_to_except_in_dynamic_raw__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c index 16de41e..f76f261 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in_dynamic_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic_raw_safely__fails(void **state) { void test__f_print_to_except_in_dynamic_raw_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_in_dynamic_raw_safely__returns_file_descriptor_not( const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -91,7 +91,7 @@ void test__f_print_to_except_in_dynamic_raw_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -103,11 +103,11 @@ void test__f_print_to_except_in_dynamic_raw_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c index 1414802..ca24396 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in_dynamic_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic_safely__fails(void **state) { void test__f_print_to_except_in_dynamic_safely__returns_data_not(void **state) { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -74,7 +74,7 @@ void test__f_print_to_except_in_dynamic_safely__returns_file_descriptor_not(void const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -91,7 +91,7 @@ void test__f_print_to_except_in_dynamic_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -103,11 +103,11 @@ void test__f_print_to_except_in_dynamic_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c index 72233a7..b425111 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,7 +61,7 @@ void test__f_print_to_except_in_raw__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_in_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -104,7 +104,7 @@ void test__f_print_to_except_in_raw__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -116,7 +116,7 @@ void test__f_print_to_except_in_raw__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -128,11 +128,11 @@ void test__f_print_to_except_in_raw__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c index 4308004..50c893b 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,7 +61,7 @@ void test__f_print_to_except_in_raw_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_in_raw_safely__returns_file_descriptor_not(void **s const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -104,7 +104,7 @@ void test__f_print_to_except_in_raw_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -116,7 +116,7 @@ void test__f_print_to_except_in_raw_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -128,11 +128,11 @@ void test__f_print_to_except_in_raw_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c index d9c82de..927b8a7 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c @@ -9,7 +9,7 @@ void test__f_print_to_except_in_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -61,7 +61,7 @@ void test__f_print_to_except_in_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_in_safely__returns_file_descriptor_not(void **state const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -104,7 +104,7 @@ void test__f_print_to_except_in_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -116,7 +116,7 @@ void test__f_print_to_except_in_safely__works(void **state) { { const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; - const f_string_ranges_t range = f_string_ranges_t_initialize; + const f_ranges_t range = f_ranges_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -128,11 +128,11 @@ void test__f_print_to_except_in_safely__works(void **state) { { f_number_unsigned_t lengths[] = { 3 }; - f_string_range_t ranges[] = { - macro_f_string_range_t_initialize_1(0, 1), + f_range_t ranges[] = { + macro_f_range_t_initialize_1(0, 1), }; const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); - const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); + const f_ranges_t range = macro_f_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_rip/c/rip.c b/level_0/f_rip/c/rip.c index 9725c35..1a5b8d0 100644 --- a/level_0/f_rip/c/rip.c +++ b/level_0/f_rip/c/rip.c @@ -94,7 +94,7 @@ extern "C" { #endif // _di_f_rip_nulless_ #ifndef _di_f_rip_dynamic_partial_ - f_status_t f_rip_dynamic_partial(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_rip_dynamic_partial(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -118,7 +118,7 @@ extern "C" { #endif // _di_f_rip_dynamic_partial_ #ifndef _di_f_rip_dynamic_partial_nulless_ - f_status_t f_rip_dynamic_partial_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_rip_dynamic_partial_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_rip/c/rip.h b/level_0/f_rip/c/rip.h index 23ac555..1b5ab98 100644 --- a/level_0/f_rip/c/rip.h +++ b/level_0/f_rip/c/rip.h @@ -194,7 +194,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_rip_dynamic_partial_ - extern f_status_t f_rip_dynamic_partial(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_rip_dynamic_partial(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_rip_dynamic_partial_ /** @@ -231,7 +231,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_rip_dynamic_partial_nulless_ - extern f_status_t f_rip_dynamic_partial_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_rip_dynamic_partial_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_rip_dynamic_partial_nulless_ #ifdef __cplusplus diff --git a/level_0/f_rip/c/rip/utf.c b/level_0/f_rip/c/rip/utf.c index c3f266d..29e8299 100644 --- a/level_0/f_rip/c/rip/utf.c +++ b/level_0/f_rip/c/rip/utf.c @@ -31,7 +31,7 @@ extern "C" { #endif // _di_f_rip_utf_ #ifndef _di_f_rip_utf_dynamic_ - f_status_t f_rip_utf_dynamic(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_rip_utf_dynamic(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return F_status_set_error(F_parameter); if (source.used <= range.stop) return F_status_set_error(F_parameter); @@ -46,7 +46,7 @@ extern "C" { #endif // _di_f_rip_utf_dynamic_ #ifndef _di_f_rip_utf_dynamic_nulless_ - f_status_t f_rip_utf_dynamic_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_rip_utf_dynamic_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return F_status_set_error(F_parameter); if (source.used <= range.stop) return F_status_set_error(F_parameter); diff --git a/level_0/f_rip/c/rip/utf.h b/level_0/f_rip/c/rip/utf.h index e3ebb11..31313dc 100644 --- a/level_0/f_rip/c/rip/utf.h +++ b/level_0/f_rip/c/rip/utf.h @@ -67,7 +67,7 @@ extern "C" { * @see f_utf_string_append() */ #ifndef _di_f_rip_utf_dynamic_ - extern f_status_t f_rip_utf_dynamic(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_rip_utf_dynamic(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_rip_utf_dynamic_ /** @@ -97,7 +97,7 @@ extern "C" { * @see f_utf_string_append_nulless() */ #ifndef _di_f_rip_utf_dynamic_nulless_ - extern f_status_t f_rip_utf_dynamic_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_rip_utf_dynamic_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_rip_utf_dynamic_nulless_ /** diff --git a/level_0/f_serialize/c/private-serialize.c b/level_0/f_serialize/c/private-serialize.c index c72215c..5a9bfe9 100644 --- a/level_0/f_serialize/c/private-serialize.c +++ b/level_0/f_serialize/c/private-serialize.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_serialize_from_simple_get_) || !defined(_di_f_serialize_from_simple_select_) - f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const range) { + f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_range_t * const range) { f_number_unsigned_t start = 0; f_number_unsigned_t current = 0; diff --git a/level_0/f_serialize/c/private-serialize.h b/level_0/f_serialize/c/private-serialize.h index d7c77c1..6584dc5 100644 --- a/level_0/f_serialize/c/private-serialize.h +++ b/level_0/f_serialize/c/private-serialize.h @@ -36,7 +36,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #if !defined(_di_f_serialize_from_simple_get_) || !defined(_di_f_serialize_from_simple_select_) - extern f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const range) F_attribute_visibility_internal_d; + extern f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_range_t * const range) F_attribute_visibility_internal_d; #endif // !defined(_di_f_serialize_from_simple_get_) || !defined(_di_f_serialize_from_simple_select_) #ifdef __cplusplus diff --git a/level_0/f_serialize/c/serialize.c b/level_0/f_serialize/c/serialize.c index c2cb699..b57fe00 100644 --- a/level_0/f_serialize/c/serialize.c +++ b/level_0/f_serialize/c/serialize.c @@ -91,7 +91,7 @@ extern "C" { if (!source.used) return F_data_not; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_status_t status = private_f_serialize_from_simple_select(source, index, &range); if (F_status_is_error(status)) return status; @@ -112,7 +112,7 @@ extern "C" { #endif // _di_f_serialize_from_simple_get_ #ifndef _di_f_serialize_from_simple_range_ - f_status_t f_serialize_from_simple_range(const f_string_static_t source, f_string_ranges_t * const ranges) { + f_status_t f_serialize_from_simple_range(const f_string_static_t source, f_ranges_t * const ranges) { #ifndef _di_level_0_parameter_checking_ if (!ranges) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -131,7 +131,7 @@ extern "C" { if (i + width > source.used) { total = i - start; - status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); + status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); if (F_status_is_error(status)) return status; if (total) { @@ -149,7 +149,7 @@ extern "C" { if (source.string[i] == f_serialize_to_simple_splitter_s.string[0]) { total = i - start; - status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); + status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); if (F_status_is_error(status)) return status; if (total) { @@ -165,7 +165,7 @@ extern "C" { // Handle case when splitter as at the end of the string, creating a new empty string. if (start == source.used) { - status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); + status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); if (F_status_is_error(status)) return status; ranges->array[ranges->used].start = 1; @@ -180,7 +180,7 @@ extern "C" { if (start < source.used) { total = source.used - start; - status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); + status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_t), (void **) &ranges->array, &ranges->used, &ranges->size); if (F_status_is_error(status)) return status; if (total) { @@ -198,7 +198,7 @@ extern "C" { #endif // _di_f_serialize_from_simple_range_ #ifndef _di_f_serialize_from_simple_select_ - f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const range) { + f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_serialize/c/serialize.h b/level_0/f_serialize/c/serialize.h index 71989c3..9310fb3 100644 --- a/level_0/f_serialize/c/serialize.h +++ b/level_0/f_serialize/c/serialize.h @@ -126,7 +126,7 @@ extern "C" { * @see f_memory_array_increase() */ #ifndef _di_f_serialize_from_simple_range_ - extern f_status_t f_serialize_from_simple_range(const f_string_static_t source, f_string_ranges_t * const ranges); + extern f_status_t f_serialize_from_simple_range(const f_string_static_t source, f_ranges_t * const ranges); #endif // _di_f_serialize_from_simple_range_ /** @@ -156,7 +156,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_serialize_from_simple_select_ - extern f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const range); + extern f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_range_t * const range); #endif // _di_f_serialize_from_simple_select_ /** diff --git a/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_range.c b/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_range.c index 125a8b3..26aaa15 100644 --- a/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_range.c +++ b/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_range.c @@ -20,7 +20,7 @@ void test__f_serialize_from_simple_range__returns_data_not(void **state) { const f_string_static_t source = f_string_static_t_initialize; - f_string_ranges_t ranges = f_string_ranges_t_initialize; + f_ranges_t ranges = f_ranges_t_initialize; { const f_status_t status = f_serialize_from_simple_range(source, &ranges); @@ -43,15 +43,15 @@ void test__f_serialize_from_simple_range__works(void **state) { macro_f_string_static_t_initialize_1("им:?", 0, 6), }; - f_string_range_t expected_array_0[] = { { 0, 0 } }; - f_string_range_t expected_array_1[] = { { 0, 4 } }; - f_string_range_t expected_array_2[] = { { 0, 0 }, { 1, 0 } }; - f_string_range_t expected_array_3[] = { { 1, 0 }, { 1, 2 } }; - f_string_range_t expected_array_4[] = { { 0, 4 }, { 6, 6 }, { 1, 0 }, { 9, 11 } }; - f_string_range_t expected_array_5[] = { { 0, 3 }, { 5, 7 } }; - f_string_range_t expected_array_6[] = { { 0, 3 }, { 5, 5 } }; + f_range_t expected_array_0[] = { { 0, 0 } }; + f_range_t expected_array_1[] = { { 0, 4 } }; + f_range_t expected_array_2[] = { { 0, 0 }, { 1, 0 } }; + f_range_t expected_array_3[] = { { 1, 0 }, { 1, 2 } }; + f_range_t expected_array_4[] = { { 0, 4 }, { 6, 6 }, { 1, 0 }, { 9, 11 } }; + f_range_t expected_array_5[] = { { 0, 3 }, { 5, 7 } }; + f_range_t expected_array_6[] = { { 0, 3 }, { 5, 5 } }; - f_string_ranges_t expecteds[] = { + f_ranges_t expecteds[] = { macro_f_string_statics_t_initialize_1(expected_array_0, 0, 1), macro_f_string_statics_t_initialize_1(expected_array_1, 0, 1), macro_f_string_statics_t_initialize_1(expected_array_2, 0, 2), @@ -61,7 +61,7 @@ void test__f_serialize_from_simple_range__works(void **state) { macro_f_string_statics_t_initialize_1(expected_array_6, 0, 2), }; - f_string_ranges_t ranges = f_string_ranges_t_initialize; + f_ranges_t ranges = f_ranges_t_initialize; for (uint8_t i = 0; i < 7; ++i) { diff --git a/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_select.c b/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_select.c index 9e29676..a3f2a1a 100644 --- a/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_select.c +++ b/level_0/f_serialize/tests/unit/c/test-serialize-from_simple_select.c @@ -18,7 +18,7 @@ void test__f_serialize_from_simple_select__parameter_checking(void **state) { void test__f_serialize_from_simple_select__returns_data_not(void **state) { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; { const f_status_t status = f_serialize_from_simple_select(f_string_empty_s, 0, &range); @@ -31,7 +31,7 @@ void test__f_serialize_from_simple_select__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test:2::other:им:蠇:м:", 0, 26); - const f_string_range_t ranges[] = { + const f_range_t ranges[] = { { 0, 3 }, { 5, 5 }, { 1, 0 }, @@ -44,7 +44,7 @@ void test__f_serialize_from_simple_select__works(void **state) { for (uint8_t i = 0; i < 8; ++i) { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_serialize_from_simple_select(source, i, &range); diff --git a/level_0/f_string/c/string.c b/level_0/f_string/c/string.c index f9c1c11..8c17e6e 100644 --- a/level_0/f_string/c/string.c +++ b/level_0/f_string/c/string.c @@ -274,7 +274,7 @@ extern "C" { #endif // _di_f_string_prepend_nulless_ #ifndef _di_f_string_seek_line_ - f_status_t f_string_seek_line(const f_string_t string, f_string_range_t *range) { + f_status_t f_string_seek_line(const f_string_t string, f_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -293,7 +293,7 @@ extern "C" { #endif // _di_f_string_seek_line_ #ifndef _di_f_string_seek_line_to_ - f_status_t f_string_seek_line_to(const f_string_t string, const f_char_t seek_to, f_string_range_t * const range) { + f_status_t f_string_seek_line_to(const f_string_t string, const f_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -314,7 +314,7 @@ extern "C" { #endif // _di_f_string_seek_line_to_ #ifndef _di_f_string_seek_to_ - f_status_t f_string_seek_to(const f_string_t string, const f_char_t seek_to, f_string_range_t * const range) { + f_status_t f_string_seek_to(const f_string_t string, const f_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h index 4379a53..e1092c2 100644 --- a/level_0/f_string/c/string.h +++ b/level_0/f_string/c/string.h @@ -23,12 +23,6 @@ // FLL-0 string includes. #include -#include -#include -#include -#include -#include -#include #include #include #include @@ -424,7 +418,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_seek_line_ - extern f_status_t f_string_seek_line(const f_string_t string, f_string_range_t * const range); + extern f_status_t f_string_seek_line(const f_string_t string, f_range_t * const range); #endif // _di_f_string_seek_line_ /** @@ -447,7 +441,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_string_seek_line_to_ - extern f_status_t f_string_seek_line_to(const f_string_t string, const f_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_string_seek_line_to(const f_string_t string, const f_char_t seek_to, f_range_t * const range); #endif // _di_f_string_seek_line_to_ /** @@ -471,7 +465,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_string_seek_to_ - extern f_status_t f_string_seek_to(const f_string_t string, const f_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_string_seek_to(const f_string_t string, const f_char_t seek_to, f_range_t * const range); #endif // _di_f_string_seek_to_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/dynamic.c b/level_0/f_string/c/string/dynamic.c index 41e8777..54cd724 100644 --- a/level_0/f_string/c/string/dynamic.c +++ b/level_0/f_string/c/string/dynamic.c @@ -162,7 +162,7 @@ extern "C" { #endif // _di_f_string_dynamic_mish_nulless_ #ifndef _di_f_string_dynamic_partial_append_ - f_status_t f_string_dynamic_partial_append(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_append(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -180,7 +180,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_append_ #ifndef _di_f_string_dynamic_partial_append_assure_ - f_status_t f_string_dynamic_partial_append_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_append_assure(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -212,7 +212,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_append_assure_ #ifndef _di_f_string_dynamic_partial_append_assure_nulless_ - f_status_t f_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -256,7 +256,7 @@ extern "C" { #endif // _di_f_string_dynamic_append_assure_nulless_ #ifndef _di_f_string_dynamic_partial_append_nulless_ - f_status_t f_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -274,7 +274,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_append_nulless_ #ifndef _di_f_string_dynamic_partial_mash_ - f_status_t f_string_dynamic_partial_mash(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_mash(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -297,7 +297,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_mash_ #ifndef _di_f_string_dynamic_partial_mash_nulless_ - f_status_t f_string_dynamic_partial_mash_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_mash_nulless(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -320,7 +320,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_mash_nulless_ #ifndef _di_f_string_dynamic_partial_mish_ - f_status_t f_string_dynamic_partial_mish(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_mish(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -343,7 +343,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_mish_ #ifndef _di_f_string_dynamic_partial_mish_nulless_ - f_status_t f_string_dynamic_partial_mish_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_mish_nulless(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -366,7 +366,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_mish_nulless_ #ifndef _di_f_string_dynamic_partial_prepend_ - f_status_t f_string_dynamic_partial_prepend(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_prepend(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -384,7 +384,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_prepend_ #ifndef _di_f_string_dynamic_partial_prepend_assure_ - f_status_t f_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -415,7 +415,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_prepend_assure_ #ifndef _di_f_string_dynamic_partial_prepend_assure_nulless_ - f_status_t f_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -460,7 +460,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_prepend_assure_nulless #ifndef _di_f_string_dynamic_partial_prepend_nulless_ - f_status_t f_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination) { + f_status_t f_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -558,7 +558,7 @@ extern "C" { #endif // _di_f_string_dynamic_prepend_nulless_ #ifndef _di_f_string_dynamic_seek_line_ - f_status_t f_string_dynamic_seek_line(const f_string_static_t structure, f_string_range_t * const range) { + f_status_t f_string_dynamic_seek_line(const f_string_static_t structure, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -579,7 +579,7 @@ extern "C" { #endif // _di_f_string_dynamic_seek_line_ #ifndef _di_f_string_dynamic_seek_line_to_ - f_status_t f_string_dynamic_seek_line_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range) { + f_status_t f_string_dynamic_seek_line_to(const f_string_static_t structure, const f_char_t seek_to_this, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -602,7 +602,7 @@ extern "C" { #endif // _di_f_string_dynamic_seek_line_to_ #ifndef _di_f_string_dynamic_seek_to_ - f_status_t f_string_dynamic_seek_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range) { + f_status_t f_string_dynamic_seek_to(const f_string_static_t structure, const f_char_t seek_to_this, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/dynamic.h b/level_0/f_string/c/string/dynamic.h index bc02c3e..72c4db1 100644 --- a/level_0/f_string/c/string/dynamic.h +++ b/level_0/f_string/c/string/dynamic.h @@ -257,7 +257,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_append_ - extern f_status_t f_string_dynamic_partial_append(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_append(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_append_ /** @@ -282,7 +282,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_append_assure_ - extern f_status_t f_string_dynamic_partial_append_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_append_assure(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_append_assure_ /** @@ -311,7 +311,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_append_assure_nulless_ - extern f_status_t f_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_append_assure_nulless_ /** @@ -338,7 +338,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_append_nulless_ - extern f_status_t f_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_append_nulless_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mash_ - extern f_status_t f_string_dynamic_partial_mash(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_mash(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_mash_ /** @@ -398,7 +398,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mash_nulless_ - extern f_status_t f_string_dynamic_partial_mash_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_mash_nulless(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_mash_nulless_ /** @@ -427,7 +427,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mish_ - extern f_status_t f_string_dynamic_partial_mish(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_mish(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_mish_ /** @@ -458,7 +458,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mish_nulless_ - extern f_status_t f_string_dynamic_partial_mish_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_mish_nulless(const f_string_static_t glue, const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_mish_nulless_ /** @@ -485,7 +485,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_prepend_ - extern f_status_t f_string_dynamic_partial_prepend(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_prepend(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_prepend_ /** @@ -512,7 +512,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_prepend_assure_ - extern f_status_t f_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_prepend_assure_ /** @@ -541,7 +541,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_prepend_assure_nulless_ - extern f_status_t f_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_prepend_assure_nulless_ /** @@ -568,7 +568,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_prepend_nulless_ - extern f_status_t f_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t * const destination); + extern f_status_t f_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_range_t range, f_string_dynamic_t * const destination); #endif // _di_f_string_dynamic_partial_prepend_nulless_ /** @@ -686,7 +686,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_seek_line_ - extern f_status_t f_string_dynamic_seek_line(const f_string_static_t structure, f_string_range_t * const range); + extern f_status_t f_string_dynamic_seek_line(const f_string_static_t structure, f_range_t * const range); #endif // _di_f_string_dynamic_seek_line_ /** @@ -712,7 +712,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_seek_line_to_ - extern f_status_t f_string_dynamic_seek_line_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range); + extern f_status_t f_string_dynamic_seek_line_to(const f_string_static_t structure, const f_char_t seek_to_this, f_range_t * const range); #endif // _di_f_string_dynamic_seek_line_to_ /** @@ -738,7 +738,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_seek_to_ - extern f_status_t f_string_dynamic_seek_to(const f_string_static_t structure, const f_char_t seek_to_this, f_string_range_t * const range); + extern f_status_t f_string_dynamic_seek_to(const f_string_static_t structure, const f_char_t seek_to_this, f_range_t * const range); #endif // _di_f_string_dynamic_seek_to_ /** diff --git a/level_0/f_string/c/string/quantity.h b/level_0/f_string/c/string/quantity.h index bf793f0..8dee426 100644 --- a/level_0/f_string/c/string/quantity.h +++ b/level_0/f_string/c/string/quantity.h @@ -19,7 +19,7 @@ extern "C" { /** * Store string quantity. * - * Similar to f_string_range_t, except total is relative to start and is not an absolute stop position. + * Similar to f_range_t, except total is relative to start and is not an absolute stop position. * * Two common uses for when total is 0 is: * 1) Exactly that, process a total of 0 strings bytes. diff --git a/level_0/f_string/c/string/range.c b/level_0/f_string/c/string/range.c deleted file mode 100644 index 37d48a1..0000000 --- a/level_0/f_string/c/string/range.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "../string.h" -#include "../private-string.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_f_string_range_empty_c_ - const f_string_range_t f_string_range_empty_c = { 1, 0 }; -#endif // _di_f_string_range_empty_c_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/c/string/range.h b/level_0/f_string/c/string/range.h deleted file mode 100644 index 555358d..0000000 --- a/level_0/f_string/c/string/range.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Defines range string data. - * - * This is auto-included by string.h and should not need to be explicitly included. - */ -#ifndef _F_string_range_h -#define _F_string_range_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A structure designating a start and stop range for some string. - * - * In general, this project uses the start and stop position inclusively, meaning that a range of 0 to 1 would include positions 0 and position 1. - * Therefore, a range from 0 to 0 would be include position 0. - * Set start to some value larger than stop to designate that there is no range (such as start = 1, stop = 0). - * - * Properties: - * - start: The start position. - * - stop: The stop position. - */ -#ifndef _di_f_string_range_t_ - typedef struct { - f_number_unsigned_t start; - f_number_unsigned_t stop; - } f_string_range_t; - - #define f_string_range_t_initialize { 1, 0 } - - #define macro_f_string_range_t_initialize_1(start, stop) { start, stop } - #define macro_f_string_range_t_initialize_2(length) { length ? 0 : 1, length ? length - 1 : 0 } - - #define macro_f_string_range_t_clear(range) \ - range.start = 1; \ - range.stop = 0; -#endif // _di_f_string_range_t_ - -/** - * Provide a static empty range. - * - * This is intended to represent an empty or disabled range. - */ -#ifndef _di_f_string_range_empty_c_ - extern const f_string_range_t f_string_range_empty_c; -#endif // _di_f_string_range_empty_c_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _F_string_range_h diff --git a/level_0/f_string/c/string/range_double.c b/level_0/f_string/c/string/range_double.c deleted file mode 100644 index 25125f4..0000000 --- a/level_0/f_string/c/string/range_double.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "../string.h" -#include "../private-string.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_f_string_range_double_empty_c_ - const f_string_range_double_t f_string_range_double_empty_c = { 1, 0 }; -#endif // _di_f_string_range_double_empty_c_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/c/string/range_double.h b/level_0/f_string/c/string/range_double.h deleted file mode 100644 index 5a8247a..0000000 --- a/level_0/f_string/c/string/range_double.h +++ /dev/null @@ -1,65 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Defines range string data. - * - * This is auto-included by string.h and should not need to be explicitly included. - */ -#ifndef _F_string_range_double_h -#define _F_string_range_double_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A structure designating two start and stop ranges for some string(s). - * - * In general, this project uses the start and stop position inclusively, meaning that a range of 0 to 1 would include positions 0 and position 1. - * Therefore, a range from 0 to 0 would be include position 0. - * Set start to some value larger than stop to designate that there is no range (such as start = 1, stop = 0). - * - * Properties: - * - start_1: The first start position. - * - stop_1: The first stop position. - * - start_2: The second start position. - * - stop_2: The second stop position. - */ -#ifndef _di_f_string_range_double_t_ - typedef struct { - f_number_unsigned_t start_1; - f_number_unsigned_t stop_1; - f_number_unsigned_t start_2; - f_number_unsigned_t stop_2; - } f_string_range_double_t; - - #define f_string_range_double_t_initialize { 1, 0, 1, 0 } - - #define macro_f_string_range_double_t_initialize_1(start_1, stop_1, start_2, stop_2) { start_1, stop_1, start_2, stop_2 } - #define macro_f_string_range_double_t_initialize_2(length_1, length_2) { length_1 ? 0 : 1, length_1 ? length_1 - 1 : 0, length_2 ? 0 : 1, length_2 ? length_2 - 1 : 0 } - - #define macro_f_string_range_double_t_clear(range_1, range_2) \ - range_1.start = 1; \ - range_1.stop = 0 \ - range_2.start = 1; \ - range_2.stop = 0; -#endif // _di_f_string_range_double_t_ - -/** - * Provide a static empty range. - * - * This is intended to represent an empty or disabled range. - */ -#ifndef _di_f_string_range_double_empty_c_ - extern const f_string_range_double_t f_string_range_double_empty_c; -#endif // _di_f_string_range_double_empty_c_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _F_string_range_double_h diff --git a/level_0/f_string/c/string/range_doubles.h b/level_0/f_string/c/string/range_doubles.h deleted file mode 100644 index 1011daf..0000000 --- a/level_0/f_string/c/string/range_doubles.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Defines range string data. - * - * This is auto-included by string.h and should not need to be explicitly included. - */ -#ifndef _F_string_range_doubles_h -#define _F_string_range_doubles_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * An array of string ranges. - * - * Properties: - * - array: The array of string ranges. - * - size: Total amount of allocated space. - * - used: Total number of allocated spaces used. - */ -#ifndef _di_f_string_range_doubles_t_ - typedef struct { - f_string_range_double_t *array; - - f_number_unsigned_t size; - f_number_unsigned_t used; - } f_string_range_doubles_t; - - #define f_string_range_doubles_t_initialize { 0, 0, 0 } - - #define macro_f_string_range_doubles_t_initialize_1(array, size, used) { array, size, used } - #define macro_f_string_range_doubles_t_initialize_2(array, length) { array, length, length } - - #define macro_f_string_range_doubles_t_clear(ranges) \ - ranges.array = 0; \ - ranges.size = 0; \ - ranges.used = 0; -#endif // _di_f_string_range_doubles_t_ - -/** - * Append the single source range onto the destination. - * - * @param source - * The source range to append. - * @param destination - * The destination ranges the source is appended onto. - * - * @return - * F_okay on success. - * F_data_not on success, but there is nothing to append (size == 0). - * - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_memory_resize(). - */ -#ifndef _di_f_string_range_doubles_append_ - extern f_status_t f_string_range_doubles_append(const f_string_range_double_t source, f_string_range_doubles_t * const destination); -#endif // _di_f_string_range_doubles_append_ - -/** - * Append the source ranges onto the destination. - * - * @param source - * The source ranges to append. - * @param destination - * The destination ranges the source is appended onto. - * - * @return - * F_okay on success. - * F_data_not on success, but there is nothing to append (size == 0). - * - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_memory_resize(). - */ -#ifndef _di_f_string_range_doubles_append_all_ - extern f_status_t f_string_range_doubles_append_all(const f_string_range_doubles_t source, f_string_range_doubles_t * const destination); -#endif // _di_f_string_range_doubles_append_all_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _F_string_range_doubles_h diff --git a/level_0/f_string/c/string/range_doubless.c b/level_0/f_string/c/string/range_doubless.c deleted file mode 100644 index 8d2b4f2..0000000 --- a/level_0/f_string/c/string/range_doubless.c +++ /dev/null @@ -1,124 +0,0 @@ -#include "../string.h" -#include "../private-string.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_f_string_range_doubless_append_ - f_status_t f_string_range_doubless_append(const f_string_range_doubles_t source, f_string_range_doubless_t * const destination) { - #ifndef _di_level_0_parameter_checking_ - if (!destination) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!source.used) return F_data_not; - - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; - - f_string_range_doubles_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; - - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_string_range_double_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; - - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - - destination_inner->array[destination_inner->used].start_1 = source.array[i].start_1; - destination_inner->array[destination_inner->used].stop_1 = source.array[i].stop_1; - destination_inner->array[destination_inner->used].start_2 = source.array[i].start_2; - destination_inner->array[destination_inner->used].stop_2 = source.array[i].stop_2; - } // for - } - } - - ++destination->used; - - return F_okay; - } -#endif // _di_f_string_range_doubless_append_ - -#ifndef _di_f_string_range_doubless_append_all_ - f_status_t f_string_range_doubless_append_all(const f_string_range_doubless_t source, f_string_range_doubless_t * const destination) { - #ifndef _di_level_0_parameter_checking_ - if (!destination) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!source.used) return F_data_not; - - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; - - f_string_range_doubles_t * destination_inner = 0; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - - destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; - - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_range_double_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); - if (F_status_is_error(status)) return status; - - for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - - destination_inner->array[destination_inner->used].start_1 = source.array[i].array[j].start_1; - destination_inner->array[destination_inner->used].stop_1 = source.array[i].array[j].stop_1; - destination_inner->array[destination_inner->used].start_2 = source.array[i].array[j].start_2; - destination_inner->array[destination_inner->used].stop_2 = source.array[i].array[j].stop_2; - } // for - } - } // for - } - - return F_okay; - } -#endif // _di_f_string_range_doubless_append_all_ - -#ifndef _di_f_string_range_doubless_delete_callback_ - f_status_t f_string_range_doubless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - - { - f_string_range_doubles_t * const array = (f_string_range_doubles_t *) void_array; - f_status_t status = F_okay; - - for (f_number_unsigned_t i = start; i < stop; ++i) { - - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_string_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } - - return F_okay; - } -#endif // _di_f_string_range_doubless_delete_callback_ - -#ifndef _di_f_string_range_doubless_destroy_callback_ - f_status_t f_string_range_doubless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - - { - f_string_range_doubles_t * const array = (f_string_range_doubles_t *) void_array; - f_status_t status = F_okay; - - for (f_number_unsigned_t i = start; i < stop; ++i) { - - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } - - return F_okay; - } -#endif // _di_f_string_range_doubless_destroy_callback_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/c/string/ranges.h b/level_0/f_string/c/string/ranges.h deleted file mode 100644 index 65ccfcc..0000000 --- a/level_0/f_string/c/string/ranges.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Defines range string data. - * - * This is auto-included by string.h and should not need to be explicitly included. - */ -#ifndef _F_string_ranges_h -#define _F_string_ranges_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * An array of string ranges. - * - * Properties: - * - array: The array of string ranges. - * - size: Total amount of allocated space. - * - used: Total number of allocated spaces used. - */ -#ifndef _di_f_string_ranges_t_ - typedef struct { - f_string_range_t *array; - - f_number_unsigned_t size; - f_number_unsigned_t used; - } f_string_ranges_t; - - #define f_string_ranges_t_initialize { 0, 0, 0 } - - #define macro_f_string_ranges_t_initialize_1(array, size, used) { array, size, used } - #define macro_f_string_ranges_t_initialize_2(array, length) { array, length, length } - - #define macro_f_string_ranges_t_clear(ranges) \ - ranges.array = 0; \ - ranges.size = 0; \ - ranges.used = 0; -#endif // _di_f_string_ranges_t_ - -/** - * Append the single source range onto the destination. - * - * @param source - * The source range to append. - * @param destination - * The destination ranges the source is appended onto. - * - * @return - * F_okay on success. - * F_data_not on success, but there is nothing to append (size == 0). - * - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_memory_resize(). - */ -#ifndef _di_f_string_ranges_append_ - extern f_status_t f_string_ranges_append(const f_string_range_t source, f_string_ranges_t * const destination); -#endif // _di_f_string_ranges_append_ - -/** - * Append the source ranges onto the destination. - * - * @param source - * The source ranges to append. - * @param destination - * The destination ranges the source is appended onto. - * - * @return - * F_okay on success. - * F_data_not on success, but there is nothing to append (size == 0). - * - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_memory_resize(). - */ -#ifndef _di_f_string_ranges_append_all_ - extern f_status_t f_string_ranges_append_all(const f_string_ranges_t source, f_string_ranges_t * const destination); -#endif // _di_f_string_ranges_append_all_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _F_string_ranges_h diff --git a/level_0/f_string/c/string/tripless.c b/level_0/f_string/c/string/tripless.c index 5ec1258..bc00bf4 100644 --- a/level_0/f_string/c/string/tripless.c +++ b/level_0/f_string/c/string/tripless.c @@ -14,7 +14,7 @@ extern "C" { if (!source.used) return F_data_not; { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); if (F_status_is_error(status)) return status; f_string_triples_t * const destination_inner = &destination->array[destination->used]; diff --git a/level_0/f_string/data/build/settings b/level_0/f_string/data/build/settings index 15fca29..0e7b5b4 100644 --- a/level_0/f_string/data/build/settings +++ b/level_0/f_string/data/build/settings @@ -38,8 +38,6 @@ build_sources_library string/dynamic.c string/dynamics.c string/dynamicss.c build_sources_library string/map.c string/maps.c string/mapss.c build_sources_library string/map_multi.c string/map_multis.c string/map_multiss.c build_sources_library string/quantity.c string/quantitys.c string/quantityss.c -build_sources_library string/range.c string/ranges.c string/rangess.c -build_sources_library string/range_double.c string/range_doubles.c string/range_doubless.c build_sources_library string/static.c string/statics.c string/staticss.c build_sources_library string/triple.c string/triples.c string/tripless.c @@ -48,8 +46,6 @@ build_sources_headers string/dynamic.h string/dynamics.h string/dynamicss.h build_sources_headers string/map.h string/maps.h string/mapss.h build_sources_headers string/map_multi.h string/map_multis.h string/map_multiss.h build_sources_headers string/quantity.h string/quantitys.h string/quantityss.h -build_sources_headers string/range.h string/ranges.h string/rangess.h -build_sources_headers string/range_double.h string/range_double.h string/range_doubless.h build_sources_headers string/static.h string/statics.h string/staticss.h build_sources_headers string/triple.h string/triples.h string/tripless.h diff --git a/level_0/f_string/data/build/settings-mocks b/level_0/f_string/data/build/settings-mocks index 0d50e9b..55fb344 100644 --- a/level_0/f_string/data/build/settings-mocks +++ b/level_0/f_string/data/build/settings-mocks @@ -26,8 +26,6 @@ build_sources_library string/dynamic.c string/dynamics.c string/dynamicss.c build_sources_library string/map.c string/maps.c string/mapss.c build_sources_library string/map_multi.c string/map_multis.c string/map_multiss.c build_sources_library string/quantity.c string/quantitys.c string/quantityss.c -build_sources_library string/range.c string/ranges.c string/rangess.c -build_sources_library string/range_double.c string/range_doubles.c string/range_doubless.c build_sources_library string/static.c string/statics.c string/staticss.c build_sources_library string/triple.c string/triples.c string/tripless.c build_sources_library ../../tests/unit/c/mock-string.c @@ -37,8 +35,6 @@ build_sources_headers string/dynamic.h string/dynamics.h string/dynamicss.h build_sources_headers string/map.h string/maps.h string/mapss.h build_sources_headers string/map_multi.h string/map_multis.h string/map_multiss.h build_sources_headers string/quantity.h string/quantitys.h string/quantityss.h -build_sources_headers string/range.h string/ranges.h string/rangess.h -build_sources_headers string/range_double.h string/range_doubles.h string/range_doubless.h build_sources_headers string/static.h string/statics.h string/staticss.h build_sources_headers string/triple.h string/triples.h string/tripless.h diff --git a/level_0/f_string/data/build/settings-tests b/level_0/f_string/data/build/settings-tests index 907eb95..0bca0f8 100644 --- a/level_0/f_string/data/build/settings-tests +++ b/level_0/f_string/data/build/settings-tests @@ -50,10 +50,6 @@ build_sources_program test-string-mish.c test-string-mish_nulless.c build_sources_program test-string-prepend.c test-string-prepend_assure.c test-string-prepend_assure_nulless.c test-string-prepend_nulless.c build_sources_program test-string-quantitys_append.c test-string-quantitys_append_all.c test-string-quantityss_append.c test-string-quantityss_append_all.c build_sources_program test-string-quantityss_delete_callback.c test-string-quantityss_destroy_callback.c -build_sources_program test-string-ranges_append.c test-string-ranges_append_all.c test-string-rangess_append.c test-string-rangess_append_all.c -build_sources_program test-string-rangess_delete_callback.c test-string-rangess_destroy_callback.c -build_sources_program test-string-range_doubles_append.c test-string-range_doubles_append_all.c test-string-range_doubless_append.c test-string-range_doubless_append_all.c -build_sources_program test-string-range_doubless_delete_callback.c test-string-range_doubless_destroy_callback.c build_sources_program test-string-seek_line.c test-string-seek_line_to.c test-string-seek_to.c build_sources_program test-string-triples_append.c test-string-triples_append_all.c test-string-tripless_append.c test-string-tripless_append_all.c build_sources_program test-string-triples_delete_callback.c test-string-triples_destroy_callback.c diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append.c index 5096417..2e3a44a 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_append__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -28,7 +28,7 @@ void test__f_string_dynamic_partial_append__works(void **state) { void test__f_string_dynamic_partial_append__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_append(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure.c index 3ecc0b9..67a96f3 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_append_assure__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -39,7 +39,7 @@ void test__f_string_dynamic_partial_append_assure__works(void **state) { void test__f_string_dynamic_partial_append_assure__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_append_assure(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure_nulless.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure_nulless.c index ae1afb6..b3d555a 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure_nulless.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_assure_nulless.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_append_assure_nulless__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -37,7 +37,7 @@ void test__f_string_dynamic_partial_append_assure_nulless__works(void **state) { void test__f_string_dynamic_partial_append_assure_nulless__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_append_assure_nulless(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_nulless.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_nulless.c index 8c8bdca..01d864f 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_nulless.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_append_nulless.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_append_nulless__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -27,7 +27,7 @@ void test__f_string_dynamic_partial_append_nulless__works(void **state) { void test__f_string_dynamic_partial_append_nulless__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_append_nulless(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash.c index 9c8a5ff..fb357b3 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash.c @@ -11,7 +11,7 @@ void test__f_string_dynamic_partial_mash__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected1 = macro_f_string_static_t_initialize_1("te\0st", 0, 5); const f_string_static_t expected2 = macro_f_string_static_t_initialize_1("te\0st:te\0st", 0, 11); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -43,7 +43,7 @@ void test__f_string_dynamic_partial_mash__parameter_checking(void **state) { const f_string_static_t glue = macro_f_string_static_t_initialize_1(":", 0, 1); const f_string_static_t source = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_mash(glue, source, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash_nulless.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash_nulless.c index 6831723..0e8428d 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash_nulless.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mash_nulless.c @@ -11,7 +11,7 @@ void test__f_string_dynamic_partial_mash_nulless__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected1 = macro_f_string_static_t_initialize_1("test", 0, 4); const f_string_static_t expected2 = macro_f_string_static_t_initialize_1("test:test", 0, 9); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -40,7 +40,7 @@ void test__f_string_dynamic_partial_mash_nulless__parameter_checking(void **stat const f_string_static_t glue = macro_f_string_static_t_initialize_1(":", 0, 1); const f_string_static_t source = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_mash_nulless(glue, source, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish.c index d8b131a..f83dfe0 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish.c @@ -11,7 +11,7 @@ void test__f_string_dynamic_partial_mish__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected1 = macro_f_string_static_t_initialize_1("te\0st", 0, 5); const f_string_static_t expected2 = macro_f_string_static_t_initialize_1("te\0st:te\0st", 0, 11); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -43,7 +43,7 @@ void test__f_string_dynamic_partial_mish__parameter_checking(void **state) { const f_string_static_t glue = macro_f_string_static_t_initialize_1(":", 0, 1); const f_string_static_t source = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_mish(glue, source, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish_nulless.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish_nulless.c index b55bcd4..9c1afe7 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish_nulless.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_mish_nulless.c @@ -11,7 +11,7 @@ void test__f_string_dynamic_partial_mish_nulless__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected1 = macro_f_string_static_t_initialize_1("test", 0, 4); const f_string_static_t expected2 = macro_f_string_static_t_initialize_1("test:test", 0, 9); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -40,7 +40,7 @@ void test__f_string_dynamic_partial_mish_nulless__parameter_checking(void **stat const f_string_static_t glue = macro_f_string_static_t_initialize_1(":", 0, 1); const f_string_static_t source = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_mish_nulless(glue, source, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend.c index c908f90..decba43 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_prepend__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -28,7 +28,7 @@ void test__f_string_dynamic_partial_prepend__works(void **state) { void test__f_string_dynamic_partial_prepend__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_prepend(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure.c index 48769f4..fa9c6ef 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_prepend_assure__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("te\0st", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -39,7 +39,7 @@ void test__f_string_dynamic_partial_prepend_assure__works(void **state) { void test__f_string_dynamic_partial_prepend_assure__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_prepend_assure(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure_nulless.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure_nulless.c index 32534c6..ccdaed3 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure_nulless.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_assure_nulless.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_prepend_assure_nulless__works(void **state) const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -37,7 +37,7 @@ void test__f_string_dynamic_partial_prepend_assure_nulless__works(void **state) void test__f_string_dynamic_partial_prepend_assure_nulless__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_prepend_assure_nulless(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_nulless.c b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_nulless.c index 78ac3f8..ab61193 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_nulless.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_partial_prepend_nulless.c @@ -9,7 +9,7 @@ void test__f_string_dynamic_partial_prepend_nulless__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("_te\0st_", 0, 7); const f_string_static_t expected = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_string_dynamic_t destination = f_string_dynamic_t_initialize; { @@ -27,7 +27,7 @@ void test__f_string_dynamic_partial_prepend_nulless__works(void **state) { void test__f_string_dynamic_partial_prepend_nulless__parameter_checking(void **state) { const f_string_dynamic_t data = f_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_string_dynamic_partial_prepend_nulless(data, partial, 0); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line.c b/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line.c index 350cd14..1ab687a 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line.c @@ -10,7 +10,7 @@ void test__f_string_dynamic_seek_line__returns_data_not_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_string_dynamic_seek_line(source, &range); @@ -23,7 +23,7 @@ void test__f_string_dynamic_seek_line__returns_none_eos(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_dynamic_seek_line(source, &range); @@ -39,7 +39,7 @@ void test__f_string_dynamic_seek_line__returns_none_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 2); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 2); const f_status_t status = f_string_dynamic_seek_line(source, &range); @@ -55,7 +55,7 @@ void test__f_string_dynamic_seek_line__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_dynamic_seek_line(source, &range); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line_to.c b/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line_to.c index 9ca2a16..6141525 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line_to.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_seek_line_to.c @@ -11,7 +11,7 @@ void test__f_string_dynamic_seek_line_to__at_newline(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("te\nXst", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -28,7 +28,7 @@ void test__f_string_dynamic_seek_line_to__returns_data_not_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -42,7 +42,7 @@ void test__f_string_dynamic_seek_line_to__returns_none_eos(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -59,7 +59,7 @@ void test__f_string_dynamic_seek_line_to__returns_none_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 2); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 2); const f_status_t status = f_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -76,7 +76,7 @@ void test__f_string_dynamic_seek_line_to__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("teX\nst", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_dynamic_seek_line_to(source, to.string[0], &range); diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_seek_to.c b/level_0/f_string/tests/unit/c/test-string-dynamic_seek_to.c index b8413de..b2e9d51 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_seek_to.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_seek_to.c @@ -11,7 +11,7 @@ void test__f_string_dynamic_seek_to__returns_data_not_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_string_dynamic_seek_to(source, to.string[0], &range); @@ -25,7 +25,7 @@ void test__f_string_dynamic_seek_to__returns_none_eos(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_dynamic_seek_to(source, to.string[0], &range); @@ -42,7 +42,7 @@ void test__f_string_dynamic_seek_to__returns_none_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 2); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 2); const f_status_t status = f_string_dynamic_seek_to(source, to.string[0], &range); @@ -59,7 +59,7 @@ void test__f_string_dynamic_seek_to__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("te\nXst", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_dynamic_seek_to(source, to.string[0], &range); diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubles_append.c b/level_0/f_string/tests/unit/c/test-string-range_doubles_append.c deleted file mode 100644 index 4182e73..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubles_append.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "test-string.h" -#include "test-string-range_doubles_append.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_range_doubles_append__works(void **state) { - - const f_string_range_double_t source = macro_f_string_range_double_t_initialize_1(1, 2); - f_string_range_doubles_t destination = f_string_range_doubles_t_initialize; - - { - const f_status_t status = f_string_range_doubles_append(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.used, 1); - assert_int_equal(destination.array[0].start, source.start); - assert_int_equal(destination.array[0].stop, source.stop); - } - - free((void *) destination.array); -} - -void test__f_string_range_doubles_append__parameter_checking(void **state) { - - const f_string_range_double_t data = f_string_range_double_t_initialize; - - { - const f_status_t status = f_string_range_doubles_append(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubles_append.h b/level_0/f_string/tests/unit/c/test-string-range_doubles_append.h deleted file mode 100644 index 0068d8d..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubles_append.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_range_doubles_append_h -#define _TEST__F_string_range_doubles_append_h - -/** - * Test that the function works. - * - * @see f_string_range_doubles_append() - */ -extern void test__f_string_range_doubles_append__works(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_range_doubles_append() - */ -extern void test__f_string_range_doubles_append__parameter_checking(void **state); - -#endif // _TEST__F_string_range_doubles_append_h diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.c b/level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.c deleted file mode 100644 index c35ed5b..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "test-string.h" -#include "test-string-range_doubles_append_all.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_range_doubles_append_all__works(void **state) { - - const int length_sources = 2; - - f_string_range_double_t sources_array[] = { - macro_f_string_range_double_t_initialize_1(1, 2), - macro_f_string_range_double_t_initialize_1(3, 4), - }; - - const f_string_range_doubles_t source = macro_f_string_range_doubles_t_initialize_1(sources_array, 0, length_sources); - f_string_range_doubles_t destination = f_string_range_doubles_t_initialize; - - { - const f_status_t status = f_string_range_doubles_append_all(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.used, source.used); - assert_int_equal(destination.size, source.used); - - for (f_number_unsigned_t i = 0; i < length_sources; ++i) { - - assert_int_equal(destination.array[i].start, source.array[i].start); - assert_int_equal(destination.array[i].stop, source.array[i].stop); - } // for - } - - free((void *) destination.array); -} - -void test__f_string_range_doubles_append_all__returns_data_not(void **state) { - - const int length = 5; - f_string_range_doubles_t source = f_string_range_doubles_t_initialize; - f_string_range_doubles_t destination = f_string_range_doubles_t_initialize; - - { - const f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_double_t), (void **) &source.array, &source.used, &source.size); - - assert_int_equal(status, F_okay); - assert_int_equal(source.used, 0); - assert_int_equal(source.size, length); - } - - { - const f_status_t status = f_string_range_doubles_append_all(source, &destination); - - assert_int_equal(status, F_data_not); - assert_int_equal(destination.used, 0); - assert_int_equal(destination.size, 0); - assert_null(destination.array); - } - - free((void *) source.array); -} - -void test__f_string_range_doubles_append_all__parameter_checking(void **state) { - - const f_string_range_doubles_t data = f_string_range_doubles_t_initialize; - - { - const f_status_t status = f_string_range_doubles_append_all(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.h b/level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.h deleted file mode 100644 index 429d27a..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubles_append_all.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_range_doubles_append_all_h -#define _TEST__F_string_range_doubles_append_all_h - -/** - * Test that the function works. - * - * @see f_string_range_doubles_append_all() - */ -extern void test__f_string_range_doubles_append_all__works(void **state); - -/** - * Test that the function returns F_data_not when asked to copy an empty structure. - * - * @see f_string_range_doubles_append_all() - */ -extern void test__f_string_range_doubles_append_all__returns_data_not(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_range_doubles_append_all() - */ -extern void test__f_string_range_doubles_append_all__parameter_checking(void **state); - -#endif // _TEST__F_string_range_doubles_append_all_h diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_append.c b/level_0/f_string/tests/unit/c/test-string-range_doubless_append.c deleted file mode 100644 index 4b4cdc5..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_append.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "test-string.h" -#include "test-string-range_doubless_append.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_range_doubless_append__works(void **state) { - - const int length_sources = 2; - - f_string_range_double_t sources_array[] = { - macro_f_string_range_double_t_initialize_1(1, 2), - macro_f_string_range_double_t_initialize_1(3, 4), - }; - - const f_string_range_doubles_t source = macro_f_string_range_doubles_t_initialize_1(sources_array, 0, length_sources); - f_string_range_doubless_t destination = f_string_range_doubless_t_initialize; - - { - const f_status_t status = f_string_range_doubless_append(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.array[0].used, length_sources); - - for (f_number_unsigned_t i = 0; i < length_sources; ++i) { - - assert_int_equal(destination.array[0].array[i].start, sources_array[i].start); - assert_int_equal(destination.array[0].array[i].stop, sources_array[i].stop); - } // for - } - - free((void *) destination.array[0].array); - free((void *) destination.array); -} - -void test__f_string_range_doubless_append__returns_data_not(void **state) { - - const int length = 5; - f_string_range_doubles_t source = f_string_range_doubless_t_initialize; - f_string_range_doubless_t destination = f_string_range_doubless_t_initialize; - - { - const f_status_t status = f_memory_arrays_resize(length, sizeof(f_string_range_doubles_t), (void **) &source.array, &source.used, &source.size, &f_string_range_doubless_delete_callback); - - assert_int_equal(status, F_okay); - assert_int_equal(source.used, 0); - assert_int_equal(source.size, length); - } - - { - const f_status_t status = f_string_range_doubless_append(source, &destination); - - assert_int_equal(status, F_data_not); - assert_int_equal(destination.used, 0); - assert_int_equal(destination.size, 0); - assert_null(destination.array); - } - - free((void *) source.array); -} - -void test__f_string_range_doubless_append__parameter_checking(void **state) { - - f_string_range_doubles_t data = f_string_range_doubles_t_initialize; - - { - const f_status_t status = f_string_range_doubless_append(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_append.h b/level_0/f_string/tests/unit/c/test-string-range_doubless_append.h deleted file mode 100644 index ace3d4a..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_append.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_range_doubless_append_h -#define _TEST__F_string_range_doubless_append_h - -/** - * Test that the function works. - * - * @see f_string_range_doubless_append() - */ -extern void test__f_string_range_doubless_append__works(void **state); - -/** - * Test that the function returns F_data_not when asked to copy an empty structure. - * - * @see f_string_range_doubless_append() - */ -extern void test__f_string_range_doubless_append__returns_data_not(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_range_doubless_append() - */ -extern void test__f_string_range_doubless_append__parameter_checking(void **state); - -#endif // _TEST__F_string_range_doubless_append_h diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.c b/level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.c deleted file mode 100644 index 286e452..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.c +++ /dev/null @@ -1,93 +0,0 @@ -#include "test-string.h" -#include "test-string-range_doubless_append_all.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_range_doubless_append_all__works(void **state) { - - const int length_sources = 2; - const int length_sources_set = 2; - - f_string_range_double_t sources_array1[] = { - macro_f_string_range_double_t_initialize_1(1, 2), - macro_f_string_range_double_t_initialize_1(3, 4), - }; - - f_string_range_double_t sources_array2[] = { - macro_f_string_range_double_t_initialize_1(5, 6), - macro_f_string_range_double_t_initialize_1(7, 8), - }; - - f_string_range_doubles_t sources_set_array[] = { - macro_f_string_range_doubles_t_initialize_1(sources_array1, 0, length_sources), - macro_f_string_range_doubles_t_initialize_1(sources_array2, 0, length_sources), - }; - - const f_string_range_doubless_t source = macro_f_string_range_doubless_t_initialize_1(sources_set_array, 0, length_sources_set); - f_string_range_doubless_t destination = f_string_range_doubless_t_initialize; - - { - const f_status_t status = f_string_range_doubless_append_all(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.used, source.used); - - for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { - - for (f_number_unsigned_t i = 0; i < length_sources; ++i) { - - assert_int_equal(destination.array[j].array[i].start, sources_set_array[j].array[i].start); - assert_int_equal(destination.array[j].array[i].stop, sources_set_array[j].array[i].stop); - } // for - } // for - } - - for (f_number_unsigned_t i = 0; i < destination.used; ++i) { - free((void *) destination.array[i].array); - } // for - - free((void *) destination.array); -} - -void test__f_string_range_doubless_append_all__returns_data_not(void **state) { - - const int length = 5; - f_string_range_doubless_t source = f_string_range_doubless_t_initialize; - f_string_range_doubless_t destination = f_string_range_doubless_t_initialize; - - { - const f_status_t status = f_memory_arrays_resize(length, sizeof(f_string_range_doubles_t), (void **) &source.array, &source.used, &source.size, &f_string_range_doubless_delete_callback); - - assert_int_equal(status, F_okay); - assert_int_equal(source.used, 0); - assert_int_equal(source.size, length); - } - - { - const f_status_t status = f_string_range_doubless_append_all(source, &destination); - - assert_int_equal(status, F_data_not); - assert_int_equal(destination.used, 0); - assert_int_equal(destination.size, 0); - assert_null(destination.array); - } - - free((void *) source.array); -} - -void test__f_string_range_doubless_append_all__parameter_checking(void **state) { - - const f_string_range_doubless_t data = f_string_range_doubless_t_initialize; - - { - const f_status_t status = f_string_range_doubless_append_all(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.h b/level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.h deleted file mode 100644 index 1c3e583..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_append_all.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_range_doubless_append_all_h -#define _TEST__F_string_range_doubless_append_all_h - -/** - * Test that the function works. - * - * @see f_string_range_doubless_append_all() - */ -extern void test__f_string_range_doubless_append_all__works(void **state); - -/** - * Test that the function returns F_data_not when asked to copy an empty structure. - * - * @see f_string_range_doubless_append_all() - */ -extern void test__f_string_range_doubless_append_all__returns_data_not(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_range_doubless_append_all() - */ -extern void test__f_string_range_doubless_append_all__parameter_checking(void **state); - -#endif // _TEST__F_string_range_doubless_append_all_h diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.c b/level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.c deleted file mode 100644 index efe6e80..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "test-string.h" -#include "test-string-range_doubless_delete_callback.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_range_doubless_delete_callback__fails(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 0; - - f_string_range_double_t data = f_string_range_double_t_initialize; - f_string_range_double_t data_array[] = { data }; - f_string_range_doubles_t datas = { .array = data_array, .used = 1, .size = 1 }; - f_string_range_doubles_t datas_array[] = { datas }; - - { - will_return(__wrap_f_memory_array_resize, true); - will_return(__wrap_f_memory_array_resize, F_status_set_error(F_failure)); - - const f_status_t status = f_string_range_doubless_delete_callback(0, 1, (void *) datas_array); - - assert_int_equal(status, F_status_set_error(F_failure)); - } -} - -void test__f_string_range_doubless_delete_callback__works(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 1; - - const f_number_unsigned_t length = 1; - - f_string_range_doubless_t datass = f_string_range_doubless_t_initialize; - - { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_doubles_t), (void **) &datass.array, &datass.used, &datass.size); - assert_int_equal(status, F_okay); - - status = f_memory_array_resize(1, sizeof(f_string_range_double_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); - assert_int_equal(status, F_okay); - } - - { - const f_status_t status = f_string_range_doubless_delete_callback(0, length, (void *) datass.array); - - assert_int_equal(status, F_okay); - assert_int_equal(datass.array[0].size, 0); - } - - free((void *) datass.array); -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.h b/level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.h deleted file mode 100644 index 7f2a90c..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_delete_callback.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string__range_doubless_delete_callback -#define _TEST__F_string__range_doubless_delete_callback - -/** - * Test that the function fails. - * - * @see f_string_range_doubless_delete_callback() - */ -extern void test__f_string_range_doubless_delete_callback__fails(void **state); - -/** - * Test that the function works. - * - * @see f_string_range_doubless_delete_callback() - */ -extern void test__f_string_range_doubless_delete_callback__works(void **state); - -#endif // _TEST__F_string__range_doubless_delete_callback diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.c b/level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.c deleted file mode 100644 index 1964d72..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "test-string.h" -#include "test-string-range_doubless_destroy_callback.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_range_doubless_destroy_callback__fails(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 0; - - f_string_range_double_t data = f_string_range_double_t_initialize; - f_string_range_double_t data_array[] = { data }; - f_string_range_doubles_t datas = { .array = data_array, .used = 1, .size = 1 }; - f_string_range_doubles_t datas_array[] = { datas }; - - { - will_return(__wrap_f_memory_array_adjust, true); - will_return(__wrap_f_memory_array_adjust, F_status_set_error(F_failure)); - - const f_status_t status = f_string_range_doubless_destroy_callback(0, 1, (void *) datas_array); - - assert_int_equal(status, F_status_set_error(F_failure)); - } -} - -void test__f_string_range_doubless_destroy_callback__works(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 1; - - const f_number_unsigned_t length = 1; - - f_string_range_doubless_t datass = f_string_range_doubless_t_initialize; - - { - f_status_t status = f_memory_array_adjust(length, sizeof(f_string_range_doubles_t), (void **) &datass.array, &datass.used, &datass.size); - assert_int_equal(status, F_okay); - - status = f_memory_array_adjust(1, sizeof(f_string_range_double_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); - assert_int_equal(status, F_okay); - } - - { - const f_status_t status = f_string_range_doubless_destroy_callback(0, length, (void *) datass.array); - - assert_int_equal(status, F_okay); - assert_int_equal(datass.array[0].size, 0); - } - - free((void *) datass.array); -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.h b/level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.h deleted file mode 100644 index 7e489ac..0000000 --- a/level_0/f_string/tests/unit/c/test-string-range_doubless_destroy_callback.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string__range_doubless_destroy_callback -#define _TEST__F_string__range_doubless_destroy_callback - -/** - * Test that the function fails. - * - * @see f_string_range_doubless_destroy_callback() - */ -extern void test__f_string_range_doubless_destroy_callback__fails(void **state); - -/** - * Test that the function works. - * - * @see f_string_range_doubless_destroy_callback() - */ -extern void test__f_string_range_doubless_destroy_callback__works(void **state); - -#endif // _TEST__F_string__range_doubless_destroy_callback diff --git a/level_0/f_string/tests/unit/c/test-string-ranges_append.c b/level_0/f_string/tests/unit/c/test-string-ranges_append.c deleted file mode 100644 index f619a07..0000000 --- a/level_0/f_string/tests/unit/c/test-string-ranges_append.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "test-string.h" -#include "test-string-ranges_append.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_ranges_append__works(void **state) { - - const f_string_range_t source = macro_f_string_range_t_initialize_1(1, 2); - f_string_ranges_t destination = f_string_ranges_t_initialize; - - { - const f_status_t status = f_string_ranges_append(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.used, 1); - assert_int_equal(destination.array[0].start, source.start); - assert_int_equal(destination.array[0].stop, source.stop); - } - - free((void *) destination.array); -} - -void test__f_string_ranges_append__parameter_checking(void **state) { - - const f_string_range_t data = f_string_range_t_initialize; - - { - const f_status_t status = f_string_ranges_append(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-ranges_append.h b/level_0/f_string/tests/unit/c/test-string-ranges_append.h deleted file mode 100644 index d6f9e15..0000000 --- a/level_0/f_string/tests/unit/c/test-string-ranges_append.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_ranges_append_h -#define _TEST__F_string_ranges_append_h - -/** - * Test that the function works. - * - * @see f_string_ranges_append() - */ -extern void test__f_string_ranges_append__works(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_ranges_append() - */ -extern void test__f_string_ranges_append__parameter_checking(void **state); - -#endif // _TEST__F_string_ranges_append_h diff --git a/level_0/f_string/tests/unit/c/test-string-ranges_append_all.c b/level_0/f_string/tests/unit/c/test-string-ranges_append_all.c deleted file mode 100644 index a1df06a..0000000 --- a/level_0/f_string/tests/unit/c/test-string-ranges_append_all.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "test-string.h" -#include "test-string-ranges_append_all.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_ranges_append_all__works(void **state) { - - const int length_sources = 2; - - f_string_range_t sources_array[] = { - macro_f_string_range_t_initialize_1(1, 2), - macro_f_string_range_t_initialize_1(3, 4), - }; - - const f_string_ranges_t source = macro_f_string_ranges_t_initialize_1(sources_array, 0, length_sources); - f_string_ranges_t destination = f_string_ranges_t_initialize; - - { - const f_status_t status = f_string_ranges_append_all(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.used, source.used); - assert_int_equal(destination.size, source.used); - - for (f_number_unsigned_t i = 0; i < length_sources; ++i) { - - assert_int_equal(destination.array[i].start, source.array[i].start); - assert_int_equal(destination.array[i].stop, source.array[i].stop); - } // for - } - - free((void *) destination.array); -} - -void test__f_string_ranges_append_all__returns_data_not(void **state) { - - const int length = 5; - f_string_ranges_t source = f_string_ranges_t_initialize; - f_string_ranges_t destination = f_string_ranges_t_initialize; - - { - const f_status_t status = f_memory_array_resize(length, sizeof(f_string_range_t), (void **) &source.array, &source.used, &source.size); - - assert_int_equal(status, F_okay); - assert_int_equal(source.used, 0); - assert_int_equal(source.size, length); - } - - { - const f_status_t status = f_string_ranges_append_all(source, &destination); - - assert_int_equal(status, F_data_not); - assert_int_equal(destination.used, 0); - assert_int_equal(destination.size, 0); - assert_null(destination.array); - } - - free((void *) source.array); -} - -void test__f_string_ranges_append_all__parameter_checking(void **state) { - - const f_string_ranges_t data = f_string_ranges_t_initialize; - - { - const f_status_t status = f_string_ranges_append_all(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-ranges_append_all.h b/level_0/f_string/tests/unit/c/test-string-ranges_append_all.h deleted file mode 100644 index fc9a66c..0000000 --- a/level_0/f_string/tests/unit/c/test-string-ranges_append_all.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_ranges_append_all_h -#define _TEST__F_string_ranges_append_all_h - -/** - * Test that the function works. - * - * @see f_string_ranges_append_all() - */ -extern void test__f_string_ranges_append_all__works(void **state); - -/** - * Test that the function returns F_data_not when asked to copy an empty structure. - * - * @see f_string_ranges_append_all() - */ -extern void test__f_string_ranges_append_all__returns_data_not(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_ranges_append_all() - */ -extern void test__f_string_ranges_append_all__parameter_checking(void **state); - -#endif // _TEST__F_string_ranges_append_all_h diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_append.c b/level_0/f_string/tests/unit/c/test-string-rangess_append.c deleted file mode 100644 index bdb2624..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_append.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "test-string.h" -#include "test-string-rangess_append.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_rangess_append__works(void **state) { - - const int length_sources = 2; - - f_string_range_t sources_array[] = { - macro_f_string_range_t_initialize_1(1, 2), - macro_f_string_range_t_initialize_1(3, 4), - }; - - const f_string_ranges_t source = macro_f_string_ranges_t_initialize_1(sources_array, 0, length_sources); - f_string_rangess_t destination = f_string_rangess_t_initialize; - - { - const f_status_t status = f_string_rangess_append(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.array[0].used, length_sources); - - for (f_number_unsigned_t i = 0; i < length_sources; ++i) { - - assert_int_equal(destination.array[0].array[i].start, sources_array[i].start); - assert_int_equal(destination.array[0].array[i].stop, sources_array[i].stop); - } // for - } - - free((void *) destination.array[0].array); - free((void *) destination.array); -} - -void test__f_string_rangess_append__returns_data_not(void **state) { - - const int length = 5; - f_string_ranges_t source = f_string_rangess_t_initialize; - f_string_rangess_t destination = f_string_rangess_t_initialize; - - { - const f_status_t status = f_memory_arrays_resize(length, sizeof(f_string_ranges_t), (void **) &source.array, &source.used, &source.size, &f_string_rangess_delete_callback); - - assert_int_equal(status, F_okay); - assert_int_equal(source.used, 0); - assert_int_equal(source.size, length); - } - - { - const f_status_t status = f_string_rangess_append(source, &destination); - - assert_int_equal(status, F_data_not); - assert_int_equal(destination.used, 0); - assert_int_equal(destination.size, 0); - assert_null(destination.array); - } - - free((void *) source.array); -} - -void test__f_string_rangess_append__parameter_checking(void **state) { - - f_string_ranges_t data = f_string_ranges_t_initialize; - - { - const f_status_t status = f_string_rangess_append(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_append.h b/level_0/f_string/tests/unit/c/test-string-rangess_append.h deleted file mode 100644 index 7b07263..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_append.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_rangess_append_h -#define _TEST__F_string_rangess_append_h - -/** - * Test that the function works. - * - * @see f_string_rangess_append() - */ -extern void test__f_string_rangess_append__works(void **state); - -/** - * Test that the function returns F_data_not when asked to copy an empty structure. - * - * @see f_string_rangess_append() - */ -extern void test__f_string_rangess_append__returns_data_not(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_rangess_append() - */ -extern void test__f_string_rangess_append__parameter_checking(void **state); - -#endif // _TEST__F_string_rangess_append_h diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_append_all.c b/level_0/f_string/tests/unit/c/test-string-rangess_append_all.c deleted file mode 100644 index 9773ce6..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_append_all.c +++ /dev/null @@ -1,93 +0,0 @@ -#include "test-string.h" -#include "test-string-rangess_append_all.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_rangess_append_all__works(void **state) { - - const int length_sources = 2; - const int length_sources_set = 2; - - f_string_range_t sources_array1[] = { - macro_f_string_range_t_initialize_1(1, 2), - macro_f_string_range_t_initialize_1(3, 4), - }; - - f_string_range_t sources_array2[] = { - macro_f_string_range_t_initialize_1(5, 6), - macro_f_string_range_t_initialize_1(7, 8), - }; - - f_string_ranges_t sources_set_array[] = { - macro_f_string_ranges_t_initialize_1(sources_array1, 0, length_sources), - macro_f_string_ranges_t_initialize_1(sources_array2, 0, length_sources), - }; - - const f_string_rangess_t source = macro_f_string_rangess_t_initialize_1(sources_set_array, 0, length_sources_set); - f_string_rangess_t destination = f_string_rangess_t_initialize; - - { - const f_status_t status = f_string_rangess_append_all(source, &destination); - - assert_int_equal(status, F_okay); - assert_int_equal(destination.used, source.used); - - for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { - - for (f_number_unsigned_t i = 0; i < length_sources; ++i) { - - assert_int_equal(destination.array[j].array[i].start, sources_set_array[j].array[i].start); - assert_int_equal(destination.array[j].array[i].stop, sources_set_array[j].array[i].stop); - } // for - } // for - } - - for (f_number_unsigned_t i = 0; i < destination.used; ++i) { - free((void *) destination.array[i].array); - } // for - - free((void *) destination.array); -} - -void test__f_string_rangess_append_all__returns_data_not(void **state) { - - const int length = 5; - f_string_rangess_t source = f_string_rangess_t_initialize; - f_string_rangess_t destination = f_string_rangess_t_initialize; - - { - const f_status_t status = f_memory_arrays_resize(length, sizeof(f_string_ranges_t), (void **) &source.array, &source.used, &source.size, &f_string_rangess_delete_callback); - - assert_int_equal(status, F_okay); - assert_int_equal(source.used, 0); - assert_int_equal(source.size, length); - } - - { - const f_status_t status = f_string_rangess_append_all(source, &destination); - - assert_int_equal(status, F_data_not); - assert_int_equal(destination.used, 0); - assert_int_equal(destination.size, 0); - assert_null(destination.array); - } - - free((void *) source.array); -} - -void test__f_string_rangess_append_all__parameter_checking(void **state) { - - const f_string_rangess_t data = f_string_rangess_t_initialize; - - { - const f_status_t status = f_string_rangess_append_all(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_append_all.h b/level_0/f_string/tests/unit/c/test-string-rangess_append_all.h deleted file mode 100644 index 0ee22c0..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_append_all.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string_rangess_append_all_h -#define _TEST__F_string_rangess_append_all_h - -/** - * Test that the function works. - * - * @see f_string_rangess_append_all() - */ -extern void test__f_string_rangess_append_all__works(void **state); - -/** - * Test that the function returns F_data_not when asked to copy an empty structure. - * - * @see f_string_rangess_append_all() - */ -extern void test__f_string_rangess_append_all__returns_data_not(void **state); - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_string_rangess_append_all() - */ -extern void test__f_string_rangess_append_all__parameter_checking(void **state); - -#endif // _TEST__F_string_rangess_append_all_h diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.c b/level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.c deleted file mode 100644 index d0be50c..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "test-string.h" -#include "test-string-rangess_delete_callback.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_rangess_delete_callback__fails(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 0; - - f_string_range_t data = f_string_range_t_initialize; - f_string_range_t data_array[] = { data }; - f_string_ranges_t datas = { .array = data_array, .used = 1, .size = 1 }; - f_string_ranges_t datas_array[] = { datas }; - - { - will_return(__wrap_f_memory_array_resize, true); - will_return(__wrap_f_memory_array_resize, F_status_set_error(F_failure)); - - const f_status_t status = f_string_rangess_delete_callback(0, 1, (void *) datas_array); - - assert_int_equal(status, F_status_set_error(F_failure)); - } -} - -void test__f_string_rangess_delete_callback__works(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 1; - - const f_number_unsigned_t length = 1; - - f_string_rangess_t datass = f_string_rangess_t_initialize; - - { - f_status_t status = f_memory_array_resize(length, sizeof(f_string_ranges_t), (void **) &datass.array, &datass.used, &datass.size); - assert_int_equal(status, F_okay); - - status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); - assert_int_equal(status, F_okay); - } - - { - const f_status_t status = f_string_rangess_delete_callback(0, length, (void *) datass.array); - - assert_int_equal(status, F_okay); - assert_int_equal(datass.array[0].size, 0); - } - - free((void *) datass.array); -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.h b/level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.h deleted file mode 100644 index 678b767..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_delete_callback.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string__rangess_delete_callback -#define _TEST__F_string__rangess_delete_callback - -/** - * Test that the function fails. - * - * @see f_string_rangess_delete_callback() - */ -extern void test__f_string_rangess_delete_callback__fails(void **state); - -/** - * Test that the function works. - * - * @see f_string_rangess_delete_callback() - */ -extern void test__f_string_rangess_delete_callback__works(void **state); - -#endif // _TEST__F_string__rangess_delete_callback diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.c b/level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.c deleted file mode 100644 index c339fd2..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "test-string.h" -#include "test-string-rangess_destroy_callback.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_string_rangess_destroy_callback__fails(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 0; - - f_string_range_t data = f_string_range_t_initialize; - f_string_range_t data_array[] = { data }; - f_string_ranges_t datas = { .array = data_array, .used = 1, .size = 1 }; - f_string_ranges_t datas_array[] = { datas }; - - { - will_return(__wrap_f_memory_array_adjust, true); - will_return(__wrap_f_memory_array_adjust, F_status_set_error(F_failure)); - - const f_status_t status = f_string_rangess_destroy_callback(0, 1, (void *) datas_array); - - assert_int_equal(status, F_status_set_error(F_failure)); - } -} - -void test__f_string_rangess_destroy_callback__works(void **state) { - - mock_unwrap = 0; - mock_unwrap_f_memory = 1; - - const f_number_unsigned_t length = 1; - - f_string_rangess_t datass = f_string_rangess_t_initialize; - - { - f_status_t status = f_memory_array_adjust(length, sizeof(f_string_ranges_t), (void **) &datass.array, &datass.used, &datass.size); - assert_int_equal(status, F_okay); - - status = f_memory_array_adjust(1, sizeof(f_string_range_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); - assert_int_equal(status, F_okay); - } - - { - const f_status_t status = f_string_rangess_destroy_callback(0, length, (void *) datass.array); - - assert_int_equal(status, F_okay); - assert_int_equal(datass.array[0].size, 0); - } - - free((void *) datass.array); -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.h b/level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.h deleted file mode 100644 index 5c423ff..0000000 --- a/level_0/f_string/tests/unit/c/test-string-rangess_destroy_callback.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: String - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_string__rangess_destroy_callback -#define _TEST__F_string__rangess_destroy_callback - -/** - * Test that the function fails. - * - * @see f_string_rangess_destroy_callback() - */ -extern void test__f_string_rangess_destroy_callback__fails(void **state); - -/** - * Test that the function works. - * - * @see f_string_rangess_destroy_callback() - */ -extern void test__f_string_rangess_destroy_callback__works(void **state); - -#endif // _TEST__F_string__rangess_destroy_callback diff --git a/level_0/f_string/tests/unit/c/test-string-seek_line.c b/level_0/f_string/tests/unit/c/test-string-seek_line.c index 0679723..b48fb92 100644 --- a/level_0/f_string/tests/unit/c/test-string-seek_line.c +++ b/level_0/f_string/tests/unit/c/test-string-seek_line.c @@ -10,7 +10,7 @@ void test__f_string_seek_line__returns_data_not_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_string_seek_line(source.string, &range); @@ -23,7 +23,7 @@ void test__f_string_seek_line__returns_none_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_seek_line(source.string, &range); @@ -39,7 +39,7 @@ void test__f_string_seek_line__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_seek_line(source.string, &range); diff --git a/level_0/f_string/tests/unit/c/test-string-seek_line_to.c b/level_0/f_string/tests/unit/c/test-string-seek_line_to.c index fae1a03..0384ab1 100644 --- a/level_0/f_string/tests/unit/c/test-string-seek_line_to.c +++ b/level_0/f_string/tests/unit/c/test-string-seek_line_to.c @@ -11,7 +11,7 @@ void test__f_string_seek_line_to__at_newline(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("te\nXst", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_seek_line_to(source.string, to.string[0], &range); @@ -28,7 +28,7 @@ void test__f_string_seek_line_to__returns_data_not_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_string_seek_line_to(source.string, to.string[0], &range); @@ -42,7 +42,7 @@ void test__f_string_seek_line_to__returns_none_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_seek_line_to(source.string, to.string[0], &range); @@ -59,7 +59,7 @@ void test__f_string_seek_line_to__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("teX\nst", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_seek_line_to(source.string, to.string[0], &range); diff --git a/level_0/f_string/tests/unit/c/test-string-seek_to.c b/level_0/f_string/tests/unit/c/test-string-seek_to.c index 8607afe..95f4654 100644 --- a/level_0/f_string/tests/unit/c/test-string-seek_to.c +++ b/level_0/f_string/tests/unit/c/test-string-seek_to.c @@ -11,7 +11,7 @@ void test__f_string_seek_to__returns_data_not_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_string_seek_to(source.string, to.string[0], &range); @@ -25,7 +25,7 @@ void test__f_string_seek_to__returns_none_stop(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("test\nafter", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_seek_to(source.string, to.string[0], &range); @@ -42,7 +42,7 @@ void test__f_string_seek_to__works(void **state) { const f_string_static_t source = macro_f_string_static_t_initialize_1("te\nXst", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_string_seek_to(source.string, to.string[0], &range); diff --git a/level_0/f_string/tests/unit/c/test-string.c b/level_0/f_string/tests/unit/c/test-string.c index a677ea3..048693c 100644 --- a/level_0/f_string/tests/unit/c/test-string.c +++ b/level_0/f_string/tests/unit/c/test-string.c @@ -125,15 +125,6 @@ int main(void) { cmocka_unit_test(test__f_string_quantityss_append_all__works), cmocka_unit_test(test__f_string_quantityss_append_all__returns_data_not), - cmocka_unit_test(test__f_string_ranges_append__works), - cmocka_unit_test(test__f_string_ranges_append_all__works), - cmocka_unit_test(test__f_string_ranges_append_all__returns_data_not), - - cmocka_unit_test(test__f_string_rangess_append__works), - cmocka_unit_test(test__f_string_rangess_append__returns_data_not), - cmocka_unit_test(test__f_string_rangess_append_all__works), - cmocka_unit_test(test__f_string_rangess_append_all__returns_data_not), - cmocka_unit_test(test__f_string_triples_append__works), cmocka_unit_test(test__f_string_triples_append_all__works), cmocka_unit_test(test__f_string_triples_append_all__returns_data_not), @@ -191,11 +182,6 @@ int main(void) { cmocka_unit_test(test__f_string_quantityss_delete_callback__works), cmocka_unit_test(test__f_string_quantityss_destroy_callback__works), - cmocka_unit_test(test__f_string_rangess_delete_callback__fails), - cmocka_unit_test(test__f_string_rangess_destroy_callback__fails), - cmocka_unit_test(test__f_string_rangess_delete_callback__works), - cmocka_unit_test(test__f_string_rangess_destroy_callback__works), - cmocka_unit_test(test__f_string_triples_delete_callback__fails), cmocka_unit_test(test__f_string_triples_destroy_callback__fails), cmocka_unit_test(test__f_string_triples_delete_callback__works), @@ -282,11 +268,6 @@ int main(void) { cmocka_unit_test(test__f_string_quantityss_append__parameter_checking), cmocka_unit_test(test__f_string_quantityss_append_all__parameter_checking), - cmocka_unit_test(test__f_string_ranges_append__parameter_checking), - cmocka_unit_test(test__f_string_ranges_append_all__parameter_checking), - cmocka_unit_test(test__f_string_rangess_append__parameter_checking), - cmocka_unit_test(test__f_string_rangess_append_all__parameter_checking), - cmocka_unit_test(test__f_string_triples_append__parameter_checking), cmocka_unit_test(test__f_string_triples_append_all__parameter_checking), cmocka_unit_test(test__f_string_tripless_append__parameter_checking), @@ -319,9 +300,6 @@ int main(void) { // f_string_quantityss_delete_callback() doesn't use parameter checking. // f_string_quantityss_destroy_callback() doesn't use parameter checking. - // f_string_rangess_delete_callback() doesn't use parameter checking. - // f_string_rangess_destroy_callback() doesn't use parameter checking. - // f_string_triples_delete_callback() doesn't use parameter checking. // f_string_triples_destroy_callback() doesn't use parameter checking. diff --git a/level_0/f_string/tests/unit/c/test-string.h b/level_0/f_string/tests/unit/c/test-string.h index 178438d..aa3441c 100644 --- a/level_0/f_string/tests/unit/c/test-string.h +++ b/level_0/f_string/tests/unit/c/test-string.h @@ -97,12 +97,6 @@ #include "test-string-quantityss_append_all.h" #include "test-string-quantityss_delete_callback.h" #include "test-string-quantityss_destroy_callback.h" -#include "test-string-ranges_append.h" -#include "test-string-ranges_append_all.h" -#include "test-string-rangess_append.h" -#include "test-string-rangess_append_all.h" -#include "test-string-rangess_delete_callback.h" -#include "test-string-rangess_destroy_callback.h" #include "test-string-seek_line.h" #include "test-string-seek_line_to.h" #include "test-string-seek_to.h" diff --git a/level_0/f_type/c/type.h b/level_0/f_type/c/type.h index 2c77e4a..c518a42 100644 --- a/level_0/f_type/c/type.h +++ b/level_0/f_type/c/type.h @@ -26,11 +26,13 @@ // FLL-0 type includes. #include #include -#include #include #include -#include +#include +#include +#include #include +#include #ifdef __cplusplus extern "C" { diff --git a/level_0/f_type/c/type/range.h b/level_0/f_type/c/type/range.h new file mode 100644 index 0000000..d65e7bb --- /dev/null +++ b/level_0/f_type/c/type/range.h @@ -0,0 +1,104 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Defines range type data. + * + * This is auto-included by type.h and should not need to be explicitly included. + */ +#ifndef _F_range_h +#define _F_range_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * A structure designating a start and stop range for some string. + * + * In general, this project uses the start and stop position inclusively, meaning that a range of 0 to 1 would include positions 0 and position 1. + * Therefore, a range from 0 to 0 would be include position 0. + * Set start to some value larger than stop to designate that there is no range (such as start = 1, stop = 0). + * + * Properties: + * - start: The start position. + * - stop: The stop position. + */ +#ifndef _di_f_range_t_ + typedef struct { + f_number_unsigned_t start; + f_number_unsigned_t stop; + } f_range_t; + + #define f_range_t_initialize { 1, 0 } + + #define macro_f_range_t_initialize_1(start, stop) { start, stop } + #define macro_f_range_t_initialize_2(length) { length ? 0 : 1, length ? length - 1 : 0 } + + #define macro_f_range_t_clear(range) \ + range.start = 1; \ + range.stop = 0; +#endif // _di_f_range_t_ + +/** + * An array of ranges. + * + * Properties: + * - array: The array of ranges. + * - size: Total amount of allocated space. + * - used: Total number of allocated spaces used. + */ +#ifndef _di_f_ranges_t_ + typedef struct { + f_range_t *array; + + f_number_unsigned_t size; + f_number_unsigned_t used; + } f_ranges_t; + + #define f_ranges_t_initialize { 0, 0, 0 } + + #define macro_f_ranges_t_initialize_1(array, size, used) { array, size, used } + #define macro_f_ranges_t_initialize_2(array, length) { array, length, length } + + #define macro_f_ranges_t_clear(ranges) \ + ranges.array = 0; \ + ranges.size = 0; \ + ranges.used = 0; +#endif // _di_f_ranges_t_ + +/** + * This holds an array of f_ranges_t. + * + * Properties: + * - array: The array of ranges arrays. + * - size: Total amount of allocated space. + * - used: Total number of allocated spaces used. + */ +#ifndef _di_f_rangess_t_ + typedef struct { + f_ranges_t *array; + + f_number_unsigned_t size; + f_number_unsigned_t used; + } f_rangess_t; + + #define f_rangess_t_initialize { 0, 0, 0 } + + #define macro_f_rangess_t_initialize_1(array, size, used) { array, size, used } + #define macro_f_rangess_t_initialize_2(array, length) { array, length, length } + + #define macro_f_rangess_t_clear(rangess) \ + rangess.array = 0; \ + rangess.size = 0; \ + rangess.used = 0; +#endif // _di_f_rangess_t_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _F_range_h diff --git a/level_0/f_type/c/type/range_double.h b/level_0/f_type/c/type/range_double.h new file mode 100644 index 0000000..5206266 --- /dev/null +++ b/level_0/f_type/c/type/range_double.h @@ -0,0 +1,110 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Defines data to be used for/by type (array) related functionality. + * + * This is auto-included by type_array.h and should not need to be explicitly included. + */ +#ifndef _F_range_double_h +#define _F_range_double_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * A structure designating two start and stop ranges for some string(s). + * + * In general, this project uses the start and stop position inclusively, meaning that a range of 0 to 1 would include positions 0 and position 1. + * Therefore, a range from 0 to 0 would be include position 0. + * Set start to some value larger than stop to designate that there is no range (such as start = 1, stop = 0). + * + * Properties: + * - start_1: The first start position. + * - stop_1: The first stop position. + * - start_2: The second start position. + * - stop_2: The second stop position. + */ +#ifndef _di_f_range_double_t_ + typedef struct { + f_number_unsigned_t start_1; + f_number_unsigned_t stop_1; + f_number_unsigned_t start_2; + f_number_unsigned_t stop_2; + } f_range_double_t; + + #define f_range_double_t_initialize { 1, 0, 1, 0 } + + #define macro_f_range_double_t_initialize_1(start_1, stop_1, start_2, stop_2) { start_1, stop_1, start_2, stop_2 } + #define macro_f_range_double_t_initialize_2(length_1, length_2) { length_1 ? 0 : 1, length_1 ? length_1 - 1 : 0, length_2 ? 0 : 1, length_2 ? length_2 - 1 : 0 } + + #define macro_f_range_double_t_clear(range_1, range_2) \ + range_1.start = 1; \ + range_1.stop = 0 \ + range_2.start = 1; \ + range_2.stop = 0; +#endif // _di_f_range_double_t_ + +/** + * An array of ranges. + * + * Properties: + * - array: The array of ranges. + * - size: Total amount of allocated space. + * - used: Total number of allocated spaces used. + */ +#ifndef _di_f_range_doubles_t_ + typedef struct { + f_range_double_t *array; + + f_number_unsigned_t size; + f_number_unsigned_t used; + } f_range_doubles_t; + + #define f_range_doubles_t_initialize { 0, 0, 0 } + + #define macro_f_range_doubles_t_initialize_1(array, size, used) { array, size, used } + #define macro_f_range_doubles_t_initialize_2(array, length) { array, length, length } + + #define macro_f_range_doubles_t_clear(ranges) \ + ranges.array = 0; \ + ranges.size = 0; \ + ranges.used = 0; +#endif // _di_f_range_doubles_t_ + +/** + * This holds an array of f_range_doubles_t. + * + * Properties: + * - array: The array of ranges arrays. + * - size: Total amount of allocated space. + * - used: Total number of allocated spaces used. + */ +#ifndef _di_f_range_doubless_t_ + typedef struct { + f_range_doubles_t *array; + + f_number_unsigned_t size; + f_number_unsigned_t used; + } f_range_doubless_t; + + #define f_range_doubless_t_initialize { 0, 0, 0 } + + #define macro_f_range_doubless_t_initialize_1(array, size, used) { array, size, used } + #define macro_f_range_doubless_t_initialize_2(array, length) { array, length, length } + + #define macro_f_range_doubless_t_clear(rangess) \ + rangess.array = 0; \ + rangess.size = 0; \ + rangess.used = 0; +#endif // _di_f_range_doubless_t_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _F_range_double_h diff --git a/level_0/f_type/data/build/settings b/level_0/f_type/data/build/settings index 9ea0f6b..e261518 100644 --- a/level_0/f_type/data/build/settings +++ b/level_0/f_type/data/build/settings @@ -31,7 +31,7 @@ build_language c build_libraries -lc -build_sources_headers type.h type/cell.h type/file.h type/fll.h type/mode.h type/number.h type/state.h type/status.h type/time.h +build_sources_headers type.h type/cell.h type/file.h type/fll.h type/mode.h type/number.h type/range.h type/range_double.h type/state.h type/status.h type/time.h build_script yes build_shared yes diff --git a/level_0/f_type_array/c/type_array.h b/level_0/f_type_array/c/type_array.h index 57bf168..b6a03c6 100644 --- a/level_0/f_type_array/c/type_array.h +++ b/level_0/f_type_array/c/type_array.h @@ -28,6 +28,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/level_0/f_type_array/c/type_array/range.c b/level_0/f_type_array/c/type_array/range.c new file mode 100644 index 0000000..b857990 --- /dev/null +++ b/level_0/f_type_array/c/type_array/range.c @@ -0,0 +1,14 @@ +#include "../type_array.h" +#include "range.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _di_f_range_empty_c_ + const f_range_t f_range_empty_c = { 1, 0 }; +#endif // _di_f_range_empty_c_ + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/c/type_array/range.h b/level_0/f_type_array/c/type_array/range.h new file mode 100644 index 0000000..db64c8c --- /dev/null +++ b/level_0/f_type_array/c/type_array/range.h @@ -0,0 +1,32 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Defines data to be used for/by type (array) related functionality. + * + * This is auto-included by type_array.h and should not need to be explicitly included. + */ +#ifndef _F_type_array_range_h +#define _F_type_array_range_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Provide a static empty range. + * + * This is intended to represent an empty or disabled range. + */ +#ifndef _di_f_range_empty_c_ + extern const f_range_t f_range_empty_c; +#endif // _di_f_range_empty_c_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _F_type_array_range_h diff --git a/level_0/f_type_array/c/type_array/range_double.c b/level_0/f_type_array/c/type_array/range_double.c new file mode 100644 index 0000000..43bbc32 --- /dev/null +++ b/level_0/f_type_array/c/type_array/range_double.c @@ -0,0 +1,14 @@ +#include "../type_array.h" +#include "range_double.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _di_f_range_double_empty_c_ + const f_range_double_t f_range_double_empty_c = { 1, 0 }; +#endif // _di_f_range_double_empty_c_ + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/c/type_array/range_double.h b/level_0/f_type_array/c/type_array/range_double.h new file mode 100644 index 0000000..cc110cc --- /dev/null +++ b/level_0/f_type_array/c/type_array/range_double.h @@ -0,0 +1,32 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Defines data to be used for/by type (array) related functionality. + * + * This is auto-included by type_array.h and should not need to be explicitly included. + */ +#ifndef _F_type_array_range_double_h +#define _F_type_array_range_double_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Provide a static empty range. + * + * This is intended to represent an empty or disabled range. + */ +#ifndef _di_f_range_double_empty_c_ + extern const f_range_double_t f_range_double_empty_c; +#endif // _di_f_range_double_empty_c_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _F_type_array_range_double_h diff --git a/level_0/f_string/c/string/range_doubles.c b/level_0/f_type_array/c/type_array/range_doubles.c similarity index 65% rename from level_0/f_string/c/string/range_doubles.c rename to level_0/f_type_array/c/type_array/range_doubles.c index 0726b59..7177423 100644 --- a/level_0/f_string/c/string/range_doubles.c +++ b/level_0/f_type_array/c/type_array/range_doubles.c @@ -1,18 +1,18 @@ -#include "../string.h" -#include "../private-string.h" +#include "../type_array.h" +#include "range_doubles.h" #ifdef __cplusplus extern "C" { #endif -#ifndef _di_f_string_range_doubles_append_ - f_status_t f_string_range_doubles_append(const f_string_range_double_t source, f_string_range_doubles_t * const destination) { +#ifndef _di_f_range_doubles_append_ + f_status_t f_range_doubles_append(const f_range_double_t source, f_range_doubles_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ { - const f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_range_double_t), (void **) &destination->array, &destination->used, &destination->size); + const f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_double_t), (void **) &destination->array, &destination->used, &destination->size); if (F_status_is_error(status)) return status; } @@ -23,10 +23,10 @@ extern "C" { return F_okay; } -#endif // _di_f_string_range_doubles_append_ +#endif // _di_f_range_doubles_append_ -#ifndef _di_f_string_range_doubles_append_all_ - f_status_t f_string_range_doubles_append_all(const f_string_range_doubles_t source, f_string_range_doubles_t * const destination) { +#ifndef _di_f_range_doubles_append_all_ + f_status_t f_range_doubles_append_all(const f_range_doubles_t source, f_range_doubles_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -34,7 +34,7 @@ extern "C" { if (!source.used) return F_data_not; { - const f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_range_double_t), (void **) &destination->array, &destination->used, &destination->size); + const f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_range_double_t), (void **) &destination->array, &destination->used, &destination->size); if (F_status_is_error(status)) return status; } @@ -48,7 +48,7 @@ extern "C" { return F_okay; } -#endif // _di_f_string_range_doubles_append_all_ +#endif // _di_f_range_doubles_append_all_ #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_type_array/c/type_array/range_doubles.h b/level_0/f_type_array/c/type_array/range_doubles.h new file mode 100644 index 0000000..f7167b9 --- /dev/null +++ b/level_0/f_type_array/c/type_array/range_doubles.h @@ -0,0 +1,63 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Defines data to be used for/by type (array) related functionality. + * + * This is auto-included by type_array.h and should not need to be explicitly included. + */ +#ifndef _F_type_array_range_doubles_h +#define _F_type_array_range_doubles_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Append the single source range onto the destination. + * + * @param source + * The source range to append. + * @param destination + * The destination ranges the source is appended onto. + * + * @return + * F_okay on success. + * F_data_not on success, but there is nothing to append (size == 0). + * + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_memory_resize(). + */ +#ifndef _di_f_range_doubles_append_ + extern f_status_t f_range_doubles_append(const f_range_double_t source, f_range_doubles_t * const destination); +#endif // _di_f_range_doubles_append_ + +/** + * Append the source ranges onto the destination. + * + * @param source + * The source ranges to append. + * @param destination + * The destination ranges the source is appended onto. + * + * @return + * F_okay on success. + * F_data_not on success, but there is nothing to append (size == 0). + * + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_memory_resize(). + */ +#ifndef _di_f_range_doubles_append_all_ + extern f_status_t f_range_doubles_append_all(const f_range_doubles_t source, f_range_doubles_t * const destination); +#endif // _di_f_range_doubles_append_all_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _F_type_array_range_doubles_h diff --git a/level_0/f_string/c/string/rangess.c b/level_0/f_type_array/c/type_array/range_doubless.c similarity index 60% rename from level_0/f_string/c/string/rangess.c rename to level_0/f_type_array/c/type_array/range_doubless.c index 9d4d673..60c10c3 100644 --- a/level_0/f_string/c/string/rangess.c +++ b/level_0/f_type_array/c/type_array/range_doubless.c @@ -1,12 +1,12 @@ -#include "../string.h" -#include "../private-string.h" +#include "../type_array.h" +#include "range_doubless.h" #ifdef __cplusplus extern "C" { #endif -#ifndef _di_f_string_rangess_append_ - f_status_t f_string_rangess_append(const f_string_ranges_t source, f_string_rangess_t * const destination) { +#ifndef _di_f_range_doubless_append_ + f_status_t f_range_doubless_append(const f_range_doubles_t source, f_range_doubless_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -14,20 +14,22 @@ extern "C" { if (!source.used) return F_data_not; { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); if (F_status_is_error(status)) return status; - f_string_ranges_t * const destination_inner = &destination->array[destination->used]; + f_range_doubles_t * const destination_inner = &destination->array[destination->used]; destination_inner->used = 0; if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_string_range_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + status = f_memory_array_increase_by(source.used, sizeof(f_range_double_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); if (F_status_is_error(status)) return status; for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start = source.array[i].start; - destination_inner->array[destination_inner->used].stop = source.array[i].stop; + destination_inner->array[destination_inner->used].start_1 = source.array[i].start_1; + destination_inner->array[destination_inner->used].stop_1 = source.array[i].stop_1; + destination_inner->array[destination_inner->used].start_2 = source.array[i].start_2; + destination_inner->array[destination_inner->used].stop_2 = source.array[i].stop_2; } // for } } @@ -36,10 +38,10 @@ extern "C" { return F_okay; } -#endif // _di_f_string_rangess_append_ +#endif // _di_f_range_doubless_append_ -#ifndef _di_f_string_rangess_append_all_ - f_status_t f_string_rangess_append_all(const f_string_rangess_t source, f_string_rangess_t * const destination) { +#ifndef _di_f_range_doubless_append_all_ + f_status_t f_range_doubless_append_all(const f_range_doubless_t source, f_range_doubless_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -47,10 +49,10 @@ extern "C" { if (!source.used) return F_data_not; { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); if (F_status_is_error(status)) return status; - f_string_ranges_t * destination_inner = 0; + f_range_doubles_t * destination_inner = 0; f_number_unsigned_t j = 0; for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { @@ -59,13 +61,15 @@ extern "C" { destination_inner->used = 0; if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_range_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_range_double_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); if (F_status_is_error(status)) return status; for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start = source.array[i].array[j].start; - destination_inner->array[destination_inner->used].stop = source.array[i].array[j].stop; + destination_inner->array[destination_inner->used].start_1 = source.array[i].array[j].start_1; + destination_inner->array[destination_inner->used].stop_1 = source.array[i].array[j].stop_1; + destination_inner->array[destination_inner->used].start_2 = source.array[i].array[j].start_2; + destination_inner->array[destination_inner->used].stop_2 = source.array[i].array[j].stop_2; } // for } } // for @@ -73,19 +77,19 @@ extern "C" { return F_okay; } -#endif // _di_f_string_rangess_append_all_ +#endif // _di_f_range_doubless_append_all_ -#ifndef _di_f_string_rangess_delete_callback_ - f_status_t f_string_rangess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { +#ifndef _di_f_range_doubless_delete_callback_ + f_status_t f_range_doubless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { { - f_string_ranges_t * const array = (f_string_ranges_t *) void_array; + f_range_doubles_t * const array = (f_range_doubles_t *) void_array; f_status_t status = F_okay; for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = f_memory_array_resize(0, sizeof(f_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); if (F_status_is_error(status)) return status; } } // for @@ -93,19 +97,19 @@ extern "C" { return F_okay; } -#endif // _di_f_string_rangess_delete_callback_ +#endif // _di_f_range_doubless_delete_callback_ -#ifndef _di_f_string_rangess_destroy_callback_ - f_status_t f_string_rangess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { +#ifndef _di_f_range_doubless_destroy_callback_ + f_status_t f_range_doubless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { { - f_string_ranges_t * const array = (f_string_ranges_t *) void_array; + f_range_doubles_t * const array = (f_range_doubles_t *) void_array; f_status_t status = F_okay; for (f_number_unsigned_t i = start; i < stop; ++i) { if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_string_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = f_memory_array_adjust(0, sizeof(f_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); if (F_status_is_error(status)) return status; } } // for @@ -113,7 +117,7 @@ extern "C" { return F_okay; } -#endif // _di_f_string_rangess_destroy_callback_ +#endif // _di_f_range_doubless_destroy_callback_ #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_string/c/string/rangess.h b/level_0/f_type_array/c/type_array/range_doubless.h similarity index 58% rename from level_0/f_string/c/string/rangess.h rename to level_0/f_type_array/c/type_array/range_doubless.h index 5de97e1..ff76532 100644 --- a/level_0/f_string/c/string/rangess.h +++ b/level_0/f_type_array/c/type_array/range_doubless.h @@ -1,49 +1,22 @@ /** * FLL - Level 0 * - * Project: String + * Project: Type * API Version: 0.7 * Licenses: lgpl-2.1-or-later * - * Defines range string data. + * Defines data to be used for/by type (array) related functionality. * - * This is auto-included by string.h and should not need to be explicitly included. + * This is auto-included by type_array.h and should not need to be explicitly included. */ -#ifndef _F_string_rangess_h -#define _F_string_rangess_h +#ifndef _F_type_array_range_doubless_h +#define _F_type_array_range_doubless_h #ifdef __cplusplus extern "C" { #endif /** - * This holds an array of f_string_ranges_t. - * - * Properties: - * - array: The array of ranges arrays. - * - size: Total amount of allocated space. - * - used: Total number of allocated spaces used. - */ -#ifndef _di_f_string_rangess_t_ - typedef struct { - f_string_ranges_t *array; - - f_number_unsigned_t size; - f_number_unsigned_t used; - } f_string_rangess_t; - - #define f_string_rangess_t_initialize { 0, 0, 0 } - - #define macro_f_string_rangess_t_initialize_1(array, size, used) { array, size, used } - #define macro_f_string_rangess_t_initialize_2(array, length) { array, length, length } - - #define macro_f_string_rangess_t_clear(rangess) \ - rangess.array = 0; \ - rangess.size = 0; \ - rangess.used = 0; -#endif // _di_f_string_rangess_t_ - -/** * Append the single source ranges onto the destination. * * @param source @@ -59,9 +32,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_string_rangess_append_ - extern f_status_t f_string_rangess_append(const f_string_ranges_t source, f_string_rangess_t * const destination); -#endif // _di_f_string_rangess_append_ +#ifndef _di_f_range_doubless_append_ + extern f_status_t f_range_doubless_append(const f_range_doubles_t source, f_range_doubless_t * const destination); +#endif // _di_f_range_doubless_append_ /** * Append the source rangess onto the destination. @@ -79,12 +52,12 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_string_rangess_append_all_ - extern f_status_t f_string_rangess_append_all(const f_string_rangess_t source, f_string_rangess_t * const destination); -#endif // _di_f_string_rangess_append_all_ +#ifndef _di_f_range_doubless_append_all_ + extern f_status_t f_range_doubless_append_all(const f_range_doubless_t source, f_range_doubless_t * const destination); +#endif // _di_f_range_doubless_append_all_ /** - * A callback intended to be passed to f_memory_arrayss_resize() for an f_string_rangess_t structure. + * A callback intended to be passed to f_memory_arrayss_resize() for an f_range_doubless_t structure. * * This is only called when shrinking the array and generally should perform deallocations. * @@ -107,12 +80,12 @@ extern "C" { * * @see f_memory_array_resize() */ -#ifndef _di_f_string_rangess_delete_callback_ - extern f_status_t f_string_rangess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); -#endif // _di_f_string_rangess_delete_callback_ +#ifndef _di_f_range_doubless_delete_callback_ + extern f_status_t f_range_doubless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); +#endif // _di_f_range_doubless_delete_callback_ /** - * A callback intended to be passed to f_memory_arrayss_adjust() for an f_string_rangess_t structure. + * A callback intended to be passed to f_memory_arrayss_adjust() for an f_range_doubless_t structure. * * This is only called when shrinking the array and generally should perform deallocations. * @@ -135,12 +108,12 @@ extern "C" { * * @see f_memory_array_adjust() */ -#ifndef _di_f_string_rangess_destroy_callback_ - extern f_status_t f_string_rangess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); -#endif // _di_f_string_rangess_destroy_callback_ +#ifndef _di_f_range_doubless_destroy_callback_ + extern f_status_t f_range_doubless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); +#endif // _di_f_range_doubless_destroy_callback_ #ifdef __cplusplus } // extern "C" #endif -#endif // _F_string_rangess_h +#endif // _F_type_array_range_doubless_h diff --git a/level_0/f_string/c/string/ranges.c b/level_0/f_type_array/c/type_array/ranges.c similarity index 62% rename from level_0/f_string/c/string/ranges.c rename to level_0/f_type_array/c/type_array/ranges.c index 38f9fef..d8cc08d 100644 --- a/level_0/f_string/c/string/ranges.c +++ b/level_0/f_type_array/c/type_array/ranges.c @@ -1,18 +1,18 @@ -#include "../string.h" -#include "../private-string.h" +#include "../type_array.h" +#include "ranges.h" #ifdef __cplusplus extern "C" { #endif -#ifndef _di_f_string_ranges_append_ - f_status_t f_string_ranges_append(const f_string_range_t source, f_string_ranges_t * const destination) { +#ifndef _di_f_ranges_append_ + f_status_t f_ranges_append(const f_range_t source, f_ranges_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ { - const f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_range_t), (void **) &destination->array, &destination->used, &destination->size); + const f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_t), (void **) &destination->array, &destination->used, &destination->size); if (F_status_is_error(status)) return status; } @@ -21,10 +21,10 @@ extern "C" { return F_okay; } -#endif // _di_f_string_ranges_append_ +#endif // _di_f_ranges_append_ -#ifndef _di_f_string_ranges_append_all_ - f_status_t f_string_ranges_append_all(const f_string_ranges_t source, f_string_ranges_t * const destination) { +#ifndef _di_f_ranges_append_all_ + f_status_t f_ranges_append_all(const f_ranges_t source, f_ranges_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -32,7 +32,7 @@ extern "C" { if (!source.used) return F_data_not; { - const f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_range_t), (void **) &destination->array, &destination->used, &destination->size); + const f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_range_t), (void **) &destination->array, &destination->used, &destination->size); if (F_status_is_error(status)) return status; } @@ -44,7 +44,7 @@ extern "C" { return F_okay; } -#endif // _di_f_string_ranges_append_all_ +#endif // _di_f_ranges_append_all_ #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_type_array/c/type_array/ranges.h b/level_0/f_type_array/c/type_array/ranges.h new file mode 100644 index 0000000..36c2e7f --- /dev/null +++ b/level_0/f_type_array/c/type_array/ranges.h @@ -0,0 +1,63 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Defines data to be used for/by type (array) related functionality. + * + * This is auto-included by type_array.h and should not need to be explicitly included. + */ +#ifndef _F_type_array_ranges_h +#define _F_type_array_ranges_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Append the single source range onto the destination. + * + * @param source + * The source range to append. + * @param destination + * The destination ranges the source is appended onto. + * + * @return + * F_okay on success. + * F_data_not on success, but there is nothing to append (size == 0). + * + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_memory_resize(). + */ +#ifndef _di_f_ranges_append_ + extern f_status_t f_ranges_append(const f_range_t source, f_ranges_t * const destination); +#endif // _di_f_ranges_append_ + +/** + * Append the source ranges onto the destination. + * + * @param source + * The source ranges to append. + * @param destination + * The destination ranges the source is appended onto. + * + * @return + * F_okay on success. + * F_data_not on success, but there is nothing to append (size == 0). + * + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_memory_resize(). + */ +#ifndef _di_f_ranges_append_all_ + extern f_status_t f_ranges_append_all(const f_ranges_t source, f_ranges_t * const destination); +#endif // _di_f_ranges_append_all_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _F_type_array_ranges_h diff --git a/level_0/f_type_array/c/type_array/rangess.c b/level_0/f_type_array/c/type_array/rangess.c new file mode 100644 index 0000000..89bd170 --- /dev/null +++ b/level_0/f_type_array/c/type_array/rangess.c @@ -0,0 +1,120 @@ +#include "../type_array.h" +#include "rangess.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _di_f_rangess_append_ + f_status_t f_rangess_append(const f_ranges_t source, f_rangess_t * const destination) { + #ifndef _di_level_0_parameter_checking_ + if (!destination) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!source.used) return F_data_not; + + { + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; + + f_ranges_t * const destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; + + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_range_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; + + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { + + destination_inner->array[destination_inner->used].start = source.array[i].start; + destination_inner->array[destination_inner->used].stop = source.array[i].stop; + } // for + } + } + + ++destination->used; + + return F_okay; + } +#endif // _di_f_rangess_append_ + +#ifndef _di_f_rangess_append_all_ + f_status_t f_rangess_append_all(const f_rangess_t source, f_rangess_t * const destination) { + #ifndef _di_level_0_parameter_checking_ + if (!destination) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!source.used) return F_data_not; + + { + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; + + f_ranges_t * destination_inner = 0; + f_number_unsigned_t j = 0; + + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + + destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; + + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_range_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); + if (F_status_is_error(status)) return status; + + for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { + + destination_inner->array[destination_inner->used].start = source.array[i].array[j].start; + destination_inner->array[destination_inner->used].stop = source.array[i].array[j].stop; + } // for + } + } // for + } + + return F_okay; + } +#endif // _di_f_rangess_append_all_ + +#ifndef _di_f_rangess_delete_callback_ + f_status_t f_rangess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { + + { + f_ranges_t * const array = (f_ranges_t *) void_array; + f_status_t status = F_okay; + + for (f_number_unsigned_t i = start; i < stop; ++i) { + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for + } + + return F_okay; + } +#endif // _di_f_rangess_delete_callback_ + +#ifndef _di_f_rangess_destroy_callback_ + f_status_t f_rangess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { + + { + f_ranges_t * const array = (f_ranges_t *) void_array; + f_status_t status = F_okay; + + for (f_number_unsigned_t i = start; i < stop; ++i) { + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for + } + + return F_okay; + } +#endif // _di_f_rangess_destroy_callback_ + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_string/c/string/range_doubless.h b/level_0/f_type_array/c/type_array/rangess.h similarity index 52% rename from level_0/f_string/c/string/range_doubless.h rename to level_0/f_type_array/c/type_array/rangess.h index b7619e2..937308f 100644 --- a/level_0/f_string/c/string/range_doubless.h +++ b/level_0/f_type_array/c/type_array/rangess.h @@ -1,49 +1,22 @@ /** * FLL - Level 0 * - * Project: String + * Project: Type * API Version: 0.7 * Licenses: lgpl-2.1-or-later * - * Defines range string data. + * Defines data to be used for/by type (array) related functionality. * - * This is auto-included by string.h and should not need to be explicitly included. + * This is auto-included by type_array.h and should not need to be explicitly included. */ -#ifndef _F_string_range_doubless_h -#define _F_string_range_doubless_h +#ifndef _F_type_array_rangess_h +#define _F_type_array_rangess_h #ifdef __cplusplus extern "C" { #endif /** - * This holds an array of f_string_range_doubles_t. - * - * Properties: - * - array: The array of ranges arrays. - * - size: Total amount of allocated space. - * - used: Total number of allocated spaces used. - */ -#ifndef _di_f_string_range_doubless_t_ - typedef struct { - f_string_range_doubles_t *array; - - f_number_unsigned_t size; - f_number_unsigned_t used; - } f_string_range_doubless_t; - - #define f_string_range_doubless_t_initialize { 0, 0, 0 } - - #define macro_f_string_range_doubless_t_initialize_1(array, size, used) { array, size, used } - #define macro_f_string_range_doubless_t_initialize_2(array, length) { array, length, length } - - #define macro_f_string_range_doubless_t_clear(rangess) \ - rangess.array = 0; \ - rangess.size = 0; \ - rangess.used = 0; -#endif // _di_f_string_range_doubless_t_ - -/** * Append the single source ranges onto the destination. * * @param source @@ -59,9 +32,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_string_range_doubless_append_ - extern f_status_t f_string_range_doubless_append(const f_string_range_doubles_t source, f_string_range_doubless_t * const destination); -#endif // _di_f_string_range_doubless_append_ +#ifndef _di_f_rangess_append_ + extern f_status_t f_rangess_append(const f_ranges_t source, f_rangess_t * const destination); +#endif // _di_f_rangess_append_ /** * Append the source rangess onto the destination. @@ -79,12 +52,12 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_string_range_doubless_append_all_ - extern f_status_t f_string_range_doubless_append_all(const f_string_range_doubless_t source, f_string_range_doubless_t * const destination); -#endif // _di_f_string_range_doubless_append_all_ +#ifndef _di_f_rangess_append_all_ + extern f_status_t f_rangess_append_all(const f_rangess_t source, f_rangess_t * const destination); +#endif // _di_f_rangess_append_all_ /** - * A callback intended to be passed to f_memory_arrayss_resize() for an f_string_range_doubless_t structure. + * A callback intended to be passed to f_memory_arrayss_resize() for an f_rangess_t structure. * * This is only called when shrinking the array and generally should perform deallocations. * @@ -107,12 +80,12 @@ extern "C" { * * @see f_memory_array_resize() */ -#ifndef _di_f_string_range_doubless_delete_callback_ - extern f_status_t f_string_range_doubless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); -#endif // _di_f_string_range_doubless_delete_callback_ +#ifndef _di_f_rangess_delete_callback_ + extern f_status_t f_rangess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); +#endif // _di_f_rangess_delete_callback_ /** - * A callback intended to be passed to f_memory_arrayss_adjust() for an f_string_range_doubless_t structure. + * A callback intended to be passed to f_memory_arrayss_adjust() for an f_rangess_t structure. * * This is only called when shrinking the array and generally should perform deallocations. * @@ -135,12 +108,12 @@ extern "C" { * * @see f_memory_array_adjust() */ -#ifndef _di_f_string_range_doubless_destroy_callback_ - extern f_status_t f_string_range_doubless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); -#endif // _di_f_string_range_doubless_destroy_callback_ +#ifndef _di_f_rangess_destroy_callback_ + extern f_status_t f_rangess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array); +#endif // _di_f_rangess_destroy_callback_ #ifdef __cplusplus } // extern "C" #endif -#endif // _F_string_range_doubless_h +#endif // _F_type_array_rangess_h diff --git a/level_0/f_type_array/data/build/settings b/level_0/f_type_array/data/build/settings index aa3bf69..0c12db6 100644 --- a/level_0/f_type_array/data/build/settings +++ b/level_0/f_type_array/data/build/settings @@ -32,9 +32,9 @@ build_language c build_libraries -lc build_libraries-individual -lf_memory -build_sources_library type_array/cell.c type_array/file.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_signed.c type_array/number_unsigned.c type_array/poll.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c +build_sources_library type_array/cell.c type_array/file.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_signed.c type_array/number_unsigned.c type_array/poll.c type_array/range.c type_array/ranges.c type_array/rangess.c type_array/range_double.c type_array/range_doubles.c type_array/range_doubless.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c -build_sources_headers type_array.h type_array_file.h type_array/common.h type_array/cell.h type_array/file.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_signed.h type_array/number_unsigned.h type_array/poll.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h +build_sources_headers type_array.h type_array_file.h type_array/common.h type_array/cell.h type_array/file.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_signed.h type_array/number_unsigned.h type_array/poll.h type_array/range.h type_array/ranges.h type_array/rangess.h type_array/range_double.h type_array/range_doubles.h type_array/range_doubless.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h build_script yes build_shared yes diff --git a/level_0/f_type_array/data/build/settings-mocks b/level_0/f_type_array/data/build/settings-mocks index 79faa8d..b9a7a7b 100644 --- a/level_0/f_type_array/data/build/settings-mocks +++ b/level_0/f_type_array/data/build/settings-mocks @@ -30,10 +30,10 @@ build_language c build_libraries -lc build_libraries-individual -lf_memory -build_sources_library type_array/cell.c type_array/file.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_signed.c type_array/number_unsigned.c type_array/poll.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c +build_sources_library type_array/cell.c type_array/file.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_signed.c type_array/number_unsigned.c type_array/poll.c type_array/range.c type_array/ranges.c type_array/rangess.c type_array/range_double.c type_array/range_doubles.c type_array/range_doubless.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c build_sources_library ../../tests/unit/c/mock-type_array.c -build_sources_headers type_array.h type_array_file.h type_array/common.h type_array/cell.h type_array/file.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_signed.h type_array/number_unsigned.h type_array/poll.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h +build_sources_headers type_array.h type_array_file.h type_array/common.h type_array/cell.h type_array/file.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_signed.h type_array/number_unsigned.h type_array/poll.h type_array/range.h type_array/ranges.h type_array/rangess.h type_array/range_double.h type_array/range_doubles.h type_array/range_doubless.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h build_script yes build_shared yes diff --git a/level_0/f_type_array/data/build/settings-tests b/level_0/f_type_array/data/build/settings-tests index 4eb1824..33d3009 100644 --- a/level_0/f_type_array/data/build/settings-tests +++ b/level_0/f_type_array/data/build/settings-tests @@ -34,6 +34,10 @@ build_sources_program test-type_array-int128ss_delete_callback.c test-type_array build_sources_program test-type_array-number_signedss_delete_callback.c test-type_array-number_signedss_destroy_callback.c build_sources_program test-type_array-number_unsignedss_delete_callback.c test-type_array-number_unsignedss_destroy_callback.c build_sources_program test-type_array-pollss_delete_callback.c test-type_array-pollss_destroy_callback.c +build_sources_program test-type_array-ranges_append.c test-type_array-ranges_append_all.c test-type_array-rangess_append.c test-type_array-rangess_append_all.c +build_sources_program test-type_array-rangess_delete_callback.c test-type_array-rangess_destroy_callback.c +build_sources_program test-type_array-range_doubles_append.c test-type_array-range_doubles_append_all.c test-type_array-range_doubless_append.c test-type_array-range_doubless_append_all.c +build_sources_program test-type_array-range_doubless_delete_callback.c test-type_array-range_doubless_destroy_callback.c build_sources_program test-type_array-statess_delete_callback.c test-type_array-statess_destroy_callback.c build_sources_program test-type_array-statusss_delete_callback.c test-type_array-statusss_destroy_callback.c build_sources_program test-type_array-uint8ss_delete_callback.c test-type_array-uint8ss_destroy_callback.c diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.c new file mode 100644 index 0000000..191405c --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.c @@ -0,0 +1,40 @@ +#include "test-type_array.h" +#include "test-type_array-range_doubles_append.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_range_doubles_append__works(void **state) { + + const f_range_double_t source = macro_f_range_double_t_initialize_1(1, 2, 3, 4); + f_range_doubles_t destination = f_range_doubles_t_initialize; + + { + const f_status_t status = f_range_doubles_append(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.used, 1); + assert_int_equal(destination.array[0].start_1, source.start_1); + assert_int_equal(destination.array[0].start_2, source.start_2); + assert_int_equal(destination.array[0].stop_1, source.stop_1); + assert_int_equal(destination.array[0].stop_2, source.stop_2); + } + + free((void *) destination.array); +} + +void test__f_type_array_range_doubles_append__parameter_checking(void **state) { + + const f_range_double_t data = f_range_double_t_initialize; + + { + const f_status_t status = f_range_doubles_append(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.h new file mode 100644 index 0000000..bdaa022 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__range_doubles_append_h +#define _TEST__F_type_array__range_doubles_append_h + +/** + * Test that the function works. + * + * @see f_range_doubles_append() + */ +extern void test__f_type_array_range_doubles_append__works(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_range_doubles_append() + */ +extern void test__f_type_array_range_doubles_append__parameter_checking(void **state); + +#endif // _TEST__F_type_array__range_doubles_append_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.c new file mode 100644 index 0000000..99f2333 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.c @@ -0,0 +1,78 @@ +#include "test-type_array.h" +#include "test-type_array-range_doubles_append_all.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_range_doubles_append_all__works(void **state) { + + const int length_sources = 2; + + f_range_double_t sources_array[] = { + macro_f_range_double_t_initialize_1(1, 2, 3, 4), + macro_f_range_double_t_initialize_1(5, 6, 7, 8), + }; + + const f_range_doubles_t source = macro_f_range_doubles_t_initialize_1(sources_array, 0, length_sources); + f_range_doubles_t destination = f_range_doubles_t_initialize; + + { + const f_status_t status = f_range_doubles_append_all(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.used, source.used); + assert_int_equal(destination.size, source.used); + + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { + + assert_int_equal(destination.array[i].start_1, source.array[i].start_1); + assert_int_equal(destination.array[i].start_2, source.array[i].start_2); + assert_int_equal(destination.array[i].stop_1, source.array[i].stop_1); + assert_int_equal(destination.array[i].stop_2, source.array[i].stop_2); + } // for + } + + free((void *) destination.array); +} + +void test__f_type_array_range_doubles_append_all__returns_data_not(void **state) { + + const int length = 5; + f_range_doubles_t source = f_range_doubles_t_initialize; + f_range_doubles_t destination = f_range_doubles_t_initialize; + + { + const f_status_t status = f_memory_array_resize(length, sizeof(f_range_double_t), (void **) &source.array, &source.used, &source.size); + + assert_int_equal(status, F_okay); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_range_doubles_append_all(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_range_doubles_append_all__parameter_checking(void **state) { + + const f_range_doubles_t data = f_range_doubles_t_initialize; + + { + const f_status_t status = f_range_doubles_append_all(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.h new file mode 100644 index 0000000..97d4707 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubles_append_all.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__range_doubles_append_all_h +#define _TEST__F_type_array__range_doubles_append_all_h + +/** + * Test that the function works. + * + * @see f_range_doubles_append_all() + */ +extern void test__f_type_array_range_doubles_append_all__works(void **state); + +/** + * Test that the function returns F_data_not when asked to copy an empty structure. + * + * @see f_range_doubles_append_all() + */ +extern void test__f_type_array_range_doubles_append_all__returns_data_not(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_range_doubles_append_all() + */ +extern void test__f_type_array_range_doubles_append_all__parameter_checking(void **state); + +#endif // _TEST__F_type_array__range_doubles_append_all_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.c new file mode 100644 index 0000000..f6c8b5f --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.c @@ -0,0 +1,78 @@ +#include "test-type_array.h" +#include "test-type_array-range_doubless_append.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_range_doubless_append__works(void **state) { + + const int length_sources = 2; + + f_range_double_t sources_array[] = { + macro_f_range_double_t_initialize_1(1, 2, 3, 4), + macro_f_range_double_t_initialize_1(5, 6, 7, 8), + }; + + const f_range_doubles_t source = macro_f_range_doubles_t_initialize_1(sources_array, 0, length_sources); + f_range_doubless_t destination = f_range_doubless_t_initialize; + + { + const f_status_t status = f_range_doubless_append(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.array[0].used, length_sources); + + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { + + assert_int_equal(destination.array[0].array[i].start_1, sources_array[i].start_1); + assert_int_equal(destination.array[0].array[i].start_2, sources_array[i].start_2); + assert_int_equal(destination.array[0].array[i].stop_1, sources_array[i].stop_1); + assert_int_equal(destination.array[0].array[i].stop_2, sources_array[i].stop_2); + } // for + } + + free((void *) destination.array[0].array); + free((void *) destination.array); +} + +void test__f_type_array_range_doubless_append__returns_data_not(void **state) { + + const int length = 5; + f_range_doubles_t source = f_range_doubless_t_initialize; + f_range_doubless_t destination = f_range_doubless_t_initialize; + + { + const f_status_t status = f_memory_arrays_resize(length, sizeof(f_range_doubles_t), (void **) &source.array, &source.used, &source.size, &f_range_doubless_delete_callback); + + assert_int_equal(status, F_okay); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_range_doubless_append(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_range_doubless_append__parameter_checking(void **state) { + + f_range_doubles_t data = f_range_doubles_t_initialize; + + { + const f_status_t status = f_range_doubless_append(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.h new file mode 100644 index 0000000..af8b14d --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__range_doubless_append_h +#define _TEST__F_type_array__range_doubless_append_h + +/** + * Test that the function works. + * + * @see f_range_doubless_append() + */ +extern void test__f_type_array_range_doubless_append__works(void **state); + +/** + * Test that the function returns F_data_not when asked to copy an empty structure. + * + * @see f_range_doubless_append() + */ +extern void test__f_type_array_range_doubless_append__returns_data_not(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_range_doubless_append() + */ +extern void test__f_type_array_range_doubless_append__parameter_checking(void **state); + +#endif // _TEST__F_type_array__range_doubless_append_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.c new file mode 100644 index 0000000..d2a24f2 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.c @@ -0,0 +1,95 @@ +#include "test-type_array.h" +#include "test-type_array-range_doubless_append_all.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_range_doubless_append_all__works(void **state) { + + const int length_sources = 2; + const int length_sources_set = 2; + + f_range_double_t sources_array1[] = { + macro_f_range_double_t_initialize_1(1, 2, 3, 4), + macro_f_range_double_t_initialize_1(5, 6, 7, 8), + }; + + f_range_double_t sources_array2[] = { + macro_f_range_double_t_initialize_1(9, 10, 11, 12), + macro_f_range_double_t_initialize_1(13, 14, 15, 16), + }; + + f_range_doubles_t sources_set_array[] = { + macro_f_range_doubles_t_initialize_1(sources_array1, 0, length_sources), + macro_f_range_doubles_t_initialize_1(sources_array2, 0, length_sources), + }; + + const f_range_doubless_t source = macro_f_range_doubless_t_initialize_1(sources_set_array, 0, length_sources_set); + f_range_doubless_t destination = f_range_doubless_t_initialize; + + { + const f_status_t status = f_range_doubless_append_all(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.used, source.used); + + for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { + + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { + + assert_int_equal(destination.array[j].array[i].start_1, sources_set_array[j].array[i].start_1); + assert_int_equal(destination.array[j].array[i].start_2, sources_set_array[j].array[i].start_2); + assert_int_equal(destination.array[j].array[i].stop_1, sources_set_array[j].array[i].stop_1); + assert_int_equal(destination.array[j].array[i].stop_2, sources_set_array[j].array[i].stop_2); + } // for + } // for + } + + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { + free((void *) destination.array[i].array); + } // for + + free((void *) destination.array); +} + +void test__f_type_array_range_doubless_append_all__returns_data_not(void **state) { + + const int length = 5; + f_range_doubless_t source = f_range_doubless_t_initialize; + f_range_doubless_t destination = f_range_doubless_t_initialize; + + { + const f_status_t status = f_memory_arrays_resize(length, sizeof(f_range_doubles_t), (void **) &source.array, &source.used, &source.size, &f_range_doubless_delete_callback); + + assert_int_equal(status, F_okay); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_range_doubless_append_all(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_range_doubless_append_all__parameter_checking(void **state) { + + const f_range_doubless_t data = f_range_doubless_t_initialize; + + { + const f_status_t status = f_range_doubless_append_all(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.h new file mode 100644 index 0000000..29d5a5a --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_append_all.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__range_doubless_append_all_h +#define _TEST__F_type_array__range_doubless_append_all_h + +/** + * Test that the function works. + * + * @see f_range_doubless_append_all() + */ +extern void test__f_type_array_range_doubless_append_all__works(void **state); + +/** + * Test that the function returns F_data_not when asked to copy an empty structure. + * + * @see f_range_doubless_append_all() + */ +extern void test__f_type_array_range_doubless_append_all__returns_data_not(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_range_doubless_append_all() + */ +extern void test__f_type_array_range_doubless_append_all__parameter_checking(void **state); + +#endif // _TEST__F_type_array__range_doubless_append_all_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.c b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.c new file mode 100644 index 0000000..e4d8731 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.c @@ -0,0 +1,57 @@ +#include "test-type_array.h" +#include "test-type_array-range_doubless_delete_callback.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_range_doubless_delete_callback__fails(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 0; + + f_range_double_t data = f_range_double_t_initialize; + f_range_double_t data_array[] = { data }; + f_range_doubles_t datas = { .array = data_array, .used = 1, .size = 1 }; + f_range_doubles_t datas_array[] = { datas }; + + { + will_return(__wrap_f_memory_array_resize, true); + will_return(__wrap_f_memory_array_resize, F_status_set_error(F_failure)); + + const f_status_t status = f_range_doubless_delete_callback(0, 1, (void *) datas_array); + + assert_int_equal(status, F_status_set_error(F_failure)); + } +} + +void test__f_type_array_range_doubless_delete_callback__works(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 1; + + const f_number_unsigned_t length = 1; + + f_range_doubless_t datass = f_range_doubless_t_initialize; + + { + f_status_t status = f_memory_array_resize(length, sizeof(f_range_doubles_t), (void **) &datass.array, &datass.used, &datass.size); + assert_int_equal(status, F_okay); + + status = f_memory_array_resize(1, sizeof(f_range_double_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); + assert_int_equal(status, F_okay); + } + + { + const f_status_t status = f_range_doubless_delete_callback(0, length, (void *) datass.array); + + assert_int_equal(status, F_okay); + assert_int_equal(datass.array[0].size, 0); + } + + free((void *) datass.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.h b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.h new file mode 100644 index 0000000..12c67f9 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_delete_callback.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type__range_doubless_delete_callback +#define _TEST__F_type__range_doubless_delete_callback + +/** + * Test that the function fails. + * + * @see f_range_doubless_delete_callback() + */ +extern void test__f_type_array_range_doubless_delete_callback__fails(void **state); + +/** + * Test that the function works. + * + * @see f_range_doubless_delete_callback() + */ +extern void test__f_type_array_range_doubless_delete_callback__works(void **state); + +#endif // _TEST__F_type__range_doubless_delete_callback diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.c b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.c new file mode 100644 index 0000000..c7768a4 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.c @@ -0,0 +1,57 @@ +#include "test-type_array.h" +#include "test-type_array-range_doubless_destroy_callback.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_range_doubless_destroy_callback__fails(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 0; + + f_range_double_t data = f_range_double_t_initialize; + f_range_double_t data_array[] = { data }; + f_range_doubles_t datas = { .array = data_array, .used = 1, .size = 1 }; + f_range_doubles_t datas_array[] = { datas }; + + { + will_return(__wrap_f_memory_array_adjust, true); + will_return(__wrap_f_memory_array_adjust, F_status_set_error(F_failure)); + + const f_status_t status = f_range_doubless_destroy_callback(0, 1, (void *) datas_array); + + assert_int_equal(status, F_status_set_error(F_failure)); + } +} + +void test__f_type_array_range_doubless_destroy_callback__works(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 1; + + const f_number_unsigned_t length = 1; + + f_range_doubless_t datass = f_range_doubless_t_initialize; + + { + f_status_t status = f_memory_array_adjust(length, sizeof(f_range_doubles_t), (void **) &datass.array, &datass.used, &datass.size); + assert_int_equal(status, F_okay); + + status = f_memory_array_adjust(1, sizeof(f_range_double_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); + assert_int_equal(status, F_okay); + } + + { + const f_status_t status = f_range_doubless_destroy_callback(0, length, (void *) datass.array); + + assert_int_equal(status, F_okay); + assert_int_equal(datass.array[0].size, 0); + } + + free((void *) datass.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.h b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.h new file mode 100644 index 0000000..c6c76f2 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-range_doubless_destroy_callback.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__range_doubless_destroy_callback +#define _TEST__F_type_array__range_doubless_destroy_callback + +/** + * Test that the function fails. + * + * @see f_range_doubless_destroy_callback() + */ +extern void test__f_type_array_range_doubless_destroy_callback__fails(void **state); + +/** + * Test that the function works. + * + * @see f_range_doubless_destroy_callback() + */ +extern void test__f_type_array_range_doubless_destroy_callback__works(void **state); + +#endif // _TEST__F_type_array__range_doubless_destroy_callback diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.c new file mode 100644 index 0000000..464ae0b --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.c @@ -0,0 +1,38 @@ +#include "test-type_array.h" +#include "test-type_array-ranges_append.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_ranges_append__works(void **state) { + + const f_range_t source = macro_f_range_t_initialize_1(1, 2); + f_ranges_t destination = f_ranges_t_initialize; + + { + const f_status_t status = f_ranges_append(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.used, 1); + assert_int_equal(destination.array[0].start, source.start); + assert_int_equal(destination.array[0].stop, source.stop); + } + + free((void *) destination.array); +} + +void test__f_type_array_ranges_append__parameter_checking(void **state) { + + const f_range_t data = f_range_t_initialize; + + { + const f_status_t status = f_ranges_append(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.h new file mode 100644 index 0000000..15639e0 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__ranges_append_h +#define _TEST__F_type_array__ranges_append_h + +/** + * Test that the function works. + * + * @see f_ranges_append() + */ +extern void test__f_type_array_ranges_append__works(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_ranges_append() + */ +extern void test__f_type_array_ranges_append__parameter_checking(void **state); + +#endif // _TEST__F_type_array__ranges_append_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.c new file mode 100644 index 0000000..f6fb3b7 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.c @@ -0,0 +1,76 @@ +#include "test-type_array.h" +#include "test-type_array-ranges_append_all.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_ranges_append_all__works(void **state) { + + const int length_sources = 2; + + f_range_t sources_array[] = { + macro_f_range_t_initialize_1(1, 2), + macro_f_range_t_initialize_1(3, 4), + }; + + const f_ranges_t source = macro_f_ranges_t_initialize_1(sources_array, 0, length_sources); + f_ranges_t destination = f_ranges_t_initialize; + + { + const f_status_t status = f_ranges_append_all(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.used, source.used); + assert_int_equal(destination.size, source.used); + + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { + + assert_int_equal(destination.array[i].start, source.array[i].start); + assert_int_equal(destination.array[i].stop, source.array[i].stop); + } // for + } + + free((void *) destination.array); +} + +void test__f_type_array_ranges_append_all__returns_data_not(void **state) { + + const int length = 5; + f_ranges_t source = f_ranges_t_initialize; + f_ranges_t destination = f_ranges_t_initialize; + + { + const f_status_t status = f_memory_array_resize(length, sizeof(f_range_t), (void **) &source.array, &source.used, &source.size); + + assert_int_equal(status, F_okay); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_ranges_append_all(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_ranges_append_all__parameter_checking(void **state) { + + const f_ranges_t data = f_ranges_t_initialize; + + { + const f_status_t status = f_ranges_append_all(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.h new file mode 100644 index 0000000..dafc9c7 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-ranges_append_all.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__ranges_append_all_h +#define _TEST__F_type_array__ranges_append_all_h + +/** + * Test that the function works. + * + * @see f_ranges_append_all() + */ +extern void test__f_type_array_ranges_append_all__works(void **state); + +/** + * Test that the function returns F_data_not when asked to copy an empty structure. + * + * @see f_ranges_append_all() + */ +extern void test__f_type_array_ranges_append_all__returns_data_not(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_ranges_append_all() + */ +extern void test__f_type_array_ranges_append_all__parameter_checking(void **state); + +#endif // _TEST__F_type_array__ranges_append_all_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.c new file mode 100644 index 0000000..7f03790 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.c @@ -0,0 +1,76 @@ +#include "test-type_array.h" +#include "test-type_array-rangess_append.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_rangess_append__works(void **state) { + + const int length_sources = 2; + + f_range_t sources_array[] = { + macro_f_range_t_initialize_1(1, 2), + macro_f_range_t_initialize_1(3, 4), + }; + + const f_ranges_t source = macro_f_ranges_t_initialize_1(sources_array, 0, length_sources); + f_rangess_t destination = f_rangess_t_initialize; + + { + const f_status_t status = f_rangess_append(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.array[0].used, length_sources); + + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { + + assert_int_equal(destination.array[0].array[i].start, sources_array[i].start); + assert_int_equal(destination.array[0].array[i].stop, sources_array[i].stop); + } // for + } + + free((void *) destination.array[0].array); + free((void *) destination.array); +} + +void test__f_type_array_rangess_append__returns_data_not(void **state) { + + const int length = 5; + f_ranges_t source = f_rangess_t_initialize; + f_rangess_t destination = f_rangess_t_initialize; + + { + const f_status_t status = f_memory_arrays_resize(length, sizeof(f_ranges_t), (void **) &source.array, &source.used, &source.size, &f_rangess_delete_callback); + + assert_int_equal(status, F_okay); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_rangess_append(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_rangess_append__parameter_checking(void **state) { + + f_ranges_t data = f_ranges_t_initialize; + + { + const f_status_t status = f_rangess_append(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.h new file mode 100644 index 0000000..c76589a --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__rangess_append_h +#define _TEST__F_type_array__rangess_append_h + +/** + * Test that the function works. + * + * @see f_rangess_append() + */ +extern void test__f_type_array_rangess_append__works(void **state); + +/** + * Test that the function returns F_data_not when asked to copy an empty structure. + * + * @see f_rangess_append() + */ +extern void test__f_type_array_rangess_append__returns_data_not(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_rangess_append() + */ +extern void test__f_type_array_rangess_append__parameter_checking(void **state); + +#endif // _TEST__F_type_array__rangess_append_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.c new file mode 100644 index 0000000..5a80920 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.c @@ -0,0 +1,93 @@ +#include "test-type_array.h" +#include "test-type_array-rangess_append_all.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_rangess_append_all__works(void **state) { + + const int length_sources = 2; + const int length_sources_set = 2; + + f_range_t sources_array1[] = { + macro_f_range_t_initialize_1(1, 2), + macro_f_range_t_initialize_1(3, 4), + }; + + f_range_t sources_array2[] = { + macro_f_range_t_initialize_1(5, 6), + macro_f_range_t_initialize_1(7, 8), + }; + + f_ranges_t sources_set_array[] = { + macro_f_ranges_t_initialize_1(sources_array1, 0, length_sources), + macro_f_ranges_t_initialize_1(sources_array2, 0, length_sources), + }; + + const f_rangess_t source = macro_f_rangess_t_initialize_1(sources_set_array, 0, length_sources_set); + f_rangess_t destination = f_rangess_t_initialize; + + { + const f_status_t status = f_rangess_append_all(source, &destination); + + assert_int_equal(status, F_okay); + assert_int_equal(destination.used, source.used); + + for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { + + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { + + assert_int_equal(destination.array[j].array[i].start, sources_set_array[j].array[i].start); + assert_int_equal(destination.array[j].array[i].stop, sources_set_array[j].array[i].stop); + } // for + } // for + } + + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { + free((void *) destination.array[i].array); + } // for + + free((void *) destination.array); +} + +void test__f_type_array_rangess_append_all__returns_data_not(void **state) { + + const int length = 5; + f_rangess_t source = f_rangess_t_initialize; + f_rangess_t destination = f_rangess_t_initialize; + + { + const f_status_t status = f_memory_arrays_resize(length, sizeof(f_ranges_t), (void **) &source.array, &source.used, &source.size, &f_rangess_delete_callback); + + assert_int_equal(status, F_okay); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_rangess_append_all(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_rangess_append_all__parameter_checking(void **state) { + + const f_rangess_t data = f_rangess_t_initialize; + + { + const f_status_t status = f_rangess_append_all(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.h new file mode 100644 index 0000000..25a3b4b --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_append_all.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__rangess_append_all_h +#define _TEST__F_type_array__rangess_append_all_h + +/** + * Test that the function works. + * + * @see f_rangess_append_all() + */ +extern void test__f_type_array_rangess_append_all__works(void **state); + +/** + * Test that the function returns F_data_not when asked to copy an empty structure. + * + * @see f_rangess_append_all() + */ +extern void test__f_type_array_rangess_append_all__returns_data_not(void **state); + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_rangess_append_all() + */ +extern void test__f_type_array_rangess_append_all__parameter_checking(void **state); + +#endif // _TEST__F_type_array__rangess_append_all_h diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.c b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.c new file mode 100644 index 0000000..d074e9d --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.c @@ -0,0 +1,57 @@ +#include "test-type_array.h" +#include "test-type_array-rangess_delete_callback.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_rangess_delete_callback__fails(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 0; + + f_range_t data = f_range_t_initialize; + f_range_t data_array[] = { data }; + f_ranges_t datas = { .array = data_array, .used = 1, .size = 1 }; + f_ranges_t datas_array[] = { datas }; + + { + will_return(__wrap_f_memory_array_resize, true); + will_return(__wrap_f_memory_array_resize, F_status_set_error(F_failure)); + + const f_status_t status = f_rangess_delete_callback(0, 1, (void *) datas_array); + + assert_int_equal(status, F_status_set_error(F_failure)); + } +} + +void test__f_type_array_rangess_delete_callback__works(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 1; + + const f_number_unsigned_t length = 1; + + f_rangess_t datass = f_rangess_t_initialize; + + { + f_status_t status = f_memory_array_resize(length, sizeof(f_ranges_t), (void **) &datass.array, &datass.used, &datass.size); + assert_int_equal(status, F_okay); + + status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); + assert_int_equal(status, F_okay); + } + + { + const f_status_t status = f_rangess_delete_callback(0, length, (void *) datass.array); + + assert_int_equal(status, F_okay); + assert_int_equal(datass.array[0].size, 0); + } + + free((void *) datass.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.h b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.h new file mode 100644 index 0000000..7d6e5c3 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_delete_callback.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__rangess_delete_callback +#define _TEST__F_type_array__rangess_delete_callback + +/** + * Test that the function fails. + * + * @see f_rangess_delete_callback() + */ +extern void test__f_type_array_rangess_delete_callback__fails(void **state); + +/** + * Test that the function works. + * + * @see f_rangess_delete_callback() + */ +extern void test__f_type_array_rangess_delete_callback__works(void **state); + +#endif // _TEST__F_type_array__rangess_delete_callback diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.c b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.c new file mode 100644 index 0000000..fcd406c --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.c @@ -0,0 +1,57 @@ +#include "test-type_array.h" +#include "test-type_array-rangess_destroy_callback.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_rangess_destroy_callback__fails(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 0; + + f_range_t data = f_range_t_initialize; + f_range_t data_array[] = { data }; + f_ranges_t datas = { .array = data_array, .used = 1, .size = 1 }; + f_ranges_t datas_array[] = { datas }; + + { + will_return(__wrap_f_memory_array_adjust, true); + will_return(__wrap_f_memory_array_adjust, F_status_set_error(F_failure)); + + const f_status_t status = f_rangess_destroy_callback(0, 1, (void *) datas_array); + + assert_int_equal(status, F_status_set_error(F_failure)); + } +} + +void test__f_type_array_rangess_destroy_callback__works(void **state) { + + mock_unwrap = 0; + mock_unwrap_f_memory = 1; + + const f_number_unsigned_t length = 1; + + f_rangess_t datass = f_rangess_t_initialize; + + { + f_status_t status = f_memory_array_adjust(length, sizeof(f_ranges_t), (void **) &datass.array, &datass.used, &datass.size); + assert_int_equal(status, F_okay); + + status = f_memory_array_adjust(1, sizeof(f_range_t), (void **) &datass.array[0].array, &datass.array[0].used, &datass.array[0].size); + assert_int_equal(status, F_okay); + } + + { + const f_status_t status = f_rangess_destroy_callback(0, length, (void *) datass.array); + + assert_int_equal(status, F_okay); + assert_int_equal(datass.array[0].size, 0); + } + + free((void *) datass.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.h b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.h new file mode 100644 index 0000000..8f57a25 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-rangess_destroy_callback.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__rangess_destroy_callback +#define _TEST__F_type_array__rangess_destroy_callback + +/** + * Test that the function fails. + * + * @see f_rangess_destroy_callback() + */ +extern void test__f_type_array_rangess_destroy_callback__fails(void **state); + +/** + * Test that the function works. + * + * @see f_rangess_destroy_callback() + */ +extern void test__f_type_array_rangess_destroy_callback__works(void **state); + +#endif // _TEST__F_type_array__rangess_destroy_callback diff --git a/level_0/f_type_array/tests/unit/c/test-type_array.c b/level_0/f_type_array/tests/unit/c/test-type_array.c index 73d1f01..f18509c 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array.c @@ -83,6 +83,20 @@ int main(void) { cmocka_unit_test(test__f_type_array_pollss_destroy_callback__fails), cmocka_unit_test(test__f_type_array_pollss_destroy_callback__works), + cmocka_unit_test(test__f_type_array_ranges_append__works), + cmocka_unit_test(test__f_type_array_ranges_append_all__works), + cmocka_unit_test(test__f_type_array_ranges_append_all__returns_data_not), + + cmocka_unit_test(test__f_type_array_rangess_append__works), + cmocka_unit_test(test__f_type_array_rangess_append__returns_data_not), + cmocka_unit_test(test__f_type_array_rangess_append_all__works), + cmocka_unit_test(test__f_type_array_rangess_append_all__returns_data_not), + + cmocka_unit_test(test__f_type_array_rangess_delete_callback__fails), + cmocka_unit_test(test__f_type_array_rangess_destroy_callback__fails), + cmocka_unit_test(test__f_type_array_rangess_delete_callback__works), + cmocka_unit_test(test__f_type_array_rangess_destroy_callback__works), + cmocka_unit_test(test__f_type_array_statess_delete_callback__fails), cmocka_unit_test(test__f_type_array_statess_delete_callback__works), @@ -159,6 +173,14 @@ int main(void) { // f_pollss_destroy_callback() doesn't use parameter checking. // f_pollss_delete_callback() doesn't use parameter checking. + cmocka_unit_test(test__f_type_array_ranges_append__parameter_checking), + cmocka_unit_test(test__f_type_array_ranges_append_all__parameter_checking), + cmocka_unit_test(test__f_type_array_rangess_append__parameter_checking), + cmocka_unit_test(test__f_type_array_rangess_append_all__parameter_checking), + + // f_rangess_delete_callback() doesn't use parameter checking. + // f_rangess_destroy_callback() doesn't use parameter checking. + // f_statess_destroy_callback() doesn't use parameter checking. // f_statess_delete_callback() doesn't use parameter checking. diff --git a/level_0/f_type_array/tests/unit/c/test-type_array.h b/level_0/f_type_array/tests/unit/c/test-type_array.h index b9b588c..30ebcc0 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array.h +++ b/level_0/f_type_array/tests/unit/c/test-type_array.h @@ -52,6 +52,12 @@ #include "test-type_array-number_unsignedss_destroy_callback.h" #include "test-type_array-pollss_delete_callback.h" #include "test-type_array-pollss_destroy_callback.h" +#include "test-type_array-ranges_append.h" +#include "test-type_array-ranges_append_all.h" +#include "test-type_array-rangess_append.h" +#include "test-type_array-rangess_append_all.h" +#include "test-type_array-rangess_delete_callback.h" +#include "test-type_array-rangess_destroy_callback.h" #include "test-type_array-statess_delete_callback.h" #include "test-type_array-statess_destroy_callback.h" #include "test-type_array-statusss_delete_callback.h" diff --git a/level_0/f_utf/c/utf.c b/level_0/f_utf/c/utf.c index b26d88b..2ebeacd 100644 --- a/level_0/f_utf/c/utf.c +++ b/level_0/f_utf/c/utf.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_utf_buffer_decrement_ - f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_t step) { + f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_range_t *range, const f_number_unsigned_t step) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (step < 1) return F_status_set_error(F_parameter); @@ -41,7 +41,7 @@ extern "C" { #endif // _di_f_utf_buffer_decrement_ #ifndef _di_f_utf_buffer_increment_ - f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_t step) { + f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_range_t *range, const f_number_unsigned_t step) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (step < 1) return F_status_set_error(F_parameter); diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h index 845f805..a0d1338 100644 --- a/level_0/f_utf/c/utf.h +++ b/level_0/f_utf/c/utf.h @@ -100,7 +100,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_buffer_decrement_ - extern f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_t step); + extern f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_range_t *range, const f_number_unsigned_t step); #endif // _di_f_utf_buffer_decrement_ /** @@ -133,7 +133,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_buffer_increment_ - extern f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_t step); + extern f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_range_t *range, const f_number_unsigned_t step); #endif // _di_f_utf_buffer_increment_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/dynamic.c b/level_0/f_utf/c/utf/dynamic.c index e1a722b..01e7052 100644 --- a/level_0/f_utf/c/utf/dynamic.c +++ b/level_0/f_utf/c/utf/dynamic.c @@ -172,7 +172,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_mish_nulless_ #ifndef _di_f_utf_string_dynamic_partial_append_ - f_status_t f_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -190,7 +190,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_append_ #ifndef _di_f_utf_string_dynamic_partial_append_assure_ - f_status_t f_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -226,7 +226,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_append_assure_ #ifndef _di_f_utf_string_dynamic_partial_append_assure_nulless_ - f_status_t f_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -274,7 +274,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_append_assure_nulless_ #ifndef _di_f_utf_string_dynamic_partial_append_nulless_ - f_status_t f_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -292,7 +292,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_append_nulless_ #ifndef _di_f_utf_string_dynamic_partial_mash_ - f_status_t f_utf_string_dynamic_partial_mash(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_mash(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -315,7 +315,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_mash_ #ifndef _di_f_utf_string_dynamic_partial_mash_nulless_ - f_status_t f_utf_string_dynamic_partial_mash_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_mash_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -338,7 +338,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_mash_nulless_ #ifndef _di_f_utf_string_dynamic_partial_mish_ - f_status_t f_utf_string_dynamic_partial_mish(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_mish(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -361,7 +361,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_mish_ #ifndef _di_f_utf_string_dynamic_partial_mish_nulless_ - f_status_t f_utf_string_dynamic_partial_mish_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_mish_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -384,7 +384,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_mish_nulless_ #ifndef _di_f_utf_string_dynamic_partial_prepend_ - f_status_t f_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -402,7 +402,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_prepend_ #ifndef _di_f_utf_string_dynamic_partial_prepend_assure_ - f_status_t f_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -437,7 +437,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_prepend_assure_ #ifndef _di_f_utf_string_dynamic_partial_prepend_assure_nulless_ - f_status_t f_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -484,7 +484,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_partial_prepend_assure_nulless #ifndef _di_f_utf_string_dynamic_partial_prepend_nulless_ - f_status_t f_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -591,7 +591,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_prepend_nulless_ #ifndef _di_f_utf_string_dynamic_seek_line_ - f_status_t f_utf_string_dynamic_seek_line(const f_utf_string_static_t buffer, f_string_range_t * const range) { + f_status_t f_utf_string_dynamic_seek_line(const f_utf_string_static_t buffer, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -614,7 +614,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_seek_line_ #ifndef _di_f_utf_string_dynamic_seek_line_to_ - f_status_t f_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range) { + f_status_t f_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -638,7 +638,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_seek_line_to_ #ifndef _di_f_utf_string_dynamic_seek_to_ - f_status_t f_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range) { + f_status_t f_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/dynamic.h b/level_0/f_utf/c/utf/dynamic.h index 70b1fd7..7056504 100644 --- a/level_0/f_utf/c/utf/dynamic.h +++ b/level_0/f_utf/c/utf/dynamic.h @@ -255,7 +255,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_append_ - extern f_status_t f_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_append_ /** @@ -280,7 +280,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_append_assure_ - extern f_status_t f_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_append_assure_ /** @@ -309,7 +309,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_append_assure_nulless_ - extern f_status_t f_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_append_assure_nulless_ /** @@ -336,7 +336,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_append_nulless_ - extern f_status_t f_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_append_nulless_ /** @@ -365,7 +365,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_mash_ - extern f_status_t f_utf_string_dynamic_partial_mash(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_mash(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_mash_ /** @@ -396,7 +396,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_mash_nulless_ - extern f_status_t f_utf_string_dynamic_partial_mash_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_mash_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_mash_nulless_ /** @@ -425,7 +425,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_mish_ - extern f_status_t f_utf_string_dynamic_partial_mish(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_mish(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_mish_ /** @@ -456,7 +456,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_mish_nulless_ - extern f_status_t f_utf_string_dynamic_partial_mish_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_mish_nulless(const f_utf_string_static_t glue, const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_mish_nulless_ /** @@ -483,7 +483,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_prepend_ - extern f_status_t f_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_prepend_ /** @@ -510,7 +510,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_prepend_assure_ - extern f_status_t f_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_prepend_assure_ /** @@ -539,7 +539,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_prepend_assure_nulless_ - extern f_status_t f_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_prepend_assure_nulless_ /** @@ -566,7 +566,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_partial_prepend_nulless_ - extern f_status_t f_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_string_range_t range, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_range_t range, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_dynamic_partial_prepend_nulless_ /** @@ -685,7 +685,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_seek_line_ - extern f_status_t f_utf_string_dynamic_seek_line(const f_utf_string_static_t buffer, f_string_range_t * const range); + extern f_status_t f_utf_string_dynamic_seek_line(const f_utf_string_static_t buffer, f_range_t * const range); #endif // _di_f_utf_string_dynamic_seek_line_ /** @@ -712,7 +712,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_seek_line_to_ - extern f_status_t f_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range); + extern f_status_t f_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range); #endif // _di_f_utf_string_dynamic_seek_line_to_ /** @@ -739,7 +739,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_seek_to_ - extern f_status_t f_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_string_range_t * const range); + extern f_status_t f_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, const f_utf_char_t seek_to_this, f_range_t * const range); #endif // _di_f_utf_string_dynamic_seek_to_ /** diff --git a/level_0/f_utf/c/utf/string.c b/level_0/f_utf/c/utf/string.c index dd27b33..b0e22ed 100644 --- a/level_0/f_utf/c/utf/string.c +++ b/level_0/f_utf/c/utf/string.c @@ -294,7 +294,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_nulless_ #ifndef _di_f_utf_string_seek_line_ - f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_string_range_t *range) { + f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -315,7 +315,7 @@ extern "C" { #endif // _di_f_utf_string_seek_line_ #ifndef _di_f_utf_string_seek_line_to_ - f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -336,7 +336,7 @@ extern "C" { #endif // _di_f_utf_string_seek_line_to_ #ifndef _di_f_utf_string_seek_to_ - f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/string.h b/level_0/f_utf/c/utf/string.h index a4c5a55..41fe881 100644 --- a/level_0/f_utf/c/utf/string.h +++ b/level_0/f_utf/c/utf/string.h @@ -368,7 +368,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_seek_line_ - extern f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_range_t * const range); #endif // _di_f_utf_string_seek_line_ /** @@ -391,7 +391,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_string_seek_line_to_ - extern f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_utf_string_seek_line_to_ /** @@ -415,7 +415,7 @@ extern "C" { * F_utf_not (with error bit) if unicode is an invalid Unicode character. */ #ifndef _di_f_utf_string_seek_to_ - extern f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_utf_string_seek_to_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/strings.c b/level_0/f_utf/c/utf/strings.c index c19989f..9ec3a9a 100644 --- a/level_0/f_utf/c/utf/strings.c +++ b/level_0/f_utf/c/utf/strings.c @@ -282,7 +282,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_nulless_ #ifndef _di_f_utf_string_seek_line_ - f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_string_range_t *range) { + f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -303,7 +303,7 @@ extern "C" { #endif // _di_f_utf_string_seek_line_ #ifndef _di_f_utf_string_seek_line_to_ - f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -324,7 +324,7 @@ extern "C" { #endif // _di_f_utf_string_seek_line_to_ #ifndef _di_f_utf_string_seek_to_ - f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/strings.h b/level_0/f_utf/c/utf/strings.h index a4c5a55..41fe881 100644 --- a/level_0/f_utf/c/utf/strings.h +++ b/level_0/f_utf/c/utf/strings.h @@ -368,7 +368,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_seek_line_ - extern f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_range_t * const range); #endif // _di_f_utf_string_seek_line_ /** @@ -391,7 +391,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_string_seek_line_to_ - extern f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_utf_string_seek_line_to_ /** @@ -415,7 +415,7 @@ extern "C" { * F_utf_not (with error bit) if unicode is an invalid Unicode character. */ #ifndef _di_f_utf_string_seek_to_ - extern f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_utf_string_seek_to_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/stringss.c b/level_0/f_utf/c/utf/stringss.c index a342e13..9ce8e1c 100644 --- a/level_0/f_utf/c/utf/stringss.c +++ b/level_0/f_utf/c/utf/stringss.c @@ -282,7 +282,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_nulless_ #ifndef _di_f_utf_string_seek_line_ - f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_string_range_t *range) { + f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -303,7 +303,7 @@ extern "C" { #endif // _di_f_utf_string_seek_line_ #ifndef _di_f_utf_string_seek_line_to_ - f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -324,7 +324,7 @@ extern "C" { #endif // _di_f_utf_string_seek_line_to_ #ifndef _di_f_utf_string_seek_to_ - f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range) { + f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/stringss.h b/level_0/f_utf/c/utf/stringss.h index a4c5a55..41fe881 100644 --- a/level_0/f_utf/c/utf/stringss.h +++ b/level_0/f_utf/c/utf/stringss.h @@ -368,7 +368,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_seek_line_ - extern f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_line(const f_utf_string_t string, f_range_t * const range); #endif // _di_f_utf_string_seek_line_ /** @@ -391,7 +391,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_string_seek_line_to_ - extern f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_line_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_utf_string_seek_line_to_ /** @@ -415,7 +415,7 @@ extern "C" { * F_utf_not (with error bit) if unicode is an invalid Unicode character. */ #ifndef _di_f_utf_string_seek_to_ - extern f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_string_range_t * const range); + extern f_status_t f_utf_string_seek_to(const f_utf_string_t string, const f_utf_char_t seek_to, f_range_t * const range); #endif // _di_f_utf_string_seek_to_ #ifdef __cplusplus diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c index 64ab999..5900877 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_append__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -29,7 +29,7 @@ void test__f_utf_string_dynamic_partial_append__works(void **state) { void test__f_utf_string_dynamic_partial_append__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_append(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c index 660ab23..e1d10cb 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_append_assure__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -41,7 +41,7 @@ void test__f_utf_string_dynamic_partial_append_assure__works(void **state) { void test__f_utf_string_dynamic_partial_append_assure__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_append_assure(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c index f47ed30..eaae1be 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_append_assure_nulless__works(void **stat const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -41,7 +41,7 @@ void test__f_utf_string_dynamic_partial_append_assure_nulless__works(void **stat void test__f_utf_string_dynamic_partial_append_assure_nulless__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_append_assure_nulless(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c index 44a5915..a794a28 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_append_nulless__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -29,7 +29,7 @@ void test__f_utf_string_dynamic_partial_append_nulless__works(void **state) { void test__f_utf_string_dynamic_partial_append_nulless__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_append_nulless(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c index 5894129..14b76c3 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c @@ -11,7 +11,7 @@ void test__f_utf_string_dynamic_partial_mash__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected1 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); const f_utf_string_static_t expected2 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0:\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 11); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -44,7 +44,7 @@ void test__f_utf_string_dynamic_partial_mash__parameter_checking(void **state) { const f_utf_string_static_t glue = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0:", 0, 1); const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_mash(glue, source, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c index afca92c..cb47378 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c @@ -11,7 +11,7 @@ void test__f_utf_string_dynamic_partial_mash_nulless__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected1 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); const f_utf_string_static_t expected2 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0:\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 9); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -44,7 +44,7 @@ void test__f_utf_string_dynamic_partial_mash_nulless__parameter_checking(void ** const f_utf_string_static_t glue = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0:", 0, 1); const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_mash_nulless(glue, source, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c index df3c052..f3fef0e 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c @@ -11,7 +11,7 @@ void test__f_utf_string_dynamic_partial_mish__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected1 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); const f_utf_string_static_t expected2 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0:\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 11); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -44,7 +44,7 @@ void test__f_utf_string_dynamic_partial_mish__parameter_checking(void **state) { const f_utf_string_static_t glue = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0:", 0, 1); const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_mish(glue, source, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c index e9c2059..a6ecee9 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c @@ -11,7 +11,7 @@ void test__f_utf_string_dynamic_partial_mish_nulless__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected1 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); const f_utf_string_static_t expected2 = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0:\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 9); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -44,7 +44,7 @@ void test__f_utf_string_dynamic_partial_mish_nulless__parameter_checking(void ** const f_utf_string_static_t glue = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0:", 0, 1); const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_mish_nulless(glue, source, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c index 2993200..76100c1 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_prepend__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -29,7 +29,7 @@ void test__f_utf_string_dynamic_partial_prepend__works(void **state) { void test__f_utf_string_dynamic_partial_prepend__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_prepend(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c index 383f4fc..4b18246 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_prepend_assure__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t", 0, 5); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -41,7 +41,7 @@ void test__f_utf_string_dynamic_partial_prepend_assure__works(void **state) { void test__f_utf_string_dynamic_partial_prepend_assure__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_prepend_assure(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c index 011fc75..0d1dd08 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_prepend_assure_nulless__works(void **sta const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -41,7 +41,7 @@ void test__f_utf_string_dynamic_partial_prepend_assure_nulless__works(void **sta void test__f_utf_string_dynamic_partial_prepend_assure_nulless__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_prepend_assure_nulless(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c index 1ea0361..004c09b 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c @@ -9,7 +9,7 @@ void test__f_utf_string_dynamic_partial_prepend_nulless__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0_\0\0\0t\0\0\0e\0\0\0\0\0\0\0s\0\0\0t\0\0\0_", 0, 7); const f_utf_string_static_t expected = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); - const f_string_range_t partial = macro_f_string_range_t_initialize_1(1, 5); + const f_range_t partial = macro_f_range_t_initialize_1(1, 5); f_utf_string_dynamic_t destination = f_utf_string_dynamic_t_initialize; { @@ -29,7 +29,7 @@ void test__f_utf_string_dynamic_partial_prepend_nulless__works(void **state) { void test__f_utf_string_dynamic_partial_prepend_nulless__parameter_checking(void **state) { const f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; - const f_string_range_t partial = f_string_range_t_initialize; + const f_range_t partial = f_range_t_initialize; { const f_status_t status = f_utf_string_dynamic_partial_prepend_nulless(data, partial, 0); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line.c index 802896d..ca80d90 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line.c @@ -10,7 +10,7 @@ void test__f_utf_string_dynamic_seek_line__returns_data_not_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_utf_string_dynamic_seek_line(source, &range); @@ -23,7 +23,7 @@ void test__f_utf_string_dynamic_seek_line__returns_none_eos(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_line(source, &range); @@ -39,7 +39,7 @@ void test__f_utf_string_dynamic_seek_line__returns_none_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 2); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 2); const f_status_t status = f_utf_string_dynamic_seek_line(source, &range); @@ -55,7 +55,7 @@ void test__f_utf_string_dynamic_seek_line__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_line(source, &range); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line_to.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line_to.c index 2da2fcf..46d9a26 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line_to.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_line_to.c @@ -11,7 +11,7 @@ void test__f_utf_string_dynamic_seek_line_to__after_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\n\0\0\0X\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -28,7 +28,7 @@ void test__f_utf_string_dynamic_seek_line_to__before_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0X\0\0\0\n\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -45,7 +45,7 @@ void test__f_utf_string_dynamic_seek_line_to__returns_data_not_stop(void **state const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_utf_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -59,7 +59,7 @@ void test__f_utf_string_dynamic_seek_line_to__returns_none_eos(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_line_to(source, to.string[0], &range); @@ -76,7 +76,7 @@ void test__f_utf_string_dynamic_seek_line_to__returns_none_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 2); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 2); const f_status_t status = f_utf_string_dynamic_seek_line_to(source, to.string[0], &range); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_to.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_to.c index 22701b5..a4c0348 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_to.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_seek_to.c @@ -11,7 +11,7 @@ void test__f_utf_string_dynamic_seek_to__after_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\n\0\0\0X\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_to(source, to.string[0], &range); @@ -28,7 +28,7 @@ void test__f_utf_string_dynamic_seek_to__before_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0X\0\0\0\n\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_to(source, to.string[0], &range); @@ -45,7 +45,7 @@ void test__f_utf_string_dynamic_seek_to__returns_data_not_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_utf_string_dynamic_seek_to(source, to.string[0], &range); @@ -59,7 +59,7 @@ void test__f_utf_string_dynamic_seek_to__returns_none_eos(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_to(source, to.string[0], &range); @@ -76,7 +76,7 @@ void test__f_utf_string_dynamic_seek_to__returns_none_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 2); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 2); const f_status_t status = f_utf_string_dynamic_seek_to(source, to.string[0], &range); @@ -94,7 +94,7 @@ void test__f_utf_string_dynamic_seek_to__works(void **state) { // Test where newline is before "X". { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\n\0\0\0X\0\0\0s\0\0\0t", 0, 6); - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_to(source, to.string[0], &range); @@ -107,7 +107,7 @@ void test__f_utf_string_dynamic_seek_to__works(void **state) { // Test where newline is after "X". { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0X\0\0\0\n\0\0\0s\0\0\0t", 0, 6); - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_dynamic_seek_to(source, to.string[0], &range); diff --git a/level_0/f_utf/tests/unit/c/test-utf-seek_line.c b/level_0/f_utf/tests/unit/c/test-utf-seek_line.c index e30b788..75c667c 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-seek_line.c +++ b/level_0/f_utf/tests/unit/c/test-utf-seek_line.c @@ -10,7 +10,7 @@ void test__f_utf_seek_line__returns_data_not_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_utf_string_seek_line(source.string, &range); @@ -23,7 +23,7 @@ void test__f_utf_seek_line__returns_none_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_line(source.string, &range); @@ -39,7 +39,7 @@ void test__f_utf_seek_line__works(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_line(source.string, &range); diff --git a/level_0/f_utf/tests/unit/c/test-utf-seek_line_to.c b/level_0/f_utf/tests/unit/c/test-utf-seek_line_to.c index f9f3204..47c84c3 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-seek_line_to.c +++ b/level_0/f_utf/tests/unit/c/test-utf-seek_line_to.c @@ -11,7 +11,7 @@ void test__f_utf_seek_line_to__after_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\n\0\0\0X\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_line_to(source.string, to.string[0], &range); @@ -28,7 +28,7 @@ void test__f_utf_seek_line_to__before_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0X\0\0\0\n\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_line_to(source.string, to.string[0], &range); @@ -45,7 +45,7 @@ void test__f_utf_seek_line_to__returns_data_not_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_utf_string_seek_line_to(source.string, to.string[0], &range); @@ -59,7 +59,7 @@ void test__f_utf_seek_line_to__returns_none_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t", 0, 4); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_line_to(source.string, to.string[0], &range); diff --git a/level_0/f_utf/tests/unit/c/test-utf-seek_to.c b/level_0/f_utf/tests/unit/c/test-utf-seek_to.c index f1e227e..b246a27 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-seek_to.c +++ b/level_0/f_utf/tests/unit/c/test-utf-seek_to.c @@ -11,7 +11,7 @@ void test__f_utf_seek_to__after_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0\n\0\0\0X\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_to(source.string, to.string[0], &range); @@ -28,7 +28,7 @@ void test__f_utf_seek_to__before_newline(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0X\0\0\0\n\0\0\0s\0\0\0t", 0, 6); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_to(source.string, to.string[0], &range); @@ -45,7 +45,7 @@ void test__f_utf_seek_to__returns_data_not_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_status_t status = f_utf_string_seek_to(source.string, to.string[0], &range); @@ -59,7 +59,7 @@ void test__f_utf_seek_to__returns_none_stop(void **state) { const f_utf_string_static_t source = macro_f_utf_string_static_t_initialize_1((f_utf_string_t) "\0\0\0t\0\0\0e\0\0\0s\0\0\0t\0\0\0\n\0\0\0a\0\0\0f\0\0\0t\0\0\0e\0\0\0r", 0, 10); { - f_string_range_t range = macro_f_string_range_t_initialize_1(0, source.used - 1); + f_range_t range = macro_f_range_t_initialize_1(0, source.used - 1); const f_status_t status = f_utf_string_seek_to(source.string, to.string[0], &range); diff --git a/level_1/fl_conversion/c/conversion.c b/level_1/fl_conversion/c/conversion.c index ed133e6..88d4795 100644 --- a/level_1/fl_conversion/c/conversion.c +++ b/level_1/fl_conversion/c/conversion.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_conversion_dynamic_partial_to_signed_ - f_status_t fl_conversion_dynamic_partial_to_signed(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_signed_t * const number) { + f_status_t fl_conversion_dynamic_partial_to_signed(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_signed_t * const number) { #ifndef _di_level_1_parameter_checking_ if (!number) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -26,7 +26,7 @@ extern "C" { #endif // _di_fl_conversion_dynamic_partial_to_signed_ #ifndef _di_fl_conversion_dynamic_partial_to_unsigned_ - f_status_t fl_conversion_dynamic_partial_to_unsigned(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const number) { + f_status_t fl_conversion_dynamic_partial_to_unsigned(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const number) { #ifndef _di_level_1_parameter_checking_ if (!number) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -46,7 +46,7 @@ extern "C" { #endif // _di_fl_conversion_dynamic_partial_to_unsigned_ #ifndef _di_fl_conversion_dynamic_partial_to_signed_detect_ - f_status_t fl_conversion_dynamic_partial_to_signed_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_signed_t * const number) { + f_status_t fl_conversion_dynamic_partial_to_signed_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_signed_t * const number) { #ifndef _di_level_1_parameter_checking_ if (!number) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -58,7 +58,7 @@ extern "C" { #endif // _di_fl_conversion_dynamic_partial_to_signed_detect_ #ifndef _di_fl_conversion_dynamic_partial_to_unsigned_detect_ - f_status_t fl_conversion_dynamic_partial_to_unsigned_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const number) { + f_status_t fl_conversion_dynamic_partial_to_unsigned_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const number) { #ifndef _di_level_1_parameter_checking_ if (!number) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_conversion/c/conversion.h b/level_1/fl_conversion/c/conversion.h index 9bda4c6..12b8886 100644 --- a/level_1/fl_conversion/c/conversion.h +++ b/level_1/fl_conversion/c/conversion.h @@ -58,7 +58,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_dynamic_partial_to_signed_ - extern f_status_t fl_conversion_dynamic_partial_to_signed(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_signed_t * const number); + extern f_status_t fl_conversion_dynamic_partial_to_signed(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_signed_t * const number); #endif // _di_fl_conversion_dynamic_partial_to_signed_ /** @@ -106,7 +106,7 @@ extern "C" { * @see strtoll() */ #ifndef _di_fl_conversion_dynamic_partial_to_signed_detect_ - extern f_status_t fl_conversion_dynamic_partial_to_signed_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_signed_t * const number); + extern f_status_t fl_conversion_dynamic_partial_to_signed_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_signed_t * const number); #endif // _di_fl_conversion_dynamic_partial_to_signed_detect_ /** @@ -137,7 +137,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_dynamic_partial_to_unsigned_ - extern f_status_t fl_conversion_dynamic_partial_to_unsigned(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const number); + extern f_status_t fl_conversion_dynamic_partial_to_unsigned(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const number); #endif // _di_fl_conversion_dynamic_partial_to_unsigned_ /** @@ -187,7 +187,7 @@ extern "C" { * @see strtoull() */ #ifndef _di_fl_conversion_dynamic_partial_to_unsigned_detect_ - extern f_status_t fl_conversion_dynamic_partial_to_unsigned_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const number); + extern f_status_t fl_conversion_dynamic_partial_to_unsigned_detect(const fl_conversion_data_t data, const f_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const number); #endif // _di_fl_conversion_dynamic_partial_to_unsigned_detect_ /** diff --git a/level_1/fl_fss/c/fss/basic.c b/level_1/fl_fss/c/fss/basic.c index af35355..a679642 100644 --- a/level_1/fl_fss/c/fss/basic.c +++ b/level_1/fl_fss/c/fss/basic.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_fss_basic_content_read_ - void fl_fss_basic_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void fl_fss_basic_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -40,7 +40,7 @@ extern "C" { return; } - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &found->array, &found->used, &found->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &found->array, &found->used, &found->size); if (F_status_is_error(state->status)) return; found->array[found->used].start = range->start; @@ -71,7 +71,7 @@ extern "C" { #endif // _di_fl_fss_basic_content_read_ #ifndef _di_fl_fss_basic_content_write_ - void fl_fss_basic_content_write(const f_string_static_t content, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_basic_content_write(const f_string_static_t content, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -150,7 +150,7 @@ extern "C" { #endif // _di_fl_fss_basic_content_write_ #ifndef _di_fl_fss_basic_object_read_ - void fl_fss_basic_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void fl_fss_basic_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -177,7 +177,7 @@ extern "C" { #endif // _di_fl_fss_basic_object_read_ #ifndef _di_fl_fss_basic_object_write_ - void fl_fss_basic_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_basic_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; diff --git a/level_1/fl_fss/c/fss/basic.h b/level_1/fl_fss/c/fss/basic.h index 358c533..b8ebeab 100644 --- a/level_1/fl_fss/c/fss/basic.h +++ b/level_1/fl_fss/c/fss/basic.h @@ -82,7 +82,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_basic_content_read_ - extern void fl_fss_basic_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); + extern void fl_fss_basic_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); #endif // _di_fl_fss_basic_content_read_ /** @@ -137,7 +137,7 @@ extern "C" { * @see f_memory_array_increase_by() */ #ifndef _di_fl_fss_basic_content_write_ - extern void fl_fss_basic_content_write(const f_string_static_t content, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_basic_content_write(const f_string_static_t content, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_basic_content_write_ /** @@ -205,7 +205,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_basic_object_read_ - extern void fl_fss_basic_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state); + extern void fl_fss_basic_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state); #endif // _di_fl_fss_basic_object_read_ /** @@ -269,7 +269,7 @@ extern "C" { * @see f_memory_array_increase_by() */ #ifndef _di_fl_fss_basic_object_write_ - extern void fl_fss_basic_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_basic_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_basic_object_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss/basic_list.c b/level_1/fl_fss/c/fss/basic_list.c index f41c7a2..cd937a0 100644 --- a/level_1/fl_fss/c/fss/basic_list.c +++ b/level_1/fl_fss/c/fss/basic_list.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_fss_basic_list_content_read_ - void fl_fss_basic_list_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_number_unsigneds_t * const delimits, f_string_ranges_t * const comments, f_state_t * const state) { + void fl_fss_basic_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -40,7 +40,7 @@ extern "C" { return; } - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &found->array, &found->used, &found->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &found->array, &found->used, &found->size); if (F_status_is_error(state->status)) return; found->array[found->used].start = range->start; @@ -236,7 +236,7 @@ extern "C" { f_fss_seek_to_eol(buffer, range, state); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &comments->array, &comments->used, &comments->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &comments->array, &comments->used, &comments->size); if (F_status_is_error(state->status)) break; if (range->start > range->stop || range->start >= buffer.used) { @@ -291,7 +291,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_content_read_ #ifndef _di_fl_fss_basic_list_content_write_ - void fl_fss_basic_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, f_string_range_t *range, f_string_dynamic_t *destination, f_state_t * const state) { + void fl_fss_basic_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, f_range_t *range, f_string_dynamic_t *destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -540,7 +540,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_content_write_ #ifndef _di_fl_fss_basic_list_object_read_ - void fl_fss_basic_list_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void fl_fss_basic_list_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -846,7 +846,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_object_read_ #ifndef _di_fl_fss_basic_list_object_write_ - void fl_fss_basic_list_object_write(const f_string_static_t object, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_basic_list_object_write(const f_string_static_t object, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; diff --git a/level_1/fl_fss/c/fss/basic_list.h b/level_1/fl_fss/c/fss/basic_list.h index 97bc733..822ae19 100644 --- a/level_1/fl_fss/c/fss/basic_list.h +++ b/level_1/fl_fss/c/fss/basic_list.h @@ -91,7 +91,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_basic_list_content_read_ - extern void fl_fss_basic_list_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_number_unsigneds_t * const delimits, f_string_ranges_t * const comments, f_state_t * const state); + extern void fl_fss_basic_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state); #endif // _di_fl_fss_basic_list_content_read_ /** @@ -159,7 +159,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_basic_list_content_write_ - extern void fl_fss_basic_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_basic_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_basic_list_content_write_ /** @@ -223,7 +223,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_basic_list_object_read_ - extern void fl_fss_basic_list_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); + extern void fl_fss_basic_list_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); #endif // _di_fl_fss_basic_list_object_read_ /** @@ -286,7 +286,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_basic_list_object_write_ - extern void fl_fss_basic_list_object_write(const f_string_static_t object, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_basic_list_object_write(const f_string_static_t object, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_basic_list_object_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss/embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c index 2de0279..dcae894 100644 --- a/level_1/fl_fss/c/fss/embedded_list.c +++ b/level_1/fl_fss/c/fss/embedded_list.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_fss_embedded_list_content_read_ - void fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_fss_nest_t * const found, f_number_unsigneds_t * const delimits, f_string_ranges_t * const comments, f_state_t * const state) { + void fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_fss_nest_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -30,9 +30,9 @@ extern "C" { state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); if (F_status_is_error(state->status)) return; - f_string_ranges_t objects = f_string_ranges_t_initialize; + f_ranges_t objects = f_ranges_t_initialize; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); if (F_status_is_error(state->status)) { f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); @@ -46,7 +46,7 @@ extern "C" { if (F_status_is_error(state->status)) { f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); return; } @@ -105,7 +105,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -116,7 +116,7 @@ extern "C" { else { if (range->start >= buffer.used || range->start > range->stop) { f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_okay_eos : F_okay_stop; @@ -164,7 +164,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -178,7 +178,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -260,7 +260,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -274,7 +274,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -324,7 +324,7 @@ extern "C" { state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); if (F_status_is_error(state->status)) break; state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); @@ -401,7 +401,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -415,7 +415,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -431,7 +431,7 @@ extern "C" { state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); if (F_status_is_error(state->status)) break; state->status = f_memory_array_increase(state->step_small, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); @@ -506,7 +506,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -520,7 +520,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -564,7 +564,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -578,7 +578,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -599,7 +599,7 @@ extern "C" { position = found->depth[depth].used; if (found->depth[depth].array[position].content.size != 1) { - state->status = f_memory_array_resize(1, sizeof(f_string_range_t), (void **) &found->depth[depth].array[position].content.array, &found->depth[depth].array[position].content.used, &found->depth[depth].array[position].content.size); + state->status = f_memory_array_resize(1, sizeof(f_range_t), (void **) &found->depth[depth].array[position].content.array, &found->depth[depth].array[position].content.used, &found->depth[depth].array[position].content.size); if (F_status_is_error(state->status)) break; } @@ -639,7 +639,7 @@ extern "C" { if (F_status_is_error(state->status)) break; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); if (range->start >= buffer.used) { @@ -695,7 +695,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -709,7 +709,7 @@ extern "C" { comments->used = comments_used; f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -725,7 +725,7 @@ extern "C" { f_fss_seek_to_eol(buffer, range, state); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &comments->array, &comments->used, &comments->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &comments->array, &comments->used, &comments->size); if (F_status_is_error(state->status)) break; if (range->start > range->stop || range->start >= buffer.used) { @@ -774,7 +774,7 @@ extern "C" { } // while f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &positions_start.array, &positions_start.used, &positions_start.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &slashes.array, &slashes.used, &slashes.size); delimits->used = delimits_used; @@ -793,7 +793,7 @@ extern "C" { #endif // _di_fl_fss_embedded_list_content_read_ #ifndef _di_fl_fss_embedded_list_content_write_ - void fl_fss_embedded_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_string_ranges_t * const ignore, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_embedded_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_ranges_t * const ignore, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -1087,7 +1087,7 @@ extern "C" { #endif // _di_fl_fss_embedded_list_content_write_ #ifndef _di_fl_fss_embedded_list_object_read_ - void fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -1429,7 +1429,7 @@ extern "C" { #endif // _di_fl_fss_embedded_list_object_read_ #ifndef _di_fl_fss_embedded_list_object_write_ - void fl_fss_embedded_list_object_write(const f_string_static_t object, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_embedded_list_object_write(const f_string_static_t object, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; diff --git a/level_1/fl_fss/c/fss/embedded_list.h b/level_1/fl_fss/c/fss/embedded_list.h index bbc0b85..068146a 100644 --- a/level_1/fl_fss/c/fss/embedded_list.h +++ b/level_1/fl_fss/c/fss/embedded_list.h @@ -95,7 +95,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_embedded_list_content_read_ - extern void fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_fss_nest_t * const found, f_number_unsigneds_t * const delimits, f_string_ranges_t * const comments, f_state_t * const state); + extern void fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_fss_nest_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state); #endif // _di_fl_fss_embedded_list_content_read_ /** @@ -167,7 +167,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_embedded_list_content_write_ - extern void fl_fss_embedded_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_string_ranges_t * const ignore, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_embedded_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_ranges_t * const ignore, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_embedded_list_content_write_ /** @@ -231,7 +231,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_embedded_list_object_read_ - extern void fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); + extern void fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); #endif // _di_fl_fss_embedded_list_object_read_ /** @@ -294,7 +294,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_embedded_list_object_write_ - extern void fl_fss_embedded_list_object_write(const f_string_static_t object, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_embedded_list_object_write(const f_string_static_t object, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_embedded_list_object_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss/extended.c b/level_1/fl_fss/c/fss/extended.c index 14c7376..224c919 100644 --- a/level_1/fl_fss/c/fss/extended.c +++ b/level_1/fl_fss/c/fss/extended.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_fss_extended_content_read_ - void fl_fss_extended_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_uint8s_t * const quotes, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void fl_fss_extended_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_uint8s_t * const quotes, f_number_unsigneds_t * const delimits, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -50,12 +50,12 @@ extern "C" { while (range->start <= range->stop && range->start < buffer.used) { - f_string_range_t content_partial = f_string_range_t_initialize; + f_range_t content_partial = f_range_t_initialize; private_fl_fss_basic_read(buffer, F_false, range, &content_partial, "e, delimits, state); if (state->status == F_fss_found_object || F_status_set_fine(state->status) == F_fss_found_object_content_not) { - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &found->array, &found->used, &found->size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &found->array, &found->used, &found->size); // The private function sets the error bit on unterminated quoted Object. if (state->status == F_status_set_error(F_fss_found_object_content_not)) { @@ -138,7 +138,7 @@ extern "C" { #endif // _di_fl_fss_extended_content_read_ #ifndef _di_fl_fss_extended_content_write_ - void fl_fss_extended_content_write(const f_string_static_t content, const uint8_t quote, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_extended_content_write(const f_string_static_t content, const uint8_t quote, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -208,7 +208,7 @@ extern "C" { #endif // _di_fl_fss_extended_content_write_ #ifndef _di_fl_fss_extended_object_read_ - void fl_fss_extended_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void fl_fss_extended_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -237,7 +237,7 @@ extern "C" { #endif // _di_fl_fss_extended_object_read_ #ifndef _di_fl_fss_extended_object_write_ -void fl_fss_extended_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { +void fl_fss_extended_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; diff --git a/level_1/fl_fss/c/fss/extended.h b/level_1/fl_fss/c/fss/extended.h index 8c3e69d..41ff66f 100644 --- a/level_1/fl_fss/c/fss/extended.h +++ b/level_1/fl_fss/c/fss/extended.h @@ -92,7 +92,7 @@ extern "C" { * @see fl_fss_extended_content_read() */ #ifndef _di_fl_fss_extended_content_read_ - extern void fl_fss_extended_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_uint8s_t * const quotes, f_number_unsigneds_t * const delimits, f_state_t * const state); + extern void fl_fss_extended_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_uint8s_t * const quotes, f_number_unsigneds_t * const delimits, f_state_t * const state); #endif // _di_fl_fss_extended_content_read_ /** @@ -160,7 +160,7 @@ extern "C" { * @see fl_fss_extended_content_write() */ #ifndef _di_fl_fss_extended_content_write_ - extern void fl_fss_extended_content_write(const f_string_static_t content, const uint8_t quote, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_extended_content_write(const f_string_static_t content, const uint8_t quote, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_extended_content_write_ /** @@ -229,7 +229,7 @@ extern "C" { * @see fl_fss_extended_content_read() */ #ifndef _di_fl_fss_extended_object_read_ - extern void fl_fss_extended_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state); + extern void fl_fss_extended_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state); #endif // _di_fl_fss_extended_object_read_ /** @@ -291,7 +291,7 @@ extern "C" { * @see f_memory_array_increase_by() */ #ifndef _di_fl_fss_extended_object_write_ - extern void fl_fss_extended_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_extended_object_write(const f_string_static_t object, const uint8_t quote, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_extended_object_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss/extended_list.c b/level_1/fl_fss/c/fss/extended_list.c index 7d03037..3d4c71e 100644 --- a/level_1/fl_fss/c/fss/extended_list.c +++ b/level_1/fl_fss/c/fss/extended_list.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_fss_extended_list_content_read_ - void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_number_unsigneds_t * const delimits, f_string_ranges_t * const comments, f_state_t * const state) { + void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -40,7 +40,7 @@ extern "C" { return; } - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &found->array, &found->used, &found->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &found->array, &found->used, &found->size); if (F_status_is_error(state->status)) return; found->array[found->used].start = range->start; @@ -192,7 +192,7 @@ extern "C" { f_fss_seek_to_eol(buffer, range, state); if (F_status_is_error(state->status)) break; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &comments->array, &comments->used, &comments->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &comments->array, &comments->used, &comments->size); if (F_status_is_error(state->status)) break; if (range->start > range->stop || range->start >= buffer.used) { @@ -225,7 +225,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_content_read_ #ifndef _di_fl_fss_extended_list_content_write_ - void fl_fss_extended_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_string_ranges_t * const ignore, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_extended_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_ranges_t * const ignore, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -528,7 +528,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_content_write_ #ifndef _di_fl_fss_extended_list_object_read_ - void fl_fss_extended_list_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void fl_fss_extended_list_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; @@ -869,7 +869,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_object_read_ #ifndef _di_fl_fss_extended_list_object_write_ - void fl_fss_extended_list_object_write(const f_string_static_t object, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void fl_fss_extended_list_object_write(const f_string_static_t object, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; diff --git a/level_1/fl_fss/c/fss/extended_list.h b/level_1/fl_fss/c/fss/extended_list.h index 0f0b7df..d4ec388 100644 --- a/level_1/fl_fss/c/fss/extended_list.h +++ b/level_1/fl_fss/c/fss/extended_list.h @@ -93,7 +93,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_extended_list_content_read_ - extern void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const found, f_number_unsigneds_t * const delimits, f_string_ranges_t * const comments, f_state_t * const state); + extern void fl_fss_extended_list_content_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const found, f_number_unsigneds_t * const delimits, f_ranges_t * const comments, f_state_t * const state); #endif // _di_fl_fss_extended_list_content_read_ /** @@ -165,7 +165,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_extended_list_content_write_ - extern void fl_fss_extended_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_string_ranges_t * const ignore, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_extended_list_content_write(const f_string_static_t content, const uint8_t complete, const f_string_static_t * const prepend, const f_ranges_t * const ignore, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_extended_list_content_write_ /** @@ -229,7 +229,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_extended_list_object_read_ - extern void fl_fss_extended_list_object_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); + extern void fl_fss_extended_list_object_read(const f_string_static_t buffer, f_range_t * const range, f_range_t * const found, f_number_unsigneds_t * const delimits, f_state_t * const state); #endif // _di_fl_fss_extended_list_object_read_ /** @@ -292,7 +292,7 @@ extern "C" { * @see f_utf_buffer_increment() */ #ifndef _di_fl_fss_extended_list_object_write_ - extern void fl_fss_extended_list_object_write(const f_string_static_t object, const uint8_t complete, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fl_fss_extended_list_object_write(const f_string_static_t object, const uint8_t complete, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fl_fss_extended_list_object_write_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss/payload/type.h b/level_1/fl_fss/c/fss/payload/type.h index 9e44986..4970985 100644 --- a/level_1/fl_fss/c/fss/payload/type.h +++ b/level_1/fl_fss/c/fss/payload/type.h @@ -22,6 +22,8 @@ extern "C" { * - i: A counter used for the "headers" outer arrays. * - j: A counter used for the inner loop or for pre-allocation counting. * - k: A number used for converting values but also made available for use as a counter if need be. + * - l: @todo + * - range: @todo * - conversion: The conversion data. * - destinations: The destinations map being appended to. * - original: The original destination used length. @@ -33,7 +35,7 @@ extern "C" { f_number_unsigned_t j; f_number_unsigned_t k; f_number_unsigned_t l; - f_string_range_t range; + f_range_t range; f_conversion_data_t conversion; f_string_maps_t * const destinations; @@ -46,7 +48,7 @@ extern "C" { 0, \ 0, \ 0, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ f_conversion_data_base_10_c, \ 0, \ 0, \ @@ -70,7 +72,7 @@ extern "C" { 0, \ 0, \ 0, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ f_conversion_data_base_10_c, \ destinations, \ original, \ diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c index bf14a8e..6d3cc5a 100644 --- a/level_1/fl_fss/c/private-fss.c +++ b/level_1/fl_fss/c/private-fss.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_) - void private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { + void private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) { state->status = F_okay; @@ -31,7 +31,7 @@ extern "C" { #if !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_) void private_fl_fss_basic_list_write_object_trim(const f_number_unsigned_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) { - f_string_range_t destination_range = macro_f_string_range_t_initialize_2(destination->used); + f_range_t destination_range = macro_f_range_t_initialize_2(destination->used); f_number_unsigned_t i = 0; uint8_t width = 0; @@ -111,7 +111,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_) #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) - void private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_string_range_t * const range, f_string_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) { + void private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_range_t * const range, f_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) { f_fss_skip_past_space(buffer, range, state); if (F_status_is_error(state->status)) return; @@ -728,7 +728,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) #if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) || !defined(_di_fl_fss_extended_content_write_) - void private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const uint8_t quote, f_string_range_t *range, f_string_dynamic_t *destination, f_state_t * const state, void * const internal) { + void private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const uint8_t quote, f_range_t *range, f_string_dynamic_t *destination, f_state_t * const state, void * const internal) { f_fss_skip_past_space(object, range, state); if (F_status_is_error(state->status)) return; @@ -1090,7 +1090,7 @@ extern "C" { // Only when followed by a space must the start quote be delimited. if (i <= range->stop && i < object.used) { - f_string_range_t range_i = *range; + f_range_t range_i = *range; range_i.start = i; @@ -1127,7 +1127,7 @@ extern "C" { #if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) void private_fl_fss_basic_write_object_trim(const uint8_t quote, const f_number_unsigned_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) { - f_string_range_t destination_range = macro_f_string_range_t_initialize_2(destination->used); + f_range_t destination_range = macro_f_range_t_initialize_2(destination->used); f_number_unsigned_t i = 0; uint8_t width = 0; diff --git a/level_1/fl_fss/c/private-fss.h b/level_1/fl_fss/c/private-fss.h index 422d9eb..2be6056 100644 --- a/level_1/fl_fss/c/private-fss.h +++ b/level_1/fl_fss/c/private-fss.h @@ -47,7 +47,7 @@ extern "C" { * @see fl_fss_extended_list_content_write() */ #if !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_) - extern void private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) F_attribute_visibility_internal_d; + extern void private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_) /** @@ -156,7 +156,7 @@ extern "C" { * @see fl_fss_extended_content_read() */ #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) - extern void private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_string_range_t * const range, f_string_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) F_attribute_visibility_internal_d; + extern void private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_range_t * const range, f_range_t * const found, uint8_t * const quote, f_number_unsigneds_t * const delimits, f_state_t * const state) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) /** @@ -224,7 +224,7 @@ extern "C" { * @see fl_fss_extended_content_write() */ #if !defined(fl_fss_basic_object_write) || !defined(fl_fss_extended_object_write) || !defined(_di_fl_fss_extended_content_write_) - extern void private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const uint8_t quote, f_string_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state, void * const internal) F_attribute_visibility_internal_d; + extern void private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const uint8_t quote, f_range_t * const range, f_string_dynamic_t * const destination, f_state_t * const state, void * const internal) F_attribute_visibility_internal_d; #endif // !defined(fl_fss_basic_object_write) || !defined(fl_fss_extended_object_write) || !defined(_di_fl_fss_extended_content_write_) /** diff --git a/level_1/fl_iki/c/iki.c b/level_1/fl_iki/c/iki.c index 3b55482..afa5c9c 100644 --- a/level_1/fl_iki/c/iki.c +++ b/level_1/fl_iki/c/iki.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_iki_read_ - void fl_iki_read(f_string_static_t * const buffer, f_string_range_t * const range, f_iki_data_t * const data, f_state_t * const state) { + void fl_iki_read(f_string_static_t * const buffer, f_range_t * const range, f_iki_data_t * const data, f_state_t * const state) { #ifndef _di_level_1_parameter_checking_ if (!state) return; diff --git a/level_1/fl_iki/c/iki.h b/level_1/fl_iki/c/iki.h index 953396a..13c71ef 100644 --- a/level_1/fl_iki/c/iki.h +++ b/level_1/fl_iki/c/iki.h @@ -65,7 +65,7 @@ extern "C" { * @see f_iki_read() */ #ifndef _di_fl_iki_read_ - extern void fl_iki_read(f_string_static_t * const buffer, f_string_range_t * const range, f_iki_data_t * const data, f_state_t * const state); + extern void fl_iki_read(f_string_static_t * const buffer, f_range_t * const range, f_iki_data_t * const data, f_state_t * const state); #endif // _di_fl_iki_read_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/print.c b/level_1/fl_print/c/print.c index e412384..5b69b00 100644 --- a/level_1/fl_print/c/print.c +++ b/level_1/fl_print/c/print.c @@ -148,7 +148,7 @@ extern "C" { #endif // _di_fl_print_trim_dynamic_safely_ #ifndef _di_fl_print_trim_dynamic_partial_ - f_status_t fl_print_trim_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t fl_print_trim_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -164,7 +164,7 @@ extern "C" { #endif // _di_fl_print_trim_dynamic_partial_ #ifndef _di_fl_print_trim_dynamic_partial_raw_ - f_status_t fl_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t fl_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -180,7 +180,7 @@ extern "C" { #endif // _di_fl_print_trim_dynamic_partial_raw_ #ifndef _di_fl_print_trim_dynamic_partial_raw_safely_ - f_status_t fl_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t fl_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -196,7 +196,7 @@ extern "C" { #endif // _di_fl_print_trim_dynamic_partial_raw_safely_ #ifndef _di_fl_print_trim_dynamic_partial_safely_ - f_status_t fl_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file) { + f_status_t fl_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -217,7 +217,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in(string, offset, offset + length, except_at, except_in, file); } @@ -229,7 +229,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_raw(string, offset, offset + length, except_at, except_in, file); } @@ -241,7 +241,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_raw_safely(string, offset, offset + length, except_at, except_in, file); } @@ -253,7 +253,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_safely(string, offset, offset + length, except_at, except_in, file); } @@ -265,7 +265,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in(buffer.string, 0, buffer.used, except_at, except_in, file); } @@ -277,7 +277,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_raw(buffer.string, 0, buffer.used, except_at, except_in, file); } @@ -289,7 +289,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_raw_safely(buffer.string, 0, buffer.used, except_at, except_in, file); } @@ -301,14 +301,14 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_safely(buffer.string, 0, buffer.used, except_at, except_in, file); } #endif // _di_fl_print_trim_except_dynamic_safely_ #ifndef _di_fl_print_trim_except_in_ - f_status_t fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -318,7 +318,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_ #ifndef _di_fl_print_trim_except_in_raw_ - f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -328,7 +328,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_raw_ #ifndef _di_fl_print_trim_except_in_raw_safely_ - f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -338,7 +338,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_raw_safely_ #ifndef _di_fl_print_trim_except_in_safely_ - f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -348,7 +348,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_ - f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -358,7 +358,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_ #ifndef _di_fl_print_trim_except_in_dynamic_raw_ - f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -368,7 +368,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_raw_ #ifndef _di_fl_print_trim_except_in_dynamic_raw_safely_ - f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -378,7 +378,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_raw_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_safely_ - f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -388,7 +388,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_ - f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -404,7 +404,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_ - f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -420,7 +420,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ - f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -436,7 +436,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_safely_ - f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -452,7 +452,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_safely_ #ifndef _di_fl_print_trim_except_dynamic_partial_ - f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -463,14 +463,14 @@ extern "C" { length = buffer.used - range.start; } - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in(buffer.string, range.start, range.start + length, except, except_in, file); } #endif // _di_fl_print_trim_except_dynamic_partial_ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_ - f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -481,14 +481,14 @@ extern "C" { length = buffer.used - range.start; } - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_raw(buffer.string, range.start, range.start + length, except, except_in, file); } #endif // _di_fl_print_trim_except_dynamic_partial_raw_ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_safely_ - f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -499,14 +499,14 @@ extern "C" { length = buffer.used - range.start; } - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_raw_safely(buffer.string, range.start, range.start + length, except, except_in, file); } #endif // _di_fl_print_trim_except_dynamic_partial_raw_safely_ #ifndef _di_fl_print_trim_except_dynamic_partial_safely_ - f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; @@ -517,7 +517,7 @@ extern "C" { length = buffer.used - range.start; } - const f_string_ranges_t except_in = f_string_ranges_t_initialize; + const f_ranges_t except_in = f_ranges_t_initialize; return private_fl_print_trim_except_in_safely(buffer.string, range.start, range.start + length, except, except_in, file); } diff --git a/level_1/fl_print/c/print.h b/level_1/fl_print/c/print.h index f446c4e..767d592 100644 --- a/level_1/fl_print/c/print.h +++ b/level_1/fl_print/c/print.h @@ -98,8 +98,8 @@ extern "C" { * - "-": Use left-justification. * - "#": Use alternate form conversion (prefixing 0b/0B, 0o/0O, 0t/0T, 0d/0D, 0x/0X). * - ";": Ignore characters in the given positions from a f_number_unsigned_t (only applies to static/dynamic string arguments but not character arguments). - * - ":": Ignore characters in the given ranges from a f_string_range_t (only applies to static/dynamic string arguments but not character arguments). - * - "/", Print only the given range of a string, specified by f_string_range_t (only applies to static/dynamic string arguments but not character arguments). + * - ":": Ignore characters in the given ranges from a f_range_t (only applies to static/dynamic string arguments but not character arguments). + * - "/", Print only the given range of a string, specified by f_range_t (only applies to static/dynamic string arguments but not character arguments). * - "+", Always show the signs (+ or -). * - " ", Add a space where a sign would be if the sign is not displayed (this is the space character). * - "=", Trim leading and trailing whitespaces (only applies to static/dynamic string arguments but not character arguments). @@ -719,7 +719,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_dynamic_partial_ - extern f_status_t fl_print_trim_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t fl_print_trim_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_fl_print_trim_dynamic_partial_ /** @@ -764,7 +764,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_dynamic_partial_raw_ - extern f_status_t fl_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t fl_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_fl_print_trim_dynamic_partial_raw_ /** @@ -810,7 +810,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_dynamic_partial_raw_safely_ - extern f_status_t fl_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t fl_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_fl_print_trim_dynamic_partial_raw_safely_ /** @@ -854,7 +854,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_dynamic_partial_safely_ - extern f_status_t fl_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_file_t file); + extern f_status_t fl_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_file_t file); #endif // _di_fl_print_trim_dynamic_partial_safely_ /** @@ -1293,7 +1293,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_ - extern f_status_t fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_ /** @@ -1347,7 +1347,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_raw_ - extern f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_raw_ /** @@ -1402,7 +1402,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_raw_safely_ - extern f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_raw_safely_ /** @@ -1455,7 +1455,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_safely_ - extern f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_safely_ /** @@ -1507,7 +1507,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_ - extern f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_ /** @@ -1558,7 +1558,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_raw_ - extern f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_raw_ /** @@ -1610,7 +1610,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_raw_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_raw_safely_ /** @@ -1660,7 +1660,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_safely_ /** @@ -1712,7 +1712,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_ - extern f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_ /** @@ -1764,7 +1764,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_ - extern f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_ /** @@ -1818,7 +1818,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ /** @@ -1870,7 +1870,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_safely_ /** @@ -1918,7 +1918,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_ - extern f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_ /** @@ -1966,7 +1966,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_ - extern f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_raw_ /** @@ -2016,7 +2016,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_safely_ - extern f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_raw_safely_ /** @@ -2064,7 +2064,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_safely_ - extern f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_safely_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/private-print.c b/level_1/fl_print/c/private-print.c index 8e82087..14a06e1 100644 --- a/level_1/fl_print/c/private-print.c +++ b/level_1/fl_print/c/private-print.c @@ -317,14 +317,14 @@ extern "C" { const f_string_static_t value = va_arg(apl, f_string_static_t); if (flag & F_print_format_flag_range_d) { - const f_string_range_t partial = va_arg(apl, f_string_range_t); + const f_range_t partial = va_arg(apl, f_range_t); if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (partial.start > partial.stop || partial.start >= value.used) { @@ -348,7 +348,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { *status = F_data_not; @@ -392,10 +392,10 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (flag & F_print_format_flag_trim_d) { @@ -407,7 +407,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (flag & F_print_format_flag_trim_d) { *status = private_fl_print_trim_except_in_safely(value.string, 0, value.used, except_at, except_in, file); @@ -431,14 +431,14 @@ extern "C" { const f_string_static_t value = va_arg(apl, f_string_static_t); if (flag & F_print_format_flag_range_d) { - const f_string_range_t partial = va_arg(apl, f_string_range_t); + const f_range_t partial = va_arg(apl, f_range_t); if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (partial.start > partial.stop || partial.start >= value.used) { @@ -462,7 +462,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { *status = F_data_not; @@ -506,10 +506,10 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (flag & F_print_format_flag_trim_d) { @@ -521,7 +521,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (flag & F_print_format_flag_trim_d) { *status = private_fl_print_trim_except_in_raw_safely(value.string, 0, value.used, except_at, except_in, file); @@ -709,14 +709,14 @@ extern "C" { const f_string_static_t value = va_arg(apl, f_string_static_t); if (flag & F_print_format_flag_range_d) { - const f_string_range_t partial = va_arg(apl, f_string_range_t); + const f_range_t partial = va_arg(apl, f_range_t); if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (partial.start > partial.stop || partial.start >= value.used) { @@ -740,7 +740,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { *status = F_data_not; @@ -784,10 +784,10 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (flag & F_print_format_flag_trim_d) { @@ -799,7 +799,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (flag & F_print_format_flag_trim_d) { *status = private_fl_print_trim_except_in(value.string, 0, value.used, except_at, except_in, file); @@ -830,14 +830,14 @@ extern "C" { const f_string_static_t value = va_arg(apl, f_string_static_t); if (flag & F_print_format_flag_range_d) { - const f_string_range_t partial = va_arg(apl, f_string_range_t); + const f_range_t partial = va_arg(apl, f_range_t); if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (partial.start > partial.stop || partial.start >= value.used) { @@ -861,7 +861,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { *status = F_data_not; @@ -905,10 +905,10 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_index_d) { const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); - f_string_ranges_t except_in = f_string_ranges_t_initialize; + f_ranges_t except_in = f_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { - except_in = va_arg(apl, f_string_ranges_t); + except_in = va_arg(apl, f_ranges_t); } if (flag & F_print_format_flag_trim_d) { @@ -920,7 +920,7 @@ extern "C" { } else if (flag & F_print_format_flag_ignore_range_d) { const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; - const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); + const f_ranges_t except_in = va_arg(apl, f_ranges_t); if (flag & F_print_format_flag_trim_d) { *status = private_fl_print_trim_except_in_raw(value.string, 0, value.used, except_at, except_in, file); @@ -1193,7 +1193,7 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) - f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t j = 0; @@ -1462,7 +1462,7 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) - f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t j = 0; @@ -1668,7 +1668,7 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) - f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t j = 0; @@ -1929,7 +1929,7 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_dynamic_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_safely_) || !defined(_di_fl_print_trim_except_safely_) - f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) { f_number_unsigned_t i = offset; f_number_unsigned_t j = 0; diff --git a/level_1/fl_print/c/private-print.h b/level_1/fl_print/c/private-print.h index b117f67..4e7afdc 100644 --- a/level_1/fl_print/c/private-print.h +++ b/level_1/fl_print/c/private-print.h @@ -121,7 +121,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) - extern f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) /** @@ -168,7 +168,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial_raw() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) - extern f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) /** @@ -216,7 +216,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial_raw_safely() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) - extern f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) /** @@ -264,7 +264,7 @@ extern "C" { * @see fl_print_trim_except_safely() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_dynamic_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_safely_) || !defined(_di_fl_print_trim_except_safely_) - extern f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_dynamic_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_safely_) || !defined(_di_fl_print_trim_except_safely_) /** diff --git a/level_1/fl_utf_file/c/utf_file.c b/level_1/fl_utf_file/c/utf_file.c index cc72e25..6a8d295 100644 --- a/level_1/fl_utf_file/c/utf_file.c +++ b/level_1/fl_utf_file/c/utf_file.c @@ -254,7 +254,7 @@ extern "C" { #endif // _di_fl_utf_file_write_until_ #ifndef _di_fl_utf_file_write_range_ - f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t destination, const f_string_range_t range, f_number_unsigned_t * const written) { + f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t destination, const f_range_t range, f_number_unsigned_t * const written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (range.start >= destination.used) return F_status_set_error(F_parameter); diff --git a/level_1/fl_utf_file/c/utf_file.h b/level_1/fl_utf_file/c/utf_file.h index af1686e..33b7bd7 100644 --- a/level_1/fl_utf_file/c/utf_file.h +++ b/level_1/fl_utf_file/c/utf_file.h @@ -263,7 +263,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_range_ - extern f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const written); + extern f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_range_t range, f_number_unsigned_t * const written); #endif // _di_fl_utf_file_write_range_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c index d22ebfd..21046f5 100644 --- a/level_2/fll_fss/c/fss.c +++ b/level_2/fll_fss/c/fss.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_identify_ - f_status_t fll_fss_identify(const f_string_static_t buffer, f_string_range_t * const range, f_fll_ids_t * const ids) { + f_status_t fll_fss_identify(const f_string_static_t buffer, f_range_t * const range, f_fll_ids_t * const ids) { #ifndef _di_level_2_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -165,7 +165,7 @@ extern "C" { #endif // _di_fll_fss_identify_ #ifndef _di_fll_fss_snatch_ - f_status_t fll_fss_snatch(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]) { + f_status_t fll_fss_snatch(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -218,7 +218,7 @@ extern "C" { #endif // _di_fll_fss_snatch_ #ifndef _di_fll_fss_snatch_apart_ - f_status_t fll_fss_snatch_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { + f_status_t fll_fss_snatch_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -230,7 +230,7 @@ extern "C" { if (!contents.used) return F_data_not; f_status_t status = F_okay; - f_string_ranges_t *content = 0; + f_ranges_t *content = 0; f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; @@ -284,7 +284,7 @@ extern "C" { #endif // _di_fll_fss_snatch_apart_ #ifndef _di_fll_fss_snatch_map_ - f_status_t fll_fss_snatch_map(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { + f_status_t fll_fss_snatch_map(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -404,7 +404,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_ #ifndef _di_fll_fss_snatch_map_apart_ - f_status_t fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { + f_status_t fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -478,7 +478,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_apart_ #ifndef _di_fll_fss_snatch_map_mash_ - f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { + f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -547,7 +547,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_ #ifndef _di_fll_fss_snatch_map_mash_apart_ - f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { + f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -664,7 +664,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_apart_ #ifndef _di_fll_fss_snatch_map_together_ - f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { + f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -778,7 +778,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_together_ #ifndef _di_fll_fss_snatch_mash_ - f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]) { + f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -833,7 +833,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_ #ifndef _di_fll_fss_snatch_mash_apart_ - f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { + f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -891,7 +891,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_apart_ #ifndef _di_fll_fss_snatch_together_ - f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]) { + f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); diff --git a/level_2/fll_fss/c/fss.h b/level_2/fll_fss/c/fss.h index 6345792..e2c6fdb 100644 --- a/level_2/fll_fss/c/fss.h +++ b/level_2/fll_fss/c/fss.h @@ -73,7 +73,7 @@ extern "C" { * @see f_parse_dynamic_partial_fll_identify() */ #ifndef _di_fll_fss_identify_ - extern f_status_t fll_fss_identify(const f_string_static_t buffer, f_string_range_t * const range, f_fll_ids_t * const ids); + extern f_status_t fll_fss_identify(const f_string_static_t buffer, f_range_t * const range, f_fll_ids_t * const ids); #endif // _di_fll_fss_identify_ /** @@ -119,7 +119,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_ - extern f_status_t fll_fss_snatch(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); + extern f_status_t fll_fss_snatch(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); #endif // _di_fll_fss_snatch_ /** @@ -169,7 +169,7 @@ extern "C" { * @see f_string_dynamic_partial_append_nulless() */ #ifndef _di_fll_fss_snatch_apart_ - extern f_status_t fll_fss_snatch_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); + extern f_status_t fll_fss_snatch_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_apart_ /** @@ -219,7 +219,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_ - extern f_status_t fll_fss_snatch_map(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); + extern f_status_t fll_fss_snatch_map(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_ /** @@ -271,7 +271,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_apart_ - extern f_status_t fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); + extern f_status_t fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_apart_ /** @@ -321,7 +321,7 @@ extern "C" { * Errors (with error bit) from: f_compare_dynamic_partial_trim_string(). */ #ifndef _di_fll_fss_snatch_map_mash_ - extern f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); + extern f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_mash_ /** @@ -375,7 +375,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_mash_apart_ - extern f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); + extern f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_mash_apart_ /** @@ -428,7 +428,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_together_ - extern f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); + extern f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_together_ /** @@ -475,7 +475,7 @@ extern "C" { * Errors (with error bit) from: f_compare_dynamic_partial_trim_string(). */ #ifndef _di_fll_fss_snatch_mash_ - extern f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); + extern f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); #endif // _di_fll_fss_snatch_mash_ /** @@ -526,7 +526,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_mash_apart_ - extern f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); + extern f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_mash_apart_ /** @@ -574,7 +574,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_together_ - extern f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); + extern f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, const f_string_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); #endif // _di_fll_fss_snatch_together_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss/basic.c b/level_2/fll_fss/c/fss/basic.c index 1503d60..e900861 100644 --- a/level_2/fll_fss/c/fss/basic.c +++ b/level_2/fll_fss/c/fss/basic.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_basic_read_ - void fll_fss_basic_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state) { + void fll_fss_basic_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; @@ -24,10 +24,10 @@ extern "C" { uint8_t *quoted_object = 0; do { - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects->array, &objects->used, &objects->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects->array, &objects->used, &objects->size); if (F_status_is_error(state->status)) return; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_ranges_t), (void **) &contents->array, &contents->used, &contents->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_ranges_t), (void **) &contents->array, &contents->used, &contents->size); if (F_status_is_error(state->status)) return; contents->array[contents->used].used = 0; @@ -53,7 +53,7 @@ extern "C" { ++objects_quoted->used; } - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -93,7 +93,7 @@ extern "C" { if (state->status == F_fss_found_object_content_not) { found_data = F_true; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -181,7 +181,7 @@ extern "C" { } #endif // _di_level_2_parameter_checking_ - f_string_range_t range = macro_f_string_range_t_initialize_2(object.used); + f_range_t range = macro_f_range_t_initialize_2(object.used); fl_fss_basic_object_write(object, quote, f_fss_complete_full_e, &range, destination, state); diff --git a/level_2/fll_fss/c/fss/basic.h b/level_2/fll_fss/c/fss/basic.h index 68ed193..b96a9e9 100644 --- a/level_2/fll_fss/c/fss/basic.h +++ b/level_2/fll_fss/c/fss/basic.h @@ -78,7 +78,7 @@ extern "C" { * @see fl_fss_basic_object_read() */ #ifndef _di_fll_fss_basic_read_ - extern void fll_fss_basic_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state); + extern void fll_fss_basic_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state); #endif // _di_fll_fss_basic_read_ /** diff --git a/level_2/fll_fss/c/fss/basic_list.c b/level_2/fll_fss/c/fss/basic_list.c index 5dd539d..f3cb7a4 100644 --- a/level_2/fll_fss/c/fss/basic_list.c +++ b/level_2/fll_fss/c/fss/basic_list.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_basic_list_read_ - void fll_fss_basic_list_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state) { + void fll_fss_basic_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; @@ -22,10 +22,10 @@ extern "C" { bool found_data = F_false; do { - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects->array, &objects->used, &objects->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects->array, &objects->used, &objects->size); if (F_status_is_error(state->status)) return; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_ranges_t), (void **) &contents->array, &contents->used, &contents->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_ranges_t), (void **) &contents->array, &contents->used, &contents->size); if (F_status_is_error(state->status)) return; contents->array[contents->used].used = 0; @@ -38,7 +38,7 @@ extern "C" { if (state->status == F_fss_found_object || state->status == F_fss_found_object_content_not) { ++objects->used; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -78,7 +78,7 @@ extern "C" { if (state->status == F_fss_found_object_content_not) { found_data = F_true; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -149,7 +149,7 @@ extern "C" { if (!state) return; #endif // _di_level_2_parameter_checking_ - f_string_range_t range = macro_f_string_range_t_initialize_2(object.used); + f_range_t range = macro_f_range_t_initialize_2(object.used); fl_fss_basic_list_object_write(object, f_fss_complete_full_e, &range, destination, state); diff --git a/level_2/fll_fss/c/fss/basic_list.h b/level_2/fll_fss/c/fss/basic_list.h index 85ef1af..d3bcade 100644 --- a/level_2/fll_fss/c/fss/basic_list.h +++ b/level_2/fll_fss/c/fss/basic_list.h @@ -77,7 +77,7 @@ extern "C" { * @see fl_fss_basic_list_object_read() */ #ifndef _di_fll_fss_basic_list_read_ - extern void fll_fss_basic_list_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state); + extern void fll_fss_basic_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state); #endif // _di_fll_fss_basic_list_read_ /** diff --git a/level_2/fll_fss/c/fss/embedded_list.c b/level_2/fll_fss/c/fss/embedded_list.c index 8526260..a679617 100644 --- a/level_2/fll_fss/c/fss/embedded_list.c +++ b/level_2/fll_fss/c/fss/embedded_list.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_embedded_list_read_ - void fll_fss_embedded_list_read(const f_string_static_t buffer, f_string_range_t * const range, f_fss_nest_t * const nest, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state) { + void fll_fss_embedded_list_read(const f_string_static_t buffer, f_range_t * const range, f_fss_nest_t * const nest, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; @@ -117,12 +117,12 @@ extern "C" { #endif // _di_fll_fss_embedded_list_read_ #ifndef _di_fll_fss_embedded_list_write_ - void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state) { + void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; #endif // _di_level_2_parameter_checking_ - f_string_range_t range = macro_f_string_range_t_initialize_2(object.used); + f_range_t range = macro_f_range_t_initialize_2(object.used); fl_fss_embedded_list_object_write(object, f_fss_complete_full_e, &range, destination, state); diff --git a/level_2/fll_fss/c/fss/embedded_list.h b/level_2/fll_fss/c/fss/embedded_list.h index 647cbf5..335632a 100644 --- a/level_2/fll_fss/c/fss/embedded_list.h +++ b/level_2/fll_fss/c/fss/embedded_list.h @@ -77,7 +77,7 @@ extern "C" { * @see fl_fss_embedded_list_object_read() */ #ifndef _di_fll_fss_embedded_list_read_ - extern void fll_fss_embedded_list_read(const f_string_static_t buffer, f_string_range_t * const range, f_fss_nest_t * const nest, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state); + extern void fll_fss_embedded_list_read(const f_string_static_t buffer, f_range_t * const range, f_fss_nest_t * const nest, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state); #endif // _di_fll_fss_embedded_list_read_ /** @@ -126,7 +126,7 @@ extern "C" { * @see fl_fss_embedded_list_object_write() */ #ifndef _di_fll_fss_embedded_list_write_ - extern void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fll_fss_embedded_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fll_fss_embedded_list_write_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss/extended.c b/level_2/fll_fss/c/fss/extended.c index 3f1b685..e610b35 100644 --- a/level_2/fll_fss/c/fss/extended.c +++ b/level_2/fll_fss/c/fss/extended.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_extended_read_ - void fll_fss_extended_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_uint8ss_t * const contents_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state) { + void fll_fss_extended_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_uint8ss_t * const contents_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; @@ -25,10 +25,10 @@ extern "C" { f_uint8s_t *quoted_content = 0; do { - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects->array, &objects->used, &objects->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects->array, &objects->used, &objects->size); if (F_status_is_error(state->status)) return; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_ranges_t), (void **) &contents->array, &contents->used, &contents->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_ranges_t), (void **) &contents->array, &contents->used, &contents->size); if (F_status_is_error(state->status)) return; contents->array[contents->used].used = 0; @@ -61,7 +61,7 @@ extern "C" { ++objects_quoted->used; } - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) return; contents->array[contents->used++].used = 0; @@ -206,7 +206,7 @@ extern "C" { if (!state) return; #endif // _di_level_2_parameter_checking_ - f_string_range_t range = macro_f_string_range_t_initialize_2(object.used); + f_range_t range = macro_f_range_t_initialize_2(object.used); fl_fss_extended_object_write(object, quote, f_fss_complete_full_e, &range, destination, state); diff --git a/level_2/fll_fss/c/fss/extended.h b/level_2/fll_fss/c/fss/extended.h index 556af07..cc8493a 100644 --- a/level_2/fll_fss/c/fss/extended.h +++ b/level_2/fll_fss/c/fss/extended.h @@ -81,7 +81,7 @@ extern "C" { * @see fl_fss_extended_object_read() */ #ifndef _di_fll_fss_extended_read_ - extern void fll_fss_extended_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_uint8ss_t * const contents_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state); + extern void fll_fss_extended_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_uint8s_t * const objects_quoted, f_uint8ss_t * const contents_quoted, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_state_t * const state); #endif // _di_fll_fss_extended_read_ /** diff --git a/level_2/fll_fss/c/fss/extended_list.c b/level_2/fll_fss/c/fss/extended_list.c index dc20d4b..ab2e4ab 100644 --- a/level_2/fll_fss/c/fss/extended_list.c +++ b/level_2/fll_fss/c/fss/extended_list.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_extended_list_read_ - void fll_fss_extended_list_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state) { + void fll_fss_extended_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; @@ -22,10 +22,10 @@ extern "C" { bool found_data = F_false; do { - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects->array, &objects->used, &objects->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects->array, &objects->used, &objects->size); if (F_status_is_error(state->status)) return; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_ranges_t), (void **) &contents->array, &contents->used, &contents->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_ranges_t), (void **) &contents->array, &contents->used, &contents->size); if (F_status_is_error(state->status)) return; contents->array[contents->used].used = 0; @@ -38,7 +38,7 @@ extern "C" { if (state->status == F_fss_found_object || state->status == F_fss_found_object_content_not) { ++objects->used; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(state->status)) { state->status = status; @@ -77,7 +77,7 @@ extern "C" { if (state->status == F_fss_found_object_content_not) { found_data = F_true; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -143,12 +143,12 @@ extern "C" { #endif // _di_fll_fss_extended_list_read_ #ifndef _di_fll_fss_extended_list_write_ - void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state) { + void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; #endif // _di_level_2_parameter_checking_ - f_string_range_t range = macro_f_string_range_t_initialize_2(object.used); + f_range_t range = macro_f_range_t_initialize_2(object.used); fl_fss_extended_list_object_write(object, f_fss_complete_full_e, &range, destination, state); diff --git a/level_2/fll_fss/c/fss/extended_list.h b/level_2/fll_fss/c/fss/extended_list.h index 2fb17e2..c347503 100644 --- a/level_2/fll_fss/c/fss/extended_list.h +++ b/level_2/fll_fss/c/fss/extended_list.h @@ -81,7 +81,7 @@ extern "C" { * @see fl_fss_extended_list_object_read() */ #ifndef _di_fll_fss_extended_list_read_ - extern void fll_fss_extended_list_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state); + extern void fll_fss_extended_list_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state); #endif // _di_fll_fss_extended_list_read_ /** @@ -130,7 +130,7 @@ extern "C" { * @see fl_fss_extended_list_object_write() */ #ifndef _di_fll_fss_extended_list_write_ - extern void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state); + extern void fll_fss_extended_list_write(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_ranges_t *ignore, f_string_dynamic_t * const destination, f_state_t * const state); #endif // _di_fll_fss_extended_list_write_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss/payload.c b/level_2/fll_fss/c/fss/payload.c index b354c75..8b90042 100644 --- a/level_2/fll_fss/c/fss/payload.c +++ b/level_2/fll_fss/c/fss/payload.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_payload_read_ - void fll_fss_payload_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state) { + void fll_fss_payload_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state) { #ifndef _di_level_2_parameter_checking_ if (!state) return; @@ -22,10 +22,10 @@ extern "C" { bool found_data = F_false; do { - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &objects->array, &objects->used, &objects->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &objects->array, &objects->used, &objects->size); if (F_status_is_error(state->status)) return; - state->status = f_memory_array_increase(state->step_small, sizeof(f_string_ranges_t), (void **) &contents->array, &contents->used, &contents->size); + state->status = f_memory_array_increase(state->step_small, sizeof(f_ranges_t), (void **) &contents->array, &contents->used, &contents->size); if (F_status_is_error(state->status)) return; contents->array[contents->used].used = 0; @@ -47,7 +47,7 @@ extern "C" { ++objects->used; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -83,7 +83,7 @@ extern "C" { contents->array[contents->used].used = 0; if (f_compare_dynamic_partial_string(f_fss_payload_s.string, buffer, f_fss_payload_s.used, objects->array[objects->used]) == F_equal_to) { - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -120,7 +120,7 @@ extern "C" { if (state->status == F_fss_found_object_content_not) { found_data = F_true; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -133,7 +133,7 @@ extern "C" { if (f_compare_dynamic_partial_string(f_fss_payload_s.string, buffer, f_fss_payload_s.used, objects->array[objects->used]) == F_equal_to) { ++objects->used; - status = f_memory_array_increase(state->step_small, sizeof(f_string_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); + status = f_memory_array_increase(state->step_small, sizeof(f_range_t), (void **) &contents->array[contents->used].array, &contents->array[contents->used].used, &contents->array[contents->used].size); if (F_status_is_error(status)) { state->status = status; @@ -225,7 +225,7 @@ extern "C" { } #endif // _di_level_2_parameter_checking_ - f_string_range_t range = macro_f_string_range_t_initialize_2(object.used); + f_range_t range = macro_f_range_t_initialize_2(object.used); fl_fss_basic_list_object_write(object, trim ? f_fss_complete_full_trim_e : f_fss_complete_full_e, &range, destination, state); diff --git a/level_2/fll_fss/c/fss/payload.h b/level_2/fll_fss/c/fss/payload.h index 54eb791..4bf2658 100644 --- a/level_2/fll_fss/c/fss/payload.h +++ b/level_2/fll_fss/c/fss/payload.h @@ -94,7 +94,7 @@ extern "C" { * @see fl_fss_basic_list_object_read() */ #ifndef _di_fll_fss_payload_read_ - extern void fll_fss_payload_read(const f_string_static_t buffer, f_string_range_t * const range, f_string_ranges_t * const objects, f_string_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_string_ranges_t * const comments, f_state_t * const state); + extern void fll_fss_payload_read(const f_string_static_t buffer, f_range_t * const range, f_ranges_t * const objects, f_rangess_t * const contents, f_number_unsigneds_t * const objects_delimits, f_number_unsigneds_t * const contents_delimits, f_ranges_t * const comments, f_state_t * const state); #endif // _di_fll_fss_payload_read_ /** diff --git a/level_2/fll_iki/c/iki.c b/level_2/fll_iki/c/iki.c index 342e8ba..d8305d1 100644 --- a/level_2/fll_iki/c/iki.c +++ b/level_2/fll_iki/c/iki.c @@ -13,14 +13,14 @@ extern "C" { if (escaped->used > escaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ - const f_string_range_t range = macro_f_string_range_t_initialize_2(content.used); + const f_range_t range = macro_f_range_t_initialize_2(content.used); return private_fll_iki_content_partial_escape(content, range, quote.string[0], escaped); } #endif // _di_fll_iki_content_escape_ #ifndef _di_fll_iki_content_partial_escape_ - f_status_t fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const f_string_static_t quote, f_string_dynamic_t * const escaped) { + f_status_t fll_iki_content_partial_escape(const f_string_static_t content, const f_range_t range, const f_string_static_t quote, f_string_dynamic_t * const escaped) { #ifndef _di_level_2_parameter_checking_ if (range.start > range.stop) return F_status_set_error(F_parameter); if (range.start >= content.used) return F_status_set_error(F_parameter); @@ -34,7 +34,7 @@ extern "C" { #endif // _di_fll_iki_content_partial_escape_ #ifndef _di_fll_iki_content_partial_unescape_ - f_status_t fll_iki_content_partial_unescape(const f_string_static_t content, const f_string_range_t range, const f_string_static_t quote, f_string_dynamic_t * const unescaped) { + f_status_t fll_iki_content_partial_unescape(const f_string_static_t content, const f_range_t range, const f_string_static_t quote, f_string_dynamic_t * const unescaped) { #ifndef _di_level_2_parameter_checking_ if (range.start > range.stop) return F_status_set_error(F_parameter); if (range.start >= content.used) return F_status_set_error(F_parameter); @@ -55,7 +55,7 @@ extern "C" { if (unescaped->used > unescaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ - const f_string_range_t range = macro_f_string_range_t_initialize_2(content.used); + const f_range_t range = macro_f_range_t_initialize_2(content.used); return private_fll_iki_content_partial_unescape(content, range, quote.string[0], unescaped); } diff --git a/level_2/fll_iki/c/iki.h b/level_2/fll_iki/c/iki.h index 3ba4de6..5346c91 100644 --- a/level_2/fll_iki/c/iki.h +++ b/level_2/fll_iki/c/iki.h @@ -90,7 +90,7 @@ extern "C" { * @see f_memory_array_resize() */ #ifndef _di_fll_iki_content_partial_escape_ - extern f_status_t fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const f_string_static_t quote, f_string_dynamic_t * const escaped); + extern f_status_t fll_iki_content_partial_escape(const f_string_static_t content, const f_range_t range, const f_string_static_t quote, f_string_dynamic_t * const escaped); #endif // _di_fll_iki_content_partial_escape_ /** @@ -122,7 +122,7 @@ extern "C" { * @see f_memory_array_resize() */ #ifndef _di_fll_iki_content_partial_unescape_ - extern f_status_t fll_iki_content_partial_unescape(const f_string_static_t content, const f_string_range_t range, const f_string_static_t quote, f_string_dynamic_t * const unescaped); + extern f_status_t fll_iki_content_partial_unescape(const f_string_static_t content, const f_range_t range, const f_string_static_t quote, f_string_dynamic_t * const unescaped); #endif // _di_fll_iki_content_partial_unescape_ /** diff --git a/level_2/fll_iki/c/private-iki.c b/level_2/fll_iki/c/private-iki.c index ac1b77c..e59db98 100644 --- a/level_2/fll_iki/c/private-iki.c +++ b/level_2/fll_iki/c/private-iki.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) - f_status_t private_fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const f_char_t quote, f_string_dynamic_t * const escaped) { + f_status_t private_fll_iki_content_partial_escape(const f_string_static_t content, const f_range_t range, const f_char_t quote, f_string_dynamic_t * const escaped) { f_status_t status = F_okay; @@ -71,7 +71,7 @@ extern "C" { #endif // !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) #if !defined(_di_fll_iki_content_unescape_) || !defined(_di_fll_iki_content_partial_unescape_) - f_status_t private_fll_iki_content_partial_unescape(const f_string_static_t content, const f_string_range_t range, const f_char_t quote, f_string_dynamic_t * const unescaped) { + f_status_t private_fll_iki_content_partial_unescape(const f_string_static_t content, const f_range_t range, const f_char_t quote, f_string_dynamic_t * const unescaped) { f_status_t status = F_okay; diff --git a/level_2/fll_iki/c/private-iki.h b/level_2/fll_iki/c/private-iki.h index caf3920..4546f2f 100644 --- a/level_2/fll_iki/c/private-iki.h +++ b/level_2/fll_iki/c/private-iki.h @@ -43,7 +43,7 @@ extern "C" { * @see f_memory_array_resize() */ #if !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) - extern f_status_t private_fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const f_char_t quote, f_string_dynamic_t * const escaped) F_attribute_visibility_internal_d; + extern f_status_t private_fll_iki_content_partial_escape(const f_string_static_t content, const f_range_t range, const f_char_t quote, f_string_dynamic_t * const escaped) F_attribute_visibility_internal_d; #endif // !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) /** @@ -75,7 +75,7 @@ extern "C" { * @see f_memory_array_resize() */ #if !defined(_di_fll_iki_content_unescape_) || !defined(_di_fll_iki_content_partial_unescape_) - extern f_status_t private_fll_iki_content_partial_unescape(const f_string_static_t content, const f_string_range_t range, const f_char_t quote, f_string_dynamic_t * const unescaped) F_attribute_visibility_internal_d; + extern f_status_t private_fll_iki_content_partial_unescape(const f_string_static_t content, const f_range_t range, const f_char_t quote, f_string_dynamic_t * const unescaped) F_attribute_visibility_internal_d; #endif // !defined(_di_fll_iki_content_unescape_) || !defined(_di_fll_iki_content_partial_unescape_) #ifdef __cplusplus diff --git a/level_2/fll_print/c/print.c b/level_2/fll_print/c/print.c index 76974ca..2da6bd8 100644 --- a/level_2/fll_print/c/print.c +++ b/level_2/fll_print/c/print.c @@ -65,7 +65,7 @@ extern "C" { #endif // _di_fll_print_dynamic_ #ifndef _di_fll_print_dynamic_partial_ - f_status_t fll_print_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_dynamic_partial(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -80,7 +80,7 @@ extern "C" { #endif // _di_fll_print_dynamic_partial_ #ifndef _di_fll_print_dynamic_partial_raw_ - f_status_t fll_print_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -95,7 +95,7 @@ extern "C" { #endif // _di_fll_print_dynamic_partial_raw_ #ifndef _di_fll_print_dynamic_partial_raw_safely_ - f_status_t fll_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -110,7 +110,7 @@ extern "C" { #endif // _di_fll_print_dynamic_partial_raw_safely_ #ifndef _di_fll_print_dynamic_partial_safely_ - f_status_t fll_print_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -200,7 +200,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_ #ifndef _di_fll_print_except_dynamic_partial_ - f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -215,7 +215,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_partial_ #ifndef _di_fll_print_except_dynamic_partial_raw_ - f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -230,7 +230,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_partial_raw_ #ifndef _di_fll_print_except_dynamic_partial_raw_safely_ - f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -245,7 +245,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_partial_raw_safely_ #ifndef _di_fll_print_except_dynamic_partial_safely_ - f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -350,7 +350,7 @@ extern "C" { #endif // _di_fll_print_except_safely_ #ifndef _di_fll_print_except_in_ - f_status_t fll_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -365,7 +365,7 @@ extern "C" { #endif // _di_fll_print_except_in_ #ifndef _di_fll_print_except_in_dynamic_ - f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -380,7 +380,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_ #ifndef _di_fll_print_except_in_dynamic_partial_ - f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -395,7 +395,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_ #ifndef _di_fll_print_except_in_dynamic_partial_raw_ - f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -410,7 +410,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_raw_ #ifndef _di_fll_print_except_in_dynamic_partial_raw_safely_ - f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -425,7 +425,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_raw_safely_ #ifndef _di_fll_print_except_in_dynamic_partial_safely_ - f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -440,7 +440,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_safely_ #ifndef _di_fll_print_except_in_dynamic_raw_ - f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -455,7 +455,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_raw_ #ifndef _di_fll_print_except_in_dynamic_raw_safely_ - f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -470,7 +470,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_raw_safely_ #ifndef _di_fll_print_except_in_dynamic_safely_ - f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -485,7 +485,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_safely_ #ifndef _di_fll_print_except_in_raw_ - f_status_t fll_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -500,7 +500,7 @@ extern "C" { #endif // _di_fll_print_except_in_raw_ #ifndef _di_fll_print_except_in_raw_safely_ - f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -515,7 +515,7 @@ extern "C" { #endif // _di_fll_print_except_in_raw_safely_ #ifndef _di_fll_print_except_in_safely_ - f_status_t fll_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -780,7 +780,7 @@ extern "C" { #endif // _di_fll_print_trim_dynamic_safely_ #ifndef _di_fll_print_trim_dynamic_partial_ - f_status_t fll_print_trim_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_trim_dynamic_partial(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -795,7 +795,7 @@ extern "C" { #endif // _di_fll_print_trim_dynamic_partial_ #ifndef _di_fll_print_trim_dynamic_partial_raw_ - f_status_t fll_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -810,7 +810,7 @@ extern "C" { #endif // _di_fll_print_trim_dynamic_partial_raw_ #ifndef _di_fll_print_trim_dynamic_partial_raw_safely_ - f_status_t fll_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -825,7 +825,7 @@ extern "C" { #endif // _di_fll_print_trim_dynamic_partial_raw_safely_ #ifndef _di_fll_print_trim_dynamic_partial_safely_ - f_status_t fll_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file) { + f_status_t fll_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file) { if (!file.stream) return F_stream_not; @@ -960,7 +960,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_safely_ #ifndef _di_fll_print_trim_except_in_ - f_status_t fll_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -975,7 +975,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_ #ifndef _di_fll_print_trim_except_in_raw_ - f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -990,7 +990,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_raw_ #ifndef _di_fll_print_trim_except_in_raw_safely_ - f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1005,7 +1005,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_raw_safely_ #ifndef _di_fll_print_trim_except_in_safely_ - f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1020,7 +1020,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_ - f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1035,7 +1035,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_ #ifndef _di_fll_print_trim_except_in_dynamic_raw_ - f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1050,7 +1050,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_raw_ #ifndef _di_fll_print_trim_except_in_dynamic_raw_safely_ - f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1065,7 +1065,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_raw_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_safely_ - f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1080,7 +1080,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_ - f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1095,7 +1095,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_ - f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1110,7 +1110,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ - f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1125,7 +1125,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_safely_ - f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1140,7 +1140,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_safely_ #ifndef _di_fll_print_trim_except_dynamic_partial_ - f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1155,7 +1155,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_partial_ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_ - f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1170,7 +1170,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_partial_raw_ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_safely_ - f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1185,7 +1185,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_partial_raw_safely_ #ifndef _di_fll_print_trim_except_dynamic_partial_safely_ - f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; diff --git a/level_2/fll_print/c/print.h b/level_2/fll_print/c/print.h index d7dfe23..f1482e6 100644 --- a/level_2/fll_print/c/print.h +++ b/level_2/fll_print/c/print.h @@ -150,7 +150,7 @@ extern "C" { * @see f_print_dynamic_partial() */ #ifndef _di_fll_print_dynamic_partial_ - extern f_status_t fll_print_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_dynamic_partial(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_dynamic_partial_ /** @@ -176,7 +176,7 @@ extern "C" { * @see f_print_dynamic_partial_raw() */ #ifndef _di_fll_print_dynamic_partial_raw_ - extern f_status_t fll_print_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_dynamic_partial_raw_ /** @@ -202,7 +202,7 @@ extern "C" { * @see f_print_dynamic_partial_raw_safely() */ #ifndef _di_fll_print_dynamic_partial_raw_safely_ - extern f_status_t fll_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_dynamic_partial_raw_safely_ /** @@ -228,7 +228,7 @@ extern "C" { * @see f_print_dynamic_partial_safely() */ #ifndef _di_fll_print_dynamic_partial_safely_ - extern f_status_t fll_print_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_dynamic_partial_safely_ /** @@ -387,7 +387,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_except_dynamic_partial_ - extern f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_ /** @@ -416,7 +416,7 @@ extern "C" { * @see f_print_except_dynamic_partial_raw() */ #ifndef _di_fll_print_except_dynamic_partial_raw_ - extern f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_raw_ /** @@ -445,7 +445,7 @@ extern "C" { * @see f_print_except_dynamic_partial_raw_safely() */ #ifndef _di_fll_print_except_dynamic_partial_raw_safely_ - extern f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_raw_safely_ /** @@ -474,7 +474,7 @@ extern "C" { * @see f_print_except_dynamic_partial_safely() */ #ifndef _di_fll_print_except_dynamic_partial_safely_ - extern f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_safely_ /** @@ -589,7 +589,7 @@ extern "C" { * @see f_print_except_in() */ #ifndef _di_fll_print_except_in_ - extern f_status_t fll_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_ /** @@ -623,7 +623,7 @@ extern "C" { * @see f_print_except_in_raw() */ #ifndef _di_fll_print_except_in_raw_ - extern f_status_t fll_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_raw_ /** @@ -657,7 +657,7 @@ extern "C" { * @see f_print_except_in_raw_safely() */ #ifndef _di_fll_print_except_in_raw_safely_ - extern f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_raw_safely_ /** @@ -691,7 +691,7 @@ extern "C" { * @see f_print_except_in_safely() */ #ifndef _di_fll_print_except_in_safely_ - extern f_status_t fll_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_safely_ /** @@ -721,7 +721,7 @@ extern "C" { * @see f_print_except_in_dynamic() */ #ifndef _di_fll_print_except_in_dynamic_ - extern f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_ /** @@ -753,7 +753,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial() */ #ifndef _di_fll_print_except_in_dynamic_partial_ - extern f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_ /** @@ -785,7 +785,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw() */ #ifndef _di_fll_print_except_in_dynamic_partial_raw_ - extern f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_raw_ /** @@ -817,7 +817,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw_safely() */ #ifndef _di_fll_print_except_in_dynamic_partial_raw_safely_ - extern f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_raw_safely_ /** @@ -849,7 +849,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_safely() */ #ifndef _di_fll_print_except_in_dynamic_partial_safely_ - extern f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_safely_ /** @@ -879,7 +879,7 @@ extern "C" { * @see f_print_except_in_dynamic_raw() */ #ifndef _di_fll_print_except_in_dynamic_raw_ - extern f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_raw_ /** @@ -909,7 +909,7 @@ extern "C" { * @see f_print_except_in_dynamic_raw_safely() */ #ifndef _di_fll_print_except_in_dynamic_raw_safely_ - extern f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_raw_safely_ /** @@ -939,7 +939,7 @@ extern "C" { * @see f_print_except_in_dynamic_safely() */ #ifndef _di_fll_print_except_in_dynamic_safely_ - extern f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_safely_ /** @@ -1500,7 +1500,7 @@ extern "C" { * @see fl_print_trim_dynamic_partial() */ #ifndef _di_fll_print_trim_dynamic_partial_ - extern f_status_t fll_print_trim_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_trim_dynamic_partial(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_trim_dynamic_partial_ /** @@ -1526,7 +1526,7 @@ extern "C" { * @see fl_print_trim_dynamic_partial_raw() */ #ifndef _di_fll_print_trim_dynamic_partial_raw_ - extern f_status_t fll_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_trim_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_trim_dynamic_partial_raw_ /** @@ -1552,7 +1552,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_dynamic_partial_raw_safely_ - extern f_status_t fll_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_trim_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_trim_dynamic_partial_raw_safely_ /** @@ -1578,7 +1578,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_dynamic_partial_safely_ - extern f_status_t fll_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, f_file_t file); + extern f_status_t fll_print_trim_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, f_file_t file); #endif // _di_fll_print_trim_dynamic_partial_safely_ /** @@ -1844,7 +1844,7 @@ extern "C" { * @see fl_print_trim_except_in() */ #ifndef _di_fll_print_trim_except_in_ - extern f_status_t fll_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_ /** @@ -1878,7 +1878,7 @@ extern "C" { * @see fl_print_trim_except_in_raw() */ #ifndef _di_fll_print_trim_except_in_raw_ - extern f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_raw_ /** @@ -1912,7 +1912,7 @@ extern "C" { * @see fl_print_trim_except_in_raw_safely() */ #ifndef _di_fll_print_trim_except_in_raw_safely_ - extern f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_raw_safely_ /** @@ -1946,7 +1946,7 @@ extern "C" { * @see fl_print_trim_except_in_safely() */ #ifndef _di_fll_print_trim_except_in_safely_ - extern f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_safely_ /** @@ -1976,7 +1976,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic() */ #ifndef _di_fll_print_trim_except_in_dynamic_ - extern f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_ /** @@ -2006,7 +2006,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_raw() */ #ifndef _di_fll_print_trim_except_in_dynamic_raw_ - extern f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_raw_ /** @@ -2036,7 +2036,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_raw_safely() */ #ifndef _di_fll_print_trim_except_in_dynamic_raw_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_raw_safely_ /** @@ -2066,7 +2066,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_safely() */ #ifndef _di_fll_print_trim_except_in_dynamic_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_safely_ /** @@ -2098,7 +2098,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_ - extern f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_ /** @@ -2130,7 +2130,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_ - extern f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_ /** @@ -2162,7 +2162,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ /** @@ -2194,7 +2194,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except_at, const f_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_safely_ /** @@ -2223,7 +2223,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_dynamic_partial_ - extern f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_ /** @@ -2252,7 +2252,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial_raw() */ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_ - extern f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_raw_ /** @@ -2281,7 +2281,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial_raw_safely() */ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_safely_ - extern f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_raw_safely_ /** @@ -2310,7 +2310,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial_safely() */ #ifndef _di_fll_print_trim_except_dynamic_partial_safely_ - extern f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_safely_ #ifdef __cplusplus diff --git a/level_3/control/c/main/common.c b/level_3/control/c/main/common.c index 7ea8540..db2c474 100644 --- a/level_3/control/c/main/common.c +++ b/level_3/control/c/main/common.c @@ -385,8 +385,8 @@ extern "C" { return; } - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &main->cache.objects.array, &main->cache.objects.used, &main->cache.objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &main->cache.contents.array, &main->cache.contents.used, &main->cache.contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &main->cache.objects.array, &main->cache.objects.used, &main->cache.objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &main->cache.contents.array, &main->cache.contents.used, &main->cache.contents.size, &f_rangess_delete_callback); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &main->cache.delimits.array, &main->cache.delimits.used, &main->cache.delimits.size); { diff --git a/level_3/control/c/main/common/type.c b/level_3/control/c/main/common/type.c index 4d36fd4..022579e 100644 --- a/level_3/control/c/main/common/type.c +++ b/level_3/control/c/main/common/type.c @@ -16,14 +16,14 @@ extern "C" { f_memory_array_resize(0, sizeof(f_char_t), (void **) &main->cache.small.string, &main->cache.small.used, &main->cache.small.size); f_memory_array_resize(0, sizeof(f_char_t), (void **) &main->cache.packet.string, &main->cache.packet.used, &main->cache.packet.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &main->cache.objects.array, &main->cache.objects.used, &main->cache.objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &main->cache.contents.array, &main->cache.contents.used, &main->cache.contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &main->cache.objects.array, &main->cache.objects.used, &main->cache.objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &main->cache.contents.array, &main->cache.contents.used, &main->cache.contents.size, &f_rangess_delete_callback); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &main->cache.packet_objects.array, &main->cache.packet_objects.used, &main->cache.packet_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &main->cache.packet_contents.array, &main->cache.packet_contents.used, &main->cache.packet_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &main->cache.packet_objects.array, &main->cache.packet_objects.used, &main->cache.packet_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &main->cache.packet_contents.array, &main->cache.packet_contents.used, &main->cache.packet_contents.size, &f_rangess_delete_callback); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &main->cache.header_objects.array, &main->cache.header_objects.used, &main->cache.header_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &main->cache.header_contents.array, &main->cache.header_contents.used, &main->cache.header_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &main->cache.header_objects.array, &main->cache.header_objects.used, &main->cache.header_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &main->cache.header_contents.array, &main->cache.header_contents.used, &main->cache.header_contents.size, &f_rangess_delete_callback); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &main->cache.delimits.array, &main->cache.delimits.used, &main->cache.delimits.size); } diff --git a/level_3/control/c/main/common/type.h b/level_3/control/c/main/common/type.h index 7e24f8e..ef7270c 100644 --- a/level_3/control/c/main/common/type.h +++ b/level_3/control/c/main/common/type.h @@ -41,15 +41,15 @@ extern "C" { f_string_dynamic_t small; f_string_dynamic_t packet; - f_string_ranges_t objects; - f_string_rangess_t contents; + f_ranges_t objects; + f_rangess_t contents; f_number_unsigneds_t delimits; - f_string_ranges_t packet_objects; - f_string_rangess_t packet_contents; + f_ranges_t packet_objects; + f_rangess_t packet_contents; - f_string_ranges_t header_objects; - f_string_rangess_t header_contents; + f_ranges_t header_objects; + f_rangess_t header_contents; } control_cache_t; #define control_cache_t_initialize \ @@ -57,13 +57,13 @@ extern "C" { f_string_dynamic_t_initialize, \ f_string_dynamic_t_initialize, \ f_string_dynamic_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_rangess_t_initialize, \ + f_ranges_t_initialize, \ + f_rangess_t_initialize, \ f_number_unsigneds_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_rangess_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_rangess_t_initialize, \ + f_ranges_t_initialize, \ + f_rangess_t_initialize, \ + f_ranges_t_initialize, \ + f_rangess_t_initialize, \ } #endif // _di_control_cache_t_ @@ -125,7 +125,7 @@ extern "C" { f_status_t status_signal; f_state_t state; - f_string_range_t range; + f_range_t range; f_socket_t socket; f_string_dynamic_t name_socket; @@ -141,7 +141,7 @@ extern "C" { 0, \ F_okay, \ f_state_t_initialize, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ f_socket_t_initialize, \ f_string_dynamic_t_initialize, \ f_string_dynamic_t_initialize, \ diff --git a/level_3/control/c/main/packet.c b/level_3/control/c/main/packet.c index e0dfdfc..f4f002c 100644 --- a/level_3/control/c/main/packet.c +++ b/level_3/control/c/main/packet.c @@ -167,8 +167,8 @@ extern "C" { header->length = 0; f_number_unsigned_t i = 0; - f_string_range_t range_header = f_string_range_t_initialize; - f_string_range_t range_payload = f_string_range_t_initialize; + f_range_t range_header = f_range_t_initialize; + f_range_t range_payload = f_range_t_initialize; { f_number_unsigned_t length = 5; @@ -221,7 +221,7 @@ extern "C" { { f_state_t state = macro_f_state_t_initialize_1(control_allocation_large_d, control_allocation_small_d, F_okay, 0, 0, 0, &fll_program_standard_signal_handle, 0, (void *) main, 0); - f_string_range_t range_packet = macro_f_string_range_t_initialize_2(main->cache.large.used); + f_range_t range_packet = macro_f_range_t_initialize_2(main->cache.large.used); fll_fss_basic_list_read(main->cache.large, &range_packet, &main->cache.packet_objects, &main->cache.packet_contents, &main->cache.delimits, 0, 0, &state); @@ -250,8 +250,8 @@ extern "C" { main->cache.delimits.used = 0; { - f_string_ranges_t *content_header = 0; - f_string_ranges_t *content_payload = 0; + f_ranges_t *content_header = 0; + f_ranges_t *content_payload = 0; for (; i < main->cache.packet_objects.used; ++i) { @@ -315,7 +315,7 @@ extern "C" { // 0x1 = found action, 0x2 = found length, 0x4 = found status, 0x8 = found_type. uint8_t found = 0; f_number_unsigned_t number = 0; - f_string_range_t range = range_header; + f_range_t range = range_header; fll_fss_extended_read(main->cache.large, &range, &main->cache.header_objects, &main->cache.header_contents, 0, 0, &main->cache.delimits, 0, &state); diff --git a/level_3/control/c/main/print/debug.c b/level_3/control/c/main/print/debug.c index d39bff5..aefb4fd 100644 --- a/level_3/control/c/main/print/debug.c +++ b/level_3/control/c/main/print/debug.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_control_print_debug_packet_header_object_and_content_ - f_status_t control_print_debug_packet_header_object_and_content(fl_print_t * const print, const f_string_static_t object, const f_string_static_t content, const f_string_range_t content_range) { + f_status_t control_print_debug_packet_header_object_and_content(fl_print_t * const print, const f_string_static_t object, const f_string_static_t content, const f_range_t content_range) { if (!print) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; @@ -22,7 +22,7 @@ extern "C" { #endif // _di_control_print_debug_packet_header_object_and_content_ #ifndef _di_control_print_debug_packet_message_ - f_status_t control_print_debug_packet_message(fl_print_t * const print, const f_string_t message, const f_string_static_t *buffer, const f_string_range_t *range) { + f_status_t control_print_debug_packet_message(fl_print_t * const print, const f_string_t message, const f_string_static_t *buffer, const f_range_t *range) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; diff --git a/level_3/control/c/main/print/debug.h b/level_3/control/c/main/print/debug.h index 8b1485e..da95064 100644 --- a/level_3/control/c/main/print/debug.h +++ b/level_3/control/c/main/print/debug.h @@ -37,7 +37,7 @@ extern "C" { * F_output_not (with error bit) if setting is NULL. */ #ifndef _di_control_print_debug_packet_header_object_and_content_ - extern f_status_t control_print_debug_packet_header_object_and_content(fl_print_t * const print, const f_string_static_t object, const f_string_static_t content, const f_string_range_t content_range); + extern f_status_t control_print_debug_packet_header_object_and_content(fl_print_t * const print, const f_string_static_t object, const f_string_static_t content, const f_range_t content_range); #endif // _di_control_print_debug_packet_header_object_and_content_ /** @@ -69,7 +69,7 @@ extern "C" { * F_output_not (with error bit) if setting is NULL. */ #ifndef _di_control_print_debug_packet_message_ - extern f_status_t control_print_debug_packet_message(fl_print_t * const print, const f_string_t message, const f_string_static_t *buffer, const f_string_range_t *range); + extern f_status_t control_print_debug_packet_message(fl_print_t * const print, const f_string_t message, const f_string_static_t *buffer, const f_range_t *range); #endif // _di_control_print_debug_packet_message_ #ifdef __cplusplus diff --git a/level_3/controller/c/common/private-cache.c b/level_3/controller/c/common/private-cache.c index 1fb1c21..267f2dc 100644 --- a/level_3/controller/c/common/private-cache.c +++ b/level_3/controller/c/common/private-cache.c @@ -28,13 +28,13 @@ extern "C" { f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &cache->stack.array, &cache->stack.used, &cache->stack.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &cache->delimits.array, &cache->delimits.used, &cache->delimits.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &cache->comments.array, &cache->comments.used, &cache->comments.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &cache->content_action.array, &cache->content_action.used, &cache->content_action.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &cache->object_actions.array, &cache->object_actions.used, &cache->object_actions.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &cache->object_items.array, &cache->object_items.used, &cache->object_items.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &cache->comments.array, &cache->comments.used, &cache->comments.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &cache->content_action.array, &cache->content_action.used, &cache->content_action.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &cache->object_actions.array, &cache->object_actions.used, &cache->object_actions.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &cache->object_items.array, &cache->object_items.used, &cache->object_items.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &cache->content_actions.array, &cache->content_actions.used, &cache->content_actions.size, &f_string_rangess_delete_callback); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &cache->content_items.array, &cache->content_items.used, &cache->content_items.size, &f_string_rangess_delete_callback); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &cache->content_actions.array, &cache->content_actions.used, &cache->content_actions.size, &f_rangess_delete_callback); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &cache->content_items.array, &cache->content_items.used, &cache->content_items.size, &f_rangess_delete_callback); controller_cache_action_delete_simple(&cache->action); } diff --git a/level_3/controller/c/common/private-cache.h b/level_3/controller/c/common/private-cache.h index 9382503..c84da0c 100644 --- a/level_3/controller/c/common/private-cache.h +++ b/level_3/controller/c/common/private-cache.h @@ -76,19 +76,19 @@ extern "C" { typedef struct { f_time_spec_t timestamp; - f_string_range_t range_action; + f_range_t range_action; f_number_unsigneds_t ats; f_number_unsigneds_t stack; - f_string_ranges_t comments; + f_ranges_t comments; f_number_unsigneds_t delimits; - f_string_ranges_t content_action; - f_string_rangess_t content_actions; - f_string_rangess_t content_items; - f_string_ranges_t object_actions; - f_string_ranges_t object_items; + f_ranges_t content_action; + f_rangess_t content_actions; + f_rangess_t content_items; + f_ranges_t object_actions; + f_ranges_t object_items; f_string_dynamic_t buffer_file; f_string_dynamic_t buffer_item; @@ -101,16 +101,16 @@ extern "C" { #define controller_cache_t_initialize { \ f_time_spec_t_initialize, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ f_number_unsigneds_t_initialize, \ f_number_unsigneds_t_initialize, \ - f_string_ranges_t_initialize, \ + f_ranges_t_initialize, \ f_number_unsigneds_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_rangess_t_initialize, \ - f_string_rangess_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_ranges_t_initialize, \ + f_ranges_t_initialize, \ + f_rangess_t_initialize, \ + f_rangess_t_initialize, \ + f_ranges_t_initialize, \ + f_ranges_t_initialize, \ f_string_dynamic_t_initialize, \ f_string_dynamic_t_initialize, \ f_string_dynamic_t_initialize, \ diff --git a/level_3/controller/c/controller/private-controller.c b/level_3/controller/c/controller/private-controller.c index fd48205..23f0077 100644 --- a/level_3/controller/c/controller/private-controller.c +++ b/level_3/controller/c/controller/private-controller.c @@ -11,9 +11,9 @@ extern "C" { #endif #ifndef _di_controller_range_after_number_sign_ - f_string_range_t controller_range_after_number_sign(const f_string_static_t buffer, const f_string_range_t range) { + f_range_t controller_range_after_number_sign(const f_string_static_t buffer, const f_range_t range) { - f_string_range_t result = range; + f_range_t result = range; for (; result.start <= result.stop; ++result.start) { @@ -214,7 +214,7 @@ extern "C" { if (F_status_is_error_not(status)) { f_number_unsigned_t number = 0; - f_string_range_t range = macro_f_string_range_t_initialize_2(pid_buffer.used); + f_range_t range = macro_f_range_t_initialize_2(pid_buffer.used); for (; range.start < pid_buffer.used; ++range.start) { if (!isspace(pid_buffer.string[range.start])) break; @@ -271,7 +271,7 @@ extern "C" { if (F_status_is_error_not(status)) { f_number_unsigned_t number = 0; - f_string_range_t range = macro_f_string_range_t_initialize_2(pid_buffer.used); + f_range_t range = macro_f_range_t_initialize_2(pid_buffer.used); for (; range.start < pid_buffer.used; ++range.start) { if (!isspace(pid_buffer.string[range.start])) break; @@ -295,7 +295,7 @@ extern "C" { #endif // _di_controller_file_pid_read_ #ifndef _di_controller_get_id_user_ - f_status_t controller_get_id_user(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t * const cache, uid_t * const id) { + f_status_t controller_get_id_user(const f_string_static_t buffer, const f_range_t range, controller_cache_t * const cache, uid_t * const id) { f_number_unsigned_t number = 0; @@ -330,7 +330,7 @@ extern "C" { #endif // _di_controller_get_id_user_ #ifndef _di_controller_get_id_group_ - f_status_t controller_get_id_group(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t * const cache, gid_t * const id) { + f_status_t controller_get_id_group(const f_string_static_t buffer, const f_range_t range, controller_cache_t * const cache, gid_t * const id) { f_number_unsigned_t number = 0; @@ -373,7 +373,7 @@ extern "C" { } if (destination->used >= setting->path_current.used) { - const f_string_range_t range = macro_f_string_range_t_initialize_2(setting->path_current.used); + const f_range_t range = macro_f_range_t_initialize_2(setting->path_current.used); if (f_compare_dynamic_partial_string(destination->string, setting->path_current, destination->used, range) == F_equal_to) { f_number_unsigned_t length = destination->used - setting->path_current.used; diff --git a/level_3/controller/c/controller/private-controller.h b/level_3/controller/c/controller/private-controller.h index 79175dd..738ff20 100644 --- a/level_3/controller/c/controller/private-controller.h +++ b/level_3/controller/c/controller/private-controller.h @@ -29,7 +29,7 @@ extern "C" { * The start range will be past the stop range on overflow or on any failure. */ #ifndef _di_controller_range_after_number_sign_ - extern f_string_range_t controller_range_after_number_sign(const f_string_static_t buffer, const f_string_range_t range) F_attribute_visibility_internal_d; + extern f_range_t controller_range_after_number_sign(const f_string_static_t buffer, const f_range_t range) F_attribute_visibility_internal_d; #endif // _di_controller_range_after_number_sign_ /** @@ -165,7 +165,7 @@ extern "C" { * @see f_rip_dynamic_partial_nulless() */ #ifndef _di_controller_get_id_user_ - f_status_t controller_get_id_user(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t * const cache, uid_t * const id) F_attribute_visibility_internal_d; + f_status_t controller_get_id_user(const f_string_static_t buffer, const f_range_t range, controller_cache_t * const cache, uid_t * const id) F_attribute_visibility_internal_d; #endif // _di_controller_get_id_user_ /** @@ -194,7 +194,7 @@ extern "C" { * @see f_rip_dynamic_partial_nulless() */ #ifndef _di_controller_get_id_group_ - f_status_t controller_get_id_group(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t * const cache, gid_t * const id) F_attribute_visibility_internal_d; + f_status_t controller_get_id_group(const f_string_static_t buffer, const f_range_t range, controller_cache_t * const cache, gid_t * const id) F_attribute_visibility_internal_d; #endif // _di_controller_get_id_group_ /** diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index 232c93b..fc3620d 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -72,7 +72,7 @@ extern "C" { #endif // _di_controller_entry_action_type_to_rule_action_type_ #ifndef _di_controller_entry_actions_read_ - f_status_t controller_entry_actions_read(const controller_global_t global, const bool is_entry, const f_string_range_t content_range, controller_cache_t * const cache, controller_entry_actions_t *actions) { + f_status_t controller_entry_actions_read(const controller_global_t global, const bool is_entry, const f_range_t content_range, controller_cache_t * const cache, controller_entry_actions_t *actions) { f_status_t status = F_okay; f_status_t status_action = F_okay; @@ -96,7 +96,7 @@ extern "C" { { controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_entry, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_okay, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); - f_string_range_t range = content_range; + f_range_t range = content_range; status = fll_fss_extended_read(cache->buffer_file, state, &range, &cache->object_actions, &cache->content_actions, 0, 0, &cache->delimits, 0); } @@ -1578,7 +1578,7 @@ extern "C" { if (cache->buffer_file.used) { controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_entry, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_okay, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); - f_string_range_t range = macro_f_string_range_t_initialize_2(cache->buffer_file.used); + f_range_t range = macro_f_range_t_initialize_2(cache->buffer_file.used); status = fll_fss_basic_list_read(cache->buffer_file, state, &range, &cache->object_items, &cache->content_items, &cache->delimits, 0, &cache->comments); @@ -1617,7 +1617,7 @@ extern "C" { // 0x1 = main found, 0x2 = found existing. uint8_t code = 0; - f_string_range_t *range = 0; + f_range_t *range = 0; f_number_unsigned_t at = 0; f_number_unsigned_t i = 0; @@ -1870,14 +1870,14 @@ extern "C" { #endif // _di_controller_entry_read_ #ifndef _di_controller_entry_settings_read_ - f_status_t controller_entry_settings_read(const controller_global_t global, const bool is_entry, const f_string_range_t content_range, controller_cache_t * const cache) { + f_status_t controller_entry_settings_read(const controller_global_t global, const bool is_entry, const f_range_t content_range, controller_cache_t * const cache) { f_status_t status = F_okay; { controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_entry, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_okay, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); - f_string_range_t range = content_range; + f_range_t range = content_range; status = fll_fss_extended_read(cache->buffer_file, state, &range, &cache->object_actions, &cache->content_actions, 0, 0, &cache->delimits, 0); } @@ -2325,7 +2325,7 @@ extern "C" { #endif // _di_controller_entry_settings_read_ #ifndef _di_controller_entry_settings_read_map_ - f_status_t controller_entry_settings_read_map(const f_string_static_t buffer, const f_string_ranges_t ranges, f_string_maps_t *setting_maps) { + f_status_t controller_entry_settings_read_map(const f_string_static_t buffer, const f_ranges_t ranges, f_string_maps_t *setting_maps) { { f_status_t status = f_memory_array_increase(controller_common_allocation_small_d, sizeof(f_string_map_t), (void **) &setting_maps->array, &setting_maps->used, &setting_maps->size); diff --git a/level_3/controller/c/entry/private-entry.h b/level_3/controller/c/entry/private-entry.h index f2e18c5..6c6f755 100644 --- a/level_3/controller/c/entry/private-entry.h +++ b/level_3/controller/c/entry/private-entry.h @@ -75,7 +75,7 @@ extern "C" { * @see fll_fss_extended_read() */ #ifndef _di_controller_entry_actions_read_ - extern f_status_t controller_entry_actions_read(const controller_global_t global, const bool is_entry, const f_string_range_t content_range, controller_cache_t * const cache, controller_entry_actions_t *actions) F_attribute_visibility_internal_d; + extern f_status_t controller_entry_actions_read(const controller_global_t global, const bool is_entry, const f_range_t content_range, controller_cache_t * const cache, controller_entry_actions_t *actions) F_attribute_visibility_internal_d; #endif // _di_controller_entry_actions_read_ /** @@ -209,7 +209,7 @@ extern "C" { * @see controller_entry_print_error_file() */ #ifndef _di_controller_entry_settings_read_ - extern f_status_t controller_entry_settings_read(const controller_global_t global, const bool is_entry, const f_string_range_t content_range, controller_cache_t * const cache) F_attribute_visibility_internal_d; + extern f_status_t controller_entry_settings_read(const controller_global_t global, const bool is_entry, const f_range_t content_range, controller_cache_t * const cache) F_attribute_visibility_internal_d; #endif // _di_controller_entry_settings_read_ /** @@ -231,7 +231,7 @@ extern "C" { * @see f_string_dynamic_partial_append_nulless() */ #ifndef _di_controller_entry_settings_read_map_ - f_status_t controller_entry_settings_read_map(const f_string_static_t buffer, const f_string_ranges_t ranges, f_string_maps_t *setting_maps) F_attribute_visibility_internal_d; + f_status_t controller_entry_settings_read_map(const f_string_static_t buffer, const f_ranges_t ranges, f_string_maps_t *setting_maps) F_attribute_visibility_internal_d; #endif // _di_controller_entry_settings_read_map_ /** diff --git a/level_3/controller/c/entry/private-entry_print.c b/level_3/controller/c/entry/private-entry_print.c index 0c167dd..cde6ee7 100644 --- a/level_3/controller/c/entry/private-entry_print.c +++ b/level_3/controller/c/entry/private-entry_print.c @@ -127,7 +127,7 @@ extern "C" { #endif // _di_controller_entry_print_error_file_ #ifndef _di_controller_entry_setting_read_print_error_with_range_ - void controller_entry_setting_read_print_error_with_range(const bool is_entry, const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, controller_thread_t * const thread, controller_cache_t * const cache) { + void controller_entry_setting_read_print_error_with_range(const bool is_entry, const fl_print_t print, const f_string_t before, const f_range_t range, const f_string_t after, controller_thread_t * const thread, controller_cache_t * const cache) { if (print.verbosity == f_console_verbosity_quiet_e) return; diff --git a/level_3/controller/c/entry/private-entry_print.h b/level_3/controller/c/entry/private-entry_print.h index 2bc9c96..adb6297 100644 --- a/level_3/controller/c/entry/private-entry_print.h +++ b/level_3/controller/c/entry/private-entry_print.h @@ -175,7 +175,7 @@ extern "C" { * @see controller_entry_settings_read() */ #ifndef _di_controller_entry_setting_read_print_error_with_range_ - extern void controller_entry_setting_read_print_error_with_range(const bool is_entry, const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; + extern void controller_entry_setting_read_print_error_with_range(const bool is_entry, const fl_print_t print, const f_string_t before, const f_range_t range, const f_string_t after, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; #endif // _di_controller_entry_setting_read_print_error_with_range_ /** diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index 531322e..a0e2203 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -60,7 +60,7 @@ extern "C" { #endif // _di_controller_rule_find_ #ifndef _di_controller_rule_parameters_read_ - f_status_t controller_rule_parameters_read(const controller_global_t global, const f_string_static_t buffer, f_string_range_t * const object, f_string_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state) { + f_status_t controller_rule_parameters_read(const controller_global_t global, const f_string_static_t buffer, f_range_t * const object, f_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state) { f_status_t status = F_okay; @@ -129,7 +129,7 @@ extern "C" { return status; } - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; for (f_number_unsigned_t i = 0; i < content->used; ++i) { @@ -217,7 +217,7 @@ extern "C" { #endif // _di_controller_rule_action_type_to_action_execute_type_ #ifndef _di_controller_rule_action_read_ - f_status_t controller_rule_action_read(const controller_global_t global, const bool is_normal, const uint8_t type, const uint8_t method, controller_cache_t * const cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_string_range_t *range) { + f_status_t controller_rule_action_read(const controller_global_t global, const bool is_normal, const uint8_t type, const uint8_t method, controller_cache_t * const cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_range_t *range) { f_status_t status = F_okay; @@ -303,7 +303,7 @@ extern "C" { state.step_small = controller_common_allocation_iki_small_d; state.interrupt = &controller_thread_signal_state_iki; - f_string_range_t range_iki = macro_f_string_range_t_initialize_2(actions->array[actions->used].parameters.array[0].used); + f_range_t range_iki = macro_f_range_t_initialize_2(actions->array[actions->used].parameters.array[0].used); status = fl_iki_read(&actions->array[actions->used].parameters.array[0], &range_iki, &actions->array[actions->used].ikis.array[0], state); @@ -608,7 +608,7 @@ extern "C" { state.step_small = controller_common_allocation_iki_small_d; state.interrupt = &controller_thread_signal_state_iki; - f_string_range_t range_iki = macro_f_string_range_t_initialize_2(actions->array[actions->used].parameters.array[0].used); + f_range_t range_iki = macro_f_range_t_initialize_2(actions->array[actions->used].parameters.array[0].used); status = fl_iki_read(&actions->array[actions->used].parameters.array[0], &range_iki, &actions->array[actions->used].ikis.array[0], state); @@ -1946,7 +1946,7 @@ extern "C" { f_number_unsigned_t i = 0; f_number_unsigned_t first = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_iki_data_t *iki_data = 0; f_string_dynamic_t *buffer = 0; @@ -2016,7 +2016,7 @@ extern "C" { #endif // _di_controller_rule_expand_ #ifndef _di_controller_rule_expand_iki_ - f_status_t controller_rule_expand_iki(controller_process_t * const process, const f_string_static_t source, const f_string_range_t vocabulary, const f_string_range_t content, f_string_dynamic_t * const destination) { + f_status_t controller_rule_expand_iki(controller_process_t * const process, const f_string_static_t source, const f_range_t vocabulary, const f_range_t content, f_string_dynamic_t * const destination) { if (vocabulary.start > vocabulary.stop) return F_okay; if (content.start > content.stop) return F_okay; @@ -2309,7 +2309,7 @@ extern "C" { #endif // _di_controller_rule_expand_iki_ #ifndef _di_controller_rule_id_construct_ - f_status_t controller_rule_id_construct(const controller_global_t global, const f_string_static_t source, const f_string_range_t directory, const f_string_range_t basename, f_string_dynamic_t * const alias) { + f_status_t controller_rule_id_construct(const controller_global_t global, const f_string_static_t source, const f_range_t directory, const f_range_t basename, f_string_dynamic_t * const alias) { f_status_t status = F_okay; @@ -2363,7 +2363,7 @@ extern "C" { f_status_t status = F_okay; controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_normal, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_okay, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); - f_string_range_t range = macro_f_string_range_t_initialize_2(cache->buffer_item.used); + f_range_t range = macro_f_range_t_initialize_2(cache->buffer_item.used); f_number_unsigned_t last = 0; uint8_t type = 0; @@ -3212,7 +3212,7 @@ extern "C" { process->type = type; macro_f_time_spec_t_clear(process->cache.timestamp) - macro_f_string_range_t_clear(process->cache.range_action) + macro_f_range_t_clear(process->cache.range_action) process->cache.ats.used = 0; process->cache.stack.used = 0; @@ -3790,7 +3790,7 @@ extern "C" { if (cache->buffer_file.used) { controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_normal, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_okay, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); - f_string_range_t range = macro_f_string_range_t_initialize_2(cache->buffer_file.used); + f_range_t range = macro_f_range_t_initialize_2(cache->buffer_file.used); status = fll_fss_basic_list_read(cache->buffer_file, state, &range, &cache->object_items, &cache->content_items, &cache->delimits, 0, &cache->comments); @@ -3951,8 +3951,8 @@ extern "C" { f_status_t status = F_okay; f_status_t status_return = F_okay; - f_string_range_t range = macro_f_string_range_t_initialize_2(cache->buffer_item.used); - f_string_range_t range2 = f_string_range_t_initialize; + f_range_t range = macro_f_range_t_initialize_2(cache->buffer_item.used); + f_range_t range2 = f_range_t_initialize; controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_normal, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_okay, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); diff --git a/level_3/controller/c/rule/private-rule.h b/level_3/controller/c/rule/private-rule.h index e52a96b..35e43ce 100644 --- a/level_3/controller/c/rule/private-rule.h +++ b/level_3/controller/c/rule/private-rule.h @@ -102,7 +102,7 @@ extern "C" { * @see fl_iki_read() */ #ifndef _di_controller_rule_parameters_read_ - extern f_status_t controller_rule_parameters_read(const controller_global_t global, const f_string_static_t buffer, f_string_range_t * const object, f_string_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_parameters_read(const controller_global_t global, const f_string_static_t buffer, f_range_t * const object, f_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state) F_attribute_visibility_internal_d; #endif // _di_controller_rule_parameters_read_ /** @@ -156,7 +156,7 @@ extern "C" { * @see f_fss_count_lines() */ #ifndef _di_controller_rule_action_read_ - extern f_status_t controller_rule_action_read(const controller_global_t global, const bool is_normal, const uint8_t type, const uint8_t method, controller_cache_t * const cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_string_range_t *range) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_action_read(const controller_global_t global, const bool is_normal, const uint8_t type, const uint8_t method, controller_cache_t * const cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_range_t *range) F_attribute_visibility_internal_d; #endif // _di_controller_rule_action_read_ /** @@ -379,7 +379,7 @@ extern "C" { * @see f_string_dynamic_append() */ #ifndef _di_controller_rule_expand_iki_ - extern f_status_t controller_rule_expand_iki(controller_process_t * const process, const f_string_static_t source, const f_string_range_t vocabulary, const f_string_range_t content, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_expand_iki(controller_process_t * const process, const f_string_static_t source, const f_range_t vocabulary, const f_range_t content, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // _di_controller_rule_expand_iki_ /** @@ -405,7 +405,7 @@ extern "C" { * @see f_string_dynamic_partial_append_nulless() */ #ifndef _di_controller_rule_id_construct_ - extern f_status_t controller_rule_id_construct(const controller_global_t global, const f_string_static_t source, const f_string_range_t directory, const f_string_range_t basename, f_string_dynamic_t * const alias) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_id_construct(const controller_global_t global, const f_string_static_t source, const f_range_t directory, const f_range_t basename, f_string_dynamic_t * const alias) F_attribute_visibility_internal_d; #endif // _di_controller_rule_id_construct_ /** diff --git a/level_3/controller/c/rule/private-rule_print.c b/level_3/controller/c/rule/private-rule_print.c index 722eff4..c38076c 100644 --- a/level_3/controller/c/rule/private-rule_print.c +++ b/level_3/controller/c/rule/private-rule_print.c @@ -385,7 +385,7 @@ extern "C" { #endif // _di_controller_rule_setting_read_print_error_ #ifndef _di_controller_rule_setting_read_print_error_with_range_ - void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) { + void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_range_t range, const f_string_t after, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) { if (print.verbosity == f_console_verbosity_quiet_e) return; diff --git a/level_3/controller/c/rule/private-rule_print.h b/level_3/controller/c/rule/private-rule_print.h index 16694b9..2350714 100644 --- a/level_3/controller/c/rule/private-rule_print.h +++ b/level_3/controller/c/rule/private-rule_print.h @@ -211,7 +211,7 @@ extern "C" { * @see controller_rule_setting_read() */ #ifndef _di_controller_rule_setting_read_print_error_with_range_ - extern void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; + extern void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_range_t range, const f_string_t after, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; #endif // _di_controller_rule_setting_read_print_error_with_range_ /** diff --git a/level_3/fake/c/main/build/load.c b/level_3/fake/c/main/build/load.c index babffd3..f86ff58 100644 --- a/level_3/fake/c/main/build/load.c +++ b/level_3/fake/c/main/build/load.c @@ -129,8 +129,8 @@ extern "C" { { f_string_dynamic_t buffer = f_string_dynamic_t_initialize; - f_string_ranges_t objects = f_string_ranges_t_initialize; - f_string_rangess_t contents = f_string_rangess_t_initialize; + f_ranges_t objects = f_ranges_t_initialize; + f_rangess_t contents = f_rangess_t_initialize; if (process_pipe) { fake_pipe_buffer(data, &buffer); @@ -150,7 +150,7 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status)) { - f_string_range_t range = macro_f_string_range_t_initialize_2(buffer.used); + f_range_t range = macro_f_range_t_initialize_2(buffer.used); f_number_unsigneds_t delimits = f_number_unsigneds_t_initialize; fll_fss_extended_read(buffer, &range, &objects, &contents, 0, 0, &delimits, 0, &main->setting.state); @@ -174,8 +174,8 @@ extern "C" { f_memory_array_resize(0, sizeof(f_char_t), (void **) &buffer.string, &buffer.used, &buffer.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &objects.array, &objects.used, &objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &contents.array, &contents.used, &contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &objects.array, &objects.used, &objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &contents.array, &contents.used, &contents.size, &f_rangess_delete_callback); } // Error when required settings are not specified. @@ -213,7 +213,7 @@ extern "C" { #endif // _di_fake_build_load_setting_ #ifndef _di_fake_build_load_setting_process_ - void fake_build_load_setting_process(fake_data_t * const data, const bool checks, const f_string_static_t path_file, const f_string_statics_t * const modes_custom, const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, fake_build_setting_t * const setting) { + void fake_build_load_setting_process(fake_data_t * const data, const bool checks, const f_string_static_t path_file, const f_string_statics_t * const modes_custom, const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, fake_build_setting_t * const setting) { if (!data || !data->main || !setting) return; if (F_status_is_error(data->main->setting.state.status) && buffer.used) return; diff --git a/level_3/fake/c/main/build/load.h b/level_3/fake/c/main/build/load.h index f0fc786..e3cc691 100644 --- a/level_3/fake/c/main/build/load.h +++ b/level_3/fake/c/main/build/load.h @@ -156,7 +156,7 @@ extern "C" { * @see fll_fss_snatch_apart() */ #ifndef _di_fake_build_load_setting_process_ - extern void fake_build_load_setting_process(fake_data_t * const data, const bool checks, const f_string_static_t path_file, const f_string_statics_t * const modes_custom, const f_string_static_t buffer, const f_string_ranges_t objects, const f_string_rangess_t contents, fake_build_setting_t * const setting); + extern void fake_build_load_setting_process(fake_data_t * const data, const bool checks, const f_string_static_t path_file, const f_string_statics_t * const modes_custom, const f_string_static_t buffer, const f_ranges_t objects, const f_rangess_t contents, fake_build_setting_t * const setting); #endif // _di_fake_build_load_setting_process_ /** diff --git a/level_3/fake/c/main/common.c b/level_3/fake/c/main/common.c index 6ac9d2a..702a564 100644 --- a/level_3/fake/c/main/common.c +++ b/level_3/fake/c/main/common.c @@ -561,7 +561,7 @@ extern "C" { // Shrink an overly long array. if (iki_data->content.used > fake_max_over_array_d) { - f_memory_array_resize(fake_allocation_large_d, sizeof(f_string_range_t), (void **) &iki_data->content.array, &iki_data->content.used, &iki_data->content.size); + f_memory_array_resize(fake_allocation_large_d, sizeof(f_range_t), (void **) &iki_data->content.array, &iki_data->content.used, &iki_data->content.size); } if (iki_data->delimits.used > fake_max_over_array_d) { @@ -569,11 +569,11 @@ extern "C" { } if (iki_data->variable.used > fake_max_over_array_d) { - f_memory_array_resize(fake_allocation_large_d, sizeof(f_string_range_t), (void **) &iki_data->variable.array, &iki_data->variable.used, &iki_data->variable.size); + f_memory_array_resize(fake_allocation_large_d, sizeof(f_range_t), (void **) &iki_data->variable.array, &iki_data->variable.used, &iki_data->variable.size); } if (iki_data->vocabulary.used > fake_max_over_array_d) { - f_memory_array_resize(fake_allocation_large_d, sizeof(f_string_range_t), (void **) &iki_data->vocabulary.array, &iki_data->vocabulary.used, &iki_data->vocabulary.size); + f_memory_array_resize(fake_allocation_large_d, sizeof(f_range_t), (void **) &iki_data->vocabulary.array, &iki_data->vocabulary.used, &iki_data->vocabulary.size); } while (iki_data->content.used) { diff --git a/level_3/fake/c/main/make.c b/level_3/fake/c/main/make.c index 9180ba2..d710467 100644 --- a/level_3/fake/c/main/make.c +++ b/level_3/fake/c/main/make.c @@ -22,7 +22,7 @@ extern "C" { return; } - const f_string_range_t range = macro_f_string_range_t_initialize_2(data_make->path.stack.array[0].used); + const f_range_t range = macro_f_range_t_initialize_2(data_make->path.stack.array[0].used); if (range.start <= range.stop) { main->setting.state.status = f_compare_dynamic_partial(data_make->path.stack.array[0], main->cache_argument, range, range); @@ -165,7 +165,7 @@ extern "C" { return; } - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; range.start = data_make->path.stack.array[0].used + 1; range.stop = range.start + (path.used - range.start) - 1; diff --git a/level_3/fake/c/main/make/load_fakefile.c b/level_3/fake/c/main/make/load_fakefile.c index 3ba7d02..24f9102 100644 --- a/level_3/fake/c/main/make/load_fakefile.c +++ b/level_3/fake/c/main/make/load_fakefile.c @@ -36,13 +36,13 @@ extern "C" { return; } - f_string_ranges_t list_objects = f_string_ranges_t_initialize; - f_string_rangess_t list_contents = f_string_rangess_t_initialize; + f_ranges_t list_objects = f_ranges_t_initialize; + f_rangess_t list_contents = f_rangess_t_initialize; f_number_unsigneds_t delimits = f_number_unsigneds_t_initialize; { - f_string_range_t range = macro_f_string_range_t_initialize_2(data_make->main->buffer.used); - f_string_ranges_t comments = f_string_ranges_t_initialize; + f_range_t range = macro_f_range_t_initialize_2(data_make->main->buffer.used); + f_ranges_t comments = f_ranges_t_initialize; fll_fss_basic_list_read(data_make->main->buffer, &range, &list_objects, &list_contents, &delimits, 0, &comments, &data_make->main->setting.state); @@ -59,11 +59,11 @@ extern "C" { delimits.used = 0; } - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &comments.array, &comments.used, &comments.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &comments.array, &comments.used, &comments.size); if (F_status_is_error(data_make->main->setting.state.status)) { - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &list_objects.array, &list_objects.used, &list_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &list_contents.array, &list_contents.used, &list_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &list_objects.array, &list_objects.used, &list_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &list_contents.array, &list_contents.used, &list_contents.size, &f_rangess_delete_callback); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &delimits.array, &delimits.used, &delimits.size); return; @@ -84,15 +84,15 @@ extern "C" { fake_print_error(&data_make->main->program.error, macro_fake_f(f_memory_array_resize)); f_fss_set_delete(&settings); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &list_objects.array, &list_objects.used, &list_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &list_contents.array, &list_contents.used, &list_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &list_objects.array, &list_objects.used, &list_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &list_contents.array, &list_contents.used, &list_contents.size, &f_rangess_delete_callback); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &delimits.array, &delimits.used, &delimits.size); return; } { - f_string_range_t content_range = f_string_range_t_initialize; + f_range_t content_range = f_range_t_initialize; for (f_number_unsigned_t i = 0; i < list_objects.used; ++i) { @@ -170,8 +170,8 @@ extern "C" { } // for } - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &list_objects.array, &list_objects.used, &list_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &list_contents.array, &list_contents.used, &list_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &list_objects.array, &list_objects.used, &list_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &list_contents.array, &list_contents.used, &list_contents.size, &f_rangess_delete_callback); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &delimits.array, &delimits.used, &delimits.size); if (F_status_is_error(data_make->main->setting.state.status)) { @@ -213,8 +213,8 @@ extern "C" { } } - f_string_range_t *range_compiler = 0; - f_string_range_t *range_indexer = 0; + f_range_t *range_compiler = 0; + f_range_t *range_indexer = 0; data_make->setting_make.parameter.array[0].value.used = 1; data_make->setting_make.load_build = F_false; @@ -299,7 +299,7 @@ extern "C" { #endif // _di_fake_make_load_fakefile_ #ifndef _di_fake_make_load_fakefile_setting_build_ - void fake_make_load_fakefile_setting_build(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content) { + void fake_make_load_fakefile_setting_build(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content) { if (!data_make || !data_make->data || !data_make->main || !object || !content) return; @@ -325,7 +325,7 @@ extern "C" { #endif // _di_fake_make_load_fakefile_setting_build_ #ifndef _di_fake_make_load_fakefile_setting_compiler_ - void fake_make_load_fakefile_setting_compiler(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content, f_string_range_t **range_compiler) { + void fake_make_load_fakefile_setting_compiler(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content, f_range_t **range_compiler) { if (!data_make || !data_make->data || !data_make->main || !object || !content || !range_compiler) return; @@ -427,7 +427,7 @@ extern "C" { #endif // _di_fake_make_load_fakefile_setting_define_and_parameter_ #ifndef _di_fake_make_load_fakefile_setting_environment_ - void fake_make_load_fakefile_setting_environment(fake_make_data_t * const data_make, f_string_ranges_t * const content) { + void fake_make_load_fakefile_setting_environment(fake_make_data_t * const data_make, f_ranges_t * const content) { if (!data_make || !data_make->data || !data_make->data || !data_make->main || !content) return; @@ -513,7 +513,7 @@ extern "C" { #endif // _di_fake_make_load_fakefile_setting_environment_ #ifndef _di_fake_make_load_fakefile_setting_fail_ - void fake_make_load_fakefile_setting_fail(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content) { + void fake_make_load_fakefile_setting_fail(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content) { if (!data_make || !data_make->data || !data_make->data || !data_make->main || !object || !content) return; @@ -542,7 +542,7 @@ extern "C" { #endif // _di_fake_make_load_fakefile_setting_fail_ #ifndef _di_fake_make_load_fakefile_setting_indexer_ - void fake_make_load_fakefile_setting_indexer(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content, f_string_range_t **range_indexer) { + void fake_make_load_fakefile_setting_indexer(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content, f_range_t **range_indexer) { if (!data_make || !data_make->data || !data_make->data || !data_make->main || !object || !content || !range_indexer) return; @@ -560,7 +560,7 @@ extern "C" { #endif // _di_fake_make_load_fakefile_setting_indexer_ #ifndef _di_fake_make_load_fakefile_setting_parameter_ - void fake_make_load_fakefile_setting_parameter(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content) { + void fake_make_load_fakefile_setting_parameter(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content) { if (!data_make || !data_make->data || !data_make->data || !data_make->main || !object || !content) return; diff --git a/level_3/fake/c/main/make/load_fakefile.h b/level_3/fake/c/main/make/load_fakefile.h index dfa4f54..a68e170 100644 --- a/level_3/fake/c/main/make/load_fakefile.h +++ b/level_3/fake/c/main/make/load_fakefile.h @@ -87,7 +87,7 @@ extern "C" { * The setting content. */ #ifndef _di_fake_make_load_fakefile_setting_build_ - extern void fake_make_load_fakefile_setting_build(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content); + extern void fake_make_load_fakefile_setting_build(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content); #endif // _di_fake_make_load_fakefile_setting_build_ /** @@ -105,7 +105,7 @@ extern "C" { * A pointer to the range that representing the compiler setting within the buffer. */ #ifndef _di_fake_make_load_fakefile_setting_compiler_ - extern void fake_make_load_fakefile_setting_compiler(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content, f_string_range_t **range_compiler); + extern void fake_make_load_fakefile_setting_compiler(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content, f_range_t **range_compiler); #endif // _di_fake_make_load_fakefile_setting_compiler_ /** @@ -163,7 +163,7 @@ extern "C" { * @see f_string_dynamic_partial_append_nulless() */ #ifndef _di_fake_make_load_fakefile_setting_environment_ - extern void fake_make_load_fakefile_setting_environment(fake_make_data_t * const data_make, f_string_ranges_t * const content); + extern void fake_make_load_fakefile_setting_environment(fake_make_data_t * const data_make, f_ranges_t * const content); #endif // _di_fake_make_load_fakefile_setting_environment_ /** @@ -179,7 +179,7 @@ extern "C" { * The setting content. */ #ifndef _di_fake_make_load_fakefile_setting_fail_ - extern void fake_make_load_fakefile_setting_fail(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content); + extern void fake_make_load_fakefile_setting_fail(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content); #endif // _di_fake_make_load_fakefile_setting_fail_ /** @@ -197,7 +197,7 @@ extern "C" { * A pointer to the range that representing the indexer setting within the buffer. */ #ifndef _di_fake_make_load_fakefile_setting_indexer_ - extern void fake_make_load_fakefile_setting_indexer(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content, f_string_range_t **range_indexer); + extern void fake_make_load_fakefile_setting_indexer(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content, f_range_t **range_indexer); #endif // _di_fake_make_load_fakefile_setting_indexer_ /** @@ -228,7 +228,7 @@ extern "C" { * @see fake_make_load_fakefile_setting_define_and_parameter() */ #ifndef _di_fake_make_load_fakefile_setting_parameter_ - extern void fake_make_load_fakefile_setting_parameter(fake_make_data_t * const data_make, f_string_range_t * const object, f_string_ranges_t * const content); + extern void fake_make_load_fakefile_setting_parameter(fake_make_data_t * const data_make, f_range_t * const object, f_ranges_t * const content); #endif // _di_fake_make_load_fakefile_setting_parameter_ #ifdef __cplusplus diff --git a/level_3/fake/c/main/make/operate.c b/level_3/fake/c/main/make/operate.c index 46701c7..9456599 100644 --- a/level_3/fake/c/main/make/operate.c +++ b/level_3/fake/c/main/make/operate.c @@ -100,7 +100,7 @@ extern "C" { if (main->program.parameters.remaining.used) { f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_number_unsigned_t index = 0; main->setting.state.status = F_okay; @@ -217,7 +217,7 @@ extern "C" { #endif // _di_fake_make_operate_ #ifndef _di_fake_make_operate_expand_ - void fake_make_operate_expand(fake_make_data_t * const data_make, const f_string_range_t section_name, const f_string_ranges_t content, const f_uint8s_t quotes) { + void fake_make_operate_expand(fake_make_data_t * const data_make, const f_range_t section_name, const f_ranges_t content, const f_uint8s_t quotes) { if (!data_make || !data_make->main) return; if (F_status_is_error(data_make->main->setting.state.status)) return; @@ -240,7 +240,7 @@ extern "C" { f_iki_data_t *iki_data = &main->cache_iki; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_string_map_multis_t *parameter = &data_make->setting_make.parameter; // 1 = is parameter, 2 = is define, 3 = is context. @@ -836,7 +836,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_ #ifndef _di_fake_make_operate_expand_build_ - void fake_make_operate_expand_build(fake_make_data_t * const data_make, const uint8_t quote, const f_string_range_t range_name) { + void fake_make_operate_expand_build(fake_make_data_t * const data_make, const uint8_t quote, const f_range_t range_name) { if (!data_make || !data_make->main) return; if (F_status_is_error(data_make->main->setting.state.status)) return; @@ -1141,7 +1141,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_build_ #ifndef _di_fake_make_operate_expand_context_ - void fake_make_operate_expand_context(fake_make_data_t * const data_make, const uint8_t quote, const f_string_range_t range_name) { + void fake_make_operate_expand_context(fake_make_data_t * const data_make, const uint8_t quote, const f_range_t range_name) { if (!data_make || !data_make->main) return; @@ -1192,7 +1192,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_context_ #ifndef _di_fake_make_operate_expand_environment_ - void fake_make_operate_expand_environment(fake_make_data_t * const data_make, const uint8_t quote, const f_string_range_t range_name) { + void fake_make_operate_expand_environment(fake_make_data_t * const data_make, const uint8_t quote, const f_range_t range_name) { if (!data_make || !data_make->main) return; diff --git a/level_3/fake/c/main/make/operate.h b/level_3/fake/c/main/make/operate.h index 3aee904..349d848 100644 --- a/level_3/fake/c/main/make/operate.h +++ b/level_3/fake/c/main/make/operate.h @@ -101,7 +101,7 @@ extern "C" { * @see fake_make_operate_expand_environment() */ #ifndef _di_fake_make_operate_expand_ - extern void fake_make_operate_expand(fake_make_data_t * const data_make, const f_string_range_t section_name, const f_string_ranges_t content, const f_uint8s_t quotes); + extern void fake_make_operate_expand(fake_make_data_t * const data_make, const f_range_t section_name, const f_ranges_t content, const f_uint8s_t quotes); #endif // _di_fake_make_operate_expand_ /** @@ -128,7 +128,7 @@ extern "C" { * @see f_string_dynamic_mash() */ #ifndef _di_fake_make_operate_expand_build_ - extern void fake_make_operate_expand_build(fake_make_data_t * const data_make, const uint8_t quote, const f_string_range_t range_name); + extern void fake_make_operate_expand_build(fake_make_data_t * const data_make, const uint8_t quote, const f_range_t range_name); #endif // _di_fake_make_operate_expand_build_ /** @@ -152,7 +152,7 @@ extern "C" { * @see f_string_dynamic_append_nulless() */ #ifndef _di_fake_make_operate_expand_context_ - extern void fake_make_operate_expand_context(fake_make_data_t * const data_make, const uint8_t quote, const f_string_range_t range_name); + extern void fake_make_operate_expand_context(fake_make_data_t * const data_make, const uint8_t quote, const f_range_t range_name); #endif // _di_fake_make_operate_expand_context_ /** @@ -183,7 +183,7 @@ extern "C" { * @see f_string_dynamic_partial_append_nulless() */ #ifndef _di_fake_make_operate_expand_environment_ - extern void fake_make_operate_expand_environment(fake_make_data_t * const data_make, const uint8_t quote, const f_string_range_t range_name); + extern void fake_make_operate_expand_environment(fake_make_data_t * const data_make, const uint8_t quote, const f_range_t range_name); #endif // _di_fake_make_operate_expand_environment_ /** diff --git a/level_3/fake/c/main/make/operate_process.c b/level_3/fake/c/main/make/operate_process.c index 1d3eaba..db0b62a 100644 --- a/level_3/fake/c/main/make/operate_process.c +++ b/level_3/fake/c/main/make/operate_process.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fake_make_operate_process_ - int fake_make_operate_process(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack) { + int fake_make_operate_process(fake_make_data_t * const data_make, const f_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack) { if (!data_make || !data_make->main || !state_process || !section_stack) return 0; if (data_make->main->setting.state.status == F_child) return data_make->main->program.child; diff --git a/level_3/fake/c/main/make/operate_process.h b/level_3/fake/c/main/make/operate_process.h index 9345cf5..acc5646 100644 --- a/level_3/fake/c/main/make/operate_process.h +++ b/level_3/fake/c/main/make/operate_process.h @@ -103,7 +103,7 @@ extern "C" { * @see fake_make_operate_process_type_write() */ #ifndef _di_fake_make_operate_process_ - extern int fake_make_operate_process(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack); + extern int fake_make_operate_process(fake_make_data_t * const data_make, const f_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack); #endif // _di_fake_make_operate_process_ /** diff --git a/level_3/fake/c/main/make/operate_process_type.c b/level_3/fake/c/main/make/operate_process_type.c index 42084a4..629ffc3 100644 --- a/level_3/fake/c/main/make/operate_process_type.c +++ b/level_3/fake/c/main/make/operate_process_type.c @@ -810,7 +810,7 @@ extern "C" { fake_main_t * const main = data_make->main; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_number_unsigned_t number_left = 0; f_number_unsigned_t number_right = 0; diff --git a/level_3/fake/c/main/make/operate_validate.c b/level_3/fake/c/main/make/operate_validate.c index b9f7675..c8d6fa0 100644 --- a/level_3/fake/c/main/make/operate_validate.c +++ b/level_3/fake/c/main/make/operate_validate.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fake_make_operate_validate_ - void fake_make_operate_validate(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack) { + void fake_make_operate_validate(fake_make_data_t * const data_make, const f_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack) { if (!data_make || !data_make->main) return; if (F_status_is_error(data_make->main->setting.state.status)) return; diff --git a/level_3/fake/c/main/make/operate_validate.h b/level_3/fake/c/main/make/operate_validate.h index 4ebee6d..dc0a25d 100644 --- a/level_3/fake/c/main/make/operate_validate.h +++ b/level_3/fake/c/main/make/operate_validate.h @@ -86,7 +86,7 @@ extern "C" { * @see fake_make_operate_validate_type_write() */ #ifndef _di_fake_make_operate_validate_ - extern void fake_make_operate_validate(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack); + extern void fake_make_operate_validate(fake_make_data_t * const data_make, const f_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack); #endif // _di_fake_make_operate_validate_ /** diff --git a/level_3/fake/c/main/make/operate_validate_type.c b/level_3/fake/c/main/make/operate_validate_type.c index 1f6f083..16b5c37 100644 --- a/level_3/fake/c/main/make/operate_validate_type.c +++ b/level_3/fake/c/main/make/operate_validate_type.c @@ -606,7 +606,7 @@ extern "C" { } f_status_t status = F_okay; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_number_unsigned_t number = 0; for (i = k; i < main->cache_arguments.used; ++i, main->setting.state.status = F_okay) { diff --git a/level_3/fake/c/main/make/print/error.c b/level_3/fake/c/main/make/print/error.c index c25f852..3d62d92 100644 --- a/level_3/fake/c/main/make/print/error.c +++ b/level_3/fake/c/main/make/print/error.c @@ -222,7 +222,7 @@ extern "C" { #endif // _di_fake_make_print_error_operation_incomplete_ #ifndef _di_fake_make_print_error_operation_recursion_ - f_status_t fake_make_print_error_operation_recursion(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t range) { + f_status_t fake_make_print_error_operation_recursion(fl_print_t * const print, const f_string_static_t buffer, const f_range_t range) { if (!print) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; diff --git a/level_3/fake/c/main/make/print/error.h b/level_3/fake/c/main/make/print/error.h index 0d2f55b..48ba481 100644 --- a/level_3/fake/c/main/make/print/error.h +++ b/level_3/fake/c/main/make/print/error.h @@ -343,7 +343,7 @@ extern "C" { * F_output_not (with error bit) if setting is NULL. */ #ifndef _di_fake_make_print_error_operation_recursion_ - extern f_status_t fake_make_print_error_operation_recursion(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t range); + extern f_status_t fake_make_print_error_operation_recursion(fl_print_t * const print, const f_string_static_t buffer, const f_range_t range); #endif // _di_fake_make_print_error_operation_recursion_ /** diff --git a/level_3/fake/c/main/make/print/warning.c b/level_3/fake/c/main/make/print/warning.c index 8b65aa1..fa2efd0 100644 --- a/level_3/fake/c/main/make/print/warning.c +++ b/level_3/fake/c/main/make/print/warning.c @@ -75,7 +75,7 @@ extern "C" { #endif // _di_fake_make_print_warning_file_not_found_ #ifndef _di_fake_make_print_warning_setting_content_empty_ - f_status_t fake_make_print_warning_setting_content_empty(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_string_range_t range, const f_string_static_t name) { + f_status_t fake_make_print_warning_setting_content_empty(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_range_t range, const f_string_static_t name) { if (!print) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_verbose_e) return F_output_not; @@ -97,7 +97,7 @@ extern "C" { #endif // _di_fake_make_print_warning_setting_content_empty_ #ifndef _di_fake_make_print_warning_setting_content_invalid_ - f_status_t fake_make_print_warning_setting_content_invalid(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_string_range_t object, const f_string_range_t content, const f_string_static_t name) { + f_status_t fake_make_print_warning_setting_content_invalid(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_range_t object, const f_range_t content, const f_string_static_t name) { if (!print) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_verbose_e) return F_output_not; diff --git a/level_3/fake/c/main/make/print/warning.h b/level_3/fake/c/main/make/print/warning.h index 12a07bd..06ddfe7 100644 --- a/level_3/fake/c/main/make/print/warning.h +++ b/level_3/fake/c/main/make/print/warning.h @@ -167,7 +167,7 @@ extern "C" { * @see fl_print_format() */ #ifndef _di_fake_make_print_warning_setting_content_empty_ - extern f_status_t fake_make_print_warning_setting_content_empty(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_string_range_t range, const f_string_static_t name); + extern f_status_t fake_make_print_warning_setting_content_empty(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_range_t range, const f_string_static_t name); #endif // _di_fake_make_print_warning_setting_content_empty_ /** @@ -201,7 +201,7 @@ extern "C" { * @see fl_print_format() */ #ifndef _di_fake_make_print_warning_setting_content_invalid_ - extern f_status_t fake_make_print_warning_setting_content_invalid(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_string_range_t object, const f_string_range_t content, const f_string_static_t name); + extern f_status_t fake_make_print_warning_setting_content_invalid(fl_print_t * const print, const f_string_static_t fakefile, const f_string_dynamic_t buffer, const f_range_t object, const f_range_t content, const f_string_static_t name); #endif // _di_fake_make_print_warning_setting_content_invalid_ /** diff --git a/level_3/fake/c/main/print/error.c b/level_3/fake/c/main/print/error.c index d20724f..ab9f37d 100644 --- a/level_3/fake/c/main/print/error.c +++ b/level_3/fake/c/main/print/error.c @@ -340,7 +340,7 @@ extern "C" { #endif // _di_fake_print_error_file_simple_ #ifndef _di_fake_print_error_fss_ - f_status_t fake_print_error_fss(fl_print_t * const print, const f_string_t function, const f_string_static_t path_file, const f_string_range_t range, const bool fallback) { + f_status_t fake_print_error_fss(fl_print_t * const print, const f_string_t function, const f_string_static_t path_file, const f_range_t range, const bool fallback) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; @@ -450,7 +450,7 @@ extern "C" { #endif // _di_fake_print_error_number_too_large_ #ifndef _di_fake_print_error_operation_failed_ - f_status_t fake_print_error_operation_failed(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name) { + f_status_t fake_print_error_operation_failed(fl_print_t * const print, const f_string_static_t buffer, const f_range_t section_name, const f_range_t operation_name) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; @@ -578,7 +578,7 @@ extern "C" { #endif // _di_fake_print_error_operation_path_stack_max_ #ifndef _di_fake_print_error_operation_stack_max_ - f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name, const f_number_unsigned_t stack_max) { + f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_range_t section_name, const f_range_t operation_name, const f_number_unsigned_t stack_max) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; @@ -611,7 +611,7 @@ extern "C" { #endif // _di_fake_print_error_operation_stack_max_ #ifndef _di_fake_print_error_operation_unknown_ - f_status_t fake_print_error_operation_unknown(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name) { + f_status_t fake_print_error_operation_unknown(fl_print_t * const print, const f_string_static_t buffer, const f_range_t section_name, const f_range_t operation_name) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; diff --git a/level_3/fake/c/main/print/error.h b/level_3/fake/c/main/print/error.h index acac5f8..05e9d16 100644 --- a/level_3/fake/c/main/print/error.h +++ b/level_3/fake/c/main/print/error.h @@ -415,7 +415,7 @@ extern "C" { * @see fake_print_error_fss_message() */ #ifndef _di_fake_print_error_fss_ - extern f_status_t fake_print_error_fss(fl_print_t * const print, const f_string_t function, const f_string_static_t path_file, const f_string_range_t range, const bool fallback); + extern f_status_t fake_print_error_fss(fl_print_t * const print, const f_string_t function, const f_string_static_t path_file, const f_range_t range, const bool fallback); #endif // _di_fake_print_error_fss_ /** @@ -550,7 +550,7 @@ extern "C" { * @see fl_print_format() */ #ifndef _di_fake_print_error_operation_failed_ - extern f_status_t fake_print_error_operation_failed(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name); + extern f_status_t fake_print_error_operation_failed(fl_print_t * const print, const f_string_static_t buffer, const f_range_t section_name, const f_range_t operation_name); #endif // _di_fake_print_error_operation_failed_ /** @@ -709,7 +709,7 @@ extern "C" { * @see fl_print_format() */ #ifndef _di_fake_print_error_operation_stack_max_ - extern f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name, const f_number_unsigned_t stack_max); + extern f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_range_t section_name, const f_range_t operation_name, const f_number_unsigned_t stack_max); #endif // _di_fake_print_error_operation_stack_max_ /** @@ -737,7 +737,7 @@ extern "C" { * @see fl_print_format() */ #ifndef _di_fake_print_error_operation_unknown_ - extern f_status_t fake_print_error_operation_unknown(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name); + extern f_status_t fake_print_error_operation_unknown(fl_print_t * const print, const f_string_static_t buffer, const f_range_t section_name, const f_range_t operation_name); #endif // _di_fake_print_error_operation_unknown_ /** diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index e693cd2..a034d7c 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -133,7 +133,7 @@ extern "C" { if (found_command) { firewall_local_data_t local = firewall_local_data_t_initialize; firewall_reserved_chains_t reserved = firewall_reserved_chains_t_initialize; - f_string_range_t input = f_string_range_t_initialize; + f_range_t input = f_range_t_initialize; if (command == firewall_parameter_command_show_e) { diff --git a/level_3/firewall/c/private-common.h b/level_3/firewall/c/private-common.h index 4d9d76d..67e65a3 100644 --- a/level_3/firewall/c/private-common.h +++ b/level_3/firewall/c/private-common.h @@ -23,10 +23,10 @@ typedef struct { f_string_dynamic_t buffer; f_number_unsigned_t chain; f_number_unsigneds_t chain_ids; - f_string_ranges_t chain_objects; - f_string_rangess_t chain_contents; - f_string_ranges_t rule_objects; - f_string_rangess_t rule_contents; + f_ranges_t chain_objects; + f_rangess_t chain_contents; + f_ranges_t rule_objects; + f_rangess_t rule_contents; } firewall_local_data_t; #define firewall_local_data_t_initialize \ @@ -39,10 +39,10 @@ typedef struct { f_string_dynamic_t_initialize, \ 0, \ f_number_unsigneds_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_rangess_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_rangess_t_initialize, \ + f_ranges_t_initialize, \ + f_rangess_t_initialize, \ + f_ranges_t_initialize, \ + f_rangess_t_initialize, \ } typedef struct { diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 4fcab1a..498a252 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -534,8 +534,8 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca f_string_dynamic_t path_file = f_string_dynamic_t_initialize; f_string_dynamic_t local_buffer = f_string_dynamic_t_initialize; - f_string_ranges_t basic_objects = f_string_ranges_t_initialize; - f_string_rangess_t basic_contents = f_string_ranges_t_initialize; + f_ranges_t basic_objects = f_ranges_t_initialize; + f_rangess_t basic_contents = f_ranges_t_initialize; status = f_string_dynamic_append(firewall_network_path_s, &path_file); @@ -615,7 +615,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca { f_state_t state = f_state_t_initialize; - f_string_range_t input = macro_f_string_range_t_initialize_2(local_buffer.used); + f_range_t input = macro_f_range_t_initialize_2(local_buffer.used); status = fll_fss_basic_read(local_buffer, state, &input, &basic_objects, &basic_contents, 0, &delimits, 0); } @@ -724,8 +724,8 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca f_memory_array_resize(0, sizeof(f_char_t), (void **) &local_buffer.string, &local_buffer.used, &local_buffer.size); f_memory_array_resize(0, sizeof(f_char_t), (void **) &path_file.string, &path_file.used, &path_file.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &basic_objects.array, &basic_objects.used, &basic_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &basic_contents.array, &basic_contents.used, &basic_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &basic_objects.array, &basic_objects.used, &basic_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &basic_contents.array, &basic_contents.used, &basic_contents.size, &f_rangess_delete_callback); if (F_status_set_fine(status) == F_failure || F_status_set_fine(status) == F_parameter) break; } @@ -1203,11 +1203,11 @@ f_status_t firewall_buffer_rules(firewall_data_t * const data, const f_string_st } f_number_unsigneds_t delimits = f_number_unsigneds_t_initialize; - f_string_range_t comments = f_string_range_t_initialize; + f_range_t comments = f_range_t_initialize; f_state_t state = f_state_t_initialize; { - f_string_range_t input = macro_f_string_range_t_initialize_2(local->buffer.used); + f_range_t input = macro_f_range_t_initialize_2(local->buffer.used); status = fll_fss_basic_list_read(local->buffer, state, &input, &local->chain_objects, &local->chain_contents, &delimits, 0, &comments); } @@ -1239,12 +1239,12 @@ f_status_t firewall_buffer_rules(firewall_data_t * const data, const f_string_st } f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &delimits.array, &delimits.used, &delimits.size); - macro_f_string_range_t_delete_simple(comments); + macro_f_range_t_delete_simple(comments); return status; } -f_status_t firewall_process_rules(firewall_data_t * const data, f_string_range_t * const range, firewall_local_data_t * const local) { +f_status_t firewall_process_rules(firewall_data_t * const data, f_range_t * const range, firewall_local_data_t * const local) { if (!data || !range || !local) return F_status_set_error(F_parameter); @@ -1280,8 +1280,8 @@ f_status_t firewall_process_rules(firewall_data_t * const data, f_string_range_t } } - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &local->rule_objects.array, &local->rule_objects.used, &local->rule_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &local->rule_contents.array, &local->rule_contents.used, &local->rule_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &local->rule_objects.array, &local->rule_objects.used, &local->rule_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &local->rule_contents.array, &local->rule_contents.used, &local->rule_contents.size, &f_rangess_delete_callback); return status; } @@ -1301,11 +1301,11 @@ f_status_t firewall_delete_local_data(firewall_local_data_t * const local) { f_memory_array_resize(0, sizeof(f_char_t), (void **) &local->buffer.string, &local->buffer.used, &local->buffer.size); f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &local->chain_ids.array, &local->chain_ids.used, &local->chain_ids.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &local->chain_objects.array, &local->chain_objects.used, &local->chain_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &local->chain_contents.array, &local->chain_contents.used, &local->chain_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &local->chain_objects.array, &local->chain_objects.used, &local->chain_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &local->chain_contents.array, &local->chain_contents.used, &local->chain_contents.size, &f_rangess_delete_callback); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &local->rule_objects.array, &local->rule_objects.used, &local->rule_objects.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &local->rule_contents.array, &local->rule_contents.used, &local->rule_contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &local->rule_objects.array, &local->rule_objects.used, &local->rule_objects.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &local->rule_contents.array, &local->rule_contents.used, &local->rule_contents.size, &f_rangess_delete_callback); return F_okay; } diff --git a/level_3/firewall/c/private-firewall.h b/level_3/firewall/c/private-firewall.h index a787f51..76ce290 100644 --- a/level_3/firewall/c/private-firewall.h +++ b/level_3/firewall/c/private-firewall.h @@ -128,7 +128,7 @@ extern f_status_t firewall_buffer_rules(firewall_data_t * const data, const f_st * * Status codes (with error bit) are returned on any problem. */ -extern f_status_t firewall_process_rules(firewall_data_t * const data, f_string_range_t * const range, firewall_local_data_t * const local) F_attribute_visibility_internal_d; +extern f_status_t firewall_process_rules(firewall_data_t * const data, f_range_t * const range, firewall_local_data_t * const local) F_attribute_visibility_internal_d; /** * Delete allocated local data. diff --git a/level_3/fss_identify/c/main/common/type.h b/level_3/fss_identify/c/main/common/type.h index b061e20..62c3dfe 100644 --- a/level_3/fss_identify/c/main/common/type.h +++ b/level_3/fss_identify/c/main/common/type.h @@ -47,7 +47,7 @@ extern "C" { f_number_unsigned_t line; f_number_unsigned_t total; - f_string_range_t range; + f_range_t range; f_status_t status_signal; f_state_t state; @@ -66,7 +66,7 @@ extern "C" { 0, \ 0, \ 0, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ F_okay, \ f_state_t_initialize, \ f_file_t_initialize, \ diff --git a/level_3/fss_identify/c/main/process.c b/level_3/fss_identify/c/main/process.c index fd6837d..0dea440 100644 --- a/level_3/fss_identify/c/main/process.c +++ b/level_3/fss_identify/c/main/process.c @@ -104,7 +104,7 @@ extern "C" { f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; f_number_unsigned_t number = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; for (main->setting.state.status = F_equal_to_not; i < main->setting.names.used && main->setting.state.status == F_equal_to_not; ++i) { diff --git a/level_3/fss_read/c/main/common/type.c b/level_3/fss_read/c/main/common/type.c index f4cee6c..34df7f0 100644 --- a/level_3/fss_read/c/main/common/type.c +++ b/level_3/fss_read/c/main/common/type.c @@ -77,9 +77,9 @@ extern "C" { f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->buffer.string, &setting->buffer.used, &setting->buffer.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &setting->objects.array, &setting->objects.used, &setting->objects.size); - f_memory_array_resize(0, sizeof(f_string_range_t), (void **) &setting->comments.array, &setting->comments.used, &setting->comments.size); - f_memory_arrays_resize(0, sizeof(f_string_ranges_t), (void **) &setting->contents.array, &setting->contents.used, &setting->contents.size, &f_string_rangess_delete_callback); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &setting->objects.array, &setting->objects.used, &setting->objects.size); + f_memory_array_resize(0, sizeof(f_range_t), (void **) &setting->comments.array, &setting->comments.used, &setting->comments.size); + f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &setting->contents.array, &setting->contents.used, &setting->contents.size, &f_rangess_delete_callback); f_fss_nest_delete(&setting->nest); diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h index e1a88fc..c31643c 100644 --- a/level_3/fss_read/c/main/common/type.h +++ b/level_3/fss_read/c/main/common/type.h @@ -82,13 +82,13 @@ extern "C" { #ifndef _di_fss_read_file_t_ typedef struct { f_string_static_t name; - f_string_range_t range; + f_range_t range; } fss_read_file_t; #define fss_read_file_t_initialize \ { \ f_string_static_t_initialize, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ } #endif // _di_fss_read_file_t_ @@ -151,7 +151,7 @@ extern "C" { f_status_t (*print_at)(fl_print_t * const print, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content); f_status_t (*print_object)(fl_print_t * const print, const f_number_unsigned_t at, const f_number_unsigneds_t delimits); - f_status_t (*print_content)(fl_print_t * const print, const f_string_range_t range, const uint8_t quote, const f_number_unsigneds_t delimits); + f_status_t (*print_content)(fl_print_t * const print, const f_range_t range, const uint8_t quote, const f_number_unsigneds_t delimits); f_status_t (*print_content_ignore)(fl_print_t * const print); f_status_t (*print_content_next)(fl_print_t * const print); f_status_t (*print_object_end)(fl_print_t * const print); @@ -226,7 +226,7 @@ extern "C" { f_number_unsigned_t select; f_number_unsigned_t line; - f_string_range_t range; + f_range_t range; fss_read_files_t files; fss_read_depths_t depths; @@ -234,12 +234,12 @@ extern "C" { f_string_static_t standard; f_string_dynamic_t buffer; - f_string_ranges_t comments; - f_string_rangess_t contents; + f_ranges_t comments; + f_rangess_t contents; f_number_unsigneds_t delimits_object; f_number_unsigneds_t delimits_content; f_fss_nest_t nest; - f_string_ranges_t objects; + f_ranges_t objects; f_uint8s_t quotes_object; f_uint8ss_t quotes_content; @@ -254,17 +254,17 @@ extern "C" { 0, \ 0, \ 0, \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ fss_read_files_t_initialize, \ fss_read_depths_t_initialize, \ f_string_static_t_initialize, \ f_string_dynamic_t_initialize, \ - f_string_ranges_t_initialize, \ - f_string_rangess_t_initialize, \ + f_ranges_t_initialize, \ + f_rangess_t_initialize, \ f_number_unsigneds_t_initialize, \ f_number_unsigneds_t_initialize, \ f_fss_nest_t_initialize, \ - f_string_ranges_t_initialize, \ + f_ranges_t_initialize, \ f_uint8s_t_initialize, \ f_uint8ss_t_initialize, \ } diff --git a/level_3/fss_read/c/main/print/data.c b/level_3/fss_read/c/main/print/data.c index d83b39b..c0ddc6a 100644 --- a/level_3/fss_read/c/main/print/data.c +++ b/level_3/fss_read/c/main/print/data.c @@ -64,7 +64,7 @@ extern "C" { #endif // _di_fss_read_print_at_ #ifndef _di_fss_read_print_content_ - f_status_t fss_read_print_content(fl_print_t * const print, const f_string_range_t range, const uint8_t quote, const f_number_unsigneds_t delimits) { + f_status_t fss_read_print_content(fl_print_t * const print, const f_range_t range, const uint8_t quote, const f_number_unsigneds_t delimits) { if (!print || !print->custom) return F_status_set_error(F_output_not); diff --git a/level_3/fss_read/c/main/print/data.h b/level_3/fss_read/c/main/print/data.h index 4061a73..c938ab4 100644 --- a/level_3/fss_read/c/main/print/data.h +++ b/level_3/fss_read/c/main/print/data.h @@ -91,7 +91,7 @@ extern "C" { * @see main.callback.print_set_end() */ #ifndef _di_fss_read_print_content_ - extern f_status_t fss_read_print_content(fl_print_t * const print, const f_string_range_t range, const uint8_t quote, const f_number_unsigneds_t delimits); + extern f_status_t fss_read_print_content(fl_print_t * const print, const f_range_t range, const uint8_t quote, const f_number_unsigneds_t delimits); #endif // _di_fss_read_print_content_ /** diff --git a/level_3/fss_read/c/main/process_normal.c b/level_3/fss_read/c/main/process_normal.c index 9d5235c..3bdde50 100644 --- a/level_3/fss_read/c/main/process_normal.c +++ b/level_3/fss_read/c/main/process_normal.c @@ -500,7 +500,7 @@ extern "C" { fss_read_main_t * const main = (fss_read_main_t *) void_main; f_number_unsigned_t total = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; f_number_unsigned_t k = 0; diff --git a/level_3/fss_write/c/main/common.c b/level_3/fss_write/c/main/common.c index f3e73ac..6c47841 100644 --- a/level_3/fss_write/c/main/common.c +++ b/level_3/fss_write/c/main/common.c @@ -307,7 +307,7 @@ extern "C" { } if (main->program.parameters.arguments.array[index].used) { - f_string_range_t range = macro_f_string_range_t_initialize_2(main->program.parameters.arguments.array[index].used); + f_range_t range = macro_f_range_t_initialize_2(main->program.parameters.arguments.array[index].used); for (; range.start < main->program.parameters.arguments.array[index].used; range.start++) { @@ -371,7 +371,7 @@ extern "C" { main->setting.ignoress.used = 0; - main->setting.state.status = f_memory_array_increase_by(values_data->used, sizeof(f_string_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); + main->setting.state.status = f_memory_array_increase_by(values_data->used, sizeof(f_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); if (F_status_is_error(main->setting.state.status)) { if ((main->setting.flag & fss_write_main_flag_print_first_e) && main->program.message.verbosity > f_console_verbosity_error_e) { @@ -405,7 +405,7 @@ extern "C" { break; } - main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_string_range_t), (void **) &main->setting.ignoress.array[j].array, &main->setting.ignoress.array[j].used, &main->setting.ignoress.array[j].size); + main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_range_t), (void **) &main->setting.ignoress.array[j].array, &main->setting.ignoress.array[j].used, &main->setting.ignoress.array[j].size); if (F_status_is_error(main->setting.state.status)) { if ((main->setting.flag & fss_write_main_flag_print_first_e) && main->program.message.verbosity > f_console_verbosity_error_e) { @@ -478,7 +478,7 @@ extern "C" { // Still validate the parameters, even if not being used. f_number_unsigned_t i = 0; f_number_unsigned_t index = 0; - f_string_range_t number = f_string_range_t_initialize; + f_range_t number = f_range_t_initialize; while (i < main->program.parameters.array[fss_write_parameter_ignore_e].values.used) { diff --git a/level_3/fss_write/c/main/common/type.h b/level_3/fss_write/c/main/common/type.h index 214a93b..09a3583 100644 --- a/level_3/fss_write/c/main/common/type.h +++ b/level_3/fss_write/c/main/common/type.h @@ -86,7 +86,7 @@ extern "C" { f_status_t status_signal; f_state_t state; - f_string_range_t range; + f_range_t range; f_string_static_t quote; f_string_static_t standard; @@ -95,11 +95,11 @@ extern "C" { f_string_dynamic_t buffer; f_string_dynamic_t prepend; - f_string_rangess_t ignoress; + f_rangess_t ignoress; f_string_dynamics_t objects; f_string_dynamicss_t contentss; - f_string_ranges_t *ignores; + f_ranges_t *ignores; f_string_static_t *object; f_string_static_t *content; f_string_statics_t *contents; @@ -110,13 +110,13 @@ extern "C" { fss_write_main_flag_none_e, \ F_okay, \ macro_f_state_t_initialize_1(fss_write_allocation_large_d, fss_write_allocation_small_d, F_okay, 0, 0, &fll_program_standard_signal_handle, 0, 0, 0, 0), \ - f_string_range_t_initialize, \ + f_range_t_initialize, \ f_string_static_t_initialize, \ f_string_static_t_initialize, \ f_string_dynamic_t_initialize, \ f_string_dynamic_t_initialize, \ f_string_dynamic_t_initialize, \ - f_string_rangess_t_initialize, \ + f_rangess_t_initialize, \ f_string_dynamics_t_initialize, \ f_string_dynamicss_t_initialize, \ 0, \ diff --git a/level_3/fss_write/c/main/fss_write.c b/level_3/fss_write/c/main/fss_write.c index b2a5ae2..6faa74a 100644 --- a/level_3/fss_write/c/main/fss_write.c +++ b/level_3/fss_write/c/main/fss_write.c @@ -190,7 +190,7 @@ extern "C" { } // This is processed in a single set, so there is only ever one Ignores added. - main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); + main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); if (F_status_is_error(main->setting.state.status)) { fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); @@ -206,7 +206,7 @@ extern "C" { f_number_unsigned_t total = 0; f_number_unsigned_t ignore = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; // Reset all of the used data before starting the loop. main->setting.object->used = 0; @@ -377,7 +377,7 @@ extern "C" { // Ignore is enabled. if (flag & 0x2) { - main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_range_t), (void **) &main->setting.ignores->array, &main->setting.ignores->used, &main->setting.ignores->size); + main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_range_t), (void **) &main->setting.ignores->array, &main->setting.ignores->used, &main->setting.ignores->size); if (F_status_is_error(main->setting.state.status)) { fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); diff --git a/level_3/fss_write/c/payload/fss_write.c b/level_3/fss_write/c/payload/fss_write.c index 87795f7..105bde9 100644 --- a/level_3/fss_write/c/payload/fss_write.c +++ b/level_3/fss_write/c/payload/fss_write.c @@ -28,7 +28,7 @@ extern "C" { f_number_unsigned_t total = 0; f_number_unsigned_t length = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; const f_number_unsigned_t used_objects = main->setting.objects.used; const f_number_unsigned_t used_contentss = main->setting.contentss.used; @@ -71,7 +71,7 @@ extern "C" { } // This is processed in a single set, so there is only ever one Ignores added. - main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); + main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); if (F_status_is_error(main->setting.state.status)) { fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); diff --git a/level_3/iki_read/c/main/identify.c b/level_3/iki_read/c/main/identify.c index ca40a46..a7c776f 100644 --- a/level_3/iki_read/c/main/identify.c +++ b/level_3/iki_read/c/main/identify.c @@ -63,7 +63,7 @@ extern "C" { #endif // _di_iki_read_identify_alteration_ #ifndef _di_iki_read_identify_substitution_ - f_number_unsigned_t iki_read_identify_substitution(iki_read_main_t * const main, const f_string_range_t name, const f_string_range_t value, f_string_triples_t *triple) { + f_number_unsigned_t iki_read_identify_substitution(iki_read_main_t * const main, const f_range_t name, const f_range_t value, f_string_triples_t *triple) { f_number_unsigned_t i = triple->used - 1; diff --git a/level_3/iki_read/c/main/identify.h b/level_3/iki_read/c/main/identify.h index 1908842..67e7a5a 100644 --- a/level_3/iki_read/c/main/identify.h +++ b/level_3/iki_read/c/main/identify.h @@ -57,7 +57,7 @@ extern "C" { * The value of the triple.used is returned on no match. */ #ifndef _di_iki_read_identify_substitution_ - extern f_number_unsigned_t iki_read_identify_substitution(iki_read_main_t * const main, const f_string_range_t name, const f_string_range_t value, f_string_triples_t *triple); + extern f_number_unsigned_t iki_read_identify_substitution(iki_read_main_t * const main, const f_range_t name, const f_range_t value, f_string_triples_t *triple); #endif // _di_iki_read_identify_substitution_ #ifdef __cplusplus diff --git a/level_3/iki_read/c/main/print/data.c b/level_3/iki_read/c/main/print/data.c index 8f66977..48aaf6e 100644 --- a/level_3/iki_read/c/main/print/data.c +++ b/level_3/iki_read/c/main/print/data.c @@ -22,7 +22,7 @@ extern "C" { f_print_dynamic(main->setting.reassign.array[at].c, main->program.output.to); } else { - f_string_range_t range = macro_f_string_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); + f_range_t range = macro_f_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); f_print_dynamic_partial(main->setting.buffer, range, main->program.output.to); @@ -52,7 +52,7 @@ extern "C" { iki_read_print_data_wrap_append(&main->program.output, index); } else { - f_string_range_t range = macro_f_string_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); + f_range_t range = macro_f_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); f_print_dynamic_partial(main->setting.buffer, range, main->program.output.to); @@ -80,7 +80,7 @@ extern "C" { f_print_dynamic(main->setting.replace.array[main->setting.map_replaces[index]].name, main->program.output.to); } else { - f_string_range_t range = macro_f_string_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); + f_range_t range = macro_f_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); f_print_dynamic_partial(main->setting.buffer, range, main->program.output.to); @@ -107,7 +107,7 @@ extern "C" { f_print_dynamic_partial(main->setting.buffer, main->setting.data.vocabulary.array[index], main->program.output.to); } else { - f_string_range_t range = macro_f_string_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); + f_range_t range = macro_f_range_t_initialize_1(main->setting.data.variable.array[index].start, main->setting.data.content.array[index].start - 1); f_print_dynamic_partial(main->setting.buffer, range, main->program.output.to); diff --git a/level_3/iki_read/c/main/process.c b/level_3/iki_read/c/main/process.c index a226bf7..93776ea 100644 --- a/level_3/iki_read/c/main/process.c +++ b/level_3/iki_read/c/main/process.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_iki_read_process_line_ - void iki_read_process_line(iki_read_main_t * const main, f_string_range_t *range) { + void iki_read_process_line(iki_read_main_t * const main, f_range_t *range) { if (!(main->setting.flag & iki_read_main_flag_line_e)) { main->setting.state.status = F_false; @@ -50,7 +50,7 @@ extern "C" { return; } - f_string_range_t buffer_range = macro_f_string_range_t_initialize_2(main->setting.buffer.used); + f_range_t buffer_range = macro_f_range_t_initialize_2(main->setting.buffer.used); iki_read_process_line(main, &buffer_range); @@ -81,7 +81,7 @@ extern "C" { #endif // _di_iki_read_process_buffer_ #ifndef _di_iki_read_process_buffer_ranges_ - void iki_read_process_buffer_ranges(iki_read_main_t * const main, f_string_range_t *buffer_range) { + void iki_read_process_buffer_ranges(iki_read_main_t * const main, f_range_t *buffer_range) { fl_iki_read(&main->setting.buffer, buffer_range, &main->setting.data, &main->setting.state); @@ -188,9 +188,9 @@ extern "C" { #endif // _di_iki_read_process_buffer_ranges_ #ifndef _di_iki_read_process_buffer_ranges_whole_ - void iki_read_process_buffer_ranges_whole(iki_read_main_t * const main, const f_string_range_t buffer_range) { + void iki_read_process_buffer_ranges_whole(iki_read_main_t * const main, const f_range_t buffer_range) { - f_string_range_t range = buffer_range; + f_range_t range = buffer_range; fl_iki_read(&main->setting.buffer, &range, &main->setting.data, &main->setting.state); @@ -281,7 +281,7 @@ extern "C" { #ifndef _di_iki_read_process_buffer_total_ void iki_read_process_buffer_total(iki_read_main_t * const main) { - f_string_range_t range = macro_f_string_range_t_initialize_2(main->setting.buffer.used); + f_range_t range = macro_f_range_t_initialize_2(main->setting.buffer.used); iki_read_process_line(main, &range); diff --git a/level_3/iki_read/c/main/process.h b/level_3/iki_read/c/main/process.h index d6ba0a7..8017d59 100644 --- a/level_3/iki_read/c/main/process.h +++ b/level_3/iki_read/c/main/process.h @@ -35,7 +35,7 @@ extern "C" { * The range value to represent the --line values. */ #ifndef _di_iki_read_process_line_ - extern void iki_read_process_line(iki_read_main_t * const main, f_string_range_t *range); + extern void iki_read_process_line(iki_read_main_t * const main, f_range_t *range); #endif // _di_iki_read_process_line_ /** @@ -83,7 +83,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_process_buffer_ranges_ - extern void iki_read_process_buffer_ranges(iki_read_main_t * const main, f_string_range_t *buffer_range); + extern void iki_read_process_buffer_ranges(iki_read_main_t * const main, f_range_t *buffer_range); #endif // _di_iki_read_process_buffer_ranges_ /** @@ -105,7 +105,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_process_buffer_ranges_whole_ - extern void iki_read_process_buffer_ranges_whole(iki_read_main_t * const main, const f_string_range_t buffer_range); + extern void iki_read_process_buffer_ranges_whole(iki_read_main_t * const main, const f_range_t buffer_range); #endif // _di_iki_read_process_buffer_ranges_whole_ /** diff --git a/level_3/iki_write/c/main/iki_write.c b/level_3/iki_write/c/main/iki_write.c index 8ef0ce1..9b370de 100644 --- a/level_3/iki_write/c/main/iki_write.c +++ b/level_3/iki_write/c/main/iki_write.c @@ -47,7 +47,7 @@ extern "C" { bool object_ended = F_false; f_number_unsigned_t previous = 0; - f_string_range_t range = f_string_range_t_initialize; + f_range_t range = f_range_t_initialize; f_status_t status = F_okay; f_file_t pipe = f_file_t_initialize; -- 1.8.3.1