diff --git a/include/libimp/log.h b/include/libimp/log.h index acbf6eb..7ceee10 100644 --- a/include/libimp/log.h +++ b/include/libimp/log.h @@ -109,20 +109,20 @@ inline auto &make_std_out() noexcept { * \brief Log information grips. */ template -class grip { +class logger { Outputer out_; char const *func_; level level_limit_; public: template - grip(char const *func, O &&out, level level_limit) noexcept + logger(char const *func, O &&out, level level_limit) noexcept : out_ (std::forward(out)) , func_ (func) , level_limit_(level_limit) {} template - grip const &operator()(log::level l, A &&...args) const noexcept { + logger const &operator()(log::level l, A &&...args) const noexcept { if (underlyof(l) < underlyof(level_limit_)) { return *this; } @@ -135,28 +135,28 @@ public: return *this; } - template grip const &trace (A &&...args) const noexcept { return (*this)(log::level::trace , std::forward(args)...); } - template grip const &debug (A &&...args) const noexcept { return (*this)(log::level::debug , std::forward(args)...); } - template grip const &info (A &&...args) const noexcept { return (*this)(log::level::info , std::forward(args)...); } - template grip const &warning(A &&...args) const noexcept { return (*this)(log::level::warning, std::forward(args)...); } - template grip const &error (A &&...args) const noexcept { return (*this)(log::level::error , std::forward(args)...); } - template grip const &failed (A &&...args) const noexcept { return (*this)(log::level::failed , std::forward(args)...); } + template logger const &trace (A &&...args) const noexcept { return (*this)(log::level::trace , std::forward(args)...); } + template logger const &debug (A &&...args) const noexcept { return (*this)(log::level::debug , std::forward(args)...); } + template logger const &info (A &&...args) const noexcept { return (*this)(log::level::info , std::forward(args)...); } + template logger const &warning(A &&...args) const noexcept { return (*this)(log::level::warning, std::forward(args)...); } + template logger const &error (A &&...args) const noexcept { return (*this)(log::level::error , std::forward(args)...); } + template logger const &failed (A &&...args) const noexcept { return (*this)(log::level::failed , std::forward(args)...); } }; template -inline auto make_grip(char const *func, O &&out, level level_limit = level::info) noexcept { - return grip>(func, std::forward(out), level_limit); +inline auto make_logger(char const *func, O &&out, level level_limit = level::info) noexcept { + return logger>(func, std::forward(out), level_limit); } -inline auto make_grip(char const *func, level level_limit = level::info) noexcept { - return make_grip(func, make_std_out(), level_limit); +inline auto make_logger(char const *func, level level_limit = level::info) noexcept { + return make_logger(func, make_std_out(), level_limit); } -inline auto make_grip(char const * /*ignore*/, char const *name, level level_limit = level::info) noexcept { - return make_grip(name, make_std_out(), level_limit); +inline auto make_logger(char const * /*ignore*/, char const *name, level level_limit = level::info) noexcept { + return make_logger(name, make_std_out(), level_limit); } } // namespace log LIBIMP_NAMESPACE_END_ -#define LIBIMP_LOG_(...) auto log = ::LIBIMP::log::make_grip(__func__,##__VA_ARGS__) \ No newline at end of file +#define LIBIMP_LOG_(...) auto log = ::LIBIMP::log::make_logger(__func__,##__VA_ARGS__) \ No newline at end of file diff --git a/test/imp/test_imp_log.cpp b/test/imp/test_imp_log.cpp index 05a9ee7..206e27d 100644 --- a/test/imp/test_imp_log.cpp +++ b/test/imp/test_imp_log.cpp @@ -6,7 +6,7 @@ #include "libimp/log.h" -TEST(log, gripper) { +TEST(log, logger) { { LIBIMP_LOG_(); log.info("hello"); @@ -15,6 +15,10 @@ TEST(log, gripper) { LIBIMP_LOG_(); log.info("hello 2"); } + { + LIBIMP_LOG_(); + log.info(), "hello ", 3; + } SUCCEED(); }