diff --git a/src/logger/logger.cpp b/src/logger/logger.cpp index d080005..7dbc049 100644 --- a/src/logger/logger.cpp +++ b/src/logger/logger.cpp @@ -2,22 +2,22 @@ namespace hack { - std::string log::devider_ = " "; - int log::count_ = 0; + // std::string log::devider = " "; + // int log::count = 0; - log::log(const std::string devider, std::experimental::source_location location) : location_ { location } + log::log(const std::string devider_, std::experimental::source_location location_) : location { location_ } { - this->devider_ = devider; + //this->devider = devider_; } - warn::warn(const std::string devider, std::experimental::source_location location) : location_ { location } + warn::warn(const std::string devider_, std::experimental::source_location location_) : location { location_ } { - this->devider_ = devider; + //this->devider = devider_; } - error::error(const std::string devider, std::experimental::source_location location) : location_ { location } + error::error(const std::string devider_, std::experimental::source_location location_) : location { location_ } { - this->devider_ = devider; + //this->devider = devider_; } void log::print() { std::cout << std::endl; } diff --git a/src/logger/logger.hpp b/src/logger/logger.hpp index 6ccec47..bab34bf 100644 --- a/src/logger/logger.hpp +++ b/src/logger/logger.hpp @@ -13,7 +13,7 @@ namespace hack class log { public: - log(const std::string devider = ", ", std::experimental::source_location location = std::experimental::source_location::current()); + log(const std::string devider_ = ", ", std::experimental::source_location location_ = std::experimental::source_location::current()); log(log&) = delete; log(log&&) = delete; @@ -21,80 +21,80 @@ namespace hack template void operator() (const Args&... args) { - std::cout << make_type_view - << location_.file_name() << ":" << view::color::reset - << view::color::italic << view::color::yellow << location_.function_name() << "()" << view::color::reset - << view::color::bold << view::color::blue << "[" << location_.line() << "]" << view::color::reset << ": "; - count_ = sizeof...(Args); + std::cout /*<< make_type_view*/ + << location.file_name() << ":" << view::color::reset + << view::color::italic << view::color::yellow << location.function_name() << "()" << view::color::reset + << view::color::bold << view::color::blue << "[" << location.line() << "]" << view::color::reset << ": "; + //count = sizeof...(Args); print(args...); } private: - std::experimental::source_location location_; - static int count_; - static std::string devider_; + std::experimental::source_location location; + //static int count; + //static std::string devider; private: - static void print(); + void print(); - static std::ostream& make_type_view(std::ostream &os) + std::ostream& make_type_view(std::ostream &os) { os << view::color::bold << view::color::green << "[ok]" << view::color::reset << view::color::green; return os; } template - static void print(const T& data, const Args&... args) + void print(const T& data, const Args&... args) { - count_--; + //count--; print_t(data); print(args...); } template - static void print_t(const T& data) + void print_t(const T& data) { - std::cout << data << (count_ != 0 ? devider_ : ""); + //std::cout << data << (count != 0 ? devider : ""); } template - static void print_t(const T& data) + void print_t(const T& data) { - std::cout << data << (count_ != 0 ? devider_ : ""); + //std::cout << data << (count != 0 ? devider : ""); } template - static void print_t(const T& data) + void print_t(const T& data) { std::cout << "{ "; std::copy(data.cbegin(), data.cend(), iterators::sequence_ostream_iterator(data.size(), std::cout)); - std::cout << " }" << (count_ != 0 ? devider_ : ""); + //std::cout << " }" << (count != 0 ? devider : ""); } template - static void print_t(const T& data) + void print_t(const T& data) { std::cout << "{"; std::copy(data.cbegin(), data.cend(), iterators::associative_ostream_iterator(data.size(), std::cout)); - std::cout << "}" << (count_ != 0 ? devider_ : ""); + //std::cout << "}" << (count != 0 ? devider : ""); } template - static void print_t(const T& data) + void print_t(const T& data) { print_t(data, std::make_index_sequence::value>{}); } template - static void print_t(const T& data, std::index_sequence) + void print_t(const T& data, std::index_sequence) { std::cout << "{ "; - ((std::cout << std::get(data) << (idx != std::tuple_size::value - 1 ? devider_ : "")), ...); - std::cout << " }" << (count_ != 0 ? devider_ : ""); + // ((std::cout << std::get(data) << (idx != std::tuple_size::value - 1 ? devider : "")), ...); + //std::cout << " }" << (count != 0 ? devider : ""); } template - static void print_t(const matrix& data) + void print_t(const matrix& data) { std::size_t index = data.size(); for (auto& r : data) @@ -107,9 +107,9 @@ namespace hack } template - static void print_t(const T& data) + void print_t(const T& data) { - std::cout << data << (count_ != 0 ? devider_ : ""); + //std::cout << data << (count != 0 ? devider : ""); } friend class warn; @@ -119,7 +119,7 @@ namespace hack class warn : public log { public: - warn(const std::string devider = ", ", std::experimental::source_location location = std::experimental::source_location::current()); + warn(const std::string devider_ = ", ", std::experimental::source_location location_ = std::experimental::source_location::current()); warn(log&) = delete; warn(log&&) = delete; @@ -127,19 +127,19 @@ namespace hack template void operator() (const Args&... args) { - std::cout << make_type_view - << location_.file_name() << ":" << view::color::reset - << view::color::italic << view::color::yellow << location_.function_name() << "()" << view::color::reset - << view::color::bold << view::color::blue << "[" << location_.line() << "]" << view::color::reset << ": "; - count_ = sizeof...(Args); + std::cout /*<< make_type_view*/ + << location.file_name() << ":" << view::color::reset + << view::color::italic << view::color::yellow << location.function_name() << "()" << view::color::reset + << view::color::bold << view::color::blue << "[" << location.line() << "]" << view::color::reset << ": "; + //count = sizeof...(Args); print(args...); } private: - std::experimental::source_location location_; + std::experimental::source_location location; private: - static std::ostream& make_type_view(std::ostream &os) + std::ostream& make_type_view(std::ostream &os) { os << view::color::bold << view::color::yellow << "[WARN]" << view::color::reset << view::color::yellow; return os; @@ -149,7 +149,7 @@ namespace hack class error : public log { public: - error(const std::string devider = ", ", std::experimental::source_location location = std::experimental::source_location::current()); + error(const std::string devider_ = ", ", std::experimental::source_location location_ = std::experimental::source_location::current()); error(log&) = delete; error(log&&) = delete; @@ -157,19 +157,19 @@ namespace hack template void operator() (const Args&... args) { - std::cout << make_type_view - << location_.file_name() << ":" << view::color::reset - << view::color::italic << view::color::yellow << location_.function_name() << "()" << view::color::reset - << view::color::bold << view::color::blue << "[" << location_.line() << "]" << view::color::reset << ": "; - count_ = sizeof...(Args); + std::cout /*<< make_type_view*/ + << location.file_name() << ":" << view::color::reset + << view::color::italic << view::color::yellow << location.function_name() << "()" << view::color::reset + << view::color::bold << view::color::blue << "[" << location.line() << "]" << view::color::reset << ": "; + //count = sizeof...(Args); print(args...); } private: - std::experimental::source_location location_; + std::experimental::source_location location; private: - static std::ostream& make_type_view(std::ostream &os) + std::ostream& make_type_view(std::ostream &os) { os << view::color::bold << view::color::red << "[ERROR]" << view::color::reset << view::color::red; return os;