Refactor: The f_string_range_t to f_range_t and f_string_range_double_t to f_range_do...

diff --git a/build/level_0/settings b/build/level_0/settings
index 1ddd942fb79974954f4e5194b6769d947c819b4b..c6cd04df1b361d3d67795a3bb1b0db8547d270ff 100644 (file)
--- 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 54839ef1062dc22b67dda5b0efcd5e19814d406c..b5a63036edfb9bf36ff3c4ad7ddd75df5ed82818 100644 (file)
--- 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 ea0e683e103704bb822d8a37b922f2466c79067d..a2e05d3a64ebe0f7dd88cf60a4059d5062e3e0f2 100644 (file)
--- 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 a779d202598f514bdaccd35e520e1107dfd53d6d..2c2d1bdce4e5e99ce481d6d8af3045fec11b4130 100644 (file)
--- 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 5d17a15245798a2e0ce22b0e2633e41e04e9f50e..872b63be47f96bb00fcd18a397e3988b4bab7257 100644 (file)
--- 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 6ec5594a8c25117d4a683660d01b862fc0348fd2..a24372ddcce3b974a32ee12682ccc6078e400c0f 100644 (file)
--- 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 459c7d2b3c2315a5ad1ef95c860532b03c740c31..c775e2c74c0e2389b41aa369821c79a54c1d0ce0 100644 (file)
--- 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 001440c70842f748bcf9e82721da6b465c1fb4b9..35260bbb9d494a8645f1942721e9b033a8f708fc 100644 (file)
--- 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 50de2192e29f83f77cd129f821d7f82eb02a5f0d..c94594c6d5f0b995bd7a692fa913b06628ec579a 100644 (file)
--- 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 879f02dac47b39664806963e256351c34011d620..f5c2e9c7269d36630a3f5c8809add6a8091175e7 100644 (file)
--- 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 30144525b109d74dda7b0e5ed4277513d4c98f55..019daa3cb842f542b99d35ed6428f3330f42c420 100644 (file)
--- 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 c8ae558b6d6f159997f7c167db5ff9cfdfb2843d..2efa2ace2abbee5130f5710d71af394e0b915619 100644 (file)
--- 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 bd4b58d390ce3fd7cadc53a323b058f4bfbf8a22..2acf8c12aa16c3151aeb886a4becb0e0c197a576 100644 (file)
--- 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 9104f2487d0aaa2d4618fb58cb6683e0926d8c2f..c5f7f4dd8858192f5e6ec5e95abab55abea44615 100644 (file)
--- 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 415347974bd64e9354dc9e43dfea971eca4ec86e..52e078ad4426c7d9a426a55592f24689ae2e2cce 100644 (file)
--- 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 4481c896e4239ed09e1f4a6692b7ffe4d1335e9e..1a948b191a08d6ac474a40b87f80c2b6a2b03986 100644 (file)
--- 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 4e112da1aee738bd7099a73e8008d473a89846bc..949ef70f1fab03ed9324b6297fff81ca1aa7ec40 100644 (file)
--- 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 5b5e47d0df7c7479fcbfb1adadc9d3673f2f6337..62059962d491f2e9aa7ec14f478e052e909888c6 100644 (file)
--- 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 625fb886d55bd34ef5781bc7766bdac6634f4345..3af44b83bdbdf536af56dfaf4be3a9c17f0d6067 100644 (file)
--- 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 8f725c7680915e3a010deb3c9b4b9c004f9735f0..d86dc207f06625847a5a486e8932eab965a58087 100644 (file)
--- a/level_0/f_compare/c/compare.h
+++ b/level_0/f_compare/c/compare.h
@@ -18,6 +18,7 @@
 #include <fll/level_0/memory.h>
 #include <fll/level_0/type.h>
 #include <fll/level_0/utf.h>
+#include <fll/level_0/type_array.h>
 
 // FLL-0 compare includes.
 #include <fll/level_0/compare/utf.h>
