External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use public accessors instead of befriending.

Browse Source
This commit is contained in:
Nicolas Lesser 2018-12-05 17:45:48 +01:00
parent d7c1f9047a
commit d58b99b35c
No known key found for this signature in database
GPG Key ID: 55F9BC675F85A2DF
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/fmt/color.h
View File

@ -281,6 +281,24 @@ public:
return lhs &= rhs; return lhs &= rhs;
} }
FMT_CONSTEXPR_DECL bool has_foreground() const FMT_NOEXCEPT {
return set_foreground_color;
}
FMT_CONSTEXPR_DECL bool has_background() const FMT_NOEXCEPT {
return set_background_color;
}
FMT_CONSTEXPR_DECL rgb get_foreground() const FMT_NOEXCEPT {
assert(set_foreground_color);
return foreground_color;
}
FMT_CONSTEXPR_DECL rgb get_background() const FMT_NOEXCEPT {
assert(set_background_color);
return background_color;
}
FMT_CONSTEXPR emphasis get_emphasis() const FMT_NOEXCEPT {
return ems;
}
private: private:
FMT_CONSTEXPR_DECL text_format(bool is_foreground, FMT_CONSTEXPR_DECL text_format(bool is_foreground,
rgb text_color) FMT_NOEXCEPT rgb text_color) FMT_NOEXCEPT
@ -297,10 +315,6 @@ public:
friend FMT_CONSTEXPR_DECL text_format fg(rgb foreground) FMT_NOEXCEPT; friend FMT_CONSTEXPR_DECL text_format fg(rgb foreground) FMT_NOEXCEPT;
friend FMT_CONSTEXPR_DECL text_format bg(rgb background) FMT_NOEXCEPT; friend FMT_CONSTEXPR_DECL text_format bg(rgb background) FMT_NOEXCEPT;
template <typename S, typename Char>
friend void vprint_text_format(
const text_format &tf, const S &format,
basic_format_args<typename buffer_context<Char>::type> args);
rgb foreground_color; rgb foreground_color;
rgb background_color; rgb background_color;
@ -408,14 +422,13 @@ template <
typename S, typename Char = typename internal::char_t<S>::type> typename S, typename Char = typename internal::char_t<S>::type>
void vprint_text_format(const text_format &tf, const S &format, void vprint_text_format(const text_format &tf, const S &format,
basic_format_args<typename buffer_context<Char>::type> args) { basic_format_args<typename buffer_context<Char>::type> args) {
internal::fputs<Char>(internal::make_emphasis<Char>(tf.ems), stdout); internal::fputs<Char>(internal::make_emphasis<Char>(tf.get_emphasis()), stdout);
if (tf.has_foreground())
if (tf.set_foreground_color)
internal::fputs<Char>( internal::fputs<Char>(
internal::make_foreground_color<Char>(tf.foreground_color), stdout); internal::make_foreground_color<Char>(tf.get_foreground()), stdout);
if (tf.set_background_color) if (tf.has_background())
internal::fputs<Char>( internal::fputs<Char>(
internal::make_background_color<Char>(tf.background_color), stdout); internal::make_background_color<Char>(tf.get_background()), stdout);
vprint(format, args); vprint(format, args);
internal::reset_color<Char>(stdout); internal::reset_color<Char>(stdout);
} }