Cleanup: rename f_types to f_type

diff --git a/build/documents/readme b/build/documents/readme
index 86d72be..4fd8f71 100644 (file)
--- a/build/documents/readme
+++ b/build/documents/readme
@@ -47,12 +47,12 @@ Therefore, a level_1 project can only depend on level_0 projects and a level_2 p
 
 A few projects in level_0 are essentially required by everything and are depended on by virtually all projects, regardless of the level.
 These level_0 projects are:
-- f_types: provides core typedef, #define, and similar structures for the entire set of FLL projects.
+- f_type: provides core typedef, #define, and similar structures for the entire set of FLL projects.
 - f_status: provides status codes and other status codes to be used by the entire set of FLL projects.
 - f_memory: provides common memory allocation/deallocation to be used by the entire set of FLL projects.
 - f_string: provides common string management to be used by the entire set of the FLL projects.
 
-The above projects should be installed first, and in the provided order (f_types, then f_status, then f_memory, and finally f_string).
+The above projects should be installed first, and in the provided order (f_type, then f_status, then f_memory, and finally f_string).
 No other level_0 project should depend on another and can be installed in any order (future designs may add f_utf to this list).
 
 See: data/build/dependencies for specific dependencies of this project.

diff --git a/build/level_0/settings b/build/level_0/settings
index 42b33a5..f538502 100644 (file)
--- a/build/level_0/settings
+++ b/build/level_0/settings
@@ -13,7 +13,7 @@ build_libraries -lc
 build_libraries_fll
 build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c
 build_sources_program
-build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h
+build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/type.h level_0/type_array.h level_0/utf.h
 build_shared yes
 build_static yes
 

diff --git a/build/monolithic/settings b/build/monolithic/settings
index b00459d..3fb3d70 100644 (file)
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -13,7 +13,7 @@ build_libraries -lc
 build_libraries_fll
 build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c level_1/colors.c level_1/console.c level_1/directory.c level_1/status.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/program.c level_1/serialized.c level_1/string.c level_1/utf.c level_2/colors.c level_2/execute.c level_2/status.c
 build_sources_program
-build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h
+build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/type.h level_0/type_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h
 build_sources_bash
 build_sources_settings
 build_shared yes

diff --git a/level_0/f_colors/c/colors.h b/level_0/f_colors/c/colors.h
index 5bdf5d2..45be0fc 100644 (file)
--- a/level_0/f_colors/c/colors.h
+++ b/level_0/f_colors/c/colors.h
@@ -13,7 +13,7 @@
 
 // fll-0 includes
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_console/c/console.h b/level_0/f_console/c/console.h
index 940e663..76fdcc9 100644 (file)
--- a/level_0/f_console/c/console.h
+++ b/level_0/f_console/c/console.h
@@ -15,7 +15,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/string.h>
 
 #ifdef __cplusplus

diff --git a/level_0/f_conversion/c/conversion.h b/level_0/f_conversion/c/conversion.h
index 5d5a396..334a94f 100644 (file)
--- a/level_0/f_conversion/c/conversion.h
+++ b/level_0/f_conversion/c/conversion.h
@@ -28,7 +28,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h
index 67cbb40..42c32a9 100644 (file)
--- a/level_0/f_file/c/file.h
+++ b/level_0/f_file/c/file.h
@@ -22,7 +22,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h
index 9afd750..8efc786 100644 (file)
--- a/level_0/f_fss/c/fss.h
+++ b/level_0/f_fss/c/fss.h
@@ -16,7 +16,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_memory/c/memory.h b/level_0/f_memory/c/memory.h
index e2a0f15..986df81 100644 (file)
--- a/level_0/f_memory/c/memory.h
+++ b/level_0/f_memory/c/memory.h
@@ -30,7 +30,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_pipe/c/pipe.h b/level_0/f_pipe/c/pipe.h
index 3633e11..2fb27dd 100644 (file)
--- a/level_0/f_pipe/c/pipe.h
+++ b/level_0/f_pipe/c/pipe.h
@@ -16,7 +16,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h
index ac2181a..48ec70c 100644 (file)
--- a/level_0/f_print/c/print.h
+++ b/level_0/f_print/c/print.h
@@ -19,7 +19,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_serialized/c/serialized.h b/level_0/f_serialized/c/serialized.h
index 8556df0..a3cbe6a 100644 (file)
--- a/level_0/f_serialized/c/serialized.h
+++ b/level_0/f_serialized/c/serialized.h
@@ -17,7 +17,7 @@
 
 // fll-0 includes
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h
index 5b6ef09..58b1278 100644 (file)
--- a/level_0/f_socket/c/socket.h
+++ b/level_0/f_socket/c/socket.h
@@ -18,7 +18,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C"{

diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h
index fb87e24..28c9d8f 100644 (file)
--- a/level_0/f_string/c/string.h
+++ b/level_0/f_string/c/string.h
@@ -16,7 +16,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_types/c/types.h b/level_0/f_type/c/type.h
similarity index 99%
rename from level_0/f_types/c/types.h
rename to level_0/f_type/c/type.h
index 9972d8a..ef1792b 100644 (file)
--- a/level_0/f_types/c/types.h
+++ b/level_0/f_type/c/type.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: Types
+ * Project: Type
  * API Version: 0.5
  * Licenses: lgplv2.1
  *

diff --git a/level_0/f_types/c/types_array.h b/level_0/f_type/c/type_array.h
similarity index 67%
rename from level_0/f_types/c/types_array.h
rename to level_0/f_type/c/type_array.h
index c29a002..a1f2f3a 100644 (file)
--- a/level_0/f_types/c/types_array.h
+++ b/level_0/f_type/c/type_array.h
@@ -1,18 +1,18 @@
 /**
  * FLL - Level 0
  *
- * Project: Types
+ * Project: Type
  * API Version: 0.5
  * Licenses: lgplv2.1
  *
  * Provides datatypes that are arrays of some sort and require memory operations.
  */
-#ifndef _F_types_array_h
-#define _F_types_array_h
+#ifndef _F_type_array_h
+#define _F_type_array_h
 
 // fll-0 includes
 #include <level_0/memory.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,19 +31,19 @@ extern "C" {
 
   #define f_array_lengths_initialize { 0, 0, 0 }
 
-  #define f_macro_types_array_lengths_new(status, lengths, length) \
+  #define f_macro_array_lengths_new(status, lengths, length) \
     f_macro_memory_structure_new(status, lengths, f_array_length, length)
 
-  #define f_macro_types_array_lengths_delete(status, lengths) \
+  #define f_macro_array_lengths_delete(status, lengths) \
     f_macro_memory_structure_delete(status, lengths, f_array_length)
 
-  #define f_macro_types_array_lengths_destroy(status, lengths) \
+  #define f_macro_array_lengths_destroy(status, lengths) \
     f_macro_memory_structure_destroy(status, lengths, f_array_length)
 
-  #define f_macro_types_array_lengths_resize(status, lengths, new_length) \
+  #define f_macro_array_lengths_resize(status, lengths, new_length) \
     f_macro_memory_structure_resize(status, lengths, f_array_length, new_length)
 
-  #define f_macro_types_array_lengths_adjust(status, lengths, new_length) \
+  #define f_macro_array_lengths_adjust(status, lengths, new_length) \
     f_macro_memory_structure_adjust(status, lengths, f_array_length, new_length)
 #endif // _di_f_array_lengths_
 
@@ -51,4 +51,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _F_types_array_h
+#endif // _F_type_array_h

diff --git a/level_0/f_types/data/build/dependencies b/level_0/f_type/data/build/dependencies
similarity index 100%
rename from level_0/f_types/data/build/dependencies
rename to level_0/f_type/data/build/dependencies

