Skip to content

Commit 30e5af9

Browse files
committed
Refactor log class names and function names
1 parent 2cffe55 commit 30e5af9

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

include/libimp/log.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,20 @@ inline auto &make_std_out() noexcept {
109109
* \brief Log information grips.
110110
*/
111111
template <typename Outputer>
112-
class grip {
112+
class logger {
113113
Outputer out_;
114114
char const *func_;
115115
level level_limit_;
116116

117117
public:
118118
template <typename O>
119-
grip(char const *func, O &&out, level level_limit) noexcept
119+
logger(char const *func, O &&out, level level_limit) noexcept
120120
: out_ (std::forward<O>(out))
121121
, func_ (func)
122122
, level_limit_(level_limit) {}
123123

124124
template <typename... A>
125-
grip const &operator()(log::level l, A &&...args) const noexcept {
125+
logger const &operator()(log::level l, A &&...args) const noexcept {
126126
if (underlyof(l) < underlyof(level_limit_)) {
127127
return *this;
128128
}
@@ -135,28 +135,28 @@ class grip {
135135
return *this;
136136
}
137137

138-
template <typename... A> grip const &trace (A &&...args) const noexcept { return (*this)(log::level::trace , std::forward<A>(args)...); }
139-
template <typename... A> grip const &debug (A &&...args) const noexcept { return (*this)(log::level::debug , std::forward<A>(args)...); }
140-
template <typename... A> grip const &info (A &&...args) const noexcept { return (*this)(log::level::info , std::forward<A>(args)...); }
141-
template <typename... A> grip const &warning(A &&...args) const noexcept { return (*this)(log::level::warning, std::forward<A>(args)...); }
142-
template <typename... A> grip const &error (A &&...args) const noexcept { return (*this)(log::level::error , std::forward<A>(args)...); }
143-
template <typename... A> grip const &failed (A &&...args) const noexcept { return (*this)(log::level::failed , std::forward<A>(args)...); }
138+
template <typename... A> logger const &trace (A &&...args) const noexcept { return (*this)(log::level::trace , std::forward<A>(args)...); }
139+
template <typename... A> logger const &debug (A &&...args) const noexcept { return (*this)(log::level::debug , std::forward<A>(args)...); }
140+
template <typename... A> logger const &info (A &&...args) const noexcept { return (*this)(log::level::info , std::forward<A>(args)...); }
141+
template <typename... A> logger const &warning(A &&...args) const noexcept { return (*this)(log::level::warning, std::forward<A>(args)...); }
142+
template <typename... A> logger const &error (A &&...args) const noexcept { return (*this)(log::level::error , std::forward<A>(args)...); }
143+
template <typename... A> logger const &failed (A &&...args) const noexcept { return (*this)(log::level::failed , std::forward<A>(args)...); }
144144
};
145145

146146
template <typename O>
147-
inline auto make_grip(char const *func, O &&out, level level_limit = level::info) noexcept {
148-
return grip<std::decay_t<O>>(func, std::forward<O>(out), level_limit);
147+
inline auto make_logger(char const *func, O &&out, level level_limit = level::info) noexcept {
148+
return logger<std::decay_t<O>>(func, std::forward<O>(out), level_limit);
149149
}
150150

151-
inline auto make_grip(char const *func, level level_limit = level::info) noexcept {
152-
return make_grip(func, make_std_out(), level_limit);
151+
inline auto make_logger(char const *func, level level_limit = level::info) noexcept {
152+
return make_logger(func, make_std_out(), level_limit);
153153
}
154154

155-
inline auto make_grip(char const * /*ignore*/, char const *name, level level_limit = level::info) noexcept {
156-
return make_grip(name, make_std_out(), level_limit);
155+
inline auto make_logger(char const * /*ignore*/, char const *name, level level_limit = level::info) noexcept {
156+
return make_logger(name, make_std_out(), level_limit);
157157
}
158158

159159
} // namespace log
160160
LIBIMP_NAMESPACE_END_
161161

162-
#define LIBIMP_LOG_(...) auto log = ::LIBIMP::log::make_grip(__func__,##__VA_ARGS__)
162+
#define LIBIMP_LOG_(...) auto log = ::LIBIMP::log::make_logger(__func__,##__VA_ARGS__)

test/imp/test_imp_log.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "libimp/log.h"
88

9-
TEST(log, gripper) {
9+
TEST(log, logger) {
1010
{
1111
LIBIMP_LOG_();
1212
log.info("hello");
@@ -15,6 +15,10 @@ TEST(log, gripper) {
1515
LIBIMP_LOG_();
1616
log.info("hello 2");
1717
}
18+
{
19+
LIBIMP_LOG_();
20+
log.info(), "hello ", 3;
21+
}
1822
SUCCEED();
1923
}
2024

0 commit comments

Comments
 (0)