Revert: keep fss.h

Not having fss.h goes against some of the basic design.
Keep fss.h, but do not provide fss.c.

diff --git a/build/level_1/settings b/build/level_1/settings
index 51b03161f9a7c64421b53e5b58f4e965e8f9bcf5..f62e84534d5af212a94f62d98f64cccb2e33d69c 100644 (file)
--- a/build/level_1/settings
+++ b/build/level_1/settings
@@ -22,7 +22,7 @@ build_libraries -lc
 build_libraries-level -lfll_0
 build_sources_library color.c console.c conversion.c directory.c private-directory.c private-fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c iki.c print.c status.c string.c private-string.c utf.c private-utf.c utf_file.c private-utf_file.c
 build_sources_program
-build_sources_headers color.h console.h conversion.h directory.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h iki.h print.h status.h string.h utf.h utf_file.h
+build_sources_headers color.h console.h conversion.h directory.h fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h iki.h print.h status.h string.h utf.h utf_file.h
 build_sources_script
 build_sources_setting
 build_script yes

diff --git a/build/monolithic/settings b/build/monolithic/settings
index 9e3641e89a643666ad6e5b9735efaa62e2811604..c5d58c6e49d5d8673b7446b84ece22ce2718b38d 100644 (file)
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -22,7 +22,7 @@ build_libraries -lc
 build_libraries-monolithic
 build_sources_library level_0/console.c level_0/conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/file.c level_0/private-file.c level_0/fss.c level_0/iki.c level_0/memory.c level_0/path.c level_0/pipe.c level_0/print.c level_0/serialize.c level_0/private-serialize.c level_0/socket.c level_0/utf.c level_0/private-utf.c level_1/color.c level_1/console.c level_1/conversion.c level_1/directory.c level_1/private-directory.c level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/iki.c level_1/print.c level_1/status.c level_1/string.c level_1/private-string.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_status.c level_2/program.c level_2/status.c
 build_sources_program
-build_sources_headers level_0/color.h level_0/console.h level_0/conversion.h level_0/directory.h level_0/directory_type.h level_0/environment.h level_0/file.h level_0/fss.h level_0/fss-common.h level_0/fss-named.h level_0/fss-nest.h level_0/fss-set.h level_0/iki.h level_0/iki-common.h level_0/memory.h level_0/memory-structure.h level_0/path.h level_0/pipe.h level_0/print.h level_0/serialize.h level_0/socket.h level_0/status.h level_0/status_array.h level_0/string.h level_0/string-common.h level_0/string-dynamic.h level_0/string-map.h level_0/string-quantity.h level_0/string-range.h level_0/type.h level_0/type_array.h level_0/utf.h level_0/utf-common.h level_1/color.h level_1/console.h level_1/conversion.h level_1/directory.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_macro.h level_1/fss_status.h level_1/iki.h level_1/print.h level_1/status.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/program.h level_2/status.h
+build_sources_headers level_0/color.h level_0/console.h level_0/conversion.h level_0/directory.h level_0/directory_type.h level_0/environment.h level_0/file.h level_0/fss.h level_0/fss-common.h level_0/fss-named.h level_0/fss-nest.h level_0/fss-set.h level_0/iki.h level_0/iki-common.h level_0/memory.h level_0/memory-structure.h level_0/path.h level_0/pipe.h level_0/print.h level_0/serialize.h level_0/socket.h level_0/status.h level_0/status_array.h level_0/string.h level_0/string-common.h level_0/string-dynamic.h level_0/string-map.h level_0/string-quantity.h level_0/string-range.h level_0/type.h level_0/type_array.h level_0/utf.h level_0/utf-common.h level_1/color.h level_1/console.h level_1/conversion.h level_1/directory.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_macro.h level_1/fss_status.h level_1/iki.h level_1/print.h level_1/status.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/program.h level_2/status.h
 build_sources_script
 build_sources_setting
 build_script yes

