Moved pattern formatter from spdlog/details to spdlog/

include/spdlog/details/pattern_formatter.h

@@ -1,121 +0,0 @@
-// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-#pragma once
-
-#include <spdlog/common.h>
-#include <spdlog/details/log_msg.h>
-#include <spdlog/details/os.h>
-#include <spdlog/formatter.h>
-
-#include <chrono>
-#include <ctime>
-#include <memory>
-
-#include <string>
-#include <vector>
-#include <unordered_map>
-
-namespace spdlog {
-namespace details {
-
-// padding information.
-struct padding_info
-{
-    enum pad_side
-    {
-        left,
-        right,
-        center
-    };
-
-    padding_info() = default;
-    padding_info(size_t width, padding_info::pad_side side, bool truncate)
-        : width_(width)
-        , side_(side)
-        , truncate_(truncate)
-        , enabled_(true)
-    {}
-
-    bool enabled() const
-    {
-        return enabled_;
-    }
-    const size_t width_ = 0;
-    const pad_side side_ = left;
-    bool truncate_ = false;
-    bool enabled_ = false;
-};
-
-class SPDLOG_API flag_formatter
-{
-public:
-    explicit flag_formatter(padding_info padinfo)
-        : padinfo_(padinfo)
-    {}
-    flag_formatter() = default;
-    virtual ~flag_formatter() = default;
-    virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0;
-
-protected:
-    padding_info padinfo_;
-};
-
-} // namespace details
-
-class SPDLOG_API custom_flag_formatter : public details::flag_formatter
-{
-public:
-    virtual std::unique_ptr<custom_flag_formatter> clone() const = 0;
-};
-
-class SPDLOG_API pattern_formatter final : public formatter
-{
-public:
-    using custom_flags = std::unordered_map<char, std::unique_ptr<custom_flag_formatter>>;
-
-    explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local,
-        std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = {});
-
-    // use default pattern is not given
-    explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol);
-
-    pattern_formatter(const pattern_formatter &other) = delete;
-    pattern_formatter &operator=(const pattern_formatter &other) = delete;
-
-    std::unique_ptr<formatter> clone() const override;
-    void format(const details::log_msg &msg, memory_buf_t &dest) override;
-
-    template<typename T, typename... Args>
-    pattern_formatter &add_flag_handler(char flag, const Args &... args)
-    {
-        custom_handlers_[flag] = details::make_unique<T>(args...);
-        return *this;        
-    }
-    void recompile();
-
-private:
-    std::string pattern_;
-    std::string eol_;
-    pattern_time_type pattern_time_type_;
-    std::tm cached_tm_;
-    std::chrono::seconds last_log_secs_;
-    std::vector<std::unique_ptr<details::flag_formatter>> formatters_;
-    custom_flags custom_handlers_;
-
-    std::tm get_time_(const details::log_msg &msg);
-    template<typename Padder>
-    void handle_flag_(char flag, details::padding_info padding);
-
-    // Extract given pad spec (e.g. %8X)
-    // Advance the given it pass the end of the padding spec found (if any)
-    // Return padding.
-    static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end);
-
-    void compile_pattern_(const std::string &pattern);
-};
-} // namespace spdlog
-
-#ifdef SPDLOG_HEADER_ONLY
-#include "pattern_formatter-inl.h"
-#endif

include/spdlog/details/registry-inl.h

@@ -10,7 +10,7 @@
 #include <spdlog/common.h>
 #include <spdlog/details/periodic_worker.h>
 #include <spdlog/logger.h>
-#include <spdlog/details/pattern_formatter.h>
+#include <spdlog/pattern_formatter.h>
 
 #ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
 // support for the default stdout color logger