@@ -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 216220e9219c9a97581d79d27772cf415fd3f11f..6d0151b661c849a004701bf99ce69d034f4d70c5 100644 (file)
--- 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 bc628f0ad63281b7e1631da801e0516ccd60d5b1..9f33581ed040aec1305ce03b1324c4e27b43d874 100644 (file)
--- 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 deb9037d103893780c780e414040072836998ee6..64a75fae4391445cdfefc63742ec66edda83a413 100644 (file)
--- 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 73b1628ddd5a5e25f6fa83f6d1bf4ed047e04f75..8d7bf7bad4f9925afb3dc177c78c9aee2dda1c92 100644 (file)
--- 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 dceba14cd05f33fa1d34572eb580ea3fd876580f..3c6e1e228845beb45f7f004ee35b8d42a5159aa9 100644 (file)
--- 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 13a1e0b84b6d7fbe3f5f27000d31e9a7e6f60258..4b8f362b1f2f24ecc4f1c2f6d28529ba41476ba3 100644 (file)
--- 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 757d2b61e5b2aaac6dfe8e6ac6ee4807cf73ea0b..c00e207c80780475e8b167a46d65eb3621308c59 100644 (file)
--- 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 8e682bfb8db02f18ff719fa4d15eea00376f582f..bdbe400dfbd89250d4acc8b3cd59b64692904643 100644 (file)
--- 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 5aaa4f0c6a5c9671b82c1aa71cf1ba1f09a9da71..f92d015f78720cd59cfbdd6f819133422d22e196 100644 (file)
--- 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 0de3ecbfe4dc3703aeb57cf4459accd7a3922d94..c35b08da793db251a5a7014e3183072c433bd9b3 100644 (file)
--- 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 111869b72c6c81b4143390a0243a6ded4196b264..43c6e529c4df075cddc2b70b95ff770f2af3757e 100644 (file)
--- 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 151cda5b749a65dd990abab1a32ae001fc1c7e49..dddbce34d38eb4559a530a9e5de6d41805ce9b5d 100644 (file)
--- 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 9a9bedd31c87cb2bbb72bd9a6d2d3be2d7331e16..e6bd4912ea3ad275c778e2b4f12aa923d17d1a16 100644 (file)
--- 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 59470d84ec3d2bbfa1a4a0fa4f87179c211fe314..cb118b620eebbd3e0b3de2ffd51bca9db1ba34b1 100644 (file)
--- 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 390dabf6777b0753b8953986b0a1bac938d2b907..c5721bc75c3616dcda4ceb84b4e111af37dbeb7a 100644 (file)
--- 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 787b31a98cff44cb32a8a3973082a79d4e521b3d..2a92cb5b3cc8ec0ca9b12ba608926ffb5baa00a8 100644 (file)
--- 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 e08eeb07564d4b3ae5f12922e6a55a8b7ec872f7..56beb09becfd3f4764f8d756f77e704fa2dbf38e 100644 (file)
--- 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 3d00387156eec193e2d356a67f187bdc7b033140..1b94a4e08c1fa4334bd5bee02884ef41a7958902 100644 (file)
--- 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 8386309219694c94c59b4835acd0cb57f664881f..7d94ca04d1f6efc6c9ba75b6ad348ebb00d9bf03 100644 (file)
--- 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 e8a7ae44437683b1c51af0faecdf88fc1778601b..43a075895232d6f1eac97d17f35c4deb37929f2a 100644 (file)
--- 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 9ee8c582282fb35e21de1a0c4d20ea284afa6d0f..0da8f6f997ad73b66c90ba03b1f30c03a32c59cf 100644 (file)
--- 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 494e1311380d411e57687573ba0b46d5d4eadc80..ed6142c6e3cd3797a7e5169bc30a07663b8dc7a1 100644 (file)
--- 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 f491a297589f8a6b8a46c9ed854ebac29dcc785d..271b35d93f4ea566e4daa7b1eb494f8d66c161cc 100644 (file)
--- 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 608eeb65736721b400851fd1ef46933b61876f42..520fc443fde1d770d5db8b624b794dac4aa40693 100644 (file)
--- 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 8b4f3bc8b821692adaa5e9d3be55eeed8d7c5efd..64cbaf97fa4fddcd2f6fa86405ee543aedacbb6f 100644 (file)
--- 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 b756ddaefdb1863ff2d84168f5334b874c7a9872..5e95dfef3c7692033d20bc6efec0bda7dfe24c7d 100644 (file)
--- 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 1d7010ab515b1ae49e1a6b5bfb40999cef78501f..3252152eef5e09be8012d46c8f4974b04e4d828e 100644 (file)
--- 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 e15a6438f26649aacc62d1b26ae1485d8cf71ccc..57d26b5f3e5f948ed35a1131e739e5a15b241df9 100644 (file)
--- 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 544b15c208052b3571200c5d3e8d9c668564b76e..a68fcd8f1da5f899f336eca38e696a38632754bc 100644 (file)
--- 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 6fabdd7c3b8aaddfc91279f15d902886eda00d50..43804244c7bd9e0a7f64c77b4ea36e36c6554e0f 100644 (file)
--- 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 24f4489303b10e11c57415a81f556b4d49f186e5..d770a77b9a27bef44fbb0c5d65c8690073f9f5d5 100644 (file)
--- 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 471accd0119f33fe965ab8290ea666159efe5e76..4f5f692e637aeb47d1e35eed1ba50b0a5ab1489f 100644 (file)
--- 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 be5814d5fbf94a286731ac74d353f2dbbfd2a270..0a313724cbea62e34a1be0d39f4eabb939798e23 100644 (file)
--- 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 4023087c2e89cfc3fffade0c71a04e82cab38e1d..541fd9a343e46cf84d229df18f5cc13f7771997e 100644 (file)
--- 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 0c177878489e35937151abb0d90e9c73dea023a1..641140ad81e14b1c2bd60ec8c93b1e7334378017 100644 (file)
--- 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 3f5fc11cc811535785502c192dddfe97da4082f2..3bf7cda935abfa568d4a80dcf6c5b68e5e097cf0 100644 (file)
--- 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 48b9e8b247b579b8804cd63aa799492bc71783f0..69276934049e51dd604f7754f5946db4a632dc1d 100644 (file)
--- 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 95129814e02548b7876df690e08c020a62cbc9d7..bdc5eca0ba5c0d4871ae4e7441c45d07bdc5a00e 100644 (file)
--- 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 c3ccb51dad9738058fc8682ff47a7d280d0db88a..e866d265bd191b88663a1a135ac7d8046ca568a8 100644 (file)
--- 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 b08c5d2d1b31fa3aa485dd59d53e4271eacd3758..b6e9f0418cab51e6be2690d795dc0ba5940fcd25 100644 (file)
--- 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 d048b1380501990c354bb24bcb00afb6fba4a3b6..096dd9786cdc77f93a66296f47aec4241f5a5024 100644 (file)
--- 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 376a411128745040a32fc5c2ce2b7be420de010d..96b112aa5fc8882cafbc79e4de2b7b07c303b89d 100644 (file)
--- 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 1b25f9932042eb5ae606e4cc4570cd01e2f6323e..a18d0a63bd46adb6ffc8d914e7a3f18b15f469c9 100644 (file)
--- 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 fdd98ec1df44c6a8d677d94d22894ff6fa0cb5a4..5572155205bef0031cfe5550e4c79feb961c82d7 100644 (file)
--- 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 4bf780fc8a7d127e8117aaaa62bdfe85482a21d4..62f7a793bbeac75f54fc2fd425ece4ab11615fb3 100644 (file)
--- 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 70093ef805ad1c2dcc04710b872ae7456005f5e6..53abde65af85ae77909739915f7bfc891c268ca9 100644 (file)
--- 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 1ca285bd39a8b4c1be8f9e0110f9380d3e2e44f2..0a9257ee74ee98eb7fffc221844bd735ae83498b 100644 (file)
--- 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 6d58fd1ae3f98e21ad52ce6e2f0a9f2bb5520cdd..aefc8c6e06baa647694d517a4d12999253e9aeb2 100644 (file)
--- 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 774ef440ffb655c903ffe175af27494bf0579b65..e91f7f614dc5a7fbaeb4514b89724eb15485f941 100644 (file)
--- 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 73560cd072a836080fb24f1af7881c69238be754..83817a0a0dd76936eb6007126af60661a8919c11 100644 (file)
--- 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 06bae1ed1d57ca65f86eb0855cf996511e65caec..2985d459280ff63c147b16dac04c96072aa8bd9c 100644 (file)
--- 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 16dba3dec0dda6b3a2e45f8bc2785dd7393dd5c0..b1a4a4b96241fec2f3581dab615fbeb2daa1fe69 100644 (file)
--- 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 7cb28bfd8ae3b05373b2ece58387563f7d01b00d..efa97ae68d3f0e72f76d9f3cf42f06ee711fd489 100644 (file)
--- 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 4c310f44f0733117f2c57b61d41af42c56b4e6df..11a36453a86fbcd7ea6a6258afc97bb459a4b6e6 100644 (file)
--- 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 5731dafecb56da1090d415392afea6e7853ebc80..a91f25a6be6292888780d8cadfe2c1b1ca5a052e 100644 (file)
--- 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 2f81e49a09a8960af88ce2e55b9c2f46eeffae80..160d6e7e55d9af36d61250252773c83354ea040c 100644 (file)
--- 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 220eda1258f3a157a8216e8cd4a741ddc92c0223..8121b8374e4509b6df58038027e0497dadfe963f 100644 (file)
--- 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 3e06f00a4353de2daaf116050a26664b7f300c8f..abd97ea7dc21f83a70b6c8a115c5fff0ef6f5d62 100644 (file)
--- 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 dbbcebfeccfc405fa9c2afc8df7f49c0ad806790..0ee4300b22c8d09d58b47c0ee998ff814656dd0f 100644 (file)
--- 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 b7c8a9d838e16460b487e5f8569bb7c639c98f1c..fc277cb8959dffcc0df1cf3411165f93589bc48a 100644 (file)
--- 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 bdee6d792180ff20de11bb2498669519b3af7e41..bdc274a36e4117e3121bae4b2e6a5f1144bc2af2 100644 (file)
--- 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 d45261e4046942d0259b3250cc3dec174e80481c..1e2e50f98af0c87ef9a2883e3c2c2bcc78e10fb1 100644 (file)
--- 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 93540f8c221016cadb56d5223dbc9f7caf69b03d..ac15a302b1f62c0efc527480fae7edf9695bbe78 100644 (file)
--- 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 001eedee0335ac8f265e629825cf77f44d60af7d..c2dfae655c6fd6f077cc4e317ceff2305607ccb2 100644 (file)
--- 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 ba993ea375de7584a3cbe62bc48467ad595ad99d..0e9485256fbe85cb2ec0aa4bf9ed1a512a18e92e 100644 (file)
--- 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 7b9c9f662107abe4f52f53aa70619d460b720ef0..680dfee5133d79deb6b9afe70b846542a7fc4574 100644 (file)
--- 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 7546dac554f728767d2d9647e9b7f4fea466920f..fa3ae1e3b4195f7fd160d31296cc7605a584b82c 100644 (file)
--- 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 03dcae3fc336fd3d021c57cfa53d96fe867ee44b..188106b8caa36258895639e5aebdc67f3511ef3e 100644 (file)
--- 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 edf3c925eb7ac107b1aa1337c6f58348e945e9c7..9ddb53a7a8fef075cc51b151e48fdcc27aa84203 100644 (file)
--- 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 8367776ea75a2ce9f90e5f4a2800765ca22dda11..62886559233aab2e083f8f6ff166bf8664d36fc8 100644 (file)
--- 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 e5ea694df99186dbab73117955e44f2fad21c906..9abb9ba24dbddaf7c2cdae2039dbd6bfb35994f1 100644 (file)
--- 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 eaa6c2f7d553e10e6171ba331a5d396cc251bfa0..e51ab929a94cfd5c67053eb9f59e302d3f54ce57 100644 (file)
--- 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 9eba7dd04ec8e034dd3cd75f8390a9a5735e7c7f..5ef95bf984c89b7e0c05e22b9f5274c1c447b38c 100644 (file)
--- 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 e4cc5b601951ed47a25d20b902e8a41bfef62bb1..347651e50b0d83e28058a7f702879a18845cfdb4 100644 (file)
--- 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 6076729c708766d06ad36d36d3ca9be62c787f75..5de75d3b04c06dacd8da02f254db2d6a48885342 100644 (file)
--- 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 ecc527e69106c4e138ecd9505990b81ef7678b38..fc1a61c992ad4f37510dca0b2570185d55717973 100644 (file)
--- 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 ddc8f39cdbd532bbe1f2b72d7f4eb87a52fd43bb..9a0a39fa151cb524b36b9d9a592e41fa62dabf06 100644 (file)
--- 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 2714a674564c1389cc08f814d4e77b874259b1d8..bed16285d8f5d7ffb6d609a07be6a62eb0f3cd08 100644 (file)
--- 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 6e114a108f7b14db80f88b747e386f74d391a917..6a03d3f83ba1c42f38648f683120c21388beba8d 100644 (file)
--- 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 a866bf446c85485fb2e013d2925b081e54757ccc..ebb4da3e78a7b6ca916ef2d7f8fc86f042423a3a 100644 (file)
--- 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 d5f306d1351cfe1068f5d85bffe5a5d7074d5752..d61934db361723cc12cd7499acb54ff8984d8887 100644 (file)
--- 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 1e0a84641e7a9ed06a7f91ee48dc0a10d76a3c2c..982e7fb0ad7203b859da89f9bea2c9ec7e7649e6 100644 (file)
--- 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 28d6150619c9b5abe5b1bab8928434aabaf6e4bd..573399258e3a131c8183f039808606f84412d2fb 100644 (file)
--- 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 88edcb7abbdc8ebf9b3fe9b93683abaaf7b001aa..57deb6df180cd407c949504e02647b08de9ce89d 100644 (file)
--- 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 8894699e57407c9240481c22a802c6f5f422d0cf..c0581bf1e06f396c0d60509c975e3360f78537ae 100644 (file)
--- 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 5f33f1f7345ca6ecaa5e06c51713890c7a17f2b4..726eceb7abdd1e6d822e153fca2b19fbe9716078 100644 (file)
--- 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 811847e4a95f6d8cf85dc09ea9345eb364edf06c..64742be8337932d1875336f00c12006021affa6d 100644 (file)
--- 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 fcfc26651004c774e47a6d2ef6f4e0c3d31bd7b6..f35c2968f0dc29d8903f3b4064a96d9b9f240097 100644 (file)
--- 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 7fd7e9bd6253fea14f7d0356aaa10c46e2394e4a..7c148343ccc07e4707e495de2f7117cecf5707f9 100644 (file)
--- 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 788cfb2fa72cd419a4b350dd02ae48828579050a..e5e7d7322a3bbc82ed5328dacd8acdf2253d2a32 100644 (file)
--- 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 51de8389448cca2bfec6612c3ed3d373c8fa2c0b..724189910a2434b0e795377f8c595822b1aa40d5 100644 (file)
--- 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 82feac28d7b3e876074d394c3f0a16900efb4f4b..f5459ec9af8486dc8b72bcad805e2f93547e508d 100644 (file)
--- 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 b25adf44d196b468490da15c4aaec90c625f28e5..48f3a79b18b4ccb4bb04347617fdc0cd8a8bb7b9 100644 (file)
--- 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 c1d532428367c534274c71bfc61bf75972201547..da14f29d874256acf45d2547111e0ce762ef9cc2 100644 (file)
--- 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 7d399444089770e40e49537aff850eb52e4119e7..f6cf3167e20641214135ac679c64341f33759638 100644 (file)
--- 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 3866f4c9b35ddd3512b7d24783272a71a432cc5d..64a2d44ba078cc15fb9206c18b6e6facfd3cf822 100644 (file)
--- 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 1b55bba4b7e96cd0b6d41c30548177432f2e3496..902816f41a496a496c4aaeb1faf72ed1dc24cd3f 100644 (file)
--- 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 5a1bd56e74abb8b835f670e8fef9d1d6d89ce036..3439b42a91c4f715d14691906b20dce6bc177d46 100644 (file)
--- 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 f9ab654fb8b1948e19408070b4bd85b190ced56b..b912e3e678787806005cac17adac32b32ba6caf4 100644 (file)
--- 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 7281c407de49010d1ec92b2d27763ca194713b16..b675710c155108d91ba540606faf5196eff307fc 100644 (file)
--- 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 6bd0cde458cf244fc91618e33f094208ac7c5762..a942937dc48484ff26d0de1fbd8ebae2fdfa977d 100644 (file)
--- 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 8422b7fead6266ba652837df28c2679e7ae82589..55110215fbd4700f6b571a6fd9719bf12fe0709b 100644 (file)
--- 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 ed27fbf82bc9c212512040ec39357a50484f7b86..3989ca49df3204edfe3c0dde543fe748780dcb9b 100644 (file)
--- 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 eabffaf2f01a489d5541208c21e90caabedad243..d1f7f39748c884f8847936e6a05fcf5af1d87462 100644 (file)
--- 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 2dedc5bf7fd89078ba337f45bcbb37b43c7295a8..dd0f22a19b12d6b175ac5226f93885e57e145d44 100644 (file)
--- 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 63a73bf65589779e60e634a9ac2b83350176db1b..a3b7dd5f02ed9c2d5272afb75ec1df6c51788d31 100644 (file)
--- 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 6b3e1acce607c45520a883331a72c9931b56eb9c..84308d11cce01937d1f6241ce9caaac43adc099b 100644 (file)
--- 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 539d946262979fc3a244d742f740a9e0bc36081e..18aae5aadccfb49385730d4fb60bc65866698067 100644 (file)
--- 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 0310853a949081bd47831186165c6dbed11e7a97..d18c5ef0a5f4e2feddbe5ef6375fc91661e77611 100644 (file)
--- 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 208e2639c761232a469049f08969154af3bfa2ca..dc85c65567dfcf2b1cbdf13066c2a6c74ca851cb 100644 (file)
--- 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 a50861d7b5388260b97bd9c335f07a6e3317c249..0e1dee12408c3415825bb9d5c52d522ef0715a70 100644 (file)
--- 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 8cd1f98f7b1036b1b2a8ac67d1a98f7478de79ad..914c337c5043d963204ffd3a62c9731e3b66f180 100644 (file)
--- 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 0feef3bbcd4f46693d02a83a50236f9280772e77..6b7d45d2c31195209964bd160e3cb07a8cf11731 100644 (file)
--- 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 c2aed093bf2ca1a074e96f3f65f82c7260197fce..8651aac2d2cd34aafdaa95b83add2cea2cfbac15 100644 (file)
--- 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 a5909f82fa0b52061efffc0c7b693faf2bf98b8a..c988a7261390fa47df080d8979da75b5a0177903 100644 (file)
--- 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 b0d8ab70e70f686f60a65fa2f88d50a64a4d6773..52254c8b1abbee39086bd19f3fc1e65ea72f2358 100644 (file)
--- 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 1f1225ad170fc15b6e479f69f9c414db007e9643..c9d62a92004548ef14b9c6e1993ee5984225e0c6 100644 (file)
--- 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 e438b352524766c03586a8ba68f1534d97d54c69..09e0ecf74aded53aabe7e180afc60aced9384d14 100644 (file)
--- 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 b8352d6eb1c7fb692cb30501be432d50157c4a90..0a2c3f13902ac2f2adfa584469dc9392a68a7a2d 100644 (file)
--- 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 14cee87ba5cc56a257fd5975295b38107bf5957e..ee176406ba37da8711525c4a8d7715853dabef67 100644 (file)
--- 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 52bdafa114e733b608aa5e267467d0888de6c0ed..654b68d1c91a1ad0810eeab842455cb5f8276c09 100644 (file)
--- 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 e37acec59f47f0eab248c2458081d8a845aa04c6..9ad0011e3c8e2e839ac01bdc8ccd7e1a41b03587 100644 (file)
--- 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 15f67fcb9dd9e758829421cf1514b73df5410c83..7fcd56057dd53941ce9d59eb5b99e6e3b1ff5ef6 100644 (file)
--- 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 6dbfcd676cfbb6433adc4a43467632e6eadaf4a3..2549f18eb53fd1e4abd4e8abf833d4a08b266b6e 100644 (file)
--- 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 7f7d1dc181563568b08c1602ea50c66c4122fbf7..8ae4d0c8b8eee5703b37d10487604a58c1a7ca7e 100644 (file)
--- 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 04970dd6d6a6f327575f4107b3ba25452931e56e..3ec7b70505f5f241a247f1267e9269049fdf6c8c 100644 (file)
--- 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 3a8f88d6a3488d9c0d9f2154c186bc56399b8c90..94be1b61917bed2971b992863c554f7dc2e00f3c 100644 (file)
--- 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 b38252e723dcb182b82e24a624d04c04b72bc67a..98374c28ed68d40b188838eeea8101e5ef0ffd92 100644 (file)
--- 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 25cc6d3c94777f6c7b7db847e35ff1c76fbc6cc3..f5582734e6062902769ba78a94b29738989d9059 100644 (file)
--- 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 e2098bad976162a2d7b1d1d7c30a70aea667b018..a99da98f6908dd0c77406c4fc6470a8b1829c643 100644 (file)
--- 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 7ae7f8a3778ee97bb8dfc7039b90dae19867672b..dc02eeb1ac0d9f392d7909f0f0a3876f716e34bd 100644 (file)
--- 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 d000b69f201869b540991eb93f48909745159e0c..8ebcba66e35ddb2e257ea1107ada7cbc14dc348d 100644 (file)
--- 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 f243ef87e0f7da1cd990ab84047254dfccd41140..0229d6bcdcea49ee702edc9bac18b0227fec7d55 100644 (file)
--- 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 70c78a312fedf62ba43cc1c12d554ef6805a6463..126e2f55f01740b8529b8d3eb1984b50ce890d61 100644 (file)
--- 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 5a434bd40110515356a7ff155b2fdd9de44fd876..459e69c3569ec02228c53003109c073410ddd889 100644 (file)
--- 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 94ddd78c7a0cfb52561789db10c27cd4aad6eff6..c5e19c1edccc4ee943472706f062c1beab4622a8 100644 (file)
--- 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 b6a237842118931fdbca48c3493816b230733a40..b34825c8617a2477b39bc00929098e04b401b178 100644 (file)
--- 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 698c0009ea45360f1d95cc190fcd8709a91881f6..63804eabfaa88a57b1bfb363f4a3d3c43ac7976d 100644 (file)
--- 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 80c44148d4fbd6089d1a4a4e813569637d3537a8..eefdb97d98cb6d6993ce427413460ce600c26c9b 100644 (file)
--- 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 d8ed6138c6e5b5b6857fba3334199e2473ec820b..f3d0c2c66e649dbd3927416c8c22afe92a3f92ca 100644 (file)
--- 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 a148a1e9402be10813d874b7db3c69fc5e4224a2..64a7451e79605d977009d402df30d6dddd785365 100644 (file)
--- 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 31250b0143f38d669d0910a4c483afa09279ad1d..55274de760fa1c91b4c9c537cd456dd049693669 100644 (file)
--- 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 a05969f0c9f90347148dc3d6747fb1ec5cfb2ca0..4d6e7c0eb0ea12a0e5dc0215c9eee34a01383ed4 100644 (file)
--- 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 880b05554096f938cdbbb4e4933308a7d26bba7a..9026eccf517a6e6ba7558e5c9420fca64af13278 100644 (file)
--- 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 60261a1912bf334e9f26eb17011caa374d09d284..02789ab3de3f368ef3b85490aa29a76a08255ace 100644 (file)
--- 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 ea6141eb1943e6cc86333c8ba4370745461f99f7..cb83f850c051d7610c6366e0543f86848b253a5f 100644 (file)
--- 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 6aa916bb7ca0b0c57625245feb2a642254a39218..01aa1e7ee4bf7cef8241d9fe922c58fe26e36d02 100644 (file)
--- 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 33a0a5d26b4430b0a77308cca8eb0c11ae05aa06..1cfb29aa7108354b76864cf4f09ce92069e4532d 100644 (file)
--- 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 85426b063bbbff619cd32b4a16e5e47f29cb55f6..52666cc8e31db0c42d513adb602703f323b0c19f 100644 (file)
--- 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 fe1e6490c145e3a377832fa5c2da9633c2a96aeb..13be823c63d7342966ce5561cf965b37a8b4be8b 100644 (file)
--- 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 afaf7551d90dc7c2331def4ccc591e58f4716104..f11897b0d3b92e60f6dd27aead372327b6da195e 100644 (file)
--- 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 d713bad8e8c995f92a5dd0d29560b680d97ad26f..e1ff66ce58826e1fd7676cb5dfe8469c82423896 100644 (file)
--- 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 bc6ddb6d4d56e744a80ab6ccb4473c5be6b63190..c0aa185064160508b5a79345dc0a23d7159e8f87 100644 (file)
--- 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 1c3b7eb1bd05a8df95044385f7be463b429bd0da..fe0d35da44262a25a8ac6f80940edeeefa86f090 100644 (file)
--- 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 16de41e95d341683e84b6d3af2235c5153f9ee46..f76f2616ba2c9376b906091c9851891510d91f13 100644 (file)
--- 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 141480245810e4aaacd4f197d718578217f960a4..ca243967b8cad3e9218ee0c04be2648dd25149ee 100644 (file)
--- 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 72233a75af98943ed6102eb16b6f29808ec8e49a..b425111ebf948147e2425019ef40d54310519fa5 100644 (file)
--- 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 4308004f0738a0d49453c1fc251ae2201b30a1ac..50c893b8fa0685b7b67402d31402ff011496fee8 100644 (file)
--- 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 d9c82de136f2ec454bae7fe7977997097433018f..927b8a79b47a939cf5fc945bc03e9901a697fb25 100644 (file)
--- 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 9725c357130ba75ee1994e589d7ceb2cb2709288..1a5b8d0af07e14b38595cf06bbfdc93fcc78aeb0 100644 (file)
--- 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 23ac555f76499525f3640ef0f035a8f95cd43cb0..1b5ab986045436af810c22b6abb33fcffde048a0 100644 (file)
--- 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 c3f266d6089ea6e6097ab2ce9a59a30d8d832904..29e8299469ffaf8b1623dd66a8fd791833f5ff02 100644 (file)
--- 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 e3ebb1158467ddc1699070e68b997b33ca563dc7..31313dc83f01c00c2b89df032c6f90f524998851 100644 (file)
--- 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 c72215ca45844a13031dfe70bdcd65f9e9b95d3a..5a9bfe9346902061669bdc970671f3108c2f0105 100644 (file)
--- 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 d7c77c1a26af528fabe8088a296b30a31984ce87..6584dc5116817cd765da8c979800fa2649af21e5 100644 (file)
--- 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 c2cb699c7d792075eca957f0e9eee2dac2c44b46..b57fe002ab230961329464496bf7fadd3773b0e7 100644 (file)
--- 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 71989c3d688e7ed581f0193dcb0ea16e7c1a1258..9310fb3b8ac59a78f81c0281960b622cec13e9ba 100644 (file)
--- 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 125a8b385488131968fdfcb8ffcc0d195eb90dd3..26aaa15bcb1da391675fedc45e983125ad7bac48 100644 (file)
--- 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 9e2967619032bf899c9b6c8d771ef150d39f9bca..a3f2a1a52a36ad003758179391704fbadb6512ae 100644 (file)
--- 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 f9c1c11d3f2776fb70322a8f9280c353a63d8aa5..8c17e6eb3429a5f6b1b05b4bc0db21861f417cd1 100644 (file)
--- 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 4379a5340948876d6e66479a2441617904636950..e1092c2a4a3271abc3228e0dc733238af60e0bd6 100644 (file)
--- 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 <fll/level_0/string/common.h>
-#include <fll/level_0/string/range.h>
-#include <fll/level_0/string/ranges.h>
-#include <fll/level_0/string/rangess.h>
-#include <fll/level_0/string/range_double.h>
-#include <fll/level_0/string/range_doubles.h>
-#include <fll/level_0/string/range_doubless.h>
 #include <fll/level_0/string/static.h>
 #include <fll/level_0/string/statics.h>
 #include <fll/level_0/string/staticss.h>
