Cleanup: _F_types_h should be _F_type_h and some macros have misplaces the "s".

The f_type project is singular, so do not use an "s" in the name.

Some of the macros in the type_array.h file were not converted from having the "s" after the _t to more accurately matching the type name.
For example uint8s_t should have macros using uint8s_t instead of uint8_ts.

diff --git a/level_0/f_type/c/type.h b/level_0/f_type/c/type.h
index ef8268049d8314760e9f127fde3df461a2672ad9..482d209bd42e269a5dd7eaf31eb9084d4cd2a5ce 100644 (file)
--- a/level_0/f_type/c/type.h
+++ b/level_0/f_type/c/type.h
@@ -7,8 +7,8 @@
  *
  * Provides datatype definitions.
  */
-#ifndef _F_types_h
-#define _F_types_h
+#ifndef _F_type_h
+#define _F_type_h
 
 // libc includes
 #include <stdbool.h>
@@ -307,4 +307,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _F_types_h
+#endif // _F_type_h

diff --git a/level_0/f_type/c/type_array.h b/level_0/f_type/c/type_array.h
index a9f6563128e98a1ba03a159336f830834e0f9611..9fec7241d8bf8a625c2073ec256ab425eb228685 100644 (file)
--- a/level_0/f_type/c/type_array.h
+++ b/level_0/f_type/c/type_array.h
@@ -532,20 +532,20 @@ extern "C" {
     f_array_length_t used;
   } f_int64s_t;
 
-  #define f_int64_ts_initialize { 0, 0, 0 }
+  #define f_int64s_t_initialize { 0, 0, 0 }
 
-  #define f_macro_int64_ts_clear(numbers) f_macro_memory_structure_t_clear(numbers)
+  #define f_macro_int64s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers)
 
-  #define f_macro_int64_ts_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int64_t, length)
+  #define f_macro_int64s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int64_t, length)
 
-  #define f_macro_int64_ts_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, int64_t)
-  #define f_macro_int64_ts_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int64_t)
+  #define f_macro_int64s_t_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, int64_t)
+  #define f_macro_int64s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int64_t)
 
-  #define f_macro_int64_ts_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, int64_t)
-  #define f_macro_int64_ts_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int64_t)
+  #define f_macro_int64s_t_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, int64_t)
+  #define f_macro_int64s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int64_t)
 