diff --git a/level_0/f_types/data/build/settings b/level_0/f_type/data/build/settings
similarity index 86%
rename from level_0/f_types/data/build/settings
rename to level_0/f_type/data/build/settings
index 900d593..69105ba 100644 (file)
--- a/level_0/f_types/data/build/settings
+++ b/level_0/f_type/data/build/settings
@@ -1,6 +1,6 @@
 # fss-0000
 
-project_name f_types
+project_name f_type
 project_level 0
 
 version_major 0
@@ -13,7 +13,7 @@ build_libraries -lc
 build_libraries_fll
 build_sources_library
 build_sources_program
-build_sources_headers types.h types_array.h
+build_sources_headers type.h type_array.h
 build_sources_bash
 build_sources_settings
 build_shared yes

diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h
index f2f6c77..d75b7de 100644 (file)
--- a/level_0/f_utf/c/utf.h
+++ b/level_0/f_utf/c/utf.h
@@ -40,7 +40,7 @@
 
 // fll-0 includes
 #include <level_0/status.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/string.h>
 
 #ifdef __cplusplus

diff --git a/level_1/fl_colors/c/colors.h b/level_1/fl_colors/c/colors.h
index a9b8d0b..b867297 100644 (file)
--- a/level_1/fl_colors/c/colors.h
+++ b/level_1/fl_colors/c/colors.h
@@ -20,7 +20,7 @@
 #include <level_0/status.h>
 #include <level_0/file.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/print.h>
 
 #ifdef __cplusplus

diff --git a/level_1/fl_console/c/console.h b/level_1/fl_console/c/console.h
index 03a8f04..60bb462 100644 (file)
--- a/level_1/fl_console/c/console.h
+++ b/level_1/fl_console/c/console.h
@@ -17,7 +17,7 @@
 #include <level_0/console.h>
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_directory/c/directory.h b/level_1/fl_directory/c/directory.h
index 9b4fc0e..11f2b36 100644 (file)
--- a/level_1/fl_directory/c/directory.h
+++ b/level_1/fl_directory/c/directory.h
@@ -22,7 +22,7 @@
 #include <level_0/status.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_file/c/file.h b/level_1/fl_file/c/file.h
index 537fee2..f0d5777 100644 (file)
--- a/level_1/fl_file/c/file.h
+++ b/level_1/fl_file/c/file.h
@@ -13,7 +13,7 @@
 // fll-0 includes
 #include <level_0/file.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_fss/c/fss.h b/level_1/fl_fss/c/fss.h
index 6f54496..c129804 100644 (file)
--- a/level_1/fl_fss/c/fss.h
+++ b/level_1/fl_fss/c/fss.h
@@ -18,7 +18,7 @@
 #include <level_0/file.h>
 #include <level_0/fss.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 // fll-1 includes

diff --git a/level_1/fl_fss/c/fss_basic.h b/level_1/fl_fss/c/fss_basic.h
index df3ce0d..7c850fc 100644 (file)
--- a/level_1/fl_fss/c/fss_basic.h
+++ b/level_1/fl_fss/c/fss_basic.h
@@ -18,7 +18,7 @@
 #include <level_0/status.h>
 #include <level_0/fss.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/memory.h>
 #include <level_0/utf.h>
 

diff --git a/level_1/fl_fss/c/fss_basic_list.h b/level_1/fl_fss/c/fss_basic_list.h
index e6d4b6c..3a8adc5 100644 (file)
--- a/level_1/fl_fss/c/fss_basic_list.h
+++ b/level_1/fl_fss/c/fss_basic_list.h
@@ -19,7 +19,7 @@
 #include <level_0/fss.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 // fll-1 includes

diff --git a/level_1/fl_fss/c/fss_extended.h b/level_1/fl_fss/c/fss_extended.h
index 95fea2d..0c77c49 100644 (file)
--- a/level_1/fl_fss/c/fss_extended.h
+++ b/level_1/fl_fss/c/fss_extended.h
@@ -19,7 +19,7 @@
 #include <level_0/fss.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 // fll-1 includes

