diff options
author | 2019-11-04 22:04:11 +0100 | |
---|---|---|
committer | 2019-11-04 22:04:11 +0100 | |
commit | 2cf61b2e4c72a80eb688d1b6ffcacfdeaf55bf26 (patch) | |
tree | 0d056f80f69db1a17a680c6e3d8fac06aa6b3e45 /src/lib/netlist/plib/pfmtlog.h | |
parent | e89f009945652ea15d941d4491cb8d9c0d2e3b65 (diff) |
netlist: code maintenance. (nw)
- more const
- explicitly raise exceptions instead of leaving this to log.fatal()
- correct a number of cppcheck findings.
- dead code removal
- clang lint corrections, e.g. include order
Diffstat (limited to 'src/lib/netlist/plib/pfmtlog.h')
-rw-r--r-- | src/lib/netlist/plib/pfmtlog.h | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h index 489e16aea8e..fecb3dd95bd 100644 --- a/src/lib/netlist/plib/pfmtlog.h +++ b/src/lib/netlist/plib/pfmtlog.h @@ -28,7 +28,6 @@ P_ENUM(plog_level, template <typename T> struct ptype_traits_base { - static constexpr const T cast(const T &x) { return x; } static constexpr const bool is_signed = std::numeric_limits<T>::is_signed; static char32_t fmt_spec() { return 'u'; } static inline void streamify(std::ostream &s, const T &v) @@ -42,7 +41,6 @@ template <> struct ptype_traits_base<__float128> { // FIXME: need native support at some time - static constexpr const long double cast(const __float128 &x) { return static_cast<long double>(x); } static constexpr const bool is_signed = true; static char32_t fmt_spec() { return 'f'; } static inline void streamify(std::ostream &s, const __float128 &v) @@ -155,14 +153,12 @@ struct ptype_traits<__float128> : ptype_traits_base<__float128> template<> struct ptype_traits<char *> : ptype_traits_base<char *> { - static const char *cast(const char *x) { return x; } static char32_t fmt_spec() { return 's'; } }; template<> struct ptype_traits<const char *> : ptype_traits_base<const char *> { - static const char *cast(const char *x) { return x; } static char32_t fmt_spec() { return 's'; } }; @@ -175,7 +171,6 @@ struct ptype_traits<std::string> : ptype_traits_base<std::string> template<> struct ptype_traits<const void *> : ptype_traits_base<const void *> { - static const void *cast(const void *x) { return x; } static char32_t fmt_spec() { return 'p'; } }; @@ -264,13 +259,10 @@ protected: struct rtype { - rtype() : ret(0), p(0), sl(0), pend(0), width(0) {} + rtype() : ret(0), p(0), sl(0) {} int ret; pstring::size_type p; pstring::size_type sl; - char32_t pend; - int width; - }; rtype setfmt(std::stringstream &strm, char32_t cfmt_spec); @@ -283,8 +275,6 @@ protected: template <typename T> pfmt &format_element(const char32_t cfmt_spec, T &&v) { - //auto val = ptype_traits<typename std::decay<T>::type>::cast(std::forward<T>(v)); - rtype ret; m_arg++; @@ -295,19 +285,9 @@ protected: ret = setfmt(strm, cfmt_spec); if (ret.ret>=0) { - //strm << val; ptype_traits<typename std::decay<T>::type>::streamify(strm, std::forward<T>(v)); - const pstring ps(strm.str()); - pstring pad(""); - auto aw(static_cast<std::size_t>(std::abs(ret.width))); - if (aw > ps.length()) - pad = pstring(aw - ps.length(), ' '); - - if (ret.width > 0) - m_str = m_str.substr(0, ret.p) + pad + ps + m_str.substr(ret.p + ret.sl); - else - m_str = m_str.substr(0, ret.p) + ps + pad + m_str.substr(ret.p + ret.sl); + m_str = m_str.substr(0, ret.p) + ps + m_str.substr(ret.p + ret.sl); } } while (ret.ret == 1); @@ -332,7 +312,7 @@ public: /* runtime enable */ template<bool enabled, typename... Args> - void log(const pstring & fmt, Args&&... args) const + void log(const pstring & fmt, Args&&... args) const noexcept { if (build_enabled && enabled && m_enabled) { @@ -342,7 +322,7 @@ public: } template<typename... Args> - void operator ()(const pstring &fmt, Args&&... args) const + void operator ()(const pstring &fmt, Args&&... args) const noexcept { if (build_enabled && m_enabled) { @@ -386,7 +366,7 @@ public: ~plog_channel() noexcept = default; protected: - void vdowrite(const pstring &ls) const + void vdowrite(const pstring &ls) const noexcept { m_base.vlog(L, ls); } |