Cleanup: rename f_types to f_type

diff --git a/build/documents/readme b/build/documents/readme
index 86d72beac31a183cd7b64638a8a6ed4eed3f1b27..4fd8f71383cc080a09ecef7f4367eb58398ea947 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 42b33a57193e12e785697783872f459b5c691b16..f5385024d23dda153f34b6a0fef1aaea5aa4cb88 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 b00459d50198eafcd13738e925bf8becaa502646..3fb3d70a4219fa63e4f8de89f3ae8026ac7bca7f 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 5bdf5d24bbb1592db94e5090f20e7a07d999bcee..45be0fc95b1bfb779b4418104556734940252f0b 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 940e663e833384ae633380e9bdf3f0f48bc603d4..76fdcc9b024ea4d980c6c31d44091d731275f9b6 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 5d5a396210687e7acef91d49e7e5162365dc8241..334a94f487c43451585ed69a90deba70d8d51596 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 67cbb403b7d11aa94a480833446f4d89a56b224f..42c32a9d3fb63e23bf142489537f24bb6584a830 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 9afd750bad486d8a2480bcfdf2e397e364cd68bb..8efc786902d4b3d3748d81890bfdb4f888d161f1 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 e2a0f152cafa747bed23d20fba9e06721a5f3e1d..986df81f836b881a0381f8b893689b0e5675323c 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 3633e1195a76c9d1aa8c35ce842d2aa9cc8fb57b..2fb27ddb56b54316bacd8a2cbebe407e848e95f9 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 ac2181ac959e80326bd9aa0055eb6b439caa1c5d..48ec70c58326b37408e1cece86172dbc48577953 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 8556df091d5a96b358753d51e4e7a78feba069a2..a3cbe6af7f0845629b7b28f0272bf6d4fcce28c3 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 5b6ef09540733fdf25b273c79eecfce0d5926ed5..58b1278eb3298ca1053dc86db1a607e36de74380 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 fb87e2430a4fa79144c324d07450fe3b47291095..28c9d8fe666cb1384632c44eb64a6dd1eb31423d 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 9972d8a9de4de56b9a331eac902a2f4ae23b49bd..ef1792bcf0f3ec6cb565206e2439cf75671d027f 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 c29a0029d198b8e35ce3f6b4081b15fecec55dfe..a1f2f3a4de69479f6c561fb870cebfd687f9398d 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 900d5938c4b6c72b19c82a7a052d35730f844487..69105ba778fbc9f41610ab7603bdea2adcac964a 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 f2f6c772baf44b65644cb5979b401fdac418f26d..d75b7de534be432d4fd332395d6ab528b5751776 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 a9b8d0b1f72b0d15d352467355f29f5cab58a60d..b867297ebc14d7af959844111039824da7234607 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 03a8f04ad1ba02c47ecfc20aab940155cfdabecd..60bb462e846d66f65d10ec3456d44fc9bc1998b4 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 9b4fc0eec93abb04a0b7e98fd70585ba1bfb2e05..11f2b36a89d9e52e65d04e71f6e14319c97b3d24 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 537fee2b7045ecfac27be71801418e46f394ac01..f0d5777b819b2b4b3554f3d1702b384c0a710aae 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 6f54496d4d3d55664a81b659a06fa04b9047c162..c129804995befdcdc3be1a0089e0241ce1c4962a 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 df3ce0d5b214c446d6de4c347f6db78c35ad6007..7c850fce87d5079a5325a7f2b07028a981af12ba 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 e6d4b6c0d700189b9307142b9416254f317e53c8..3a8adc57e6d5a6f0594674b6b5ec51f44774c855 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 95fea2d3179d99e6a70d0e992371c87c164777eb..0c77c4915837806759641bdf8f9f3ccf011d7c9c 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 64785d707ea48771a70a00ca809eb798350718bd..35d4785a94ce139487246694b7e0e4eb8f8cf4c7 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 b46d59c1aa9ec18571dc4ec75154d64e8774face..7b5fc4a41fd72e8dd5a66122e98361c1f89b3e76 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 8c5aa8d8d6be290800d9e8bc2dedcd1cbcf13311..1b28fc2124564f85b855f8e0c29464e5dd1b7ea7 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 f9c1b3dee2537ee500790ed8c55d3a076de224bf..2f5f4797334b3cb3e5e42991642d0267926aca9b 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 6c73a8fbba510fbe50e06dec51bd584bd1ec04fc..2af3112ce2c76e3648118b0999062f39618ce3aa 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 4695bc1a5ed36fc9bdbdb319f400aeec9e104740..309e7772b048df8cd6d1d0a72281378160ab8517 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 b36a1f7671bc5c6967fa3c96f6904aabb70a27fb..6e628993650713657bf4127eedcec223923323cb 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 a2314ce0e70ecb271482ecbfb0039936b420b006..efe9a0c54286390c361e0b0c885e01b34bb7c1b6 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 e70b39fee67126d15e88229b0617a2c315352cbf..24d3a20f1dda08e3816afb441241cc85c7015a76 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 b23914e9bb40b1865459065978e1d819e1af7124..428c5e06f553a72b33aa8b73980280ea22c57875 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 f99d0d97aa016bf43efe73cae1f9e565ac8e337a..cc9352b527f69fc683a1248acc05e7aa1437997b 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 36de010a84b131f87b4e2f75241b2fbd51041ee5..f5a32eea44b90b87bd754bc2ca7e6fe0c3c2c1a4 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 2605d8f4d9ad7a7a3f833bfca02294c2acdb3941..1ead96746ecd0d70bdce7504d7f5a6c3327521ce 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 9d13c135565aa55dad69f66094dfeb6df4e487a5..62d35bfa937aa3e9b5ee7384c59f2fdb92c4c3e6 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 3cf0e0a88e52be5eebe5089c98d9a875771b1bc7..5e23359aabe5508b035ccdd5fc828f650b22b8e2 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 bfbe5e7d66355c087adb494155a6c6e4df273e58..6f6c5ffbfd95ecfdf188ecaaae3389b89d41ce7a 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 4731d0cb8c4b4289e19c7c62e526bb6f058b58df..382cb913f7bfc076689e7f9e0b23a4ed0c9925df 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 643ecdda1c7ac1939054c245fa6122673aecc1f2..1f96c3577ed538768cfaabb0aa0a2e069a9336ab 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 a27cb1de11612e8808409e475eee49eb7ca459ed..37716b21d6d563076a53c209632adafe2375c824 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 2822ebfcf7c25f6a8dd453602a750b95d1df7377..ff0512cd6fa961cd34f7b71257b86c500969aaf6 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 b427e41f65766974aaf5f4467e0f2efce80bee1b..fff6db5d80c5ad4ac264ea5bae81817506a40b16 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 1f2eac0f56613ccfec23baf56ca8e69e730e5c88..54e46e50bc552be3dd3c4598a1a1682f17e29db6 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 ae12cb76f3a7acaf69a54755c4d9001559ea3e23..3bdbb6c722b6fd1d59d03d9197fc80394ded4e4c 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>