diff --git a/level_1/fl_program/c/program.h b/level_1/fl_program/c/program.h
index 64785d7..35d4785 100644 (file)
--- a/level_1/fl_program/c/program.h
+++ b/level_1/fl_program/c/program.h
@@ -16,7 +16,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_1/fl_serialized/c/serialized.h b/level_1/fl_serialized/c/serialized.h
index b46d59c..7b5fc4a 100644 (file)
--- a/level_1/fl_serialized/c/serialized.h
+++ b/level_1/fl_serialized/c/serialized.h
@@ -19,7 +19,7 @@
 #include <level_0/status.h>
 #include <level_0/serialized.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 #ifdef __cplusplus

diff --git a/level_1/fl_socket/c/socket.h b/level_1/fl_socket/c/socket.h
index 8c5aa8d..1b28fc2 100644 (file)
--- a/level_1/fl_socket/c/socket.h
+++ b/level_1/fl_socket/c/socket.h
@@ -22,7 +22,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/socket.h>
 
 #ifdef __cplusplus

diff --git a/level_1/fl_status/c/status.h b/level_1/fl_status/c/status.h
index f9c1b3d..2f5f479 100644 (file)
--- a/level_1/fl_status/c/status.h
+++ b/level_1/fl_status/c/status.h
@@ -13,7 +13,7 @@
 // fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 #ifdef __cplusplus

diff --git a/level_1/fl_string/c/string.h b/level_1/fl_string/c/string.h
index 6c73a8f..2af3112 100644 (file)
--- a/level_1/fl_string/c/string.h
+++ b/level_1/fl_string/c/string.h
@@ -18,7 +18,7 @@
 #include <level_0/status.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 #ifdef __cplusplus

diff --git a/level_1/fl_utf/c/utf.h b/level_1/fl_utf/c/utf.h
index 4695bc1..309e777 100644 (file)
--- a/level_1/fl_utf/c/utf.h
+++ b/level_1/fl_utf/c/utf.h
@@ -18,7 +18,7 @@
 #include <level_0/status.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 #ifdef __cplusplus

diff --git a/level_2/fll_colors/c/colors.h b/level_2/fll_colors/c/colors.h
index b36a1f7..6e62899 100644 (file)
--- a/level_2/fll_colors/c/colors.h
+++ b/level_2/fll_colors/c/colors.h
@@ -17,7 +17,7 @@
 // fll-0 includes
 #include <level_0/colors.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_2/fll_execute/c/execute.h b/level_2/fll_execute/c/execute.h
index a2314ce..efe9a0c 100644 (file)
--- a/level_2/fll_execute/c/execute.h
+++ b/level_2/fll_execute/c/execute.h
@@ -22,7 +22,7 @@
 #include <level_0/status.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 

diff --git a/level_2/fll_fss/c/fss_basic.h b/level_2/fll_fss/c/fss_basic.h
index e70b39f..24d3a20 100644 (file)
--- a/level_2/fll_fss/c/fss_basic.h
+++ b/level_2/fll_fss/c/fss_basic.h
@@ -15,7 +15,7 @@
 #include <level_0/fss.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 // fll-1 includes

diff --git a/level_2/fll_fss/c/fss_basic_list.h b/level_2/fll_fss/c/fss_basic_list.h
index b23914e..428c5e0 100644 (file)
--- a/level_2/fll_fss/c/fss_basic_list.h
+++ b/level_2/fll_fss/c/fss_basic_list.h
@@ -15,7 +15,7 @@
 #include <level_0/fss.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/fss.h>

diff --git a/level_2/fll_fss/c/fss_extended.h b/level_2/fll_fss/c/fss_extended.h
index f99d0d9..cc9352b 100644 (file)
--- a/level_2/fll_fss/c/fss_extended.h
+++ b/level_2/fll_fss/c/fss_extended.h
@@ -15,7 +15,7 @@
 #include <level_0/fss.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/fss.h>