@@ -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 41e8777baa810f841c4cc7ef15db51aad650cc9c..54cd724f5d893e9d78daf8294adb317242038bd0 100644 (file)
--- 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 bc02c3e64699aa7e3e7a98cf1093089fd33ba2ec..72c4db12cb047a2d9e58d200568a19c18e3f0ad1 100644 (file)
--- 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 bf793f0be439d468d184d4284ab2f149b6a0f1d8..8dee42613a4a68c03d3dbd33acc6850120548a49 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 5ec12589f7680813c4b6efdc58ad603cfd5f4310..bc00bf48cadc18039c8e8c4d972593b1d15a8ce1 100644 (file)
--- 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 15fca2952ad0866cf96f0080e4713c31ea51de7a..0e7b5b4541200ea6d479098b68577bb5bfeeb71b 100644 (file)
--- 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 0d50e9bf7bcb01c0750074ffbbb4780fb706cca8..55fb3442cdcced1c844c0b380f1efa2fe4ccc19c 100644 (file)
--- 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 907eb950b3230b09e05c0172e9f6124cbba26cb7..0bca0f8a3d5e6bb1e0a2a0c639e77dc1e0808b73 100644 (file)
--- 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 5096417c6fc162586175ef09a08645aa4413f693..2e3a44ae80f7df5b6d02ca8193ef0b65a3d12ac7 100644 (file)
--- 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 3ecc0b956b54d4ee43e47f614c35be15d9099cdd..67a96f3c30ee376c6555b6c146c0df684f5dd60a 100644 (file)
--- 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 ae1afb6232e72d82ebeba1f3ae248f86c909a55d..b3d555af202ca7556d9acc4e9564b01e736d457c 100644 (file)
--- 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 8c8bdca89aa2832367d52a25224dd6424b4c5113..01d864fb787094d7b17c4796163124221c41ef91 100644 (file)
--- 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 9c8a5ff27b32eb0e19b8879c6152fb529c910cf4..fb357b3c0401008068492625ae63992ef90f9235 100644 (file)
--- 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 68317232192e160b7462adef76dd596eff2e0b6c..0e8428d4c0f704dc335ccdcfc987e66bd7f57757 100644 (file)
--- 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 d8b131a7a675e659c7e3fcd143173e34e11fe29e..f83dfe0f6f5ac934db396b7adffeb0583f56a920 100644 (file)
--- 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 b55bcd4ae1c943924c73d05b1cb9344bde352e7b..9c1afe731b690ea86aafbf0556d3cd24409fcaa3 100644 (file)
--- 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 c908f9020296da9edf586f92ab1891bcbd39aa20..decba43da961e68831387eb32b4f813742e16ef2 100644 (file)
--- 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 48769f46b4b83310b8101a6a195c5e29232f508b..fa9c6ef64c92b2d95c9ce912eea042d4d30594a5 100644 (file)
--- 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 32534c6d6c9de57e3cd0694604b4f29cd9c018fb..ccdaed3466a7b030e16a389a7528460c216c98f0 100644 (file)
--- 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 78ac3f8e779636f57efa97096de8802654b2bf70..ab61193838222c326307fc0e1bb6fb3c8f90eaa3 100644 (file)
--- 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 350cd148991d71f04e1ab45d5244d7d4500649d9..1ab687a9c398d0ea4339fc657f7a3f6be799e230 100644 (file)
--- 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 9ca2a16f61db71f5bb37eb40050861bd9e1506d8..6141525c4b0a97e6343d43ee31bd2fbf8a0a279f 100644 (file)
--- 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 b8413de5869aea79ec3884187952d11e09c1de00..b2e9d51991b70fd99705248a2b3a33f38d152de2 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 067972302e32ab5faa90d546dee774dcb62f6e39..b48fb92390c89719c08c33471143f2ce8a8b893e 100644 (file)
--- 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 fae1a03255589a27b69898b2a85fec6452dcc679..0384ab1be9f1972d1fa7bb94b1be241864cbd9c4 100644 (file)
--- 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 8607afeabdea1118d41585c2e8e2cc00a20d3169..95f465497d7e317cc6a158f62b1ed18908cc2531 100644 (file)
--- 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 a677ea383f0207e65e13d555332d9b5953f01bbd..048693cfb1be246524e6ffa4f64f7ac9dbc718b9 100644 (file)
--- 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 178438de141d94f951b48756a87f3cb608e9b2bc..aa3441c3de1e6724f44bd7c926352991a451a026 100644 (file)
--- 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 2c77e4a1e17a977558ac6415cf626ab62cd81697..c518a4206852d27ff3feb62b3afcf2d544d90c4a 100644 (file)
--- 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 <fll/level_0/type/number.h>
 #include <fll/level_0/type/status.h>