diff --git a/level_1/fl_fss/c/fss.h b/level_1/fl_fss/c/fss.h
new file mode 100644 (file)
index 0000000..18a867c
--- /dev/null
+++ b/level_1/fl_fss/c/fss.h
@@ -0,0 +1,36 @@
+/**
+ * FLL - Level 1
+ *
+ * Project: FSS
+ * API Version: 0.5
+ * Licenses: lgplv2.1
+ */
+#ifndef _FL_fss_h
+#define _FL_fss_h
+
+// libc includes
+#include <ctype.h>
+#include <string.h>
+
+// fll-0 includes
+#include <level_0/type.h>
+#include <level_0/status.h>
+#include <level_0/memory.h>
+#include <level_0/string.h>
+#include <level_0/utf.h>
+#include <level_0/file.h>
+#include <level_0/fss.h>
+
+// fll-1 includes
+#include <level_1/fss_status.h>
+#include <level_1/fss_macro.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // _FL_fss_h

diff --git a/level_1/fl_fss/c/fss_basic.h b/level_1/fl_fss/c/fss_basic.h
index aef6dd3fed8ec3d9f20f9dbe533c4d44a9293b7b..0ef12c5385275c593ff71a66cf6efd4ad68759dc 100644 (file)
--- a/level_1/fl_fss/c/fss_basic.h
+++ b/level_1/fl_fss/c/fss_basic.h
@@ -23,6 +23,7 @@
 #include <level_0/utf.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>
 

diff --git a/level_1/fl_fss/c/fss_basic_list.h b/level_1/fl_fss/c/fss_basic_list.h
index 4e25d92f1d83c096fefc57ddbe31f1c8ee0b3c82..aa72e14d70126cb8e68cd2622475e4cc57fb5784 100644 (file)
--- a/level_1/fl_fss/c/fss_basic_list.h
+++ b/level_1/fl_fss/c/fss_basic_list.h
@@ -23,6 +23,7 @@
 #include <level_0/utf.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>

diff --git a/level_1/fl_fss/c/fss_extended.h b/level_1/fl_fss/c/fss_extended.h
index 27c1d2804a95988d4cff182788921a029806a234..95b6125085bb41643e4e4c930922f4667da5ecc4 100644 (file)
--- a/level_1/fl_fss/c/fss_extended.h
+++ b/level_1/fl_fss/c/fss_extended.h
@@ -23,6 +23,7 @@
 #include <level_0/utf.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>
 

diff --git a/level_1/fl_fss/c/fss_extended_list.h b/level_1/fl_fss/c/fss_extended_list.h
index 25aa370cdec275f55163f8aaff4101582eec5d99..51c391345cb606b73e2a4c5fadec5141272e3d78 100644 (file)
--- a/level_1/fl_fss/c/fss_extended_list.h
+++ b/level_1/fl_fss/c/fss_extended_list.h
@@ -23,6 +23,7 @@
 #include <level_0/utf.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>

diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c
index 1e01df45721eab64f161704e2309cfe410f50d92..aacdf2b3dcc482400a5d460db7bc3ec703cfba7e 100644 (file)
--- a/level_1/fl_fss/c/private-fss.c
+++ b/level_1/fl_fss/c/private-fss.c
@@ -1,3 +1,4 @@
+#include <level_1/fss.h>
 #include "private-fss.h"
 
 #ifdef __cplusplus

diff --git a/level_1/fl_fss/c/private-fss.h b/level_1/fl_fss/c/private-fss.h
index 0c7a443f7a2103fd1a7a889d4436ebff450b0cf0..bb9bfdcaaf302a604ce18ec46f5621324e211242 100644 (file)
--- a/level_1/fl_fss/c/private-fss.h
+++ b/level_1/fl_fss/c/private-fss.h
@@ -11,22 +11,6 @@
 #ifndef _PRIVATE_FL_fss_h
 #define _PRIVATE_FL_fss_h
 
-// libc includes
-#include <ctype.h>
-#include <string.h>
-
-// fll-0 includes
-#include <level_0/status.h>
-#include <level_0/fss.h>
-#include <level_0/string.h>
-#include <level_0/type.h>
-#include <level_0/memory.h>
-#include <level_0/utf.h>
-
-// fll-1 includes
-#include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings
index e488c35222f6914e400006460f4bfe29b4336486..57a55880435fe733194639828afa551da8d17214 100644 (file)
--- a/level_1/fl_fss/data/build/settings
+++ b/level_1/fl_fss/data/build/settings
@@ -22,7 +22,7 @@ build_libraries -lc
 build_libraries-individual -lf_fss -lf_file -lf_utf -lf_memory
 build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c
 build_sources_program