diff --git a/level_2/fll_fss/c/fss_status.h b/level_2/fll_fss/c/fss_status.h
index 36de010..f5a32ee 100644 (file)
--- a/level_2/fll_fss/c/fss_status.h
+++ b/level_2/fll_fss/c/fss_status.h
@@ -16,7 +16,7 @@
 #include <level_0/fss.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/fss.h>

diff --git a/level_2/fll_status/c/status.h b/level_2/fll_status/c/status.h
index 2605d8f..1ead967 100644 (file)
--- a/level_2/fll_status/c/status.h
+++ b/level_2/fll_status/c/status.h
@@ -14,7 +14,7 @@
 #include <level_0/conversion.h>
 #include <level_0/status.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 #include <level_0/utf.h>
 
 // fll-1 includes

diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h
index 9d13c13..62d35bf 100644 (file)
--- a/level_3/firewall/c/firewall.h
+++ b/level_3/firewall/c/firewall.h
@@ -21,8 +21,8 @@
 #include <level_0/file.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
-#include <level_0/types_array.h>
+#include <level_0/type.h>
+#include <level_0/type_array.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c
index 3cf0e0a..5e23359 100644 (file)
--- a/level_3/firewall/c/private-firewall.c
+++ b/level_3/firewall/c/private-firewall.c
@@ -870,8 +870,8 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains *reserved
 
   f_string_dynamic fixed_string = f_string_dynamic_initialize;
 
-  f_macro_types_array_lengths_delete(status, local->chain_ids);
-  f_macro_types_array_lengths_new(status, local->chain_ids, local->chain_objects.used);
+  f_macro_array_lengths_delete(status, local->chain_ids);
+  f_macro_array_lengths_new(status, local->chain_ids, local->chain_objects.used);
 
   if (f_status_is_error(status)) {
     return status;
@@ -1485,7 +1485,7 @@ f_return_status firewall_delete_local_data(firewall_local_data *local) {
   local->chain = 0;
 
   f_macro_string_dynamic_delete(status, local->buffer);
-  f_macro_types_array_lengths_delete(status, local->chain_ids);
+  f_macro_array_lengths_delete(status, local->chain_ids);
   f_macro_fss_objects_delete(status, local->chain_objects);
   f_macro_fss_contents_delete(status, local->chain_contents);
   f_macro_fss_objects_delete(status, local->rule_objects);

diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
index bfbe5e7..6f6c5ff 100644 (file)
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
@@ -23,7 +23,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
index 4731d0c..382cb91 100644 (file)
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
@@ -19,7 +19,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h
index 643ecdd..1f96c35 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.h
+++ b/level_3/fss_basic_read/c/fss_basic_read.h
@@ -23,7 +23,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h
index a27cb1d..37716b2 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.h
+++ b/level_3/fss_basic_write/c/fss_basic_write.h
@@ -19,7 +19,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h
index 2822ebf..ff0512c 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.h
+++ b/level_3/fss_extended_read/c/fss_extended_read.h
@@ -23,7 +23,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h
index b427e41..fff6db5 100644 (file)
--- a/level_3/fss_extended_write/c/fss_extended_write.h
+++ b/level_3/fss_extended_write/c/fss_extended_write.h
@@ -19,7 +19,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/fss_status_code/c/fss_status_code.h b/level_3/fss_status_code/c/fss_status_code.h
index 1f2eac0..54e46e5 100644 (file)
--- a/level_3/fss_status_code/c/fss_status_code.h
+++ b/level_3/fss_status_code/c/fss_status_code.h
@@ -20,7 +20,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>

diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h
index ae12cb7..3bdbb6c 100644 (file)
--- a/level_3/status_code/c/status_code.h
+++ b/level_3/status_code/c/status_code.h
@@ -18,7 +18,7 @@
 #include <level_0/pipe.h>
 #include <level_0/print.h>
 #include <level_0/string.h>
-#include <level_0/types.h>
+#include <level_0/type.h>
 
 // fll-1 includes
 #include <level_1/colors.h>