-#include <fll/level_0/type/mode.h>
 #include <fll/level_0/type/cell.h>
 #include <fll/level_0/type/fll.h>
-#include <fll/level_0/type/time.h>
+#include <fll/level_0/type/mode.h>
+#include <fll/level_0/type/range.h>
+#include <fll/level_0/type/range_double.h>
 #include <fll/level_0/type/state.h>
+#include <fll/level_0/type/time.h>
 
 #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 (file)
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 (file)
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 9ea0f6b78b3b7d7315f4c72b05086a843c49392f..e26151832f8ce015007893fc1009562ef774caab 100644 (file)
--- 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 57bf16858f7d5c383c5ea4f97e1b04cb5cecba13..b6a03c6c013982c47005cbf605c6f95ee9c8b41a 100644 (file)
--- 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 <fll/level_0/type_array/int128.h>
 #include <fll/level_0/type_array/number_signed.h>
 #include <fll/level_0/type_array/number_unsigned.h>
+#include <fll/level_0/type_array/range.h>
+#include <fll/level_0/type_array/ranges.h>
+#include <fll/level_0/type_array/rangess.h>
+#include <fll/level_0/type_array/range_double.h>
+#include <fll/level_0/type_array/range_doubles.h>
+#include <fll/level_0/type_array/range_doubless.h>
 #include <fll/level_0/type_array/state.h>
 #include <fll/level_0/type_array/status.h>
 #include <fll/level_0/type_array/uint8.h>

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 (file)
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 (file)
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 (file)
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 (file)
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 0726b590141186cdbd27808116061d888c47f975..71774238f1a4991afa844454fe404363083f5498 100644 (file)
--- 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 (file)
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 9d4d673d4a8bf54517f52d7390756b6367130640..60c10c3d3dd40b9c52c6d1a3108153743965db70 100644 (file)
--- 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 5de97e1976539c3842393dd106e045ded813414e..ff765322135b45a394cd2341fbb8696593dab5fa 100644 (file)
--- 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 38f9fef7d69416710c161097269be5f2a1fdc924..d8cc08d38d94379c22b4366265a123694598d0ab 100644 (file)
--- 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 (file)
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 (file)
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 b7619e27286a5a6b92b608c68fd70313821ad33a..937308f0bbe058ef0bdf3fe6359ab92cd567f816 100644 (file)
--- 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 aa3bf69d5d36d9a536ba2352e2388629cff2c34f..0c12db66a445730338646de9ed45e292c20e19f8 100644 (file)
--- 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 79faa8d564884738602dd0db9e671b5dfaae70b7..b9a7a7b0e0089485e2c5df4497fd67e8967aa8ce 100644 (file)
--- 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 4eb18245716a529bdffaaf0847e4153091a3617b..33d30092a6ea9258c1b114af6c1984ec8bc2bfd4 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 73d1f01c9cff1e74288a33036f5fb37884860afb..f18509c7d638b0154327e4be9c9032627014fc5f 100644 (file)
--- 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 b9b588c32b5b11f5b863e44e7413b35f07a62a7f..30ebcc01c826a1310f948a91ab6a48bba98805c9 100644 (file)
--- 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 b26d88bed979785967f4bd6a571300584a789ef0..2ebeacda834c9a48fae848776da64d0e2e3cc9c9 100644 (file)
--- 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 845f80566aedce802c362e0cab31b0b189e4d227..a0d133800d721f49dec3d0e306ec9846dacc50e6 100644 (file)
--- 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 e1a722bb388fd16a86469ee884eea2f09c697d99..01e7052b7387dea13c595945bad09d508298aa20 100644 (file)
--- 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 70b1fd7af98b904c54bb318414df021c87186162..7056504cd53ac706afc0d81fb41d62ff73f89c40 100644 (file)
--- 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 dd27b3352ac1a519c8c40cfdc2dc78f4ff80b1d1..b0e22ed61f855a92df1ab54d89fa1061fb6cd4c6 100644 (file)
--- 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 a4c5a55b91f3190308776d0ecf4f67a92ff0b1d1..41fe881d0efba98bebf82d80de2d400cf5b01d7b 100644 (file)
--- 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 c19989f65096e850e501cd47fc4ce0a3fc118a79..9ec3a9a1585a3ccdedc7ecffef659e9944382d2c 100644 (file)
--- 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 a4c5a55b91f3190308776d0ecf4f67a92ff0b1d1..41fe881d0efba98bebf82d80de2d400cf5b01d7b 100644 (file)
--- 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 a342e13fbedc52005ec706d6428aa1c5e99f89ee..9ce8e1c852ee7a769e0a6d48ec05e3e56408371f 100644 (file)
--- 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 a4c5a55b91f3190308776d0ecf4f67a92ff0b1d1..41fe881d0efba98bebf82d80de2d400cf5b01d7b 100644 (file)
--- 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 64ab999a54c75ae66d2364cc33d956fd8f0c5532..590087706ba7c0daf1f45378c67463776928dd10 100644 (file)
--- 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 660ab23c95d4c07413bbdac630ebbef88819d80a..e1d10cbf23a6685f1f50ae40e183ead1e1251656 100644 (file)
--- 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 f47ed30118bdf6ae59e7f3c0c8410f9f8ff427e1..eaae1be25668bc7041124fa605cab8ca59535e3a 100644 (file)
--- 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 44a5915aee16b52dff256a27e5990af0649f3052..a794a28b6470e21c988ff2b6b3fd1dd5846f2bef 100644 (file)
--- 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 5894129aa29d4ba3fc541d58112954ad980fd8dd..14b76c35ef5ccdedd150a58fddaa09b400eb1f15 100644 (file)
--- 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 afca92c7332e9011c12a2b3cee446cab8086f5e6..cb473788f4c7ad0ef382b05ce92af4fe0cb8d204 100644 (file)
--- 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 df3c05218d87fcc9d8378065c2691a4703c5471d..f3fef0e254da48ee939d7ccfa58c8e280d8d4fc8 100644 (file)
--- 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 e9c2059ea6f14704e8ff53eeacfc9ee8780f8586..a6ecee9843a274fa7535fc28a9c7fb0cc5cd090a 100644 (file)
--- 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 2993200354ca8d143aeb5a137d9d1ac083fa61f4..76100c126a9af2120b07834ee6f4fa17aae9ca1c 100644 (file)
--- 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 383f4fc490fe0061975876b45850382522295f5c..4b1824621db58ebb7755942753385803f24a3b30 100644 (file)
--- 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 011fc7578c529e2a20455364f5130947af3710de..0d1dd0877cf41071dc84b66172997ffc4c6a3d8a 100644 (file)
--- 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 1ea0361cb5470f1322fd878fdb10e40de1f2f9b2..004c09be152b84f85f0f90e15025233cdb1f5963 100644 (file)
--- 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 802896d775036a778b950f09baa273996f70dff5..ca80d908bd8bfc07b18e1d887b88df8d96537e2d 100644 (file)
--- 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 2da2fcf92fb0ab93fba3af9ace0993a00a42707f..46d9a263500b85a726347059c1a4af15670070d6 100644 (file)
--- 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 22701b57d9f4dad957826fbb18497612f2d28993..a4c0348805a69a8eb94531b2f89721358c863b90 100644 (file)
--- 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 e30b7880060d4560c1549de390119505e977e46c..75c667cbe134b60696f3cc9eb8429f5918940d2a 100644 (file)
--- 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 f9f32043f3bb6fc766c4ddba79cee1b72cf85884..47c84c3882917098713539030b3acc010d116397 100644 (file)
--- 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 f1e227ea7ca1e049b3bf547b427081a2aaf68213..b246a27a2028c60202a85faa4c8d836c0188fe48 100644 (file)
--- 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 ed133e6cb48dfa6d8d057cac1eda5bf15f5c9dc1..88d4795d2f196e35058551ba11daa2c117082837 100644 (file)
--- 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 9bda4c6ff0d28095ca70798acdc44838eea5976e..12b8886b0b2469c818ad3237a4acab8369ea16ff 100644 (file)
--- 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 af35355c99dc77d37c54afed771bb619ba9f1166..a6796420080b77dc8431e2bd092a6e57f39f5db6 100644 (file)
--- 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 358c533b78f1500fd61d15bbe267103d3d44e506..b8ebeab4971a89fbe8d447484d7b74811b8feed8 100644 (file)
--- 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 f41c7a29040e0fe61360370cc3e5bad6e6d0864d..cd937a04f6be98f9fb3c1d4dbc26a97e8b0e5c80 100644 (file)
--- 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 97bc73385ef64a2d0288afae40d7e820ed158a7e..822ae19b6deac18e46fa7f6b5784e460e3b2b214 100644 (file)
--- 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 2de0279b1f174401d6beb47354340061016613ef..dcae894071184bd77dcb6cf1180760b69537fab8 100644 (file)
--- 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 bbc0b8547203b2ba6d45a23c6835356d94995c98..068146a426cb40e1c6ab74ed7d7de3e143c24171 100644 (file)
--- 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 14c7376a2e760ca015003446dde22c52536f99fb..224c919a746fb5173d91aab50202b6ce23cc8751 100644 (file)
--- 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, &quote, 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 8c3e69d6f4f4838833a54cd28797bf3e1eb3891f..41ff66f13087bd8d9f0b3ac06a294ec3ec0d7f19 100644 (file)
--- 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 7d03037ade5e5042b6beaae05aec9a0328d810ba..3d4c71ef54c50adc3e12319186153fd47ee36d2d 100644 (file)
--- 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 0f0b7df8487b1e456a026805895fa0fbd51bd67e..d4ec3881219a0e5cd89408d08870c662112a8e6d 100644 (file)
--- 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 9e449867d44fc33bdd00afa220a31838f5ef069b..49709850078d2240f8753b7b6ace762b270abf21 100644 (file)
--- 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 bf14a8e7181681f703ef0eb8f2fee1d131e98450..6d3cc5aca0978df05fe38d5e723e814b293c9a20 100644 (file)
--- 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 422d9eb46f4824938c63e01c47a11c36e0c98b90..2be6056aa22114ed4f7e14ecfe73878d3f4850be 100644 (file)
--- 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 3b554821355ae1deef810aa3b1acdd87ff851fad..afa5c9c8661879c01fcfbd90facd4780d58d1519 100644 (file)
--- 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 953396ac1d28a150a74bf5306ae272cc91d9729a..13c71ef3f8a2e3ad9e6a6be9c7925a613c7d6d09 100644 (file)
--- 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 e412384254261db54d69ae0c1b707387e6dc5398..5b69b005755c86992183bd46de5f11a32bb75049 100644 (file)
--- 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 f446c4eb46230e4a5ff1768edff54e8eea5e74a2..767d59241db119200b5396cdb6d2b18b6dd3cfe6 100644 (file)
--- 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 8e82087d3894b7980194d043ffc44f1bc72dd933..14a06e1435d30adf1e7511fd629769e8740ee7b0 100644 (file)
--- 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 b117f67f4244bdb49f2cdc009798627c56fee70d..4e7afdc57f7e750e6d352bd802568da569ddf5a7 100644 (file)
--- 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 cc72e2551bf67523a5a15b322d78a365c738dff5..6a8d2952f0e7346bc81d2908bf34a35d928acce2 100644 (file)
--- 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 af1686e71969d77175299962cea4550d0ef233d0..33b7bd785d8a30485dc1d19a9c022cf264b6230c 100644 (file)
--- 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 d22ebfd2332dacc337677fe67bc3feca769e6552..21046f51236495bcfb2464eaf39011a76d89444e 100644 (file)
--- 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 6345792451482fdc41b8022c6659b9ecdde04e43..e2c6fdb10aae74246cd5fff6c5a4a3925b5f844e 100644 (file)
--- 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 1503d600b3bd67a13ffee6f25f5872d09a023ea9..e900861424c8599b2d2159d090878094d274cf0a 100644 (file)
--- 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 68ed193fcc8b29659784d51c7b581937365a218e..b96a9e917843dd73a0e6d20e3aac69f981d7ea9e 100644 (file)
--- 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 5dd539d7562dbd4974a1b3a982f24a2f9027c781..f3cb7a4de3dae28af73b897b9759db449cec91bf 100644 (file)
--- 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 85ef1af52fff168fd10ab6090710a9db2e9ea9d1..d3bcadee3eee9fcc2551ab530dcf7c7e9a3f6884 100644 (file)
--- 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 85262600b07dcfef7a063de7c17034d7b1b1e720..a6796177b205552fa4c80226c43672fab4f32caa 100644 (file)
--- 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 647cbf5769c8f54918a3197fdf6f3ecbb0486c7d..335632adfc7659f94843dda11c7878943651a4d4 100644 (file)
--- 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 3f1b68587aba7f7fd51538e53b2f2b87fb3e984a..e610b355c66a02097a8d108ff3f86e004e6fba26 100644 (file)
--- 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 556af07873a97c203a52f8c800ae03b83d5e2fa2..cc8493aa119790e2636e419efb9e3a4989639c58 100644 (file)
--- 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 dc20d4b5c05c4f200d7202fddf93e5bbbe1e9f42..ab2e4abd04bc3e7eb4c9374f8ff85c1ab13ec92e 100644 (file)
--- 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 2fb17e268c41cefd2944333cd760631d4390fba6..c3475039fc300a3017d22f73a77313f28d3c0d56 100644 (file)
--- 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 b354c75891d7a2c82faa06562def2f2888836426..8b900422e6e5a177760a567699a4668dda8033b4 100644 (file)
--- 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 54eb7912360862c5382462c83fb52fa7fbf2e1c2..4bf2658340c8c7788b59e06262d0e5d96853fa94 100644 (file)
--- 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 342e8bac1b746de6a9c8140f7e48249f7dde6acf..d8305d1b77b2f1a641ba4ad14fcc4f94f3e5fa7a 100644 (file)
--- 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 3ba4de60503f2258ff215baa82a632d8111f1394..5346c911a71d4fd37a07f3696232138390495ab0 100644 (file)
--- 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 ac1b77c69392d090dc4118854795a3c4a8c39939..e59db98c9ae340cedeba4acdfea5d8c405d39ac0 100644 (file)
--- 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 caf39207ea46f5bd9f8d2124f9441710ce104c98..4546f2fc0a16d09472266cb99eb3149ff145c3f4 100644 (file)
--- 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 76974ca1228e1009654fddf9a725032539cd9676..2da6bd899b3ed15c2d9f3eee15df2359f5335629 100644 (file)
--- 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 d7dfe237ba9f5e17762b7c0741bd9980688412f3..f1482e665d4b56b2ddfd0ce16c7127b3361f928f 100644 (file)
--- 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 7ea854080bea16db55dccadeaa2ccfdbe9a091c8..db2c474d34ce5b4e4bb0623469a193f8ae6cfcb0 100644 (file)
--- 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 4d36fd4d7b5dd9d768893d6dedee2894e02a2271..022579e8429c259c041f3763e4f0afba651ee20e 100644 (file)
--- 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 7e24f8e7ed526802c1c228661765bb283962e936..ef7270c87636126626910182c217b656fa5dee95 100644 (file)
--- 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 e0dfdfca9b3488443faa6beafb695473a8218e75..f4f002cc2e34c6dd5be7f82bdec24cb4a5cd7227 100644 (file)
--- 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 d39bff5eb7b785d75f7e10f16b59afe40a2a2968..aefb4fd89378260e9f7b20adefb0c9b3309bd161 100644 (file)
--- 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 8b1485e7f16c16df77cb269190d26f905b4cfe2f..da95064b8a9ee3cd276d0e2042208b89b2c9503f 100644 (file)
--- 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 1fb1c21cabaad5ca018c1bd59ed51ff3fd209afa..267f2dcbb4cbaf0f5e9b0cd682e764817ebe51a9 100644 (file)
--- 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 93825030e02ff85a9d17f500802b65e5be202bdd..c84da0c692968d6977dfbbdb3d8d5e858b3f7249 100644 (file)
--- 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 fd48205b790176323c5d011706e432e1f4d420df..23f00774116398f73c9b44c00ddaa92e9adce758 100644 (file)
--- 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 79175ddb0b873c2b583dfb7e59dad2a02f65cb2c..738ff201e2f348e6961bb73ee7d1a3724e273f75 100644 (file)
--- 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 232c93b2305d1919ca63e83b293dc0e46de28c99..fc3620d4c0545196332a95cadc66950d819b6def 100644 (file)
--- 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 f2e18c52a64db95d8327c3b43e9c8078836828d2..6c6f755aa7519b451def791652d5e5d1911093bd 100644 (file)
--- 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 0c167dd8b0e23ae7882d65746395b6e122a84857..cde6ee7e7236e521f1ab41cdff01c07f8f724365 100644 (file)
--- 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 2bc9c9677377712f788adf781c77877c03a4db59..adb62973f2e1dcb415026c2e753bd33ff6c385cf 100644 (file)
--- 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 531322ed8dc192ca44bde0ca378bd9949973c989..a0e22031460509f02c71c1a122cfaa2e8420153f 100644 (file)
--- 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 e52a96b83faff5ef51f2f04c5097caeba47e46a6..35e43ce5dae276833051d976e6fce56a33aa6b65 100644 (file)
--- 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 722eff437a75d46691ecc709651ec6f643f0b1d4..c38076c68c98f8cbd1dab9d27f519142ef275bdb 100644 (file)
--- 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 16694b9e002477fca4c2c5ff7927406bd7eab0e9..2350714b86fee6b75aa4f83c33b9793ad56dd9e9 100644 (file)
--- 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 babffd39ced1f59e6dbe7ed7c566bb9ba125f22d..f86ff584fff804a9a8b99929b188407ca36949a6 100644 (file)
--- 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 f0fc7863b93ea4d0424da9a27b210977d3ad077c..e3cc6917875ac40c2247c69eb0567d926fe36ebe 100644 (file)
--- 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 6ac9d2af8de45e07d7b4390049ad216872118ac8..702a56491d637ec3a081f75781ee296f34721be4 100644 (file)
--- 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 9180ba20002d6894a4ed6812757e502aefe0130d..d7104672fbc3ea9384de5ad7dc134e46eff65997 100644 (file)
--- 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 3ba7d029dabd745b33d05392f75560f8a8e29852..24f9102dcdcd8c200bd9bce4a743e472a08a4bca 100644 (file)
--- 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 dfa4f54cbe633441adeaff2739c9021e89c9103f..a68e1704bc28e4503e7d4ec094d6c013c07ff3b0 100644 (file)
--- 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 46701c79c81c0db2b1bfc5641294839cc6716dea..9456599146e150085591ef8c2645c9b1ef0531e1 100644 (file)
--- 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 3aee904cd7fbca52485a3ae49078c66108e08034..349d848933c1b3a91954d06b55791d6bc8dc03ea 100644 (file)
--- 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 1d3eaba49981f1c6eea734a4055ef0d98f9d15ab..db0b62a0722d5789e177a05d041d101b28380d85 100644 (file)
--- 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 9345cf5f727bf72bda57bb1ab9cc8e31adf71bdb..acc564654ffb658622f89afe570ac2d8908ef18a 100644 (file)
--- 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 42084a46f504b34a4406c019aec922caa4faaf94..629ffc34d4059cde43866375eae9bea38ddf3210 100644 (file)
--- 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 b9f7675e47ff8dc4ce30553c1ccf65cf2cea048c..c8d6fa036dcd895a75db517f17097b22ad965363 100644 (file)
--- 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 4ebee6d1010f62765e3e3d9c803c332ffd866a0b..dc0a25d0b2a767433f4cbb11b943702927b7d136 100644 (file)
--- 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 1f6f083c2b7d55f6e9f06f3eff36d4cb0212b9c8..16b5c37817ca9dde6b464d58be1e6dbf2f38fb5e 100644 (file)
--- 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 c25f8526cd5e0ff4350393a36bc5131908314e58..3d62d92dc69dbf99f3edb7c0742724c1940b7bb9 100644 (file)
--- 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 0d2f55b7d0067048cc80f9151b75a7a889180e3d..48ba481eabc9f240d56be0d197227ed62fa378ee 100644 (file)
--- 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 8b65aa1d9dbba052f02b1b4b465b157b0f95caaa..fa2efd0b1e23b260265f5cc6b3b3be0523b673ad 100644 (file)
--- 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 12a07bd6077aa06b7bad274a6400351813af991d..06ddfe77fe50a2fe16aaeb67c31e12c550463d30 100644 (file)
--- 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 d20724fbc82e95255e5b04e690efe5705993de74..ab9f37d9f1a14dc7dafa8a43f5b7e7e5ceb80dff 100644 (file)
--- 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 acac5f8515e9dd0bcff972d1c30d7a03864dc67f..05e9d16485bd766c7eeed8d64f2af2af32665988 100644 (file)
--- 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 e693cd2c595020d8bf25c18ca4fe17204855a5c4..a034d7c6a157bd146e31974c7f2c22a249af2391 100644 (file)
--- 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 4d9d76d0261ec034e26c18b36cce260777ed14c6..67e65a32adb8c0f0afe849286026ca20b7f1a165 100644 (file)
--- 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 4fcab1aa183b05483271b92c37bb8dabf492b8a1..498a25295dffef4da61480c37270ec25c78af18a 100644 (file)
--- 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 a787f51fe3289675bea2a3a1b9c94806be4ac4df..76ce2906ed171f157dbee179cb5ad8f4b45a0c56 100644 (file)
--- 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 b061e2060730eccfe7a81af20102ea8b4e4311f7..62c3dfe2b720c34c368a04eeec92ec79779062c9 100644 (file)
--- 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 fd6837d2fc96e2c4d75c104c4b92a816120e66f5..0dea44021a804dd6dd48c7d2adad93f343d2e746 100644 (file)
--- 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 f4cee6cf5874de7bdf2fe3474b03cde6f5bd4b72..34df7f03960a0b4d616725f0020e587782eb98d7 100644 (file)
--- 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 e1a88fc85b30291479cb11b9ec3a6b4bf86af092..c31643cea8114a5f5fdcaade2576372afd173c00 100644 (file)
--- 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 d83b39bac58bdb7fba5caec642ff21b181897dce..c0ddc6a070a21ca55a257e61469ae00d8f61878e 100644 (file)
--- 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 4061a736f76befd66ac3b40d5a2933eda2bda3ac..c938ab4f3702583ab35ef07f8bf384a705f7d5d0 100644 (file)
--- 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 9d5235cec23c3404a6745fa0e21bc21a39d6afc9..3bdde50f2a558c0da483acdae5ea9a5a764a9806 100644 (file)
--- 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 f3e73acbf7676a4caf9a7f89b43172c2dea61c78..6c478419ff45e80961c39daf6a87a21d09d2804e 100644 (file)
--- 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 214a93ba9b7c8648cdf374a9e8be4604896d64c6..09a3583205e3746fcac5186c49abe039eaba5b74 100644 (file)
--- 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 b2a5ae2c71853bf8e7104c5fa26cb2c069282655..6faa74a63b61a5526ec1fd1966ad2ef3127a819c 100644 (file)
--- 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 87795f742b930ccf7d0621f074d9a55e20f4b680..105bde922a01672a5353ec0a15e2fc3f440401ee 100644 (file)
--- 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 ca40a462805af3c306ef029dcd9edd9aacbe5025..a7c776f3ecde5825f8b187bb181fcc8c7caa03f1 100644 (file)
--- 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 1908842ec800b8b7eec209a5aa16c9dc6a52e4e9..67e7a5a0426d25d334766c8594d6dd48f1c6324b 100644 (file)
--- 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 8f66977d8f553ff0352764e0c31303df33d572fe..48aaf6e1483420cd8a6ac6c60eaa89d201607389 100644 (file)
--- 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 a226bf7ec79daa6b17bbad09032c66d0d59aa024..93776ea3d7bd2fbefd325446d21cac1f762c92e4 100644 (file)
--- 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 d6ba0a7f5e75dbe90e417ec045f3bcee929467f9..8017d59676ade61eb7da4573059fedcc13c330e4 100644 (file)
--- 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 8ef0ce1ffbd713789a19e1abfb578e97fccc27c6..9b370dec01bd980bdc6fcc7652b5ffb81268577b 100644 (file)
--- 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;