-build_sources_headers fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h
+build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h
 build_sources_script
 build_sources_setting
 build_script yes

diff --git a/level_2/fll_fss/c/fss.h b/level_2/fll_fss/c/fss.h
index af8893b9030dac7a3bafa96fb5a0d89f7d913c42..6ee9ce983987d31f4c59dd203495540bad2677b5 100644 (file)
--- a/level_2/fll_fss/c/fss.h
+++ b/level_2/fll_fss/c/fss.h
@@ -19,10 +19,10 @@
 #include <level_0/string.h>
 #include <level_0/utf.h>
 #include <level_0/fss.h>
-#include <level_0/file.h>
 
 // fll-1 includes
 #include <level_1/conversion.h>
+#include <level_1/fss.h>
 #include <level_1/fss_macro.h>
 #include <level_1/fss_status.h>
 #include <level_1/string.h>

diff --git a/level_2/fll_fss/c/fss_basic.h b/level_2/fll_fss/c/fss_basic.h
index 932f83830f442ad3870c21a2af7d2f7f1b9f3ccb..55a30b9f010d08e28a62be33fb50d55f97e5f518 100644 (file)
--- a/level_2/fll_fss/c/fss_basic.h
+++ b/level_2/fll_fss/c/fss_basic.h
@@ -19,6 +19,7 @@
 #include <level_0/utf.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_macro.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_basic.h>

diff --git a/level_2/fll_fss/c/fss_basic_list.h b/level_2/fll_fss/c/fss_basic_list.h
index 1a613f50ab1db3661f1759b7f99690f1016c6946..6b603d5a64eadd25b98b1edb3de2a2326323a18a 100644 (file)
--- a/level_2/fll_fss/c/fss_basic_list.h
+++ b/level_2/fll_fss/c/fss_basic_list.h
@@ -18,6 +18,7 @@
 #include <level_0/type.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_basic_list.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>

diff --git a/level_2/fll_fss/c/fss_extended.h b/level_2/fll_fss/c/fss_extended.h
index a828b867368672988bd58253f4d12cf201abfb64..24690c14fd28bab4f8a8206d2041eef910e65b8e 100644 (file)
--- a/level_2/fll_fss/c/fss_extended.h
+++ b/level_2/fll_fss/c/fss_extended.h
@@ -18,6 +18,7 @@
 #include <level_0/type.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_extended.h>
 #include <level_1/fss_macro.h>

diff --git a/level_2/fll_fss/c/fss_extended_list.h b/level_2/fll_fss/c/fss_extended_list.h
index 7753446e25a6535dd4f6dedf960b1ae00121ef15..d8eac5c78e9dcffaca03d7e764c064cb711f26e0 100644 (file)
--- a/level_2/fll_fss/c/fss_extended_list.h
+++ b/level_2/fll_fss/c/fss_extended_list.h
@@ -18,6 +18,7 @@
 #include <level_0/type.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_extended_list.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>

diff --git a/level_2/fll_fss/c/fss_status.h b/level_2/fll_fss/c/fss_status.h
index 669654c41cc2102d0e52790a6abf252b19160236..a9cc9fa41bfed34af9558cc9baab489abe996d7b 100644 (file)
--- a/level_2/fll_fss/c/fss_status.h
+++ b/level_2/fll_fss/c/fss_status.h
@@ -19,6 +19,7 @@
 #include <level_0/type.h>
 
 // fll-1 includes
+#include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_macro.h>

diff --git a/level_3/init/c/init.h b/level_3/init/c/init.h
index 4e836b865b4c7526afd1e19fbc7206ac488f8f35..e6211f69ea69934a61af9e0f3b2b61d58a6db63b 100644 (file)
--- a/level_3/init/c/init.h
+++ b/level_3/init/c/init.h
@@ -74,6 +74,7 @@
 // fll-1 includes
 #include <level_1/color.h>
 #include <level_1/console.h>
+#include <level_1/fss.h>
 #include <level_1/fss_basic_list.h>
 #include <level_1/fss_extended.h>
 #include <level_1/string.h>