ci: setup fmt

Author: alandefreitas

.github/workflows/ci.yml

@@ -58,19 +58,20 @@ jobs:
         with:
           compiler: ${{ matrix.compiler }}
           version: ${{ matrix.version }}
-          update-ld-library-path: true
+          update-ld-library-path: ${{ matrix.compiler == 'gcc' }}
+          check-latest: ${{ matrix.compiler == 'clang' }}
 
       - name: Install packages
-        uses: alandefreitas/cpp-actions/package-install@v1.2.1
+        uses: alandefreitas/cpp-actions/package-install@v1.3.0
         id: package-install
         with:
           apt-get: ${{ matrix.install }}
-          vcpkg: libxml2[tools]
+          vcpkg: fmt libxml2[tools]
           cxx: ${{ steps.setup-cpp.outputs.cxx }}
           cc: ${{ steps.setup-cpp.outputs.cc }}
 
       - name: CMake Workflow (C++${{ matrix.std }})
-        uses: alandefreitas/cpp-actions/cmake-workflow@v1.2.1
+        uses: alandefreitas/cpp-actions/cmake-workflow@v1.3.0
         with:
           cmake-version: '>=3.20'
           cxxstd: ${{ matrix.std }}

CMakeLists.txt

@@ -81,6 +81,7 @@ include(HandleLLVMOptions)
 add_definitions(${LLVM_DEFINITIONS})
 llvm_map_components_to_libnames(llvm_libs all)
 unset(CMAKE_FOLDER)
+find_package(fmt REQUIRED CONFIG)
 
 #-------------------------------------------------
 #
@@ -131,6 +132,9 @@ else()
 endif()
 target_include_directories(mrdox SYSTEM PUBLIC ${CLANG_INCLUDE_DIRS})
 
+# fmt
+target_link_libraries(mrdox PUBLIC fmt::fmt)
+
 # Windows, Win64
 if (WIN32)
     target_compile_definitions(

source/-XML/XMLTags.cpp

@@ -189,7 +189,7 @@ nest(int levels)
     }
     else
     {
-        auto const n = levels * -2;
+        auto const n = static_cast<std::size_t>(levels * -2);
         Assert(n <= indent_.size());
         indent_.resize(indent_.size() - n);
     }

source/Config.cpp

@@ -19,13 +19,23 @@
 #include <llvm/Support/YAMLParser.h>
 #include <llvm/Support/YAMLTraits.h>
 
+#include <version>
+
 // Check llvm version
 #define STRINGIFY(Value) #Value
 static_assert(
     LLVM_VERSION_MAJOR >= MRDOX_MINIMUM_LLVM_VERSION,
     "MrDox requires at least clang " STRINGIFY(MRDOX_MINIMUM_LLVM_VERSION)
     ", got " LLVM_VERSION_STRING " instead.");
 
+#if ! defined(__cpp_lib_ranges)
+#error "Ranges library unavailable"
+#endif
+
+#include <ranges>
+
+#include <fmt/format.h>
+
 namespace clang {
 namespace mrdox {
 

source/Support/Debug.hpp

@@ -18,78 +18,72 @@
 #endif
 #include <llvm/Support/raw_ostream.h>
 
-#if __has_include(<format>)
-    #define MRDOX_HAS_CXX20_FORMAT
-#endif
-
-#ifdef MRDOX_HAS_CXX20_FORMAT
-    #include <format>
-    #include <string>
-    #include <mrdox/MetadataFwd.hpp>
-
-    template<>
-    struct std::formatter<clang::mrdox::SymbolID>
-        : std::formatter<std::string>
-    {
-        std::format_context::iterator format(
-            const clang::mrdox::SymbolID& s,
-            std::format_context& ctx) const;
-    };
-
-    template<>
-    struct std::formatter<clang::mrdox::OptionalSymbolID>
-        : std::formatter<clang::mrdox::SymbolID>
-    {
-        std::format_context::iterator format(
-            const clang::mrdox::OptionalSymbolID& s,
-            std::format_context& ctx) const;
-    };
-
-    template<>
-    struct std::formatter<clang::mrdox::InfoType>
-        : std::formatter<std::string>
-    {
-        std::format_context::iterator format(
-            clang::mrdox::InfoType t,
-            std::format_context& ctx) const;
-    };
-
-    template<>
-    struct std::formatter<clang::mrdox::Access>
-        : std::formatter<std::string>
-    {
-        std::format_context::iterator format(
-            clang::mrdox::Access a,
-            std::format_context& ctx) const;
-    };
-
-    template<>
-    struct std::formatter<clang::mrdox::Reference>
-        : std::formatter<std::string>
-    {
-        std::format_context::iterator format(
-            const clang::mrdox::Reference& r,
-            std::format_context& ctx) const;
-    };
-
-    template<>
-    struct std::formatter<clang::mrdox::MemberRef>
-        : std::formatter<std::string>
-    {
-        std::format_context::iterator format(
-            const clang::mrdox::MemberRef& r,
-            std::format_context& ctx) const;
-    };
-
-    template<>
-    struct std::formatter<clang::mrdox::Info>
-        : std::formatter<std::string>
-    {
-        std::format_context::iterator format(
-            const clang::mrdox::Info& i,
-            std::format_context& ctx) const;
-    };
-#endif
+#include <fmt/format.h>
+#include <string>
+#include <mrdox/MetadataFwd.hpp>
+
+template<>
+struct fmt::formatter<clang::mrdox::SymbolID>
+    : fmt::formatter<std::string>
+{
+    fmt::format_context::iterator format(
+        const clang::mrdox::SymbolID& s,
+        fmt::format_context& ctx) const;
+};
+
+template<>
+struct fmt::formatter<clang::mrdox::OptionalSymbolID>
+    : fmt::formatter<clang::mrdox::SymbolID>
+{
+    fmt::format_context::iterator format(
+        const clang::mrdox::OptionalSymbolID& s,
+        fmt::format_context& ctx) const;
+};
+
+template<>
+struct fmt::formatter<clang::mrdox::InfoType>
+    : fmt::formatter<std::string>
+{
+    fmt::format_context::iterator format(
+        clang::mrdox::InfoType t,
+        fmt::format_context& ctx) const;
+};
+
+template<>
+struct fmt::formatter<clang::mrdox::Access>
+    : fmt::formatter<std::string>
+{
+    fmt::format_context::iterator format(
+        clang::mrdox::Access a,
+        fmt::format_context& ctx) const;
+};
+
+template<>
+struct fmt::formatter<clang::mrdox::Reference>
+    : fmt::formatter<std::string>
+{
+    fmt::format_context::iterator format(
+        const clang::mrdox::Reference& r,
+        fmt::format_context& ctx) const;
+};
+
+template<>
+struct fmt::formatter<clang::mrdox::MemberRef>
+    : fmt::formatter<std::string>
+{
+    fmt::format_context::iterator format(
+        const clang::mrdox::MemberRef& r,
+        fmt::format_context& ctx) const;
+};
+
+template<>
+struct fmt::formatter<clang::mrdox::Info>
+    : fmt::formatter<std::string>
+{
+    fmt::format_context::iterator format(
+        const clang::mrdox::Info& i,
+        fmt::format_context& ctx) const;
+};
 
 // Some nice odds and ends such as leak checking
 // and redirection to the Visual Studio output window.