Configure include cleaner

sisinflab-swot · Jun 4, 2024 · 9faf65a · 9faf65a
1 parent 5935c8f
commit 9faf65a
Show file tree

Hide file tree

Showing 106 changed files with 443 additions and 157 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -4,5 +4,7 @@ Checks: >
   clang-analyzer-*,
   -clang-analyzer-cplusplus-*,
   -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
+  misc-header-include-cycle,
+  misc-include-cleaner,
   performance-*,
   portability-*
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Configure CMake
         run: >
           CC=clang cmake -B ${{env.build_dir}}
-          -DULIB_CLANG_TIDY=ON
+          -DCOWL_CLANG_TIDY=ON
           -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
       - name: Build
         run: cmake --build ${{env.build_dir}}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,6 @@ set(COWL_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(COWL_PUBLIC_HEADERS_DIR "${COWL_PROJECT_DIR}/include")
 set(COWL_LIB_DIR "${COWL_PROJECT_DIR}/lib")
 set(COWL_SRC_DIR "${COWL_PROJECT_DIR}/src")
-set(COWL_PRIVATE_HEADERS_DIR "${COWL_SRC_DIR}/include")
 set(COWL_READER_DIR "${COWL_SRC_DIR}/reader")
 set(COWL_WRITER_DIR "${COWL_SRC_DIR}/writer")
 
@@ -97,10 +96,7 @@ endif()
 # Header dirs
 
 set(COWL_PUBLIC_HEADERS_DIRS "${COWL_PUBLIC_HEADERS_DIR}")
-
-set(COWL_PRIVATE_HEADERS_DIRS
-    "${COWL_PRIVATE_HEADERS_DIR}"
-    "${COWL_SRC_DIR}")
+set(COWL_PRIVATE_HEADERS_DIRS "${COWL_SRC_DIR}")
 
 # Header files
 

diff --git a/examples/00_base.c b/examples/00_base.c
@@ -11,6 +11,9 @@
  * @copyright SPDX-License-Identifier: EPL-2.0
  */
 #include "cowl.h"
+#include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #define ONTO "example_pizza.owl"
 

diff --git a/examples/01_errors_imports.c b/examples/01_errors_imports.c
@@ -9,6 +9,9 @@
  * @copyright SPDX-License-Identifier: EPL-2.0
  */
 #include "cowl.h"
+#include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #define ONTO "example_pizza.owl"
 #define IMPORT "import.owl"

diff --git a/examples/02_query.c b/examples/02_query.c
@@ -10,6 +10,9 @@
  * @copyright SPDX-License-Identifier: EPL-2.0
  */
 #include "cowl.h"
+#include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #define ONTO "example_pizza.owl"
 #define NS "http://www.co-ode.org/ontologies/pizza/pizza.owl#"

diff --git a/examples/03_recursive_query.c b/examples/03_recursive_query.c
@@ -10,6 +10,9 @@
  * @copyright SPDX-License-Identifier: EPL-2.0
  */
 #include "cowl.h"
+#include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #define ONTO "example_pizza.owl"
 #define NS "http://www.co-ode.org/ontologies/pizza/pizza.owl#"

diff --git a/examples/04_editing.c b/examples/04_editing.c
@@ -10,6 +10,9 @@
  * @copyright SPDX-License-Identifier: EPL-2.0
  */
 #include "cowl.h"
+#include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #define IN_PATH "example_pizza.owl"
 #define OUT_PATH "example_pizza_new.owl"

diff --git a/examples/05_istream.c b/examples/05_istream.c
@@ -12,6 +12,9 @@
  * @copyright SPDX-License-Identifier: EPL-2.0
  */
 #include "cowl.h"
+#include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #define ONTO "example_pizza.owl"
 #define NS "http://www.co-ode.org/ontologies/pizza/pizza.owl#"

diff --git a/examples/06_ostream.c b/examples/06_ostream.c
@@ -14,6 +14,9 @@
  */
 
 #include "cowl.h"
+#include "ulib.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 #define PATH "porcini_pizza.owl"
 

diff --git a/include/cowl.h b/include/cowl.h
@@ -13,6 +13,8 @@
 #ifndef COWL_H
 #define COWL_H
 
+// IWYU pragma: begin_exports
+
 #include "cowl_annot_assert_axiom.h"
 #include "cowl_annot_prop.h"
 #include "cowl_annot_prop_domain_axiom.h"
@@ -99,13 +101,13 @@
 #include "cowl_owl_vocab.h"
 #include "cowl_position.h"
 #include "cowl_primitive.h"
+#include "cowl_primitive_flags.h"
 #include "cowl_primitive_type.h"
 #include "cowl_quant_type.h"
 #include "cowl_rdf_vocab.h"
 #include "cowl_rdfs_vocab.h"
 #include "cowl_reader.h"
 #include "cowl_ret.h"
-#include "cowl_std.h"
 #include "cowl_string.h"
 #include "cowl_string_opts.h"
 #include "cowl_sub_annot_prop_axiom.h"
@@ -120,4 +122,6 @@
 #include "cowl_writer.h"
 #include "cowl_xsd_vocab.h"
 
+// IWYU pragma: end_exports
+
 #endif // COWL_H
diff --git a/include/cowl_axiom_filter.h b/include/cowl_axiom_filter.h
@@ -14,6 +14,7 @@
 #define COWL_AXIOM_FILTER_H
 
 #include "cowl_axiom_flags.h"
+#include "cowl_ret.h"
 #include "cowl_vector.h"
 
 COWL_BEGIN_DECLS

diff --git a/include/cowl_axiom_flags.h b/include/cowl_axiom_flags.h
@@ -14,7 +14,6 @@
 #define COWL_AXIOM_FLAGS_H
 
 #include "cowl_axiom_type.h"
-#include "cowl_std.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_config.h b/include/cowl_config.h
@@ -16,7 +16,6 @@
 #include "cowl_error_handler.h"
 #include "cowl_import_loader.h"
 #include "cowl_reader.h"
-#include "cowl_std.h"
 #include "cowl_writer.h"
 
 COWL_BEGIN_DECLS

diff --git a/include/cowl_error.h b/include/cowl_error.h
@@ -13,7 +13,10 @@
 #ifndef COWL_ERROR_H
 #define COWL_ERROR_H
 
-#include "cowl_std.h"
+#include "cowl_any.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
+#include "cowl_ret.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_import_loader.h b/include/cowl_import_loader.h
@@ -14,7 +14,6 @@
 #define COWL_IMPORT_LOADER_H
 
 #include "cowl_error.h"
-#include "cowl_std.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_istream_handlers.h b/include/cowl_istream_handlers.h
@@ -13,7 +13,10 @@
 #ifndef COWL_ISTREAM_HANDLERS_H
 #define COWL_ISTREAM_HANDLERS_H
 
-#include "cowl_std.h"
+#include "cowl_any.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
+#include "cowl_ret.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_iterator.h b/include/cowl_iterator.h
@@ -13,8 +13,8 @@
 #ifndef COWL_ITERATOR_H
 #define COWL_ITERATOR_H
 
+#include "cowl_any.h"
 #include "cowl_primitive_flags.h"
-#include "cowl_std.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_object.h b/include/cowl_object.h
@@ -14,7 +14,6 @@
 #define COWL_OBJECT_H
 
 #include "cowl_impl.h"
-#include "cowl_std.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_ontology.h b/include/cowl_ontology.h
@@ -19,7 +19,7 @@
 #include "cowl_object.h"
 #include "cowl_ontology_id.h"
 #include "cowl_position.h"
-#include "cowl_std.h"
+#include "cowl_ret.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_ontology_id.h b/include/cowl_ontology_id.h
@@ -13,7 +13,8 @@
 #ifndef COWL_ONTOLOGY_ID_H
 #define COWL_ONTOLOGY_ID_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_ostream.h b/include/cowl_ostream.h
@@ -13,12 +13,16 @@
 #ifndef COWL_OSTREAM_H
 #define COWL_OSTREAM_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
+#include "cowl_ontology_header.h"
+#include "cowl_ret.h"
 
 COWL_BEGIN_DECLS
 
 /// @cond
 cowl_struct_decl(CowlManager);
+cowl_struct_decl(CowlOntology);
 cowl_struct_decl(CowlSymTable);
 /// @endcond
 

diff --git a/include/cowl_owl_vocab.h b/include/cowl_owl_vocab.h
@@ -13,7 +13,8 @@
 #ifndef COWL_OWL_VOCAB_H
 #define COWL_OWL_VOCAB_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_position.h b/include/cowl_position.h
@@ -13,7 +13,7 @@
 #ifndef COWL_POSITION_H
 #define COWL_POSITION_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_primitive_flags.h b/include/cowl_primitive_flags.h
@@ -14,7 +14,6 @@
 #define COWL_PRIMITIVE_FLAGS_H
 
 #include "cowl_primitive_type.h"
-#include "cowl_std.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_rdf_vocab.h b/include/cowl_rdf_vocab.h
@@ -13,7 +13,8 @@
 #ifndef COWL_RDF_VOCAB_H
 #define COWL_RDF_VOCAB_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_rdfs_vocab.h b/include/cowl_rdfs_vocab.h
@@ -13,7 +13,8 @@
 #ifndef COWL_RDFS_VOCAB_H
 #define COWL_RDFS_VOCAB_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_reader.h b/include/cowl_reader.h
@@ -13,7 +13,9 @@
 #ifndef COWL_READER_H
 #define COWL_READER_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
+#include "cowl_ret.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_std.h b/include/cowl_std.h
diff --git a/include/cowl_string.h b/include/cowl_string.h
@@ -14,7 +14,8 @@
 #define COWL_STRING_H
 
 #include "cowl_object.h"
-#include "cowl_string_opts.h"
+#include "cowl_ret.h"
+#include "cowl_string_opts.h" // IWYU pragma: export
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_string_opts.h b/include/cowl_string_opts.h
@@ -13,7 +13,7 @@
 #ifndef COWL_STRING_OPTS_H
 #define COWL_STRING_OPTS_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_sym_table.h b/include/cowl_sym_table.h
@@ -13,7 +13,9 @@
 #ifndef COWL_SYM_TABLE_H
 #define COWL_SYM_TABLE_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
+#include "cowl_ret.h"
 
 COWL_BEGIN_DECLS
 

diff --git a/include/cowl_vector.h b/include/cowl_vector.h
@@ -13,6 +13,7 @@
 #ifndef COWL_VECTOR_H
 #define COWL_VECTOR_H
 
+#include "cowl_any.h"
 #include "cowl_object.h"
 
 COWL_BEGIN_DECLS

diff --git a/include/cowl_version.h b/include/cowl_version.h
@@ -13,10 +13,15 @@
 #ifndef COWL_VERSION_H
 #define COWL_VERSION_H
 
-#include "cowl_std.h"
+#include "cowl_attrs.h"
+#include "cowl_macros.h"
 
 COWL_BEGIN_DECLS
 
+/// @cond
+cowl_struct_decl(CowlString);
+/// @endcond
+
 /**
  * @defgroup version Library version metadata
  * @{