Refactor: Relocate the order of the size and used properties for string statics,...

For further details, see: a6ab23fe1333af5f582f73144ab55d753785aaf0.

diff --git a/level_0/f_directory/tests/unit/c/test-directory-listings_delete_callback.c b/level_0/f_directory/tests/unit/c/test-directory-listings_delete_callback.c
index 8a29569d055384db012b816d42814db75f3f3f48..77a3422d8db72a3a87a6fbefdfd6b5beee0c4111 100644 (file)
--- a/level_0/f_directory/tests/unit/c/test-directory-listings_delete_callback.c
+++ b/level_0/f_directory/tests/unit/c/test-directory-listings_delete_callback.c
@@ -12,7 +12,7 @@ void test__f_directory_listings_delete_callback__fails(void **state) {
 
   f_string_static_t base = macro_f_string_static_t_initialize_1(F_string_empty_s, 0, 1);
   f_string_static_t base_array[] = { base };
-  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 1, 0);
+  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 0, 1);
 
   f_directory_listing_t data = {
     .block = bases,

diff --git a/level_0/f_directory/tests/unit/c/test-directory-listings_destroy_callback.c b/level_0/f_directory/tests/unit/c/test-directory-listings_destroy_callback.c
index 91123bb127e6c480a6afaf0073cca4b7c423e2a7..aa7b0a093a04ec83391c3a4f8c858bd3ca32c88f 100644 (file)
--- a/level_0/f_directory/tests/unit/c/test-directory-listings_destroy_callback.c
+++ b/level_0/f_directory/tests/unit/c/test-directory-listings_destroy_callback.c
@@ -12,7 +12,7 @@ void test__f_directory_listings_destroy_callback__fails(void **state) {
 
   f_string_static_t base = macro_f_string_static_t_initialize_1(F_string_empty_s, 0, 1);
   f_string_static_t base_array[] = { base };
-  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 1, 0);
+  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 0, 1);
 
   f_directory_listing_t data = {
     .block = bases,

diff --git a/level_0/f_directory/tests/unit/c/test-directory-listingss_delete_callback.c b/level_0/f_directory/tests/unit/c/test-directory-listingss_delete_callback.c
index a819443e0676ffed53da6ecc3d6d4bb3dd37a7db..5ade60be947acfbd7931927f5de3dbe430cdce29 100644 (file)
--- a/level_0/f_directory/tests/unit/c/test-directory-listingss_delete_callback.c
+++ b/level_0/f_directory/tests/unit/c/test-directory-listingss_delete_callback.c
@@ -12,7 +12,7 @@ void test__f_directory_listingss_delete_callback__fails(void **state) {
 
   f_string_static_t base = macro_f_string_static_t_initialize_1(F_string_empty_s, 0, 1);
   f_string_static_t base_array[] = { base };
-  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 1, 0);
+  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 0, 1);
 
   f_directory_listing_t data = {
     .block = bases,

diff --git a/level_0/f_directory/tests/unit/c/test-directory-listingss_destroy_callback.c b/level_0/f_directory/tests/unit/c/test-directory-listingss_destroy_callback.c
index 350d35398c108febd9afb977529cd8a9e845b14b..24c0440deda277310b357a2ec9968523facded92 100644 (file)
--- a/level_0/f_directory/tests/unit/c/test-directory-listingss_destroy_callback.c
+++ b/level_0/f_directory/tests/unit/c/test-directory-listingss_destroy_callback.c
@@ -12,7 +12,7 @@ void test__f_directory_listingss_destroy_callback__fails(void **state) {
 
   f_string_static_t base = macro_f_string_static_t_initialize_1(F_string_empty_s, 0, 1);
   f_string_static_t base_array[] = { base };
-  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 1, 0);
+  f_string_statics_t bases = macro_f_string_statics_t_initialize_1(base_array, 0, 1);
 
   f_directory_listing_t data = {
     .block = bases,

diff --git a/level_0/f_serialize/tests/unit/c/test-serialize-from_simple.c b/level_0/f_serialize/tests/unit/c/test-serialize-from_simple.c
index 9954af5aa8d6e816f52a9b84fceb55a9ccd536f2..25ef6769837d8243cef4fb366a24474860f95b96 100644 (file)
--- a/level_0/f_serialize/tests/unit/c/test-serialize-from_simple.c
+++ b/level_0/f_serialize/tests/unit/c/test-serialize-from_simple.c
@@ -64,13 +64,13 @@ void test__f_serialize_from_simple__works(void **state) {
   f_string_static_t expected_array_6[] = { individuals[8], individuals[4] };
 
   f_string_statics_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),
-    macro_f_string_statics_t_initialize_1(expected_array_3, 0, 2),
-    macro_f_string_statics_t_initialize_1(expected_array_4, 0, 4),
-    macro_f_string_statics_t_initialize_1(expected_array_5, 0, 2),
-    macro_f_string_statics_t_initialize_1(expected_array_6, 0, 2),
+    macro_f_string_statics_t_initialize_1(expected_array_0, 1, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_1, 1, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_2, 2, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_3, 2, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_4, 4, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_5, 2, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_6, 2, 0),
   };
 
   f_string_dynamics_t destination = f_string_dynamics_t_initialize;

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 a829ff90a5444af80d9ef0afa119f7bbd99c5a13..9d8dd2014868bc724cf53ed1246ef324de0e306e 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
@@ -52,13 +52,13 @@ void test__f_serialize_from_simple_range__works(void **state) {
   f_range_t expected_array_6[] = { { 0, 3 }, { 5, 5 } };
 
   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),
-    macro_f_string_statics_t_initialize_1(expected_array_3, 0, 2),
-    macro_f_string_statics_t_initialize_1(expected_array_4, 0, 4),
-    macro_f_string_statics_t_initialize_1(expected_array_5, 0, 2),
-    macro_f_string_statics_t_initialize_1(expected_array_6, 0, 2),
+    macro_f_string_statics_t_initialize_1(expected_array_0, 1, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_1, 1, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_2, 2, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_3, 2, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_4, 4, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_5, 2, 0),
+    macro_f_string_statics_t_initialize_1(expected_array_6, 2, 0),
   };
 
   f_ranges_t ranges = f_ranges_t_initialize;

