nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

format: add basic hex specifier support

Browse Source
This commit is contained in:
Danny Robson 2016-04-14 18:54:52 +10:00
parent dd00f4167a
commit 08e688bc1e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
format.ipp
View File

@ -68,14 +68,14 @@ namespace util {
template <> template <>
inline bool inline bool
is_type_specifier<size_t> (const char *s) is_type_specifier<size_t> (const char *s)
{ return *s == 'u'; } { return *s == 'u' || *s == 'x'; }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
template <> template <>
inline bool inline bool
is_type_specifier<unsigned> (const char *s) is_type_specifier<unsigned> (const char *s)
{ return *s == 'u'; } { return *s == 'u' || *s == 'x'; }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
@ -83,7 +83,7 @@ namespace util {
inline bool inline bool
is_type_specifier<int> (const char *s) is_type_specifier<int> (const char *s)
{ {
return *s == 'i' || *s == 'd'; return *s == 'i' || *s == 'd' || *s == 'x';
} }
@ -160,7 +160,10 @@ namespace util {
if (!is_valid_specifier<typename std::decay<ValueT>::type> (&*spec)) if (!is_valid_specifier<typename std::decay<ValueT>::type> (&*spec))
throw util::format::format_error ("invalid/unhandled format specifier"); throw util::format::format_error ("invalid/unhandled format specifier");
dest << val; if (*spec == 'x') {
dest << std::hex << val << std::dec;
} else
dest << val;
render (spec + 1, last, dest, std::forward<Args> (args)...); render (spec + 1, last, dest, std::forward<Args> (args)...);
} }