-  #define f_macro_int64_ts_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int64_t, new_length)
-  #define f_macro_int64_ts_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int64_t, new_length)
+  #define f_macro_int64s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int64_t, new_length)
+  #define f_macro_int64s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int64_t, new_length)
 #endif // _di_int64s_t_
 
 /**
@@ -657,20 +657,20 @@ extern "C" {
       f_array_length_t used;
     } f_int128s_t;
 
-    #define f_int128_ts_initialize { 0, 0, 0 }
+    #define f_int128s_t_initialize { 0, 0, 0 }
 
-    #define f_macro_int128_ts_clear(numbers) f_macro_memory_structure_t_clear(numbers)
+    #define f_macro_int128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers)
 
-    #define f_macro_int128_ts_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, __int128_t, length)
+    #define f_macro_int128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, __int128_t, length)
 
-    #define f_macro_int128_ts_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, __int128_t)
-    #define f_macro_int128_ts_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, __int128_t)
+    #define f_macro_int128s_t_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, __int128_t)
+    #define f_macro_int128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, __int128_t)
 
-    #define f_macro_int128_ts_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, __int128_t)
-    #define f_macro_int128_ts_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, __int128_t)
+    #define f_macro_int128s_t_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, __int128_t)
+    #define f_macro_int128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, __int128_t)
 
-    #define f_macro_int128_ts_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, __int128_t, new_length)
-    #define f_macro_int128_ts_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, __int128_t, new_length)
+    #define f_macro_int128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, __int128_t, new_length)
+    #define f_macro_int128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, __int128_t, new_length)
   #endif // _di_int128s_t_
 
   /**
@@ -719,20 +719,20 @@ extern "C" {
       f_array_length_t used;
     } f_uint128s_t;
 
-    #define f_uint128_ts_initialize { 0, 0, 0 }
+    #define f_uint128s_t_initialize { 0, 0, 0 }
 
-    #define f_macro_uint128_ts_clear(numbers) f_macro_memory_structure_t_clear(numbers)
+    #define f_macro_uint128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers)
 
-    #define f_macro_uint128_ts_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, __uint128_t, length)
+    #define f_macro_uint128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, __uint128_t, length)
 
-    #define f_macro_uint128_ts_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, __uint128_t)
-    #define f_macro_uint128_ts_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, __uint128_t)
+    #define f_macro_uint128s_t_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, __uint128_t)
+    #define f_macro_uint128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, __uint128_t)
 
-    #define f_macro_uint128_ts_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, __uint128_t)
-    #define f_macro_uint128_ts_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, __uint128_t)
+    #define f_macro_uint128s_t_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, __uint128_t)
+    #define f_macro_uint128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, __uint128_t)
 
-    #define f_macro_uint128_ts_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, __uint128_t, new_length)
-    #define f_macro_uint128_ts_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, __uint128_t, new_length)
+    #define f_macro_uint128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, __uint128_t, new_length)
+    #define f_macro_uint128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, __uint128_t, new_length)
   #endif // _di_uint128s_t_
 
   /**
@@ -781,20 +781,20 @@ extern "C" {
       f_array_length_t used;
     } f_int128s_t;
 
-    #define f_int128_ts_initialize { 0, 0, 0 }
+    #define f_int128s_t_initialize { 0, 0, 0 }
 
-    #define f_macro_int128_ts_clear(numbers) f_macro_memory_structure_t_clear(numbers)
+    #define f_macro_int128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers)
 
-    #define f_macro_int128_ts_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int64_t, length)
+    #define f_macro_int128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int64_t, length)
 
-    #define f_macro_int128_ts_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, int64_t)
-    #define f_macro_int128_ts_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int64_t)
+    #define f_macro_int128s_t_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, int64_t)
+    #define f_macro_int128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int64_t)
 
-    #define f_macro_int128_ts_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, int64_t)
-    #define f_macro_int128_ts_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int64_t)
+    #define f_macro_int128s_t_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, int64_t)
+    #define f_macro_int128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int64_t)
 
-    #define f_macro_int128_ts_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int64_t, new_length)
-    #define f_macro_int128_ts_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int64_t, new_length)
+    #define f_macro_int128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int64_t, new_length)
+    #define f_macro_int128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int64_t, new_length)
   #endif // _di_int128s_t_
 
   /**
@@ -843,20 +843,20 @@ extern "C" {
       f_array_length_t used;
     } f_uint128s_t;
 
-    #define f_uint128_ts_initialize { 0, 0, 0 }
+    #define f_uint128s_t_initialize { 0, 0, 0 }
 
-    #define f_macro_uint128_ts_clear(numbers) f_macro_memory_structure_t_clear(numbers)
+    #define f_macro_uint128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers)
 
-    #define f_macro_uint128_ts_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, uint64_t, length)
+    #define f_macro_uint128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, uint64_t, length)
 
-    #define f_macro_uint128_ts_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, uint64_t)
-    #define f_macro_uint128_ts_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, uint64_t)
+    #define f_macro_uint128s_t_delete(status, numbers)  f_macro_memory_structure_t_delete(status, numbers, uint64_t)
+    #define f_macro_uint128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, uint64_t)
 
-    #define f_macro_uint128_ts_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, uint64_t)
-    #define f_macro_uint128_ts_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, uint64_t)
+    #define f_macro_uint128s_t_delete_simple(numbers)  f_macro_memory_structure_t_delete_simple(numbers, uint64_t)
+    #define f_macro_uint128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, uint64_t)
 
-    #define f_macro_uint128_ts_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, uint64_t, new_length)
-    #define f_macro_uint128_ts_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, uint64_t, new_length)
+    #define f_macro_uint128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, uint64_t, new_length)
+    #define f_macro_uint128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, uint64_t, new_length)
   #endif // _di_uint128s_t_
 
   /**