diff --git a/level_0/f_string/c/string/dynamics.h b/level_0/f_string/c/string/dynamics.h
index 778eb6f4423ce435d4b0b90f88133527ff55fb03..4e70c1785ecc497fda78eb74203c088c16b9d86d 100644 (file)
--- a/level_0/f_string/c/string/dynamics.h
+++ b/level_0/f_string/c/string/dynamics.h
@@ -20,16 +20,16 @@ extern "C" {
  * An array of dynamic strings.
  *
  * array: The array of dynamic dynamics.
- * size:  Total amount of allocated space.
  * used:  Total number of allocated spaces used.
+ * size:  Total amount of allocated space.
  */
 #ifndef _di_f_string_dynamics_t_
   typedef f_string_statics_t f_string_dynamics_t;
 
   #define f_string_dynamics_t_initialize f_string_statics_t_initialize
 
-  #define macro_f_string_dynamics_t_initialize_1(array, size, used) { array, size, used }
-  #define macro_f_string_dynamics_t_initialize_2(array, length) { array, length, length }
+  #define macro_f_string_dynamics_t_initialize_1(array, used, size) macro_f_string_statics_t_initialize_1(array, used, size)
+  #define macro_f_string_dynamics_t_initialize_2(array, length) macro_f_string_statics_t_initialize_2(array, length)
 
   #define macro_f_string_dynamics_t_clear(dynamics) macro_f_string_statics_t_clear(dynamics)
 #endif // _di_f_string_dynamics_t_

diff --git a/level_0/f_string/c/string/dynamicss.h b/level_0/f_string/c/string/dynamicss.h
index 42b3ca7d4390c434c0f4337e5f9556c10c9d3974..22d11b615ae87a6a4c1607918f2b3eb4db2f95ff 100644 (file)
--- a/level_0/f_string/c/string/dynamicss.h
+++ b/level_0/f_string/c/string/dynamicss.h
@@ -20,16 +20,16 @@ extern "C" {
  * An array of dynamic string arrays.
  *
  * array: The array of dynamic dynamicss.
- * size:  Total amount of allocated space.
  * used:  Total number of allocated spaces used.
+ * size:  Total amount of allocated space.
  */
 #ifndef _di_f_string_dynamicss_t_
   typedef f_string_staticss_t f_string_dynamicss_t;
 
   #define f_string_dynamicss_t_initialize f_string_staticss_t_initialize
 
-  #define macro_f_string_dynamicss_t_initialize_1(array, size, used) { array, size, used }
-  #define macro_f_string_dynamicss_t_initialize_2(array, length) { array, length, length }
+  #define macro_f_string_dynamicss_t_initialize_1(array, used, size) macro_f_string_staticss_t_initialize_1(array, used, size)
+  #define macro_f_string_dynamicss_t_initialize_2(array, length) macro_f_string_staticss_t_initialize_2(array, length)
 
   #define macro_f_string_dynamicss_t_clear(dynamicss) macro_f_string_staticss_t_clear(dynamicss)
 #endif // _di_f_string_dynamicss_t_

diff --git a/level_0/f_string/c/string/statics.h b/level_0/f_string/c/string/statics.h
index b44e816eba0b0d54b51534cfdf5960e169a66679..387049635f81137ebf0352d522957954966f6855 100644 (file)
--- a/level_0/f_string/c/string/statics.h
+++ b/level_0/f_string/c/string/statics.h
@@ -21,26 +21,26 @@ extern "C" {
  *
  * Properties:
  *   - array: The array of static strings.
- *   - size:  Total amount of space available.
  *   - used:  Total number of space used.
+ *   - size:  Total amount of space available.
  */
 #ifndef _di_f_string_statics_t_
   typedef struct {
     f_string_static_t *array;
 
-    f_number_unsigned_t size;
     f_number_unsigned_t used;
+    f_number_unsigned_t size;
   } f_string_statics_t;
 
   #define f_string_statics_t_initialize { 0, 0, 0 }
 
-  #define macro_f_string_statics_t_initialize_1(array, size, used) { array, size, used }
-  #define macro_f_string_statics_t_initialize_2(array, length) { array, length, length }
+  #define macro_f_string_statics_t_initialize_1(array_value, used_value, size_value) { .array = array_value, .used = used_value, .size = size_value }
+  #define macro_f_string_statics_t_initialize_2(array_value, length_value) { .array = array_value, .used = length_value, .size = length_value }
 
   #define macro_f_string_statics_t_clear(statics) \
     statics.array = 0; \
-    statics.size = 0; \
-    statics.used = 0;
+    statics.used = 0; \
+    statics.size = 0;
 #endif // _di_f_string_statics_t_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/c/string/staticss.h b/level_0/f_string/c/string/staticss.h
index 2ecfabd10605d5c0231ba3d3869eb7c76b2ed4f2..ad586d35c3bce9b99c4cbc9df9001ccc575879c8 100644 (file)
--- a/level_0/f_string/c/string/staticss.h
+++ b/level_0/f_string/c/string/staticss.h
@@ -21,26 +21,26 @@ extern "C" {
  *
  * Properties:
  *   - array: The array of static strings.
- *   - size:  Total amount of space available.
  *   - used:  Total number of space used.
+ *   - size:  Total amount of space available.
  */
 #ifndef _di_f_string_staticss_t_
   typedef struct {
     f_string_statics_t *array;
 
-    f_number_unsigned_t size;
     f_number_unsigned_t used;
+    f_number_unsigned_t size;
   } f_string_staticss_t;
 
   #define f_string_staticss_t_initialize { 0, 0, 0 }
 
-  #define macro_f_string_staticss_t_initialize_1(array, size, used) { array, size, used }
-  #define macro_f_string_staticss_t_initialize_2(array, length) { array, length, length }
+  #define macro_f_string_staticss_t_initialize_1(array_value, used_value, size_value) { .array = array_value, .used = used_value, .size = size_value }
+  #define macro_f_string_staticss_t_initialize_2(array_value, length_value) { .array = array_value, .used = length_value, .size = length_value }
 
   #define macro_f_string_staticss_t_clear(staticss) \
     staticss.array = 0; \
-    staticss.size = 0; \
-    staticss.used = 0;
+    staticss.used = 0; \
+    staticss.size = 0;
 #endif // _di_f_string_staticss_t_
 
 #ifdef __cplusplus

diff --git a/level_0/f_string/tests/unit/c/test-string-map_multis_append.c b/level_0/f_string/tests/unit/c/test-string-map_multis_append.c
index a372537214918616dac731a6d0e6c0fc61ade28a..74fe072602fe012431c897792ac9ff03f05750f8 100644 (file)
--- a/level_0/f_string/tests/unit/c/test-string-map_multis_append.c
+++ b/level_0/f_string/tests/unit/c/test-string-map_multis_append.c
@@ -28,7 +28,7 @@ void test__f_string_map_multis_append__works(void **state) {
   };
 
   const f_string_static_t test_key = macro_f_string_static_t_initialize_1("test_key", 8, 0);
-  const f_string_statics_t test_value = macro_f_string_statics_t_initialize_1(test_value_array, 0, length_values);
+  const f_string_statics_t test_value = macro_f_string_statics_t_initialize_1(test_value_array, length_values, 0);
 
   {
     f_status_t status = f_string_dynamic_append(test_key, &source.key);

diff --git a/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c b/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c
index 2fd1138d426b7b9377ef1e6db9ea6fb35b76fa0e..908a14ddd3fd40a1061a648bc2c4ee91989ac8f2 100644 (file)
--- a/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c
+++ b/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c
@@ -55,7 +55,7 @@ void test__f_string_map_multis_append_all__works(void **state) {
   };
 
   const f_string_static_t test_key = macro_f_string_static_t_initialize_1("test_key", 8, 0);
-  const f_string_statics_t test_value = macro_f_string_statics_t_initialize_1(test_value_array, 0, length_values);
+  const f_string_statics_t test_value = macro_f_string_statics_t_initialize_1(test_value_array, length_values, 0);
 
   {
     f_status_t status = f_memory_arrays_resize(length_inner, sizeof(f_string_map_multi_t), (void **) &source.array, &source.used, &source.size, &f_string_map_multis_delete_callback);

diff --git a/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c b/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c
index 6145aa74c6c6a41dee01c4ea63027361dd365f53..aa833d9752669d33697a3ac8169c741abeb62e1e 100644 (file)
--- a/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c
+++ b/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c
@@ -65,8 +65,8 @@ void test__f_string_map_multiss_append__works(void **state) {
   };
 
   const f_string_statics_t test_values[] = {
-    macro_f_string_statics_t_initialize_1(test_value_array1, 0, length_values),
-    macro_f_string_statics_t_initialize_1(test_value_array2, 0, length_values),
+    macro_f_string_statics_t_initialize_1(test_value_array1, length_values, 0),
+    macro_f_string_statics_t_initialize_1(test_value_array2, length_values, 0),
   };
 
   {

diff --git a/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c b/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c
index 99bdcccc6ed2e7402f6d4e168a40c5b9fe946ca3..30ef38c6b9466892263b23520a56f2c15832f07c 100644 (file)
--- a/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c
+++ b/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c
@@ -66,8 +66,8 @@ void test__f_string_map_multiss_append_all__works(void **state) {
   };
 
   const f_string_statics_t test_values[] = {
-    macro_f_string_statics_t_initialize_1(test_value_array1, 0, length_values),
-    macro_f_string_statics_t_initialize_1(test_value_array2, 0, length_values),
+    macro_f_string_statics_t_initialize_1(test_value_array1, length_values, 0),
+    macro_f_string_statics_t_initialize_1(test_value_array2, length_values, 0),
   };
 
   {