Upgraded to fmt 5.1.0
This commit is contained in:
parent
887326e715
commit
f4771be70e
File diff suppressed because it is too large
Load Diff
@ -21,47 +21,45 @@
|
|||||||
#include <locale>
|
#include <locale>
|
||||||
|
|
||||||
#if defined(_WIN32) && defined(__MINGW32__)
|
#if defined(_WIN32) && defined(__MINGW32__)
|
||||||
#include <cstring>
|
# include <cstring>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if FMT_USE_WINDOWS_H
|
#if FMT_USE_WINDOWS_H
|
||||||
#if !defined(FMT_HEADER_ONLY) && !defined(WIN32_LEAN_AND_MEAN)
|
# if !defined(FMT_HEADER_ONLY) && !defined(WIN32_LEAN_AND_MEAN)
|
||||||
#define WIN32_LEAN_AND_MEAN
|
# define WIN32_LEAN_AND_MEAN
|
||||||
#endif
|
# endif
|
||||||
#if defined(NOMINMAX) || defined(FMT_WIN_MINMAX)
|
# if defined(NOMINMAX) || defined(FMT_WIN_MINMAX)
|
||||||
#include <windows.h>
|
# include <windows.h>
|
||||||
#else
|
# else
|
||||||
#define NOMINMAX
|
# define NOMINMAX
|
||||||
#include <windows.h>
|
# include <windows.h>
|
||||||
#undef NOMINMAX
|
# undef NOMINMAX
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if FMT_EXCEPTIONS
|
#if FMT_EXCEPTIONS
|
||||||
#define FMT_TRY try
|
# define FMT_TRY try
|
||||||
#define FMT_CATCH(x) catch (x)
|
# define FMT_CATCH(x) catch (x)
|
||||||
#else
|
#else
|
||||||
#define FMT_TRY if (true)
|
# define FMT_TRY if (true)
|
||||||
#define FMT_CATCH(x) if (false)
|
# define FMT_CATCH(x) if (false)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(push)
|
# pragma warning(push)
|
||||||
#pragma warning(disable : 4127) // conditional expression is constant
|
# pragma warning(disable: 4127) // conditional expression is constant
|
||||||
#pragma warning(disable : 4702) // unreachable code
|
# pragma warning(disable: 4702) // unreachable code
|
||||||
// Disable deprecation warning for strerror. The latter is not called but
|
// Disable deprecation warning for strerror. The latter is not called but
|
||||||
// MSVC fails to detect it.
|
// MSVC fails to detect it.
|
||||||
#pragma warning(disable : 4996)
|
# pragma warning(disable: 4996)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Dummy implementations of strerror_r and strerror_s called if corresponding
|
// Dummy implementations of strerror_r and strerror_s called if corresponding
|
||||||
// system functions are not available.
|
// system functions are not available.
|
||||||
inline fmt::internal::null<> strerror_r(int, char *, ...)
|
inline fmt::internal::null<> strerror_r(int, char *, ...) {
|
||||||
{
|
|
||||||
return fmt::internal::null<>();
|
return fmt::internal::null<>();
|
||||||
}
|
}
|
||||||
inline fmt::internal::null<> strerror_s(char *, std::size_t, ...)
|
inline fmt::internal::null<> strerror_s(char *, std::size_t, ...) {
|
||||||
{
|
|
||||||
return fmt::internal::null<>();
|
return fmt::internal::null<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,28 +68,24 @@ FMT_BEGIN_NAMESPACE
|
|||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
#define FMT_SNPRINTF snprintf
|
# define FMT_SNPRINTF snprintf
|
||||||
#else // _MSC_VER
|
#else // _MSC_VER
|
||||||
inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...)
|
inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
|
||||||
{
|
|
||||||
va_list args;
|
va_list args;
|
||||||
va_start(args, format);
|
va_start(args, format);
|
||||||
int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
|
int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
|
||||||
va_end(args);
|
va_end(args);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
#define FMT_SNPRINTF fmt_snprintf
|
# define FMT_SNPRINTF fmt_snprintf
|
||||||
#endif // _MSC_VER
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
|
#if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
|
||||||
#define FMT_SWPRINTF snwprintf
|
# define FMT_SWPRINTF snwprintf
|
||||||
#else
|
#else
|
||||||
#define FMT_SWPRINTF swprintf
|
# define FMT_SWPRINTF swprintf
|
||||||
#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
|
#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
|
||||||
|
|
||||||
const char RESET_COLOR[] = "\x1b[0m";
|
|
||||||
const wchar_t WRESET_COLOR[] = L"\x1b[0m";
|
|
||||||
|
|
||||||
typedef void (*FormatFunc)(internal::buffer &, int, string_view);
|
typedef void (*FormatFunc)(internal::buffer &, int, string_view);
|
||||||
|
|
||||||
// Portable thread-safe version of strerror.
|
// Portable thread-safe version of strerror.
|
||||||
@ -103,12 +97,11 @@ typedef void (*FormatFunc)(internal::buffer &, int, string_view);
|
|||||||
// ERANGE - buffer is not large enough to store the error message
|
// ERANGE - buffer is not large enough to store the error message
|
||||||
// other - failure
|
// other - failure
|
||||||
// Buffer should be at least of size 1.
|
// Buffer should be at least of size 1.
|
||||||
int safe_strerror(int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT
|
int safe_strerror(
|
||||||
{
|
int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT {
|
||||||
FMT_ASSERT(buffer != FMT_NULL && buffer_size != 0, "invalid buffer");
|
FMT_ASSERT(buffer != FMT_NULL && buffer_size != 0, "invalid buffer");
|
||||||
|
|
||||||
class dispatcher
|
class dispatcher {
|
||||||
{
|
|
||||||
private:
|
private:
|
||||||
int error_code_;
|
int error_code_;
|
||||||
char *&buffer_;
|
char *&buffer_;
|
||||||
@ -118,15 +111,13 @@ int safe_strerror(int error_code, char *&buffer, std::size_t buffer_size) FMT_NO
|
|||||||
void operator=(const dispatcher &) {}
|
void operator=(const dispatcher &) {}
|
||||||
|
|
||||||
// Handle the result of XSI-compliant version of strerror_r.
|
// Handle the result of XSI-compliant version of strerror_r.
|
||||||
int handle(int result)
|
int handle(int result) {
|
||||||
{
|
|
||||||
// glibc versions before 2.13 return result in errno.
|
// glibc versions before 2.13 return result in errno.
|
||||||
return result == -1 ? errno : result;
|
return result == -1 ? errno : result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle the result of GNU-specific version of strerror_r.
|
// Handle the result of GNU-specific version of strerror_r.
|
||||||
int handle(char *message)
|
int handle(char *message) {
|
||||||
{
|
|
||||||
// If the buffer is full then the message is probably truncated.
|
// If the buffer is full then the message is probably truncated.
|
||||||
if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
|
if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
|
||||||
return ERANGE;
|
return ERANGE;
|
||||||
@ -135,21 +126,19 @@ int safe_strerror(int error_code, char *&buffer, std::size_t buffer_size) FMT_NO
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle the case when strerror_r is not available.
|
// Handle the case when strerror_r is not available.
|
||||||
int handle(internal::null<>)
|
int handle(internal::null<>) {
|
||||||
{
|
|
||||||
return fallback(strerror_s(buffer_, buffer_size_, error_code_));
|
return fallback(strerror_s(buffer_, buffer_size_, error_code_));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fallback to strerror_s when strerror_r is not available.
|
// Fallback to strerror_s when strerror_r is not available.
|
||||||
int fallback(int result)
|
int fallback(int result) {
|
||||||
{
|
|
||||||
// If the buffer is full then the message is probably truncated.
|
// If the buffer is full then the message is probably truncated.
|
||||||
return result == 0 && strlen(buffer_) == buffer_size_ - 1 ? ERANGE : result;
|
return result == 0 && strlen(buffer_) == buffer_size_ - 1 ?
|
||||||
|
ERANGE : result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fallback to strerror if strerror_r and strerror_s are not available.
|
// Fallback to strerror if strerror_r and strerror_s are not available.
|
||||||
int fallback(internal::null<>)
|
int fallback(internal::null<>) {
|
||||||
{
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
buffer_ = strerror(error_code_);
|
buffer_ = strerror(error_code_);
|
||||||
return errno;
|
return errno;
|
||||||
@ -157,22 +146,17 @@ int safe_strerror(int error_code, char *&buffer, std::size_t buffer_size) FMT_NO
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
dispatcher(int err_code, char *&buf, std::size_t buf_size)
|
dispatcher(int err_code, char *&buf, std::size_t buf_size)
|
||||||
: error_code_(err_code)
|
: error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {}
|
||||||
, buffer_(buf)
|
|
||||||
, buffer_size_(buf_size)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int run()
|
int run() {
|
||||||
{
|
|
||||||
return handle(strerror_r(error_code_, buffer_, buffer_size_));
|
return handle(strerror_r(error_code_, buffer_, buffer_size_));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return dispatcher(error_code, buffer, buffer_size).run();
|
return dispatcher(error_code, buffer, buffer_size).run();
|
||||||
}
|
}
|
||||||
|
|
||||||
void format_error_code(internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT
|
void format_error_code(internal::buffer &out, int error_code,
|
||||||
{
|
string_view message) FMT_NOEXCEPT {
|
||||||
// Report error code making sure that the output fits into
|
// Report error code making sure that the output fits into
|
||||||
// inline_buffer_size to avoid dynamic memory allocation and potential
|
// inline_buffer_size to avoid dynamic memory allocation and potential
|
||||||
// bad_alloc.
|
// bad_alloc.
|
||||||
@ -183,15 +167,13 @@ void format_error_code(internal::buffer &out, int error_code, string_view messag
|
|||||||
std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
|
std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
|
||||||
typedef internal::int_traits<int>::main_type main_type;
|
typedef internal::int_traits<int>::main_type main_type;
|
||||||
main_type abs_value = static_cast<main_type>(error_code);
|
main_type abs_value = static_cast<main_type>(error_code);
|
||||||
if (internal::is_negative(error_code))
|
if (internal::is_negative(error_code)) {
|
||||||
{
|
|
||||||
abs_value = 0 - abs_value;
|
abs_value = 0 - abs_value;
|
||||||
++error_code_size;
|
++error_code_size;
|
||||||
}
|
}
|
||||||
error_code_size += internal::count_digits(abs_value);
|
error_code_size += internal::count_digits(abs_value);
|
||||||
writer w(out);
|
writer w(out);
|
||||||
if (message.size() <= inline_buffer_size - error_code_size)
|
if (message.size() <= inline_buffer_size - error_code_size) {
|
||||||
{
|
|
||||||
w.write(message);
|
w.write(message);
|
||||||
w.write(SEP);
|
w.write(SEP);
|
||||||
}
|
}
|
||||||
@ -200,8 +182,8 @@ void format_error_code(internal::buffer &out, int error_code, string_view messag
|
|||||||
assert(out.size() <= inline_buffer_size);
|
assert(out.size() <= inline_buffer_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void report_error(FormatFunc func, int error_code, string_view message) FMT_NOEXCEPT
|
void report_error(FormatFunc func, int error_code,
|
||||||
{
|
string_view message) FMT_NOEXCEPT {
|
||||||
memory_buffer full_message;
|
memory_buffer full_message;
|
||||||
func(full_message, error_code, message);
|
func(full_message, error_code, message);
|
||||||
// Use Writer::data instead of Writer::c_str to avoid potential memory
|
// Use Writer::data instead of Writer::c_str to avoid potential memory
|
||||||
@ -211,31 +193,23 @@ void report_error(FormatFunc func, int error_code, string_view message) FMT_NOEX
|
|||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
class locale
|
class locale {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
std::locale locale_;
|
std::locale locale_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit locale(std::locale loc = std::locale())
|
explicit locale(std::locale loc = std::locale()) : locale_(loc) {}
|
||||||
: locale_(loc)
|
std::locale get() { return locale_; }
|
||||||
{
|
|
||||||
}
|
|
||||||
std::locale get()
|
|
||||||
{
|
|
||||||
return locale_;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
FMT_FUNC Char internal::thousands_sep(locale_provider *lp)
|
FMT_FUNC Char internal::thousands_sep(locale_provider *lp) {
|
||||||
{
|
|
||||||
std::locale loc = lp ? lp->locale().get() : std::locale();
|
std::locale loc = lp ? lp->locale().get() : std::locale();
|
||||||
return std::use_facet<std::numpunct<Char>>(loc).thousands_sep();
|
return std::use_facet<std::numpunct<Char>>(loc).thousands_sep();
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void system_error::init(int err_code, string_view format_str, format_args args)
|
FMT_FUNC void system_error::init(
|
||||||
{
|
int err_code, string_view format_str, format_args args) {
|
||||||
error_code_ = err_code;
|
error_code_ = err_code;
|
||||||
memory_buffer buffer;
|
memory_buffer buffer;
|
||||||
format_system_error(buffer, err_code, vformat(format_str, args));
|
format_system_error(buffer, err_code, vformat(format_str, args));
|
||||||
@ -244,64 +218,101 @@ FMT_FUNC void system_error::init(int err_code, string_view format_str, format_ar
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
template<typename T>
|
template <typename T>
|
||||||
int char_traits<char>::format_float(char *buffer, std::size_t size, const char *format, int precision, T value)
|
int char_traits<char>::format_float(
|
||||||
{
|
char *buffer, std::size_t size, const char *format, int precision, T value) {
|
||||||
return precision < 0 ? FMT_SNPRINTF(buffer, size, format, value) : FMT_SNPRINTF(buffer, size, format, precision, value);
|
return precision < 0 ?
|
||||||
|
FMT_SNPRINTF(buffer, size, format, value) :
|
||||||
|
FMT_SNPRINTF(buffer, size, format, precision, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
int char_traits<wchar_t>::format_float(wchar_t *buffer, std::size_t size, const wchar_t *format, int precision, T value)
|
int char_traits<wchar_t>::format_float(
|
||||||
{
|
wchar_t *buffer, std::size_t size, const wchar_t *format, int precision,
|
||||||
return precision < 0 ? FMT_SWPRINTF(buffer, size, format, value) : FMT_SWPRINTF(buffer, size, format, precision, value);
|
T value) {
|
||||||
|
return precision < 0 ?
|
||||||
|
FMT_SWPRINTF(buffer, size, format, value) :
|
||||||
|
FMT_SWPRINTF(buffer, size, format, precision, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
const char basic_data<T>::DIGITS[] = "0001020304050607080910111213141516171819"
|
const char basic_data<T>::DIGITS[] =
|
||||||
|
"0001020304050607080910111213141516171819"
|
||||||
"2021222324252627282930313233343536373839"
|
"2021222324252627282930313233343536373839"
|
||||||
"4041424344454647484950515253545556575859"
|
"4041424344454647484950515253545556575859"
|
||||||
"6061626364656667686970717273747576777879"
|
"6061626364656667686970717273747576777879"
|
||||||
"8081828384858687888990919293949596979899";
|
"8081828384858687888990919293949596979899";
|
||||||
|
|
||||||
#define FMT_POWERS_OF_10(factor) \
|
#define FMT_POWERS_OF_10(factor) \
|
||||||
factor * 10, factor * 100, factor * 1000, factor * 10000, factor * 100000, factor * 1000000, factor * 10000000, factor * 100000000, \
|
factor * 10, \
|
||||||
|
factor * 100, \
|
||||||
|
factor * 1000, \
|
||||||
|
factor * 10000, \
|
||||||
|
factor * 100000, \
|
||||||
|
factor * 1000000, \
|
||||||
|
factor * 10000000, \
|
||||||
|
factor * 100000000, \
|
||||||
factor * 1000000000
|
factor * 1000000000
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
const uint32_t basic_data<T>::POWERS_OF_10_32[] = {0, FMT_POWERS_OF_10(1)};
|
const uint32_t basic_data<T>::POWERS_OF_10_32[] = {
|
||||||
|
0, FMT_POWERS_OF_10(1)
|
||||||
|
};
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
const uint64_t basic_data<T>::POWERS_OF_10_64[] = {0, FMT_POWERS_OF_10(1), FMT_POWERS_OF_10(1000000000ull), 10000000000000000000ull};
|
const uint64_t basic_data<T>::POWERS_OF_10_64[] = {
|
||||||
|
0,
|
||||||
|
FMT_POWERS_OF_10(1),
|
||||||
|
FMT_POWERS_OF_10(1000000000ull),
|
||||||
|
10000000000000000000ull
|
||||||
|
};
|
||||||
|
|
||||||
// Normalized 64-bit significands of pow(10, k), for k = -348, -340, ..., 340.
|
// Normalized 64-bit significands of pow(10, k), for k = -348, -340, ..., 340.
|
||||||
// These are generated by support/compute-powers.py.
|
// These are generated by support/compute-powers.py.
|
||||||
template<typename T>
|
template <typename T>
|
||||||
const uint64_t basic_data<T>::POW10_SIGNIFICANDS[] = {0xfa8fd5a0081c0288, 0xbaaee17fa23ebf76, 0x8b16fb203055ac76, 0xcf42894a5dce35ea,
|
const uint64_t basic_data<T>::POW10_SIGNIFICANDS[] = {
|
||||||
0x9a6bb0aa55653b2d, 0xe61acf033d1a45df, 0xab70fe17c79ac6ca, 0xff77b1fcbebcdc4f, 0xbe5691ef416bd60c, 0x8dd01fad907ffc3c,
|
0xfa8fd5a0081c0288, 0xbaaee17fa23ebf76, 0x8b16fb203055ac76, 0xcf42894a5dce35ea,
|
||||||
0xd3515c2831559a83, 0x9d71ac8fada6c9b5, 0xea9c227723ee8bcb, 0xaecc49914078536d, 0x823c12795db6ce57, 0xc21094364dfb5637,
|
0x9a6bb0aa55653b2d, 0xe61acf033d1a45df, 0xab70fe17c79ac6ca, 0xff77b1fcbebcdc4f,
|
||||||
0x9096ea6f3848984f, 0xd77485cb25823ac7, 0xa086cfcd97bf97f4, 0xef340a98172aace5, 0xb23867fb2a35b28e, 0x84c8d4dfd2c63f3b,
|
0xbe5691ef416bd60c, 0x8dd01fad907ffc3c, 0xd3515c2831559a83, 0x9d71ac8fada6c9b5,
|
||||||
0xc5dd44271ad3cdba, 0x936b9fcebb25c996, 0xdbac6c247d62a584, 0xa3ab66580d5fdaf6, 0xf3e2f893dec3f126, 0xb5b5ada8aaff80b8,
|
0xea9c227723ee8bcb, 0xaecc49914078536d, 0x823c12795db6ce57, 0xc21094364dfb5637,
|
||||||
0x87625f056c7c4a8b, 0xc9bcff6034c13053, 0x964e858c91ba2655, 0xdff9772470297ebd, 0xa6dfbd9fb8e5b88f, 0xf8a95fcf88747d94,
|
0x9096ea6f3848984f, 0xd77485cb25823ac7, 0xa086cfcd97bf97f4, 0xef340a98172aace5,
|
||||||
0xb94470938fa89bcf, 0x8a08f0f8bf0f156b, 0xcdb02555653131b6, 0x993fe2c6d07b7fac, 0xe45c10c42a2b3b06, 0xaa242499697392d3,
|
0xb23867fb2a35b28e, 0x84c8d4dfd2c63f3b, 0xc5dd44271ad3cdba, 0x936b9fcebb25c996,
|
||||||
0xfd87b5f28300ca0e, 0xbce5086492111aeb, 0x8cbccc096f5088cc, 0xd1b71758e219652c, 0x9c40000000000000, 0xe8d4a51000000000,
|
0xdbac6c247d62a584, 0xa3ab66580d5fdaf6, 0xf3e2f893dec3f126, 0xb5b5ada8aaff80b8,
|
||||||
0xad78ebc5ac620000, 0x813f3978f8940984, 0xc097ce7bc90715b3, 0x8f7e32ce7bea5c70, 0xd5d238a4abe98068, 0x9f4f2726179a2245,
|
0x87625f056c7c4a8b, 0xc9bcff6034c13053, 0x964e858c91ba2655, 0xdff9772470297ebd,
|
||||||
0xed63a231d4c4fb27, 0xb0de65388cc8ada8, 0x83c7088e1aab65db, 0xc45d1df942711d9a, 0x924d692ca61be758, 0xda01ee641a708dea,
|
0xa6dfbd9fb8e5b88f, 0xf8a95fcf88747d94, 0xb94470938fa89bcf, 0x8a08f0f8bf0f156b,
|
||||||
0xa26da3999aef774a, 0xf209787bb47d6b85, 0xb454e4a179dd1877, 0x865b86925b9bc5c2, 0xc83553c5c8965d3d, 0x952ab45cfa97a0b3,
|
0xcdb02555653131b6, 0x993fe2c6d07b7fac, 0xe45c10c42a2b3b06, 0xaa242499697392d3,
|
||||||
0xde469fbd99a05fe3, 0xa59bc234db398c25, 0xf6c69a72a3989f5c, 0xb7dcbf5354e9bece, 0x88fcf317f22241e2, 0xcc20ce9bd35c78a5,
|
0xfd87b5f28300ca0e, 0xbce5086492111aeb, 0x8cbccc096f5088cc, 0xd1b71758e219652c,
|
||||||
0x98165af37b2153df, 0xe2a0b5dc971f303a, 0xa8d9d1535ce3b396, 0xfb9b7cd9a4a7443c, 0xbb764c4ca7a44410, 0x8bab8eefb6409c1a,
|
0x9c40000000000000, 0xe8d4a51000000000, 0xad78ebc5ac620000, 0x813f3978f8940984,
|
||||||
0xd01fef10a657842c, 0x9b10a4e5e9913129, 0xe7109bfba19c0c9d, 0xac2820d9623bf429, 0x80444b5e7aa7cf85, 0xbf21e44003acdd2d,
|
0xc097ce7bc90715b3, 0x8f7e32ce7bea5c70, 0xd5d238a4abe98068, 0x9f4f2726179a2245,
|
||||||
0x8e679c2f5e44ff8f, 0xd433179d9c8cb841, 0x9e19db92b4e31ba9, 0xeb96bf6ebadf77d9, 0xaf87023b9bf0ee6b};
|
0xed63a231d4c4fb27, 0xb0de65388cc8ada8, 0x83c7088e1aab65db, 0xc45d1df942711d9a,
|
||||||
|
0x924d692ca61be758, 0xda01ee641a708dea, 0xa26da3999aef774a, 0xf209787bb47d6b85,
|
||||||
|
0xb454e4a179dd1877, 0x865b86925b9bc5c2, 0xc83553c5c8965d3d, 0x952ab45cfa97a0b3,
|
||||||
|
0xde469fbd99a05fe3, 0xa59bc234db398c25, 0xf6c69a72a3989f5c, 0xb7dcbf5354e9bece,
|
||||||
|
0x88fcf317f22241e2, 0xcc20ce9bd35c78a5, 0x98165af37b2153df, 0xe2a0b5dc971f303a,
|
||||||
|
0xa8d9d1535ce3b396, 0xfb9b7cd9a4a7443c, 0xbb764c4ca7a44410, 0x8bab8eefb6409c1a,
|
||||||
|
0xd01fef10a657842c, 0x9b10a4e5e9913129, 0xe7109bfba19c0c9d, 0xac2820d9623bf429,
|
||||||
|
0x80444b5e7aa7cf85, 0xbf21e44003acdd2d, 0x8e679c2f5e44ff8f, 0xd433179d9c8cb841,
|
||||||
|
0x9e19db92b4e31ba9, 0xeb96bf6ebadf77d9, 0xaf87023b9bf0ee6b
|
||||||
|
};
|
||||||
|
|
||||||
// Binary exponents of pow(10, k), for k = -348, -340, ..., 340, corresponding
|
// Binary exponents of pow(10, k), for k = -348, -340, ..., 340, corresponding
|
||||||
// to significands above.
|
// to significands above.
|
||||||
template<typename T>
|
template <typename T>
|
||||||
const int16_t basic_data<T>::POW10_EXPONENTS[] = {-1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954, -927, -901,
|
const int16_t basic_data<T>::POW10_EXPONENTS[] = {
|
||||||
-874, -847, -821, -794, -768, -741, -715, -688, -661, -635, -608, -582, -555, -529, -502, -475, -449, -422, -396, -369, -343, -316,
|
-1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954,
|
||||||
-289, -263, -236, -210, -183, -157, -130, -103, -77, -50, -24, 3, 30, 56, 83, 109, 136, 162, 189, 216, 242, 269, 295, 322, 348, 375,
|
-927, -901, -874, -847, -821, -794, -768, -741, -715, -688, -661,
|
||||||
402, 428, 455, 481, 508, 534, 561, 588, 614, 641, 667, 694, 720, 747, 774, 800, 827, 853, 880, 907, 933, 960, 986, 1013, 1039, 1066};
|
-635, -608, -582, -555, -529, -502, -475, -449, -422, -396, -369,
|
||||||
|
-343, -316, -289, -263, -236, -210, -183, -157, -130, -103, -77,
|
||||||
|
-50, -24, 3, 30, 56, 83, 109, 136, 162, 189, 216,
|
||||||
|
242, 269, 295, 322, 348, 375, 402, 428, 455, 481, 508,
|
||||||
|
534, 561, 588, 614, 641, 667, 694, 720, 747, 774, 800,
|
||||||
|
827, 853, 880, 907, 933, 960, 986, 1013, 1039, 1066
|
||||||
|
};
|
||||||
|
|
||||||
FMT_FUNC fp operator*(fp x, fp y)
|
template <typename T> const char basic_data<T>::RESET_COLOR[] = "\x1b[0m";
|
||||||
{
|
template <typename T> const wchar_t basic_data<T>::WRESET_COLOR[] = L"\x1b[0m";
|
||||||
|
|
||||||
|
FMT_FUNC fp operator*(fp x, fp y) {
|
||||||
// Multiply 32-bit parts of significands.
|
// Multiply 32-bit parts of significands.
|
||||||
uint64_t mask = (1ULL << 32) - 1;
|
uint64_t mask = (1ULL << 32) - 1;
|
||||||
uint64_t a = x.f >> 32, b = x.f & mask;
|
uint64_t a = x.f >> 32, b = x.f & mask;
|
||||||
@ -312,10 +323,10 @@ FMT_FUNC fp operator*(fp x, fp y)
|
|||||||
return fp(ac + (ad >> 32) + (bc >> 32) + (mid >> 32), x.e + y.e + 64);
|
return fp(ac + (ad >> 32) + (bc >> 32) + (mid >> 32), x.e + y.e + 64);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC fp get_cached_power(int min_exponent, int &pow10_exponent)
|
FMT_FUNC fp get_cached_power(int min_exponent, int &pow10_exponent) {
|
||||||
{
|
|
||||||
const double one_over_log2_10 = 0.30102999566398114; // 1 / log2(10)
|
const double one_over_log2_10 = 0.30102999566398114; // 1 / log2(10)
|
||||||
int index = static_cast<int>(std::ceil((min_exponent + fp::significand_size - 1) * one_over_log2_10));
|
int index = static_cast<int>(std::ceil(
|
||||||
|
(min_exponent + fp::significand_size - 1) * one_over_log2_10));
|
||||||
// Decimal exponent of the first (smallest) cached power of 10.
|
// Decimal exponent of the first (smallest) cached power of 10.
|
||||||
const int first_dec_exp = -348;
|
const int first_dec_exp = -348;
|
||||||
// Difference between two consecutive decimal exponents in cached powers of 10.
|
// Difference between two consecutive decimal exponents in cached powers of 10.
|
||||||
@ -328,64 +339,63 @@ FMT_FUNC fp get_cached_power(int min_exponent, int &pow10_exponent)
|
|||||||
|
|
||||||
#if FMT_USE_WINDOWS_H
|
#if FMT_USE_WINDOWS_H
|
||||||
|
|
||||||
FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s)
|
FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s) {
|
||||||
{
|
|
||||||
static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
|
static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
|
||||||
if (s.size() > INT_MAX)
|
if (s.size() > INT_MAX)
|
||||||
FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG));
|
FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG));
|
||||||
int s_size = static_cast<int>(s.size());
|
int s_size = static_cast<int>(s.size());
|
||||||
if (s_size == 0)
|
if (s_size == 0) {
|
||||||
{
|
|
||||||
// MultiByteToWideChar does not support zero length, handle separately.
|
// MultiByteToWideChar does not support zero length, handle separately.
|
||||||
buffer_.resize(1);
|
buffer_.resize(1);
|
||||||
buffer_[0] = 0;
|
buffer_[0] = 0;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int length = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0);
|
int length = MultiByteToWideChar(
|
||||||
|
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0);
|
||||||
if (length == 0)
|
if (length == 0)
|
||||||
FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
|
FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
|
||||||
buffer_.resize(length + 1);
|
buffer_.resize(length + 1);
|
||||||
length = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
|
length = MultiByteToWideChar(
|
||||||
|
CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
|
||||||
if (length == 0)
|
if (length == 0)
|
||||||
FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
|
FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
|
||||||
buffer_[length] = 0;
|
buffer_[length] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC internal::utf16_to_utf8::utf16_to_utf8(wstring_view s)
|
FMT_FUNC internal::utf16_to_utf8::utf16_to_utf8(wstring_view s) {
|
||||||
{
|
if (int error_code = convert(s)) {
|
||||||
if (int error_code = convert(s))
|
FMT_THROW(windows_error(error_code,
|
||||||
{
|
"cannot convert string from UTF-16 to UTF-8"));
|
||||||
FMT_THROW(windows_error(error_code, "cannot convert string from UTF-16 to UTF-8"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s)
|
FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s) {
|
||||||
{
|
|
||||||
if (s.size() > INT_MAX)
|
if (s.size() > INT_MAX)
|
||||||
return ERROR_INVALID_PARAMETER;
|
return ERROR_INVALID_PARAMETER;
|
||||||
int s_size = static_cast<int>(s.size());
|
int s_size = static_cast<int>(s.size());
|
||||||
if (s_size == 0)
|
if (s_size == 0) {
|
||||||
{
|
|
||||||
// WideCharToMultiByte does not support zero length, handle separately.
|
// WideCharToMultiByte does not support zero length, handle separately.
|
||||||
buffer_.resize(1);
|
buffer_.resize(1);
|
||||||
buffer_[0] = 0;
|
buffer_[0] = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL);
|
int length = WideCharToMultiByte(
|
||||||
|
CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL);
|
||||||
if (length == 0)
|
if (length == 0)
|
||||||
return GetLastError();
|
return GetLastError();
|
||||||
buffer_.resize(length + 1);
|
buffer_.resize(length + 1);
|
||||||
length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL);
|
length = WideCharToMultiByte(
|
||||||
|
CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL);
|
||||||
if (length == 0)
|
if (length == 0)
|
||||||
return GetLastError();
|
return GetLastError();
|
||||||
buffer_[length] = 0;
|
buffer_[length] = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void windows_error::init(int err_code, string_view format_str, format_args args)
|
FMT_FUNC void windows_error::init(
|
||||||
{
|
int err_code, string_view format_str, format_args args) {
|
||||||
error_code_ = err_code;
|
error_code_ = err_code;
|
||||||
memory_buffer buffer;
|
memory_buffer buffer;
|
||||||
internal::format_windows_error(buffer, err_code, vformat(format_str, args));
|
internal::format_windows_error(buffer, err_code, vformat(format_str, args));
|
||||||
@ -393,22 +403,20 @@ FMT_FUNC void windows_error::init(int err_code, string_view format_str, format_a
|
|||||||
base = std::runtime_error(to_string(buffer));
|
base = std::runtime_error(to_string(buffer));
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void internal::format_windows_error(internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT
|
FMT_FUNC void internal::format_windows_error(
|
||||||
{
|
internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT {
|
||||||
FMT_TRY
|
FMT_TRY {
|
||||||
{
|
|
||||||
wmemory_buffer buf;
|
wmemory_buffer buf;
|
||||||
buf.resize(inline_buffer_size);
|
buf.resize(inline_buffer_size);
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
wchar_t *system_message = &buf[0];
|
wchar_t *system_message = &buf[0];
|
||||||
int result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, FMT_NULL, error_code,
|
int result = FormatMessageW(
|
||||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), system_message, static_cast<uint32_t>(buf.size()), FMT_NULL);
|
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||||
if (result != 0)
|
FMT_NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||||
{
|
system_message, static_cast<uint32_t>(buf.size()), FMT_NULL);
|
||||||
|
if (result != 0) {
|
||||||
utf16_to_utf8 utf8_message;
|
utf16_to_utf8 utf8_message;
|
||||||
if (utf8_message.convert(system_message) == ERROR_SUCCESS)
|
if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
|
||||||
{
|
|
||||||
writer w(out);
|
writer w(out);
|
||||||
w.write(message);
|
w.write(message);
|
||||||
w.write(": ");
|
w.write(": ");
|
||||||
@ -421,25 +429,21 @@ FMT_FUNC void internal::format_windows_error(internal::buffer &out, int error_co
|
|||||||
break; // Can't get error message, report error code instead.
|
break; // Can't get error message, report error code instead.
|
||||||
buf.resize(buf.size() * 2);
|
buf.resize(buf.size() * 2);
|
||||||
}
|
}
|
||||||
}
|
} FMT_CATCH(...) {}
|
||||||
FMT_CATCH(...) {}
|
|
||||||
format_error_code(out, error_code, message);
|
format_error_code(out, error_code, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // FMT_USE_WINDOWS_H
|
#endif // FMT_USE_WINDOWS_H
|
||||||
|
|
||||||
FMT_FUNC void format_system_error(internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT
|
FMT_FUNC void format_system_error(
|
||||||
{
|
internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT {
|
||||||
FMT_TRY
|
FMT_TRY {
|
||||||
{
|
|
||||||
memory_buffer buf;
|
memory_buffer buf;
|
||||||
buf.resize(inline_buffer_size);
|
buf.resize(inline_buffer_size);
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
char *system_message = &buf[0];
|
char *system_message = &buf[0];
|
||||||
int result = safe_strerror(error_code, system_message, buf.size());
|
int result = safe_strerror(error_code, system_message, buf.size());
|
||||||
if (result == 0)
|
if (result == 0) {
|
||||||
{
|
|
||||||
writer w(out);
|
writer w(out);
|
||||||
w.write(message);
|
w.write(message);
|
||||||
w.write(": ");
|
w.write(": ");
|
||||||
@ -450,85 +454,111 @@ FMT_FUNC void format_system_error(internal::buffer &out, int error_code, string_
|
|||||||
break; // Can't get error message, report error code instead.
|
break; // Can't get error message, report error code instead.
|
||||||
buf.resize(buf.size() * 2);
|
buf.resize(buf.size() * 2);
|
||||||
}
|
}
|
||||||
}
|
} FMT_CATCH(...) {}
|
||||||
FMT_CATCH(...) {}
|
|
||||||
format_error_code(out, error_code, message);
|
format_error_code(out, error_code, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
void basic_fixed_buffer<Char>::grow(std::size_t)
|
void basic_fixed_buffer<Char>::grow(std::size_t) {
|
||||||
{
|
|
||||||
FMT_THROW(std::runtime_error("buffer overflow"));
|
FMT_THROW(std::runtime_error("buffer overflow"));
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void internal::error_handler::on_error(const char *message)
|
FMT_FUNC void internal::error_handler::on_error(const char *message) {
|
||||||
{
|
|
||||||
FMT_THROW(format_error(message));
|
FMT_THROW(format_error(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void report_system_error(int error_code, fmt::string_view message) FMT_NOEXCEPT
|
FMT_FUNC void report_system_error(
|
||||||
{
|
int error_code, fmt::string_view message) FMT_NOEXCEPT {
|
||||||
report_error(format_system_error, error_code, message);
|
report_error(format_system_error, error_code, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if FMT_USE_WINDOWS_H
|
#if FMT_USE_WINDOWS_H
|
||||||
FMT_FUNC void report_windows_error(int error_code, fmt::string_view message) FMT_NOEXCEPT
|
FMT_FUNC void report_windows_error(
|
||||||
{
|
int error_code, fmt::string_view message) FMT_NOEXCEPT {
|
||||||
report_error(internal::format_windows_error, error_code, message);
|
report_error(internal::format_windows_error, error_code, message);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_FUNC void vprint(std::FILE *f, string_view format_str, format_args args)
|
FMT_FUNC void vprint(std::FILE *f, string_view format_str, format_args args) {
|
||||||
{
|
|
||||||
memory_buffer buffer;
|
memory_buffer buffer;
|
||||||
vformat_to(buffer, format_str, args);
|
vformat_to(buffer, format_str, args);
|
||||||
std::fwrite(buffer.data(), 1, buffer.size(), f);
|
std::fwrite(buffer.data(), 1, buffer.size(), f);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void vprint(std::FILE *f, wstring_view format_str, wformat_args args)
|
FMT_FUNC void vprint(std::FILE *f, wstring_view format_str, wformat_args args) {
|
||||||
{
|
|
||||||
wmemory_buffer buffer;
|
wmemory_buffer buffer;
|
||||||
vformat_to(buffer, format_str, args);
|
vformat_to(buffer, format_str, args);
|
||||||
std::fwrite(buffer.data(), sizeof(wchar_t), buffer.size(), f);
|
std::fwrite(buffer.data(), sizeof(wchar_t), buffer.size(), f);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void vprint(string_view format_str, format_args args)
|
FMT_FUNC void vprint(string_view format_str, format_args args) {
|
||||||
{
|
|
||||||
vprint(stdout, format_str, args);
|
vprint(stdout, format_str, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void vprint(wstring_view format_str, wformat_args args)
|
FMT_FUNC void vprint(wstring_view format_str, wformat_args args) {
|
||||||
{
|
|
||||||
vprint(stdout, format_str, args);
|
vprint(stdout, format_str, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void vprint_colored(color c, string_view format, format_args args)
|
#ifndef FMT_EXTENDED_COLORS
|
||||||
{
|
FMT_FUNC void vprint_colored(color c, string_view format, format_args args) {
|
||||||
char escape[] = "\x1b[30m";
|
char escape[] = "\x1b[30m";
|
||||||
escape[3] = static_cast<char>('0' + c);
|
escape[3] = static_cast<char>('0' + c);
|
||||||
std::fputs(escape, stdout);
|
std::fputs(escape, stdout);
|
||||||
vprint(format, args);
|
vprint(format, args);
|
||||||
std::fputs(RESET_COLOR, stdout);
|
std::fputs(internal::data::RESET_COLOR, stdout);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void vprint_colored(color c, wstring_view format, wformat_args args)
|
FMT_FUNC void vprint_colored(color c, wstring_view format, wformat_args args) {
|
||||||
{
|
|
||||||
wchar_t escape[] = L"\x1b[30m";
|
wchar_t escape[] = L"\x1b[30m";
|
||||||
escape[3] = static_cast<wchar_t>('0' + c);
|
escape[3] = static_cast<wchar_t>('0' + c);
|
||||||
std::fputws(escape, stdout);
|
std::fputws(escape, stdout);
|
||||||
vprint(format, args);
|
vprint(format, args);
|
||||||
std::fputws(WRESET_COLOR, stdout);
|
std::fputws(internal::data::WRESET_COLOR, stdout);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
namespace internal {
|
||||||
|
FMT_CONSTEXPR void to_esc(uint8_t c, char out[], int offset) {
|
||||||
|
out[offset + 0] = static_cast<char>('0' + c / 100);
|
||||||
|
out[offset + 1] = static_cast<char>('0' + c / 10 % 10);
|
||||||
|
out[offset + 2] = static_cast<char>('0' + c % 10);
|
||||||
|
}
|
||||||
|
} // namespace internal
|
||||||
|
|
||||||
|
FMT_FUNC void vprint_rgb(rgb fd, string_view format, format_args args) {
|
||||||
|
char escape_fd[] = "\x1b[38;2;000;000;000m";
|
||||||
|
internal::to_esc(fd.r, escape_fd, 7);
|
||||||
|
internal::to_esc(fd.g, escape_fd, 11);
|
||||||
|
internal::to_esc(fd.b, escape_fd, 15);
|
||||||
|
|
||||||
|
std::fputs(escape_fd, stdout);
|
||||||
|
vprint(format, args);
|
||||||
|
std::fputs(internal::data::RESET_COLOR, stdout);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC locale locale_provider::locale()
|
FMT_FUNC void vprint_rgb(rgb fd, rgb bg, string_view format, format_args args) {
|
||||||
{
|
char escape_fd[] = "\x1b[38;2;000;000;000m"; // foreground color
|
||||||
return fmt::locale();
|
char escape_bg[] = "\x1b[48;2;000;000;000m"; // background color
|
||||||
|
internal::to_esc(fd.r, escape_fd, 7);
|
||||||
|
internal::to_esc(fd.g, escape_fd, 11);
|
||||||
|
internal::to_esc(fd.b, escape_fd, 15);
|
||||||
|
|
||||||
|
internal::to_esc(bg.r, escape_bg, 7);
|
||||||
|
internal::to_esc(bg.g, escape_bg, 11);
|
||||||
|
internal::to_esc(bg.b, escape_bg, 15);
|
||||||
|
|
||||||
|
std::fputs(escape_fd, stdout);
|
||||||
|
std::fputs(escape_bg, stdout);
|
||||||
|
vprint(format, args);
|
||||||
|
std::fputs(internal::data::RESET_COLOR, stdout);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
FMT_FUNC locale locale_provider::locale() { return fmt::locale(); }
|
||||||
|
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(pop)
|
# pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // FMT_FORMAT_INL_H_
|
#endif // FMT_FORMAT_INL_H_
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
// Formatting library for C++
|
|
||||||
//
|
|
||||||
// Copyright (c) 2012 - 2016, Victor Zverovich
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// For the license information refer to format.h.
|
|
||||||
|
|
||||||
#include "fmt/format-inl.h"
|
|
||||||
|
|
||||||
namespace fmt {
|
|
||||||
|
|
||||||
template struct internal::basic_data<void>;
|
|
||||||
|
|
||||||
// Explicit instantiations for char.
|
|
||||||
|
|
||||||
template FMT_API char internal::thousands_sep(locale_provider *lp);
|
|
||||||
|
|
||||||
template void basic_fixed_buffer<char>::grow(std::size_t);
|
|
||||||
|
|
||||||
template void internal::arg_map<format_context>::init(
|
|
||||||
const basic_format_args<format_context> &args);
|
|
||||||
|
|
||||||
template FMT_API int internal::char_traits<char>::format_float(
|
|
||||||
char *buffer, std::size_t size, const char *format,
|
|
||||||
unsigned width, int precision, double value);
|
|
||||||
|
|
||||||
template FMT_API int internal::char_traits<char>::format_float(
|
|
||||||
char *buffer, std::size_t size, const char *format,
|
|
||||||
unsigned width, int precision, long double value);
|
|
||||||
|
|
||||||
// Explicit instantiations for wchar_t.
|
|
||||||
|
|
||||||
template FMT_API wchar_t internal::thousands_sep(locale_provider *lp);
|
|
||||||
|
|
||||||
template void basic_fixed_buffer<wchar_t>::grow(std::size_t);
|
|
||||||
|
|
||||||
template void internal::arg_map<wformat_context>::init(const wformat_args &args);
|
|
||||||
|
|
||||||
template FMT_API int internal::char_traits<wchar_t>::format_float(
|
|
||||||
wchar_t *buffer, std::size_t size, const wchar_t *format,
|
|
||||||
unsigned width, int precision, double value);
|
|
||||||
|
|
||||||
template FMT_API int internal::char_traits<wchar_t>::format_float(
|
|
||||||
wchar_t *buffer, std::size_t size, const wchar_t *format,
|
|
||||||
unsigned width, int precision, long double value);
|
|
||||||
} // namespace fmt
|
|
File diff suppressed because it is too large
Load Diff
@ -14,22 +14,18 @@
|
|||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
template<class Char>
|
template <class Char>
|
||||||
class formatbuf : public std::basic_streambuf<Char>
|
class formatbuf : public std::basic_streambuf<Char> {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
typedef typename std::basic_streambuf<Char>::int_type int_type;
|
typedef typename std::basic_streambuf<Char>::int_type int_type;
|
||||||
typedef typename std::basic_streambuf<Char>::traits_type traits_type;
|
typedef typename std::basic_streambuf<Char>::traits_type traits_type;
|
||||||
|
|
||||||
basic_buffer<Char> &buffer_;
|
basic_buffer<Char> &buffer_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
formatbuf(basic_buffer<Char> &buffer)
|
formatbuf(basic_buffer<Char> &buffer) : buffer_(buffer) {}
|
||||||
: buffer_(buffer)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// The put-area is actually always empty. This makes the implementation
|
// The put-area is actually always empty. This makes the implementation
|
||||||
// simpler and has the advantage that the streambuf and the buffer are always
|
// simpler and has the advantage that the streambuf and the buffer are always
|
||||||
// in sync and sputc never writes into uninitialized memory. The obvious
|
// in sync and sputc never writes into uninitialized memory. The obvious
|
||||||
@ -37,43 +33,41 @@ protected:
|
|||||||
// to overflow. There is no disadvantage here for sputn since this always
|
// to overflow. There is no disadvantage here for sputn since this always
|
||||||
// results in a call to xsputn.
|
// results in a call to xsputn.
|
||||||
|
|
||||||
int_type overflow(int_type ch = traits_type::eof()) FMT_OVERRIDE
|
int_type overflow(int_type ch = traits_type::eof()) FMT_OVERRIDE {
|
||||||
{
|
|
||||||
if (!traits_type::eq_int_type(ch, traits_type::eof()))
|
if (!traits_type::eq_int_type(ch, traits_type::eof()))
|
||||||
buffer_.push_back(static_cast<Char>(ch));
|
buffer_.push_back(static_cast<Char>(ch));
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::streamsize xsputn(const Char *s, std::streamsize count) FMT_OVERRIDE
|
std::streamsize xsputn(const Char *s, std::streamsize count) FMT_OVERRIDE {
|
||||||
{
|
|
||||||
buffer_.append(s, s + count);
|
buffer_.append(s, s + count);
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
struct test_stream : std::basic_ostream<Char>
|
struct test_stream : std::basic_ostream<Char> {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
struct null;
|
struct null;
|
||||||
// Hide all operator<< from std::basic_ostream<Char>.
|
// Hide all operator<< from std::basic_ostream<Char>.
|
||||||
void operator<<(null);
|
void operator<<(null);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Checks if T has a user-defined operator<< (e.g. not a member of std::ostream).
|
// Checks if T has a user-defined operator<< (e.g. not a member of std::ostream).
|
||||||
template<typename T, typename Char>
|
template <typename T, typename Char>
|
||||||
class is_streamable
|
class is_streamable {
|
||||||
{
|
private:
|
||||||
private:
|
template <typename U>
|
||||||
template<typename U>
|
static decltype(
|
||||||
static decltype(internal::declval<test_stream<Char> &>() << internal::declval<U>(), std::true_type()) test(int);
|
internal::declval<test_stream<Char>&>()
|
||||||
|
<< internal::declval<U>(), std::true_type()) test(int);
|
||||||
|
|
||||||
template<typename>
|
template <typename>
|
||||||
static std::false_type test(...);
|
static std::false_type test(...);
|
||||||
|
|
||||||
typedef decltype(test<T>(0)) result;
|
typedef decltype(test<T>(0)) result;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// std::string operator<< is not considered user-defined because we handle strings
|
// std::string operator<< is not considered user-defined because we handle strings
|
||||||
// specially.
|
// specially.
|
||||||
static const bool value = result::value && !std::is_same<T, std::string>::value;
|
static const bool value = result::value && !std::is_same<T, std::string>::value;
|
||||||
@ -81,23 +75,22 @@ public:
|
|||||||
|
|
||||||
// Disable conversion to int if T has an overloaded operator<< which is a free
|
// Disable conversion to int if T has an overloaded operator<< which is a free
|
||||||
// function (not a member of std::ostream).
|
// function (not a member of std::ostream).
|
||||||
template<typename T, typename Char>
|
template <typename T, typename Char>
|
||||||
class convert_to_int<T, Char, true>
|
class convert_to_int<T, Char, true> {
|
||||||
{
|
public:
|
||||||
public:
|
static const bool value =
|
||||||
static const bool value = convert_to_int<T, Char, false>::value && !is_streamable<T, Char>::value;
|
convert_to_int<T, Char, false>::value && !is_streamable<T, Char>::value;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Write the content of buf to os.
|
// Write the content of buf to os.
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
void write(std::basic_ostream<Char> &os, basic_buffer<Char> &buf)
|
void write(std::basic_ostream<Char> &os, basic_buffer<Char> &buf) {
|
||||||
{
|
|
||||||
const Char *data = buf.data();
|
const Char *data = buf.data();
|
||||||
typedef std::make_unsigned<std::streamsize>::type UnsignedStreamSize;
|
typedef std::make_unsigned<std::streamsize>::type UnsignedStreamSize;
|
||||||
UnsignedStreamSize size = buf.size();
|
UnsignedStreamSize size = buf.size();
|
||||||
UnsignedStreamSize max_size = internal::to_unsigned((std::numeric_limits<std::streamsize>::max)());
|
UnsignedStreamSize max_size =
|
||||||
do
|
internal::to_unsigned((std::numeric_limits<std::streamsize>::max)());
|
||||||
{
|
do {
|
||||||
UnsignedStreamSize n = size <= max_size ? size : max_size;
|
UnsignedStreamSize n = size <= max_size ? size : max_size;
|
||||||
os.write(data, static_cast<std::streamsize>(n));
|
os.write(data, static_cast<std::streamsize>(n));
|
||||||
data += n;
|
data += n;
|
||||||
@ -105,9 +98,8 @@ void write(std::basic_ostream<Char> &os, basic_buffer<Char> &buf)
|
|||||||
} while (size != 0);
|
} while (size != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Char, typename T>
|
template <typename Char, typename T>
|
||||||
void format_value(basic_buffer<Char> &buffer, const T &value)
|
void format_value(basic_buffer<Char> &buffer, const T &value) {
|
||||||
{
|
|
||||||
internal::formatbuf<Char> format_buf(buffer);
|
internal::formatbuf<Char> format_buf(buffer);
|
||||||
std::basic_ostream<Char> output(&format_buf);
|
std::basic_ostream<Char> output(&format_buf);
|
||||||
output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
|
output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
|
||||||
@ -116,20 +108,19 @@ void format_value(basic_buffer<Char> &buffer, const T &value)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Disable builtin formatting of enums and use operator<< instead.
|
// Disable builtin formatting of enums and use operator<< instead.
|
||||||
template<typename T>
|
template <typename T>
|
||||||
struct format_enum<T, typename std::enable_if<std::is_enum<T>::value>::type> : std::false_type
|
struct format_enum<T,
|
||||||
{
|
typename std::enable_if<std::is_enum<T>::value>::type> : std::false_type {};
|
||||||
};
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|
||||||
// Formats an object of type T that has an overloaded ostream operator<<.
|
// Formats an object of type T that has an overloaded ostream operator<<.
|
||||||
template<typename T, typename Char>
|
template <typename T, typename Char>
|
||||||
struct formatter<T, Char, typename std::enable_if<internal::is_streamable<T, Char>::value>::type> : formatter<basic_string_view<Char>, Char>
|
struct formatter<T, Char,
|
||||||
{
|
typename std::enable_if<internal::is_streamable<T, Char>::value>::type>
|
||||||
|
: formatter<basic_string_view<Char>, Char> {
|
||||||
|
|
||||||
template<typename Context>
|
template <typename Context>
|
||||||
auto format(const T &value, Context &ctx) -> decltype(ctx.out())
|
auto format(const T &value, Context &ctx) -> decltype(ctx.out()) {
|
||||||
{
|
|
||||||
basic_memory_buffer<Char> buffer;
|
basic_memory_buffer<Char> buffer;
|
||||||
internal::format_value(buffer, value);
|
internal::format_value(buffer, value);
|
||||||
basic_string_view<Char> str(buffer.data(), buffer.size());
|
basic_string_view<Char> str(buffer.data(), buffer.size());
|
||||||
@ -138,10 +129,10 @@ struct formatter<T, Char, typename std::enable_if<internal::is_streamable<T, Cha
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
inline void vprint(
|
inline void vprint(std::basic_ostream<Char> &os,
|
||||||
std::basic_ostream<Char> &os, basic_string_view<Char> format_str, basic_format_args<typename buffer_context<Char>::type> args)
|
basic_string_view<Char> format_str,
|
||||||
{
|
basic_format_args<typename buffer_context<Char>::type> args) {
|
||||||
basic_memory_buffer<Char> buffer;
|
basic_memory_buffer<Char> buffer;
|
||||||
vformat_to(buffer, format_str, args);
|
vformat_to(buffer, format_str, args);
|
||||||
internal::write(os, buffer);
|
internal::write(os, buffer);
|
||||||
@ -155,15 +146,15 @@ inline void vprint(
|
|||||||
fmt::print(cerr, "Don't {}!", "panic");
|
fmt::print(cerr, "Don't {}!", "panic");
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline void print(std::ostream &os, string_view format_str, const Args &... args)
|
inline void print(std::ostream &os, string_view format_str,
|
||||||
{
|
const Args & ... args) {
|
||||||
vprint<char>(os, format_str, make_format_args<format_context>(args...));
|
vprint<char>(os, format_str, make_format_args<format_context>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline void print(std::wostream &os, wstring_view format_str, const Args &... args)
|
inline void print(std::wostream &os, wstring_view format_str,
|
||||||
{
|
const Args & ... args) {
|
||||||
vprint<wchar_t>(os, format_str, make_format_args<wformat_context>(args...));
|
vprint<wchar_t>(os, format_str, make_format_args<wformat_context>(args...));
|
||||||
}
|
}
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#if defined(__MINGW32__) || defined(__CYGWIN__)
|
#if defined(__MINGW32__) || defined(__CYGWIN__)
|
||||||
// Workaround MinGW bug https://sourceforge.net/p/mingw/bugs/2024/.
|
// Workaround MinGW bug https://sourceforge.net/p/mingw/bugs/2024/.
|
||||||
#undef __STRICT_ANSI__
|
# undef __STRICT_ANSI__
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
@ -22,43 +22,42 @@
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
|
||||||
#if defined __APPLE__ || defined(__FreeBSD__)
|
#if defined __APPLE__ || defined(__FreeBSD__)
|
||||||
#include <xlocale.h> // for LC_NUMERIC_MASK on OS X
|
# include <xlocale.h> // for LC_NUMERIC_MASK on OS X
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
|
|
||||||
#ifndef FMT_POSIX
|
#ifndef FMT_POSIX
|
||||||
#if defined(_WIN32) && !defined(__MINGW32__)
|
# if defined(_WIN32) && !defined(__MINGW32__)
|
||||||
// Fix warnings about deprecated symbols.
|
// Fix warnings about deprecated symbols.
|
||||||
#define FMT_POSIX(call) _##call
|
# define FMT_POSIX(call) _##call
|
||||||
#else
|
# else
|
||||||
#define FMT_POSIX(call) call
|
# define FMT_POSIX(call) call
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Calls to system functions are wrapped in FMT_SYSTEM for testability.
|
// Calls to system functions are wrapped in FMT_SYSTEM for testability.
|
||||||
#ifdef FMT_SYSTEM
|
#ifdef FMT_SYSTEM
|
||||||
#define FMT_POSIX_CALL(call) FMT_SYSTEM(call)
|
# define FMT_POSIX_CALL(call) FMT_SYSTEM(call)
|
||||||
#else
|
#else
|
||||||
#define FMT_SYSTEM(call) call
|
# define FMT_SYSTEM(call) call
|
||||||
#ifdef _WIN32
|
# ifdef _WIN32
|
||||||
// Fix warnings about deprecated symbols.
|
// Fix warnings about deprecated symbols.
|
||||||
#define FMT_POSIX_CALL(call) ::_##call
|
# define FMT_POSIX_CALL(call) ::_##call
|
||||||
#else
|
# else
|
||||||
#define FMT_POSIX_CALL(call) ::call
|
# define FMT_POSIX_CALL(call) ::call
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Retries the expression while it evaluates to error_result and errno
|
// Retries the expression while it evaluates to error_result and errno
|
||||||
// equals to EINTR.
|
// equals to EINTR.
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#define FMT_RETRY_VAL(result, expression, error_result) \
|
# define FMT_RETRY_VAL(result, expression, error_result) \
|
||||||
do \
|
do { \
|
||||||
{ \
|
|
||||||
result = (expression); \
|
result = (expression); \
|
||||||
} while (result == error_result && errno == EINTR)
|
} while (result == error_result && errno == EINTR)
|
||||||
#else
|
#else
|
||||||
#define FMT_RETRY_VAL(result, expression, error_result) result = (expression)
|
# define FMT_RETRY_VAL(result, expression, error_result) result = (expression)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define FMT_RETRY(result, expression) FMT_RETRY_VAL(result, expression, -1)
|
#define FMT_RETRY(result, expression) FMT_RETRY_VAL(result, expression, -1)
|
||||||
@ -90,68 +89,50 @@ FMT_BEGIN_NAMESPACE
|
|||||||
format(std::string("{}"), 42);
|
format(std::string("{}"), 42);
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
class basic_cstring_view
|
class basic_cstring_view {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
const Char *data_;
|
const Char *data_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** Constructs a string reference object from a C string. */
|
/** Constructs a string reference object from a C string. */
|
||||||
basic_cstring_view(const Char *s)
|
basic_cstring_view(const Char *s) : data_(s) {}
|
||||||
: data_(s)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Constructs a string reference from an ``std::string`` object.
|
Constructs a string reference from an ``std::string`` object.
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
basic_cstring_view(const std::basic_string<Char> &s)
|
basic_cstring_view(const std::basic_string<Char> &s) : data_(s.c_str()) {}
|
||||||
: data_(s.c_str())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Returns the pointer to a C string. */
|
/** Returns the pointer to a C string. */
|
||||||
const Char *c_str() const
|
const Char *c_str() const { return data_; }
|
||||||
{
|
|
||||||
return data_;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef basic_cstring_view<char> cstring_view;
|
typedef basic_cstring_view<char> cstring_view;
|
||||||
typedef basic_cstring_view<wchar_t> wcstring_view;
|
typedef basic_cstring_view<wchar_t> wcstring_view;
|
||||||
|
|
||||||
// An error code.
|
// An error code.
|
||||||
class error_code
|
class error_code {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
int value_;
|
int value_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit error_code(int value = 0) FMT_NOEXCEPT : value_(value) {}
|
explicit error_code(int value = 0) FMT_NOEXCEPT : value_(value) {}
|
||||||
|
|
||||||
int get() const FMT_NOEXCEPT
|
int get() const FMT_NOEXCEPT { return value_; }
|
||||||
{
|
|
||||||
return value_;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// A buffered file.
|
// A buffered file.
|
||||||
class buffered_file
|
class buffered_file {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
FILE *file_;
|
FILE *file_;
|
||||||
|
|
||||||
friend class file;
|
friend class file;
|
||||||
|
|
||||||
explicit buffered_file(FILE *f)
|
explicit buffered_file(FILE *f) : file_(f) {}
|
||||||
: file_(f)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Constructs a buffered_file object which doesn't represent any file.
|
// Constructs a buffered_file object which doesn't represent any file.
|
||||||
buffered_file() FMT_NOEXCEPT : file_(FMT_NULL) {}
|
buffered_file() FMT_NOEXCEPT : file_(FMT_NULL) {}
|
||||||
|
|
||||||
@ -162,11 +143,10 @@ public:
|
|||||||
// Emulate a move constructor and a move assignment operator if rvalue
|
// Emulate a move constructor and a move assignment operator if rvalue
|
||||||
// references are not supported.
|
// references are not supported.
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// A proxy object to emulate a move constructor.
|
// A proxy object to emulate a move constructor.
|
||||||
// It is private to make it impossible call operator Proxy directly.
|
// It is private to make it impossible call operator Proxy directly.
|
||||||
struct Proxy
|
struct Proxy {
|
||||||
{
|
|
||||||
FILE *file;
|
FILE *file;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -175,22 +155,19 @@ public:
|
|||||||
buffered_file(Proxy p) FMT_NOEXCEPT : file_(p.file) {}
|
buffered_file(Proxy p) FMT_NOEXCEPT : file_(p.file) {}
|
||||||
|
|
||||||
// A "move constructor" for moving from an lvalue.
|
// A "move constructor" for moving from an lvalue.
|
||||||
buffered_file(buffered_file &f) FMT_NOEXCEPT : file_(f.file_)
|
buffered_file(buffered_file &f) FMT_NOEXCEPT : file_(f.file_) {
|
||||||
{
|
|
||||||
f.file_ = FMT_NULL;
|
f.file_ = FMT_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// A "move assignment operator" for moving from a temporary.
|
// A "move assignment operator" for moving from a temporary.
|
||||||
buffered_file &operator=(Proxy p)
|
buffered_file &operator=(Proxy p) {
|
||||||
{
|
|
||||||
close();
|
close();
|
||||||
file_ = p.file;
|
file_ = p.file;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// A "move assignment operator" for moving from an lvalue.
|
// A "move assignment operator" for moving from an lvalue.
|
||||||
buffered_file &operator=(buffered_file &other)
|
buffered_file &operator=(buffered_file &other) {
|
||||||
{
|
|
||||||
close();
|
close();
|
||||||
file_ = other.file_;
|
file_ = other.file_;
|
||||||
other.file_ = FMT_NULL;
|
other.file_ = FMT_NULL;
|
||||||
@ -199,25 +176,22 @@ public:
|
|||||||
|
|
||||||
// Returns a proxy object for moving from a temporary:
|
// Returns a proxy object for moving from a temporary:
|
||||||
// buffered_file file = buffered_file(...);
|
// buffered_file file = buffered_file(...);
|
||||||
operator Proxy() FMT_NOEXCEPT
|
operator Proxy() FMT_NOEXCEPT {
|
||||||
{
|
|
||||||
Proxy p = {file_};
|
Proxy p = {file_};
|
||||||
file_ = FMT_NULL;
|
file_ = FMT_NULL;
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
private:
|
private:
|
||||||
FMT_DISALLOW_COPY_AND_ASSIGN(buffered_file);
|
FMT_DISALLOW_COPY_AND_ASSIGN(buffered_file);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
buffered_file(buffered_file &&other) FMT_NOEXCEPT : file_(other.file_)
|
buffered_file(buffered_file &&other) FMT_NOEXCEPT : file_(other.file_) {
|
||||||
{
|
|
||||||
other.file_ = FMT_NULL;
|
other.file_ = FMT_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
buffered_file &operator=(buffered_file &&other)
|
buffered_file& operator=(buffered_file &&other) {
|
||||||
{
|
|
||||||
close();
|
close();
|
||||||
file_ = other.file_;
|
file_ = other.file_;
|
||||||
other.file_ = FMT_NULL;
|
other.file_ = FMT_NULL;
|
||||||
@ -232,23 +206,18 @@ public:
|
|||||||
FMT_API void close();
|
FMT_API void close();
|
||||||
|
|
||||||
// Returns the pointer to a FILE object representing this file.
|
// Returns the pointer to a FILE object representing this file.
|
||||||
FILE *get() const FMT_NOEXCEPT
|
FILE *get() const FMT_NOEXCEPT { return file_; }
|
||||||
{
|
|
||||||
return file_;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We place parentheses around fileno to workaround a bug in some versions
|
// We place parentheses around fileno to workaround a bug in some versions
|
||||||
// of MinGW that define fileno as a macro.
|
// of MinGW that define fileno as a macro.
|
||||||
FMT_API int(fileno)() const;
|
FMT_API int (fileno)() const;
|
||||||
|
|
||||||
void vprint(string_view format_str, format_args args)
|
void vprint(string_view format_str, format_args args) {
|
||||||
{
|
|
||||||
fmt::vprint(file_, format_str, args);
|
fmt::vprint(file_, format_str, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline void print(string_view format_str, const Args &... args)
|
inline void print(string_view format_str, const Args & ... args) {
|
||||||
{
|
|
||||||
vprint(format_str, make_format_args(args...));
|
vprint(format_str, make_format_args(args...));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -259,21 +228,16 @@ public:
|
|||||||
// closing the file multiple times will cause a crash on Windows rather
|
// closing the file multiple times will cause a crash on Windows rather
|
||||||
// than an exception. You can get standard behavior by overriding the
|
// than an exception. You can get standard behavior by overriding the
|
||||||
// invalid parameter handler with _set_invalid_parameter_handler.
|
// invalid parameter handler with _set_invalid_parameter_handler.
|
||||||
class file
|
class file {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
int fd_; // File descriptor.
|
int fd_; // File descriptor.
|
||||||
|
|
||||||
// Constructs a file object with a given descriptor.
|
// Constructs a file object with a given descriptor.
|
||||||
explicit file(int fd)
|
explicit file(int fd) : fd_(fd) {}
|
||||||
: fd_(fd)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Possible values for the oflag argument to the constructor.
|
// Possible values for the oflag argument to the constructor.
|
||||||
enum
|
enum {
|
||||||
{
|
|
||||||
RDONLY = FMT_POSIX(O_RDONLY), // Open for reading only.
|
RDONLY = FMT_POSIX(O_RDONLY), // Open for reading only.
|
||||||
WRONLY = FMT_POSIX(O_WRONLY), // Open for writing only.
|
WRONLY = FMT_POSIX(O_WRONLY), // Open for writing only.
|
||||||
RDWR = FMT_POSIX(O_RDWR) // Open for reading and writing.
|
RDWR = FMT_POSIX(O_RDWR) // Open for reading and writing.
|
||||||
@ -289,35 +253,31 @@ public:
|
|||||||
// Emulate a move constructor and a move assignment operator if rvalue
|
// Emulate a move constructor and a move assignment operator if rvalue
|
||||||
// references are not supported.
|
// references are not supported.
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// A proxy object to emulate a move constructor.
|
// A proxy object to emulate a move constructor.
|
||||||
// It is private to make it impossible call operator Proxy directly.
|
// It is private to make it impossible call operator Proxy directly.
|
||||||
struct Proxy
|
struct Proxy {
|
||||||
{
|
|
||||||
int fd;
|
int fd;
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// A "move constructor" for moving from a temporary.
|
// A "move constructor" for moving from a temporary.
|
||||||
file(Proxy p) FMT_NOEXCEPT : fd_(p.fd) {}
|
file(Proxy p) FMT_NOEXCEPT : fd_(p.fd) {}
|
||||||
|
|
||||||
// A "move constructor" for moving from an lvalue.
|
// A "move constructor" for moving from an lvalue.
|
||||||
file(file &other) FMT_NOEXCEPT : fd_(other.fd_)
|
file(file &other) FMT_NOEXCEPT : fd_(other.fd_) {
|
||||||
{
|
|
||||||
other.fd_ = -1;
|
other.fd_ = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// A "move assignment operator" for moving from a temporary.
|
// A "move assignment operator" for moving from a temporary.
|
||||||
file &operator=(Proxy p)
|
file &operator=(Proxy p) {
|
||||||
{
|
|
||||||
close();
|
close();
|
||||||
fd_ = p.fd;
|
fd_ = p.fd;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// A "move assignment operator" for moving from an lvalue.
|
// A "move assignment operator" for moving from an lvalue.
|
||||||
file &operator=(file &other)
|
file &operator=(file &other) {
|
||||||
{
|
|
||||||
close();
|
close();
|
||||||
fd_ = other.fd_;
|
fd_ = other.fd_;
|
||||||
other.fd_ = -1;
|
other.fd_ = -1;
|
||||||
@ -326,25 +286,22 @@ public:
|
|||||||
|
|
||||||
// Returns a proxy object for moving from a temporary:
|
// Returns a proxy object for moving from a temporary:
|
||||||
// file f = file(...);
|
// file f = file(...);
|
||||||
operator Proxy() FMT_NOEXCEPT
|
operator Proxy() FMT_NOEXCEPT {
|
||||||
{
|
|
||||||
Proxy p = {fd_};
|
Proxy p = {fd_};
|
||||||
fd_ = -1;
|
fd_ = -1;
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
private:
|
private:
|
||||||
FMT_DISALLOW_COPY_AND_ASSIGN(file);
|
FMT_DISALLOW_COPY_AND_ASSIGN(file);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
file(file &&other) FMT_NOEXCEPT : fd_(other.fd_)
|
file(file &&other) FMT_NOEXCEPT : fd_(other.fd_) {
|
||||||
{
|
|
||||||
other.fd_ = -1;
|
other.fd_ = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
file &operator=(file &&other)
|
file& operator=(file &&other) {
|
||||||
{
|
|
||||||
close();
|
close();
|
||||||
fd_ = other.fd_;
|
fd_ = other.fd_;
|
||||||
other.fd_ = -1;
|
other.fd_ = -1;
|
||||||
@ -356,10 +313,7 @@ public:
|
|||||||
FMT_API ~file() FMT_DTOR_NOEXCEPT;
|
FMT_API ~file() FMT_DTOR_NOEXCEPT;
|
||||||
|
|
||||||
// Returns the file descriptor.
|
// Returns the file descriptor.
|
||||||
int descriptor() const FMT_NOEXCEPT
|
int descriptor() const FMT_NOEXCEPT { return fd_; }
|
||||||
{
|
|
||||||
return fd_;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Closes the file.
|
// Closes the file.
|
||||||
FMT_API void close();
|
FMT_API void close();
|
||||||
@ -398,66 +352,51 @@ public:
|
|||||||
// Returns the memory page size.
|
// Returns the memory page size.
|
||||||
long getpagesize();
|
long getpagesize();
|
||||||
|
|
||||||
#if (defined(LC_NUMERIC_MASK) || defined(_MSC_VER)) && !defined(__ANDROID__) && !defined(__CYGWIN__) && !defined(__OpenBSD__)
|
#if (defined(LC_NUMERIC_MASK) || defined(_MSC_VER)) && \
|
||||||
#define FMT_LOCALE
|
!defined(__ANDROID__) && !defined(__CYGWIN__) && !defined(__OpenBSD__)
|
||||||
|
# define FMT_LOCALE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FMT_LOCALE
|
#ifdef FMT_LOCALE
|
||||||
// A "C" numeric locale.
|
// A "C" numeric locale.
|
||||||
class Locale
|
class Locale {
|
||||||
{
|
private:
|
||||||
private:
|
# ifdef _MSC_VER
|
||||||
#ifdef _MSC_VER
|
|
||||||
typedef _locale_t locale_t;
|
typedef _locale_t locale_t;
|
||||||
|
|
||||||
enum
|
enum { LC_NUMERIC_MASK = LC_NUMERIC };
|
||||||
{
|
|
||||||
LC_NUMERIC_MASK = LC_NUMERIC
|
|
||||||
};
|
|
||||||
|
|
||||||
static locale_t newlocale(int category_mask, const char *locale, locale_t)
|
static locale_t newlocale(int category_mask, const char *locale, locale_t) {
|
||||||
{
|
|
||||||
return _create_locale(category_mask, locale);
|
return _create_locale(category_mask, locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void freelocale(locale_t locale)
|
static void freelocale(locale_t locale) {
|
||||||
{
|
|
||||||
_free_locale(locale);
|
_free_locale(locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
static double strtod_l(const char *nptr, char **endptr, _locale_t locale)
|
static double strtod_l(const char *nptr, char **endptr, _locale_t locale) {
|
||||||
{
|
|
||||||
return _strtod_l(nptr, endptr, locale);
|
return _strtod_l(nptr, endptr, locale);
|
||||||
}
|
}
|
||||||
#endif
|
# endif
|
||||||
|
|
||||||
locale_t locale_;
|
locale_t locale_;
|
||||||
|
|
||||||
FMT_DISALLOW_COPY_AND_ASSIGN(Locale);
|
FMT_DISALLOW_COPY_AND_ASSIGN(Locale);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef locale_t Type;
|
typedef locale_t Type;
|
||||||
|
|
||||||
Locale()
|
Locale() : locale_(newlocale(LC_NUMERIC_MASK, "C", FMT_NULL)) {
|
||||||
: locale_(newlocale(LC_NUMERIC_MASK, "C", FMT_NULL))
|
|
||||||
{
|
|
||||||
if (!locale_)
|
if (!locale_)
|
||||||
FMT_THROW(system_error(errno, "cannot create locale"));
|
FMT_THROW(system_error(errno, "cannot create locale"));
|
||||||
}
|
}
|
||||||
~Locale()
|
~Locale() { freelocale(locale_); }
|
||||||
{
|
|
||||||
freelocale(locale_);
|
|
||||||
}
|
|
||||||
|
|
||||||
Type get() const
|
Type get() const { return locale_; }
|
||||||
{
|
|
||||||
return locale_;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Converts string to floating-point number and advances str past the end
|
// Converts string to floating-point number and advances str past the end
|
||||||
// of the parsed input.
|
// of the parsed input.
|
||||||
double strtod(const char *&str) const
|
double strtod(const char *&str) const {
|
||||||
{
|
|
||||||
char *end = FMT_NULL;
|
char *end = FMT_NULL;
|
||||||
double result = strtod_l(str, &end, locale_);
|
double result = strtod_l(str, &end, locale_);
|
||||||
str = end;
|
str = end;
|
||||||
@ -470,15 +409,9 @@ FMT_END_NAMESPACE
|
|||||||
#if !FMT_USE_RVALUE_REFERENCES
|
#if !FMT_USE_RVALUE_REFERENCES
|
||||||
namespace std {
|
namespace std {
|
||||||
// For compatibility with C++98.
|
// For compatibility with C++98.
|
||||||
inline fmt::buffered_file &move(fmt::buffered_file &f)
|
inline fmt::buffered_file &move(fmt::buffered_file &f) { return f; }
|
||||||
{
|
inline fmt::file &move(fmt::file &f) { return f; }
|
||||||
return f;
|
|
||||||
}
|
}
|
||||||
inline fmt::file &move(fmt::file &f)
|
|
||||||
{
|
|
||||||
return f;
|
|
||||||
}
|
|
||||||
} // namespace std
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // FMT_POSIX_H_
|
#endif // FMT_POSIX_H_
|
||||||
|
@ -18,141 +18,111 @@ namespace internal {
|
|||||||
|
|
||||||
// Checks if a value fits in int - used to avoid warnings about comparing
|
// Checks if a value fits in int - used to avoid warnings about comparing
|
||||||
// signed and unsigned integers.
|
// signed and unsigned integers.
|
||||||
template<bool IsSigned>
|
template <bool IsSigned>
|
||||||
struct int_checker
|
struct int_checker {
|
||||||
{
|
template <typename T>
|
||||||
template<typename T>
|
static bool fits_in_int(T value) {
|
||||||
static bool fits_in_int(T value)
|
|
||||||
{
|
|
||||||
unsigned max = std::numeric_limits<int>::max();
|
unsigned max = std::numeric_limits<int>::max();
|
||||||
return value <= max;
|
return value <= max;
|
||||||
}
|
}
|
||||||
static bool fits_in_int(bool)
|
static bool fits_in_int(bool) { return true; }
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template<>
|
template <>
|
||||||
struct int_checker<true>
|
struct int_checker<true> {
|
||||||
{
|
template <typename T>
|
||||||
template<typename T>
|
static bool fits_in_int(T value) {
|
||||||
static bool fits_in_int(T value)
|
return value >= std::numeric_limits<int>::min() &&
|
||||||
{
|
value <= std::numeric_limits<int>::max();
|
||||||
return value >= std::numeric_limits<int>::min() && value <= std::numeric_limits<int>::max();
|
|
||||||
}
|
|
||||||
static bool fits_in_int(int)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
static bool fits_in_int(int) { return true; }
|
||||||
};
|
};
|
||||||
|
|
||||||
class printf_precision_handler : public function<int>
|
class printf_precision_handler: public function<int> {
|
||||||
{
|
public:
|
||||||
public:
|
template <typename T>
|
||||||
template<typename T>
|
typename std::enable_if<std::is_integral<T>::value, int>::type
|
||||||
typename std::enable_if<std::is_integral<T>::value, int>::type operator()(T value)
|
operator()(T value) {
|
||||||
{
|
|
||||||
if (!int_checker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
|
if (!int_checker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
|
||||||
FMT_THROW(format_error("number is too big"));
|
FMT_THROW(format_error("number is too big"));
|
||||||
return static_cast<int>(value);
|
return static_cast<int>(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
typename std::enable_if<!std::is_integral<T>::value, int>::type operator()(T)
|
typename std::enable_if<!std::is_integral<T>::value, int>::type operator()(T) {
|
||||||
{
|
|
||||||
FMT_THROW(format_error("precision is not integer"));
|
FMT_THROW(format_error("precision is not integer"));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// An argument visitor that returns true iff arg is a zero integer.
|
// An argument visitor that returns true iff arg is a zero integer.
|
||||||
class is_zero_int : public function<bool>
|
class is_zero_int: public function<bool> {
|
||||||
{
|
public:
|
||||||
public:
|
template <typename T>
|
||||||
template<typename T>
|
typename std::enable_if<std::is_integral<T>::value, bool>::type
|
||||||
typename std::enable_if<std::is_integral<T>::value, bool>::type operator()(T value)
|
operator()(T value) { return value == 0; }
|
||||||
{
|
|
||||||
return value == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
typename std::enable_if<!std::is_integral<T>::value, bool>::type operator()(T)
|
typename std::enable_if<!std::is_integral<T>::value, bool>::type
|
||||||
{
|
operator()(T) { return false; }
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
struct make_unsigned_or_bool : std::make_unsigned<T>
|
struct make_unsigned_or_bool : std::make_unsigned<T> {};
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
template<>
|
template <>
|
||||||
struct make_unsigned_or_bool<bool>
|
struct make_unsigned_or_bool<bool> {
|
||||||
{
|
|
||||||
typedef bool type;
|
typedef bool type;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T, typename Context>
|
template <typename T, typename Context>
|
||||||
class arg_converter : public function<void>
|
class arg_converter: public function<void> {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
typedef typename Context::char_type Char;
|
typedef typename Context::char_type Char;
|
||||||
|
|
||||||
basic_format_arg<Context> &arg_;
|
basic_format_arg<Context> &arg_;
|
||||||
typename Context::char_type type_;
|
typename Context::char_type type_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
arg_converter(basic_format_arg<Context> &arg, Char type)
|
arg_converter(basic_format_arg<Context> &arg, Char type)
|
||||||
: arg_(arg)
|
: arg_(arg), type_(type) {}
|
||||||
, type_(type)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator()(bool value)
|
void operator()(bool value) {
|
||||||
{
|
|
||||||
if (type_ != 's')
|
if (type_ != 's')
|
||||||
operator()<bool>(value);
|
operator()<bool>(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename U>
|
template <typename U>
|
||||||
typename std::enable_if<std::is_integral<U>::value>::type operator()(U value)
|
typename std::enable_if<std::is_integral<U>::value>::type
|
||||||
{
|
operator()(U value) {
|
||||||
bool is_signed = type_ == 'd' || type_ == 'i';
|
bool is_signed = type_ == 'd' || type_ == 'i';
|
||||||
typedef typename std::conditional<std::is_same<T, void>::value, U, T>::type TargetType;
|
typedef typename std::conditional<
|
||||||
if (const_check(sizeof(TargetType) <= sizeof(int)))
|
std::is_same<T, void>::value, U, T>::type TargetType;
|
||||||
{
|
if (const_check(sizeof(TargetType) <= sizeof(int))) {
|
||||||
// Extra casts are used to silence warnings.
|
// Extra casts are used to silence warnings.
|
||||||
if (is_signed)
|
if (is_signed) {
|
||||||
{
|
arg_ = internal::make_arg<Context>(
|
||||||
arg_ = internal::make_arg<Context>(static_cast<int>(static_cast<TargetType>(value)));
|
static_cast<int>(static_cast<TargetType>(value)));
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
typedef typename make_unsigned_or_bool<TargetType>::type Unsigned;
|
typedef typename make_unsigned_or_bool<TargetType>::type Unsigned;
|
||||||
arg_ = internal::make_arg<Context>(static_cast<unsigned>(static_cast<Unsigned>(value)));
|
arg_ = internal::make_arg<Context>(
|
||||||
|
static_cast<unsigned>(static_cast<Unsigned>(value)));
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
if (is_signed) {
|
||||||
{
|
|
||||||
if (is_signed)
|
|
||||||
{
|
|
||||||
// glibc's printf doesn't sign extend arguments of smaller types:
|
// glibc's printf doesn't sign extend arguments of smaller types:
|
||||||
// std::printf("%lld", -42); // prints "4294967254"
|
// std::printf("%lld", -42); // prints "4294967254"
|
||||||
// but we don't have to do the same because it's a UB.
|
// but we don't have to do the same because it's a UB.
|
||||||
arg_ = internal::make_arg<Context>(static_cast<long long>(value));
|
arg_ = internal::make_arg<Context>(static_cast<long long>(value));
|
||||||
}
|
} else {
|
||||||
else
|
arg_ = internal::make_arg<Context>(
|
||||||
{
|
static_cast<typename make_unsigned_or_bool<U>::type>(value));
|
||||||
arg_ = internal::make_arg<Context>(static_cast<typename make_unsigned_or_bool<U>::type>(value));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename U>
|
template <typename U>
|
||||||
typename std::enable_if<!std::is_integral<U>::value>::type operator()(U)
|
typename std::enable_if<!std::is_integral<U>::value>::type operator()(U) {
|
||||||
{
|
|
||||||
// No coversion needed for non-integral types.
|
// No coversion needed for non-integral types.
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -161,66 +131,55 @@ public:
|
|||||||
// If T is void, the argument is converted to corresponding signed or unsigned
|
// If T is void, the argument is converted to corresponding signed or unsigned
|
||||||
// type depending on the type specifier: 'd' and 'i' - signed, other -
|
// type depending on the type specifier: 'd' and 'i' - signed, other -
|
||||||
// unsigned).
|
// unsigned).
|
||||||
template<typename T, typename Context, typename Char>
|
template <typename T, typename Context, typename Char>
|
||||||
void convert_arg(basic_format_arg<Context> &arg, Char type)
|
void convert_arg(basic_format_arg<Context> &arg, Char type) {
|
||||||
{
|
|
||||||
visit(arg_converter<T, Context>(arg, type), arg);
|
visit(arg_converter<T, Context>(arg, type), arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Converts an integer argument to char for printf.
|
// Converts an integer argument to char for printf.
|
||||||
template<typename Context>
|
template <typename Context>
|
||||||
class char_converter : public function<void>
|
class char_converter: public function<void> {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
basic_format_arg<Context> &arg_;
|
basic_format_arg<Context> &arg_;
|
||||||
|
|
||||||
FMT_DISALLOW_COPY_AND_ASSIGN(char_converter);
|
FMT_DISALLOW_COPY_AND_ASSIGN(char_converter);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit char_converter(basic_format_arg<Context> &arg)
|
explicit char_converter(basic_format_arg<Context> &arg) : arg_(arg) {}
|
||||||
: arg_(arg)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
typename std::enable_if<std::is_integral<T>::value>::type operator()(T value)
|
typename std::enable_if<std::is_integral<T>::value>::type
|
||||||
{
|
operator()(T value) {
|
||||||
typedef typename Context::char_type Char;
|
typedef typename Context::char_type Char;
|
||||||
arg_ = internal::make_arg<Context>(static_cast<Char>(value));
|
arg_ = internal::make_arg<Context>(static_cast<Char>(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
typename std::enable_if<!std::is_integral<T>::value>::type operator()(T)
|
typename std::enable_if<!std::is_integral<T>::value>::type operator()(T) {
|
||||||
{
|
|
||||||
// No coversion needed for non-integral types.
|
// No coversion needed for non-integral types.
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Checks if an argument is a valid printf width specifier and sets
|
// Checks if an argument is a valid printf width specifier and sets
|
||||||
// left alignment if it is negative.
|
// left alignment if it is negative.
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
class printf_width_handler : public function<unsigned>
|
class printf_width_handler: public function<unsigned> {
|
||||||
{
|
private:
|
||||||
private:
|
|
||||||
typedef basic_format_specs<Char> format_specs;
|
typedef basic_format_specs<Char> format_specs;
|
||||||
|
|
||||||
format_specs &spec_;
|
format_specs &spec_;
|
||||||
|
|
||||||
FMT_DISALLOW_COPY_AND_ASSIGN(printf_width_handler);
|
FMT_DISALLOW_COPY_AND_ASSIGN(printf_width_handler);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit printf_width_handler(format_specs &spec)
|
explicit printf_width_handler(format_specs &spec) : spec_(spec) {}
|
||||||
: spec_(spec)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
typename std::enable_if<std::is_integral<T>::value, unsigned>::type operator()(T value)
|
typename std::enable_if<std::is_integral<T>::value, unsigned>::type
|
||||||
{
|
operator()(T value) {
|
||||||
typedef typename internal::int_traits<T>::main_type UnsignedType;
|
typedef typename internal::int_traits<T>::main_type UnsignedType;
|
||||||
UnsignedType width = static_cast<UnsignedType>(value);
|
UnsignedType width = static_cast<UnsignedType>(value);
|
||||||
if (internal::is_negative(value))
|
if (internal::is_negative(value)) {
|
||||||
{
|
|
||||||
spec_.align_ = ALIGN_LEFT;
|
spec_.align_ = ALIGN_LEFT;
|
||||||
width = 0 - width;
|
width = 0 - width;
|
||||||
}
|
}
|
||||||
@ -230,19 +189,22 @@ public:
|
|||||||
return static_cast<unsigned>(width);
|
return static_cast<unsigned>(width);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
typename std::enable_if<!std::is_integral<T>::value, unsigned>::type operator()(T)
|
typename std::enable_if<!std::is_integral<T>::value, unsigned>::type
|
||||||
{
|
operator()(T) {
|
||||||
FMT_THROW(format_error("width is not integer"));
|
FMT_THROW(format_error("width is not integer"));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|
||||||
template<typename Range>
|
template <typename Range>
|
||||||
class printf_arg_formatter;
|
class printf_arg_formatter;
|
||||||
|
|
||||||
template<typename OutputIt, typename Char, typename ArgFormatter = printf_arg_formatter<back_insert_range<internal::basic_buffer<Char>>>>
|
template <
|
||||||
|
typename OutputIt, typename Char,
|
||||||
|
typename ArgFormatter =
|
||||||
|
printf_arg_formatter<back_insert_range<internal::basic_buffer<Char>>>>
|
||||||
class basic_printf_context;
|
class basic_printf_context;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -250,11 +212,12 @@ class basic_printf_context;
|
|||||||
The ``printf`` argument formatter.
|
The ``printf`` argument formatter.
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template<typename Range>
|
template <typename Range>
|
||||||
class printf_arg_formatter : public internal::function<typename internal::arg_formatter_base<Range>::iterator>,
|
class printf_arg_formatter:
|
||||||
public internal::arg_formatter_base<Range>
|
public internal::function<
|
||||||
{
|
typename internal::arg_formatter_base<Range>::iterator>,
|
||||||
private:
|
public internal::arg_formatter_base<Range> {
|
||||||
|
private:
|
||||||
typedef typename Range::value_type char_type;
|
typedef typename Range::value_type char_type;
|
||||||
typedef decltype(internal::declval<Range>().begin()) iterator;
|
typedef decltype(internal::declval<Range>().begin()) iterator;
|
||||||
typedef internal::arg_formatter_base<Range> base;
|
typedef internal::arg_formatter_base<Range> base;
|
||||||
@ -262,19 +225,17 @@ private:
|
|||||||
|
|
||||||
context_type &context_;
|
context_type &context_;
|
||||||
|
|
||||||
void write_null_pointer(char)
|
void write_null_pointer(char) {
|
||||||
{
|
|
||||||
this->spec().type_ = 0;
|
this->spec().type_ = 0;
|
||||||
this->write("(nil)");
|
this->write("(nil)");
|
||||||
}
|
}
|
||||||
|
|
||||||
void write_null_pointer(wchar_t)
|
void write_null_pointer(wchar_t) {
|
||||||
{
|
|
||||||
this->spec().type_ = 0;
|
this->spec().type_ = 0;
|
||||||
this->write(L"(nil)");
|
this->write(L"(nil)");
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef typename base::format_specs format_specs;
|
typedef typename base::format_specs format_specs;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -284,39 +245,43 @@ public:
|
|||||||
specifier information for standard argument types.
|
specifier information for standard argument types.
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
printf_arg_formatter(internal::basic_buffer<char_type> &buffer, format_specs &spec, context_type &ctx)
|
printf_arg_formatter(internal::basic_buffer<char_type> &buffer,
|
||||||
: base(back_insert_range<internal::basic_buffer<char_type>>(buffer), spec)
|
format_specs &spec, context_type &ctx)
|
||||||
, context_(ctx)
|
: base(back_insert_range<internal::basic_buffer<char_type>>(buffer), spec),
|
||||||
{
|
context_(ctx) {}
|
||||||
}
|
|
||||||
|
|
||||||
using base::operator();
|
template <typename T>
|
||||||
|
typename std::enable_if<std::is_integral<T>::value, iterator>::type
|
||||||
/** Formats an argument of type ``bool``. */
|
operator()(T value) {
|
||||||
iterator operator()(bool value)
|
// MSVC2013 fails to compile separate overloads for bool and char_type so
|
||||||
{
|
// use std::is_same instead.
|
||||||
|
if (std::is_same<T, bool>::value) {
|
||||||
format_specs &fmt_spec = this->spec();
|
format_specs &fmt_spec = this->spec();
|
||||||
if (fmt_spec.type_ != 's')
|
if (fmt_spec.type_ != 's')
|
||||||
return (*this)(value ? 1 : 0);
|
return base::operator()(value ? 1 : 0);
|
||||||
fmt_spec.type_ = 0;
|
fmt_spec.type_ = 0;
|
||||||
this->write(value);
|
this->write(value != 0);
|
||||||
return this->out();
|
} else if (std::is_same<T, char_type>::value) {
|
||||||
}
|
|
||||||
|
|
||||||
/** Formats a character. */
|
|
||||||
iterator operator()(char_type value)
|
|
||||||
{
|
|
||||||
format_specs &fmt_spec = this->spec();
|
format_specs &fmt_spec = this->spec();
|
||||||
if (fmt_spec.type_ && fmt_spec.type_ != 'c')
|
if (fmt_spec.type_ && fmt_spec.type_ != 'c')
|
||||||
return (*this)(static_cast<int>(value));
|
return (*this)(static_cast<int>(value));
|
||||||
fmt_spec.flags_ = 0;
|
fmt_spec.flags_ = 0;
|
||||||
fmt_spec.align_ = ALIGN_RIGHT;
|
fmt_spec.align_ = ALIGN_RIGHT;
|
||||||
return base::operator()(value);
|
return base::operator()(value);
|
||||||
|
} else {
|
||||||
|
return base::operator()(value);
|
||||||
|
}
|
||||||
|
return this->out();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
typename std::enable_if<std::is_floating_point<T>::value, iterator>::type
|
||||||
|
operator()(T value) {
|
||||||
|
return base::operator()(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Formats a null-terminated C string. */
|
/** Formats a null-terminated C string. */
|
||||||
iterator operator()(const char *value)
|
iterator operator()(const char *value) {
|
||||||
{
|
|
||||||
if (value)
|
if (value)
|
||||||
base::operator()(value);
|
base::operator()(value);
|
||||||
else if (this->spec().type_ == 'p')
|
else if (this->spec().type_ == 'p')
|
||||||
@ -327,8 +292,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Formats a null-terminated wide C string. */
|
/** Formats a null-terminated wide C string. */
|
||||||
iterator operator()(const wchar_t *value)
|
iterator operator()(const wchar_t *value) {
|
||||||
{
|
|
||||||
if (value)
|
if (value)
|
||||||
base::operator()(value);
|
base::operator()(value);
|
||||||
else if (this->spec().type_ == 'p')
|
else if (this->spec().type_ == 'p')
|
||||||
@ -338,9 +302,16 @@ public:
|
|||||||
return this->out();
|
return this->out();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
iterator operator()(basic_string_view<char_type> value) {
|
||||||
|
return base::operator()(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator operator()(monostate value) {
|
||||||
|
return base::operator()(value);
|
||||||
|
}
|
||||||
|
|
||||||
/** Formats a pointer. */
|
/** Formats a pointer. */
|
||||||
iterator operator()(const void *value)
|
iterator operator()(const void *value) {
|
||||||
{
|
|
||||||
if (value)
|
if (value)
|
||||||
return base::operator()(value);
|
return base::operator()(value);
|
||||||
this->spec().type_ = 0;
|
this->spec().type_ = 0;
|
||||||
@ -349,45 +320,37 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Formats an argument of a custom (user-defined) type. */
|
/** Formats an argument of a custom (user-defined) type. */
|
||||||
iterator operator()(typename basic_format_arg<context_type>::handle handle)
|
iterator operator()(typename basic_format_arg<context_type>::handle handle) {
|
||||||
{
|
|
||||||
handle.format(context_);
|
handle.format(context_);
|
||||||
return this->out();
|
return this->out();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
struct printf_formatter
|
struct printf_formatter {
|
||||||
{
|
template <typename ParseContext>
|
||||||
template<typename ParseContext>
|
auto parse(ParseContext &ctx) -> decltype(ctx.begin()) { return ctx.begin(); }
|
||||||
auto parse(ParseContext &ctx) -> decltype(ctx.begin())
|
|
||||||
{
|
|
||||||
return ctx.begin();
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const T &value, FormatContext &ctx) -> decltype(ctx.out())
|
auto format(const T &value, FormatContext &ctx) -> decltype(ctx.out()) {
|
||||||
{
|
|
||||||
internal::format_value(internal::get_container(ctx.out()), value);
|
internal::format_value(internal::get_container(ctx.out()), value);
|
||||||
return ctx.out();
|
return ctx.out();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/** This template formats data and writes the output to a writer. */
|
/** This template formats data and writes the output to a writer. */
|
||||||
template<typename OutputIt, typename Char, typename ArgFormatter>
|
template <typename OutputIt, typename Char, typename ArgFormatter>
|
||||||
class basic_printf_context : private internal::context_base<OutputIt, basic_printf_context<OutputIt, Char, ArgFormatter>, Char>
|
class basic_printf_context :
|
||||||
{
|
private internal::context_base<
|
||||||
public:
|
OutputIt, basic_printf_context<OutputIt, Char, ArgFormatter>, Char> {
|
||||||
|
public:
|
||||||
/** The character type for the output. */
|
/** The character type for the output. */
|
||||||
typedef Char char_type;
|
typedef Char char_type;
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
struct formatter_type
|
struct formatter_type { typedef printf_formatter<T> type; };
|
||||||
{
|
|
||||||
typedef printf_formatter<T> type;
|
|
||||||
};
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
typedef internal::context_base<OutputIt, basic_printf_context, Char> base;
|
typedef internal::context_base<OutputIt, basic_printf_context, Char> base;
|
||||||
typedef typename base::format_arg format_arg;
|
typedef typename base::format_arg format_arg;
|
||||||
typedef basic_format_specs<char_type> format_specs;
|
typedef basic_format_specs<char_type> format_specs;
|
||||||
@ -397,12 +360,14 @@ private:
|
|||||||
|
|
||||||
// Returns the argument with specified index or, if arg_index is equal
|
// Returns the argument with specified index or, if arg_index is equal
|
||||||
// to the maximum unsigned value, the next argument.
|
// to the maximum unsigned value, the next argument.
|
||||||
format_arg get_arg(iterator it, unsigned arg_index = (std::numeric_limits<unsigned>::max)());
|
format_arg get_arg(
|
||||||
|
iterator it,
|
||||||
|
unsigned arg_index = (std::numeric_limits<unsigned>::max)());
|
||||||
|
|
||||||
// Parses argument index, flags and width and returns the argument index.
|
// Parses argument index, flags and width and returns the argument index.
|
||||||
unsigned parse_header(iterator &it, format_specs &spec);
|
unsigned parse_header(iterator &it, format_specs &spec);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
\rst
|
\rst
|
||||||
Constructs a ``printf_context`` object. References to the arguments and
|
Constructs a ``printf_context`` object. References to the arguments and
|
||||||
@ -410,26 +375,23 @@ public:
|
|||||||
appropriate lifetimes.
|
appropriate lifetimes.
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
basic_printf_context(OutputIt out, basic_string_view<char_type> format_str, basic_format_args<basic_printf_context> args)
|
basic_printf_context(OutputIt out, basic_string_view<char_type> format_str,
|
||||||
: base(out, format_str, args)
|
basic_format_args<basic_printf_context> args)
|
||||||
{
|
: base(out, format_str, args) {}
|
||||||
}
|
|
||||||
|
|
||||||
using base::advance_to;
|
|
||||||
using base::out;
|
|
||||||
using base::parse_context;
|
using base::parse_context;
|
||||||
|
using base::out;
|
||||||
|
using base::advance_to;
|
||||||
|
|
||||||
/** Formats stored arguments and writes the output to the range. */
|
/** Formats stored arguments and writes the output to the range. */
|
||||||
void format();
|
void format();
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename OutputIt, typename Char, typename AF>
|
template <typename OutputIt, typename Char, typename AF>
|
||||||
void basic_printf_context<OutputIt, Char, AF>::parse_flags(format_specs &spec, iterator &it)
|
void basic_printf_context<OutputIt, Char, AF>::parse_flags(
|
||||||
{
|
format_specs &spec, iterator &it) {
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
switch (*it++) {
|
||||||
switch (*it++)
|
|
||||||
{
|
|
||||||
case '-':
|
case '-':
|
||||||
spec.align_ = ALIGN_LEFT;
|
spec.align_ = ALIGN_LEFT;
|
||||||
break;
|
break;
|
||||||
@ -452,38 +414,33 @@ void basic_printf_context<OutputIt, Char, AF>::parse_flags(format_specs &spec, i
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename OutputIt, typename Char, typename AF>
|
template <typename OutputIt, typename Char, typename AF>
|
||||||
typename basic_printf_context<OutputIt, Char, AF>::format_arg basic_printf_context<OutputIt, Char, AF>::get_arg(
|
typename basic_printf_context<OutputIt, Char, AF>::format_arg
|
||||||
iterator it, unsigned arg_index)
|
basic_printf_context<OutputIt, Char, AF>::get_arg(
|
||||||
{
|
iterator it, unsigned arg_index) {
|
||||||
(void)it;
|
(void)it;
|
||||||
if (arg_index == std::numeric_limits<unsigned>::max())
|
if (arg_index == std::numeric_limits<unsigned>::max())
|
||||||
return this->do_get_arg(this->parse_context().next_arg_id());
|
return this->do_get_arg(this->parse_context().next_arg_id());
|
||||||
return base::get_arg(arg_index - 1);
|
return base::get_arg(arg_index - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename OutputIt, typename Char, typename AF>
|
template <typename OutputIt, typename Char, typename AF>
|
||||||
unsigned basic_printf_context<OutputIt, Char, AF>::parse_header(iterator &it, format_specs &spec)
|
unsigned basic_printf_context<OutputIt, Char, AF>::parse_header(
|
||||||
{
|
iterator &it, format_specs &spec) {
|
||||||
unsigned arg_index = std::numeric_limits<unsigned>::max();
|
unsigned arg_index = std::numeric_limits<unsigned>::max();
|
||||||
char_type c = *it;
|
char_type c = *it;
|
||||||
if (c >= '0' && c <= '9')
|
if (c >= '0' && c <= '9') {
|
||||||
{
|
|
||||||
// Parse an argument index (if followed by '$') or a width possibly
|
// Parse an argument index (if followed by '$') or a width possibly
|
||||||
// preceded with '0' flag(s).
|
// preceded with '0' flag(s).
|
||||||
internal::error_handler eh;
|
internal::error_handler eh;
|
||||||
unsigned value = parse_nonnegative_int(it, eh);
|
unsigned value = parse_nonnegative_int(it, eh);
|
||||||
if (*it == '$')
|
if (*it == '$') { // value is an argument index
|
||||||
{ // value is an argument index
|
|
||||||
++it;
|
++it;
|
||||||
arg_index = value;
|
arg_index = value;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
if (c == '0')
|
if (c == '0')
|
||||||
spec.fill_ = '0';
|
spec.fill_ = '0';
|
||||||
if (value != 0)
|
if (value != 0) {
|
||||||
{
|
|
||||||
// Nonzero value means that we parsed width and don't need to
|
// Nonzero value means that we parsed width and don't need to
|
||||||
// parse it or flags again, so return now.
|
// parse it or flags again, so return now.
|
||||||
spec.width_ = value;
|
spec.width_ = value;
|
||||||
@ -493,33 +450,27 @@ unsigned basic_printf_context<OutputIt, Char, AF>::parse_header(iterator &it, fo
|
|||||||
}
|
}
|
||||||
parse_flags(spec, it);
|
parse_flags(spec, it);
|
||||||
// Parse width.
|
// Parse width.
|
||||||
if (*it >= '0' && *it <= '9')
|
if (*it >= '0' && *it <= '9') {
|
||||||
{
|
|
||||||
internal::error_handler eh;
|
internal::error_handler eh;
|
||||||
spec.width_ = parse_nonnegative_int(it, eh);
|
spec.width_ = parse_nonnegative_int(it, eh);
|
||||||
}
|
} else if (*it == '*') {
|
||||||
else if (*it == '*')
|
|
||||||
{
|
|
||||||
++it;
|
++it;
|
||||||
spec.width_ = visit(internal::printf_width_handler<char_type>(spec), get_arg(it));
|
spec.width_ =
|
||||||
|
visit(internal::printf_width_handler<char_type>(spec), get_arg(it));
|
||||||
}
|
}
|
||||||
return arg_index;
|
return arg_index;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename OutputIt, typename Char, typename AF>
|
template <typename OutputIt, typename Char, typename AF>
|
||||||
void basic_printf_context<OutputIt, Char, AF>::format()
|
void basic_printf_context<OutputIt, Char, AF>::format() {
|
||||||
{
|
|
||||||
auto &buffer = internal::get_container(this->out());
|
auto &buffer = internal::get_container(this->out());
|
||||||
auto start = iterator(this->parse_context());
|
auto start = iterator(this->parse_context());
|
||||||
auto it = start;
|
auto it = start;
|
||||||
using internal::pointer_from;
|
using internal::pointer_from;
|
||||||
while (*it)
|
while (*it) {
|
||||||
{
|
|
||||||
char_type c = *it++;
|
char_type c = *it++;
|
||||||
if (c != '%')
|
if (c != '%') continue;
|
||||||
continue;
|
if (*it == c) {
|
||||||
if (*it == c)
|
|
||||||
{
|
|
||||||
buffer.append(pointer_from(start), pointer_from(it));
|
buffer.append(pointer_from(start), pointer_from(it));
|
||||||
start = ++it;
|
start = ++it;
|
||||||
continue;
|
continue;
|
||||||
@ -533,21 +484,16 @@ void basic_printf_context<OutputIt, Char, AF>::format()
|
|||||||
unsigned arg_index = parse_header(it, spec);
|
unsigned arg_index = parse_header(it, spec);
|
||||||
|
|
||||||
// Parse precision.
|
// Parse precision.
|
||||||
if (*it == '.')
|
if (*it == '.') {
|
||||||
{
|
|
||||||
++it;
|
++it;
|
||||||
if ('0' <= *it && *it <= '9')
|
if ('0' <= *it && *it <= '9') {
|
||||||
{
|
|
||||||
internal::error_handler eh;
|
internal::error_handler eh;
|
||||||
spec.precision_ = static_cast<int>(parse_nonnegative_int(it, eh));
|
spec.precision_ = static_cast<int>(parse_nonnegative_int(it, eh));
|
||||||
}
|
} else if (*it == '*') {
|
||||||
else if (*it == '*')
|
|
||||||
{
|
|
||||||
++it;
|
++it;
|
||||||
spec.precision_ = visit(internal::printf_precision_handler(), get_arg(it));
|
spec.precision_ =
|
||||||
}
|
visit(internal::printf_precision_handler(), get_arg(it));
|
||||||
else
|
} else {
|
||||||
{
|
|
||||||
spec.precision_ = 0;
|
spec.precision_ = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -555,8 +501,7 @@ void basic_printf_context<OutputIt, Char, AF>::format()
|
|||||||
format_arg arg = get_arg(it, arg_index);
|
format_arg arg = get_arg(it, arg_index);
|
||||||
if (spec.flag(HASH_FLAG) && visit(internal::is_zero_int(), arg))
|
if (spec.flag(HASH_FLAG) && visit(internal::is_zero_int(), arg))
|
||||||
spec.flags_ &= ~internal::to_unsigned<int>(HASH_FLAG);
|
spec.flags_ &= ~internal::to_unsigned<int>(HASH_FLAG);
|
||||||
if (spec.fill_ == '0')
|
if (spec.fill_ == '0') {
|
||||||
{
|
|
||||||
if (arg.is_arithmetic())
|
if (arg.is_arithmetic())
|
||||||
spec.align_ = ALIGN_NUMERIC;
|
spec.align_ = ALIGN_NUMERIC;
|
||||||
else
|
else
|
||||||
@ -565,8 +510,7 @@ void basic_printf_context<OutputIt, Char, AF>::format()
|
|||||||
|
|
||||||
// Parse length and convert the argument to the required type.
|
// Parse length and convert the argument to the required type.
|
||||||
using internal::convert_arg;
|
using internal::convert_arg;
|
||||||
switch (*it++)
|
switch (*it++) {
|
||||||
{
|
|
||||||
case 'h':
|
case 'h':
|
||||||
if (*it == 'h')
|
if (*it == 'h')
|
||||||
convert_arg<signed char>(arg, *++it);
|
convert_arg<signed char>(arg, *++it);
|
||||||
@ -601,13 +545,10 @@ void basic_printf_context<OutputIt, Char, AF>::format()
|
|||||||
if (!*it)
|
if (!*it)
|
||||||
FMT_THROW(format_error("invalid format string"));
|
FMT_THROW(format_error("invalid format string"));
|
||||||
spec.type_ = static_cast<char>(*it++);
|
spec.type_ = static_cast<char>(*it++);
|
||||||
if (arg.is_integral())
|
if (arg.is_integral()) {
|
||||||
{
|
|
||||||
// Normalize type.
|
// Normalize type.
|
||||||
switch (spec.type_)
|
switch (spec.type_) {
|
||||||
{
|
case 'i': case 'u':
|
||||||
case 'i':
|
|
||||||
case 'u':
|
|
||||||
spec.type_ = 'd';
|
spec.type_ = 'd';
|
||||||
break;
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
@ -625,28 +566,28 @@ void basic_printf_context<OutputIt, Char, AF>::format()
|
|||||||
buffer.append(pointer_from(start), pointer_from(it));
|
buffer.append(pointer_from(start), pointer_from(it));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Char, typename Context>
|
template <typename Char, typename Context>
|
||||||
void printf(internal::basic_buffer<Char> &buf, basic_string_view<Char> format, basic_format_args<Context> args)
|
void printf(internal::basic_buffer<Char> &buf, basic_string_view<Char> format,
|
||||||
{
|
basic_format_args<Context> args) {
|
||||||
Context(std::back_inserter(buf), format, args).format();
|
Context(std::back_inserter(buf), format, args).format();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Buffer>
|
template <typename Buffer>
|
||||||
struct printf_context
|
struct printf_context {
|
||||||
{
|
typedef basic_printf_context<
|
||||||
typedef basic_printf_context<std::back_insert_iterator<Buffer>, typename Buffer::value_type> type;
|
std::back_insert_iterator<Buffer>, typename Buffer::value_type> type;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename... Args>
|
template <typename ...Args>
|
||||||
inline format_arg_store<printf_context<internal::buffer>::type, Args...> make_printf_args(const Args &... args)
|
inline format_arg_store<printf_context<internal::buffer>::type, Args...>
|
||||||
{
|
make_printf_args(const Args & ... args) {
|
||||||
return format_arg_store<printf_context<internal::buffer>::type, Args...>(args...);
|
return format_arg_store<printf_context<internal::buffer>::type, Args...>(
|
||||||
|
args...);
|
||||||
}
|
}
|
||||||
typedef basic_format_args<printf_context<internal::buffer>::type> printf_args;
|
typedef basic_format_args<printf_context<internal::buffer>::type> printf_args;
|
||||||
typedef basic_format_args<printf_context<internal::wbuffer>::type> wprintf_args;
|
typedef basic_format_args<printf_context<internal::wbuffer>::type> wprintf_args;
|
||||||
|
|
||||||
inline std::string vsprintf(string_view format, printf_args args)
|
inline std::string vsprintf(string_view format, printf_args args) {
|
||||||
{
|
|
||||||
memory_buffer buffer;
|
memory_buffer buffer;
|
||||||
printf(buffer, format, args);
|
printf(buffer, format, args);
|
||||||
return to_string(buffer);
|
return to_string(buffer);
|
||||||
@ -661,33 +602,33 @@ inline std::string vsprintf(string_view format, printf_args args)
|
|||||||
std::string message = fmt::sprintf("The answer is %d", 42);
|
std::string message = fmt::sprintf("The answer is %d", 42);
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline std::string sprintf(string_view format_str, const Args &... args)
|
inline std::string sprintf(string_view format_str, const Args & ... args) {
|
||||||
{
|
return vsprintf(format_str,
|
||||||
return vsprintf(format_str, make_format_args<typename printf_context<internal::buffer>::type>(args...));
|
make_format_args<typename printf_context<internal::buffer>::type>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::wstring vsprintf(wstring_view format, wprintf_args args)
|
inline std::wstring vsprintf(wstring_view format, wprintf_args args) {
|
||||||
{
|
|
||||||
wmemory_buffer buffer;
|
wmemory_buffer buffer;
|
||||||
printf(buffer, format, args);
|
printf(buffer, format, args);
|
||||||
return to_string(buffer);
|
return to_string(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline std::wstring sprintf(wstring_view format_str, const Args &... args)
|
inline std::wstring sprintf(wstring_view format_str, const Args & ... args) {
|
||||||
{
|
return vsprintf(format_str,
|
||||||
return vsprintf(format_str, make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
|
make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
inline int vfprintf(
|
inline int vfprintf(std::FILE *f, basic_string_view<Char> format,
|
||||||
std::FILE *f, basic_string_view<Char> format, basic_format_args<typename printf_context<internal::basic_buffer<Char>>::type> args)
|
basic_format_args<typename printf_context<
|
||||||
{
|
internal::basic_buffer<Char>>::type> args) {
|
||||||
basic_memory_buffer<Char> buffer;
|
basic_memory_buffer<Char> buffer;
|
||||||
printf(buffer, format, args);
|
printf(buffer, format, args);
|
||||||
std::size_t size = buffer.size();
|
std::size_t size = buffer.size();
|
||||||
return std::fwrite(buffer.data(), sizeof(Char), size, f) < size ? -1 : static_cast<int>(size);
|
return std::fwrite(
|
||||||
|
buffer.data(), sizeof(Char), size, f) < size ? -1 : static_cast<int>(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -699,26 +640,25 @@ inline int vfprintf(
|
|||||||
fmt::fprintf(stderr, "Don't %s!", "panic");
|
fmt::fprintf(stderr, "Don't %s!", "panic");
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline int fprintf(std::FILE *f, string_view format_str, const Args &... args)
|
inline int fprintf(std::FILE *f, string_view format_str, const Args & ... args) {
|
||||||
{
|
auto vargs = make_format_args<
|
||||||
auto vargs = make_format_args<typename printf_context<internal::buffer>::type>(args...);
|
typename printf_context<internal::buffer>::type>(args...);
|
||||||
return vfprintf<char>(f, format_str, vargs);
|
return vfprintf<char>(f, format_str, vargs);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline int fprintf(std::FILE *f, wstring_view format_str, const Args &... args)
|
inline int fprintf(std::FILE *f, wstring_view format_str,
|
||||||
{
|
const Args & ... args) {
|
||||||
return vfprintf(f, format_str, make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
|
return vfprintf(f, format_str,
|
||||||
|
make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int vprintf(string_view format, printf_args args)
|
inline int vprintf(string_view format, printf_args args) {
|
||||||
{
|
|
||||||
return vfprintf(stdout, format, args);
|
return vfprintf(stdout, format, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int vprintf(wstring_view format, wprintf_args args)
|
inline int vprintf(wstring_view format, wprintf_args args) {
|
||||||
{
|
|
||||||
return vfprintf(stdout, format, args);
|
return vfprintf(stdout, format, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -731,28 +671,28 @@ inline int vprintf(wstring_view format, wprintf_args args)
|
|||||||
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline int printf(string_view format_str, const Args &... args)
|
inline int printf(string_view format_str, const Args & ... args) {
|
||||||
{
|
return vprintf(format_str,
|
||||||
return vprintf(format_str, make_format_args<typename printf_context<internal::buffer>::type>(args...));
|
make_format_args<typename printf_context<internal::buffer>::type>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline int printf(wstring_view format_str, const Args &... args)
|
inline int printf(wstring_view format_str, const Args & ... args) {
|
||||||
{
|
return vprintf(format_str,
|
||||||
return vprintf(format_str, make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
|
make_format_args<typename printf_context<internal::wbuffer>::type>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int vfprintf(std::ostream &os, string_view format_str, printf_args args)
|
inline int vfprintf(std::ostream &os, string_view format_str,
|
||||||
{
|
printf_args args) {
|
||||||
memory_buffer buffer;
|
memory_buffer buffer;
|
||||||
printf(buffer, format_str, args);
|
printf(buffer, format_str, args);
|
||||||
internal::write(os, buffer);
|
internal::write(os, buffer);
|
||||||
return static_cast<int>(buffer.size());
|
return static_cast<int>(buffer.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int vfprintf(std::wostream &os, wstring_view format_str, wprintf_args args)
|
inline int vfprintf(std::wostream &os, wstring_view format_str,
|
||||||
{
|
wprintf_args args) {
|
||||||
wmemory_buffer buffer;
|
wmemory_buffer buffer;
|
||||||
printf(buffer, format_str, args);
|
printf(buffer, format_str, args);
|
||||||
internal::write(os, buffer);
|
internal::write(os, buffer);
|
||||||
@ -768,17 +708,19 @@ inline int vfprintf(std::wostream &os, wstring_view format_str, wprintf_args arg
|
|||||||
fmt::fprintf(cerr, "Don't %s!", "panic");
|
fmt::fprintf(cerr, "Don't %s!", "panic");
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline int fprintf(std::ostream &os, string_view format_str, const Args &... args)
|
inline int fprintf(std::ostream &os, string_view format_str,
|
||||||
{
|
const Args & ... args) {
|
||||||
auto vargs = make_format_args<typename printf_context<internal::buffer>::type>(args...);
|
auto vargs = make_format_args<
|
||||||
|
typename printf_context<internal::buffer>::type>(args...);
|
||||||
return vfprintf(os, format_str, vargs);
|
return vfprintf(os, format_str, vargs);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template <typename... Args>
|
||||||
inline int fprintf(std::wostream &os, wstring_view format_str, const Args &... args)
|
inline int fprintf(std::wostream &os, wstring_view format_str,
|
||||||
{
|
const Args & ... args) {
|
||||||
auto vargs = make_format_args<typename printf_context<internal::buffer>::type>(args...);
|
auto vargs = make_format_args<
|
||||||
|
typename printf_context<internal::buffer>::type>(args...);
|
||||||
return vfprintf(os, format_str, vargs);
|
return vfprintf(os, format_str, vargs);
|
||||||
}
|
}
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
|
@ -17,268 +17,233 @@
|
|||||||
|
|
||||||
// output only up to N items from the range.
|
// output only up to N items from the range.
|
||||||
#ifndef FMT_RANGE_OUTPUT_LENGTH_LIMIT
|
#ifndef FMT_RANGE_OUTPUT_LENGTH_LIMIT
|
||||||
#define FMT_RANGE_OUTPUT_LENGTH_LIMIT 256
|
# define FMT_RANGE_OUTPUT_LENGTH_LIMIT 256
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
struct formatting_base
|
struct formatting_base {
|
||||||
{
|
template <typename ParseContext>
|
||||||
template<typename ParseContext>
|
FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
|
||||||
FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin())
|
|
||||||
{
|
|
||||||
return ctx.begin();
|
return ctx.begin();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename Char, typename Enable = void>
|
template <typename Char, typename Enable = void>
|
||||||
struct formatting_range : formatting_base<Char>
|
struct formatting_range : formatting_base<Char> {
|
||||||
{
|
|
||||||
static FMT_CONSTEXPR_DECL const std::size_t range_length_limit =
|
static FMT_CONSTEXPR_DECL const std::size_t range_length_limit =
|
||||||
FMT_RANGE_OUTPUT_LENGTH_LIMIT; // output only up to N items from the range.
|
FMT_RANGE_OUTPUT_LENGTH_LIMIT; // output only up to N items from the range.
|
||||||
Char prefix;
|
Char prefix;
|
||||||
Char delimiter;
|
Char delimiter;
|
||||||
Char postfix;
|
Char postfix;
|
||||||
formatting_range()
|
formatting_range() : prefix('{'), delimiter(','), postfix('}') {}
|
||||||
: prefix('{')
|
|
||||||
, delimiter(',')
|
|
||||||
, postfix('}')
|
|
||||||
{
|
|
||||||
}
|
|
||||||
static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
|
static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
|
||||||
static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
|
static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename Char, typename Enable = void>
|
template <typename Char, typename Enable = void>
|
||||||
struct formatting_tuple : formatting_base<Char>
|
struct formatting_tuple : formatting_base<Char> {
|
||||||
{
|
|
||||||
Char prefix;
|
Char prefix;
|
||||||
Char delimiter;
|
Char delimiter;
|
||||||
Char postfix;
|
Char postfix;
|
||||||
formatting_tuple()
|
formatting_tuple() : prefix('('), delimiter(','), postfix(')') {}
|
||||||
: prefix('(')
|
|
||||||
, delimiter(',')
|
|
||||||
, postfix(')')
|
|
||||||
{
|
|
||||||
}
|
|
||||||
static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
|
static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
|
||||||
static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
|
static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
template<typename RangeT, typename OutputIterator>
|
template <typename RangeT, typename OutputIterator>
|
||||||
void copy(const RangeT &range, OutputIterator out)
|
void copy(const RangeT &range, OutputIterator out) {
|
||||||
{
|
|
||||||
for (auto it = range.begin(), end = range.end(); it != end; ++it)
|
for (auto it = range.begin(), end = range.end(); it != end; ++it)
|
||||||
*out++ = *it;
|
*out++ = *it;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename OutputIterator>
|
template <typename OutputIterator>
|
||||||
void copy(const char *str, OutputIterator out)
|
void copy(const char *str, OutputIterator out) {
|
||||||
{
|
|
||||||
const char *p_curr = str;
|
const char *p_curr = str;
|
||||||
while (*p_curr)
|
while (*p_curr) {
|
||||||
{
|
|
||||||
*out++ = *p_curr++;
|
*out++ = *p_curr++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename OutputIterator>
|
template <typename OutputIterator>
|
||||||
void copy(char ch, OutputIterator out)
|
void copy(char ch, OutputIterator out) {
|
||||||
{
|
|
||||||
*out++ = ch;
|
*out++ = ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return true value if T has std::string interface, like std::string_view.
|
/// Return true value if T has std::string interface, like std::string_view.
|
||||||
template<typename T>
|
template <typename T>
|
||||||
class is_like_std_string
|
class is_like_std_string {
|
||||||
{
|
template <typename U>
|
||||||
template<typename U>
|
static auto check(U *p) ->
|
||||||
static auto check(U *p) -> decltype(p->find('a'), p->length(), p->data(), int());
|
decltype(p->find('a'), p->length(), p->data(), int());
|
||||||
template<typename>
|
template <typename>
|
||||||
static void check(...);
|
static void check(...);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static FMT_CONSTEXPR_DECL const bool value = !std::is_void<decltype(check<T>(FMT_NULL))>::value;
|
static FMT_CONSTEXPR_DECL const bool value =
|
||||||
|
!std::is_void<decltype(check<T>(FMT_NULL))>::value;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename... Ts>
|
template <typename... Ts>
|
||||||
struct conditional_helper
|
struct conditional_helper {};
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
template<typename T, typename _ = void>
|
template <typename T, typename _ = void>
|
||||||
struct is_range_ : std::false_type
|
struct is_range_ : std::false_type {};
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
template<typename T>
|
#if !FMT_MSC_VER || FMT_MSC_VER > 1800
|
||||||
struct is_range_<T, typename std::conditional<false,
|
template <typename T>
|
||||||
conditional_helper<decltype(internal::declval<T>().begin()), decltype(internal::declval<T>().end())>, void>::type>
|
struct is_range_<T, typename std::conditional<
|
||||||
: std::true_type
|
false,
|
||||||
{
|
conditional_helper<decltype(internal::declval<T>().begin()),
|
||||||
};
|
decltype(internal::declval<T>().end())>,
|
||||||
|
void>::type> : std::true_type {};
|
||||||
|
#endif
|
||||||
|
|
||||||
/// tuple_size and tuple_element check.
|
/// tuple_size and tuple_element check.
|
||||||
template<typename T>
|
template <typename T>
|
||||||
class is_tuple_like_
|
class is_tuple_like_ {
|
||||||
{
|
template <typename U>
|
||||||
template<typename U>
|
static auto check(U *p) ->
|
||||||
static auto check(U *p) -> decltype(std::tuple_size<U>::value, internal::declval<typename std::tuple_element<0, U>::type>(), int());
|
decltype(std::tuple_size<U>::value,
|
||||||
template<typename>
|
internal::declval<typename std::tuple_element<0, U>::type>(), int());
|
||||||
|
template <typename>
|
||||||
static void check(...);
|
static void check(...);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static FMT_CONSTEXPR_DECL const bool value = !std::is_void<decltype(check<T>(FMT_NULL))>::value;
|
static FMT_CONSTEXPR_DECL const bool value =
|
||||||
|
!std::is_void<decltype(check<T>(FMT_NULL))>::value;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Check for integer_sequence
|
// Check for integer_sequence
|
||||||
#if defined(__cpp_lib_integer_sequence) || FMT_MSC_VER >= 1900
|
#if defined(__cpp_lib_integer_sequence) || FMT_MSC_VER >= 1900
|
||||||
template<typename T, T... N>
|
template <typename T, T... N>
|
||||||
using integer_sequence = std::integer_sequence<T, N...>;
|
using integer_sequence = std::integer_sequence<T, N...>;
|
||||||
template<std::size_t... N>
|
template <std::size_t... N>
|
||||||
using index_sequence = std::index_sequence<N...>;
|
using index_sequence = std::index_sequence<N...>;
|
||||||
template<std::size_t N>
|
template <std::size_t N>
|
||||||
using make_index_sequence = std::make_index_sequence<N>;
|
using make_index_sequence = std::make_index_sequence<N>;
|
||||||
#else
|
#else
|
||||||
template<typename T, T... N>
|
template <typename T, T... N>
|
||||||
struct integer_sequence
|
struct integer_sequence {
|
||||||
{
|
|
||||||
typedef T value_type;
|
typedef T value_type;
|
||||||
|
|
||||||
static FMT_CONSTEXPR std::size_t size()
|
static FMT_CONSTEXPR std::size_t size() {
|
||||||
{
|
|
||||||
return sizeof...(N);
|
return sizeof...(N);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<std::size_t... N>
|
template <std::size_t... N>
|
||||||
using index_sequence = integer_sequence<std::size_t, N...>;
|
using index_sequence = integer_sequence<std::size_t, N...>;
|
||||||
|
|
||||||
template<typename T, std::size_t N, T... Ns>
|
template <typename T, std::size_t N, T... Ns>
|
||||||
struct make_integer_sequence : make_integer_sequence<T, N - 1, N - 1, Ns...>
|
struct make_integer_sequence : make_integer_sequence<T, N - 1, N - 1, Ns...> {};
|
||||||
{
|
template <typename T, T... Ns>
|
||||||
};
|
struct make_integer_sequence<T, 0, Ns...> : integer_sequence<T, Ns...> {};
|
||||||
template<typename T, T... Ns>
|
|
||||||
struct make_integer_sequence<T, 0, Ns...> : integer_sequence<T, Ns...>
|
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
template<std::size_t N>
|
template <std::size_t N>
|
||||||
using make_index_sequence = make_integer_sequence<std::size_t, N>;
|
using make_index_sequence = make_integer_sequence<std::size_t, N>;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
template<class Tuple, class F, size_t... Is>
|
template <class Tuple, class F, size_t... Is>
|
||||||
void for_each(index_sequence<Is...>, Tuple &&tup, F &&f) noexcept
|
void for_each(index_sequence<Is...>, Tuple &&tup, F &&f) FMT_NOEXCEPT {
|
||||||
{
|
|
||||||
using std::get;
|
using std::get;
|
||||||
// using free function get<I>(T) now.
|
// using free function get<I>(T) now.
|
||||||
const int _[] = {0, ((void)f(get<Is>(tup)), 0)...};
|
const int _[] = {0, ((void)f(get<Is>(tup)), 0)...};
|
||||||
(void)_; // blocks warnings
|
(void)_; // blocks warnings
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class T>
|
template <class T>
|
||||||
FMT_CONSTEXPR make_index_sequence<std::tuple_size<T>::value> get_indexes(T const &)
|
FMT_CONSTEXPR make_index_sequence<std::tuple_size<T>::value>
|
||||||
{
|
get_indexes(T const &) { return {}; }
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
template<class Tuple, class F>
|
template <class Tuple, class F>
|
||||||
void for_each(Tuple &&tup, F &&f)
|
void for_each(Tuple &&tup, F &&f) {
|
||||||
{
|
|
||||||
const auto indexes = get_indexes(tup);
|
const auto indexes = get_indexes(tup);
|
||||||
for_each(indexes, std::forward<Tuple>(tup), std::forward<F>(f));
|
for_each(indexes, std::forward<Tuple>(tup), std::forward<F>(f));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Arg>
|
template<typename Arg>
|
||||||
FMT_CONSTEXPR const char *format_str_quoted(
|
FMT_CONSTEXPR const char* format_str_quoted(bool add_space, const Arg&,
|
||||||
bool add_space, const Arg &, typename std::enable_if<!is_like_std_string<typename std::decay<Arg>::type>::value>::type * = nullptr)
|
typename std::enable_if<
|
||||||
{
|
!is_like_std_string<typename std::decay<Arg>::type>::value>::type* = nullptr) {
|
||||||
return add_space ? " {}" : "{}";
|
return add_space ? " {}" : "{}";
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Arg>
|
template<typename Arg>
|
||||||
FMT_CONSTEXPR const char *format_str_quoted(
|
FMT_CONSTEXPR const char* format_str_quoted(bool add_space, const Arg&,
|
||||||
bool add_space, const Arg &, typename std::enable_if<is_like_std_string<typename std::decay<Arg>::type>::value>::type * = nullptr)
|
typename std::enable_if<
|
||||||
{
|
is_like_std_string<typename std::decay<Arg>::type>::value>::type* = nullptr) {
|
||||||
return add_space ? " \"{}\"" : "\"{}\"";
|
return add_space ? " \"{}\"" : "\"{}\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_CONSTEXPR const char *format_str_quoted(bool add_space, const char *)
|
FMT_CONSTEXPR const char* format_str_quoted(bool add_space, const char*) {
|
||||||
{
|
|
||||||
return add_space ? " \"{}\"" : "\"{}\"";
|
return add_space ? " \"{}\"" : "\"{}\"";
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR const wchar_t *format_str_quoted(bool add_space, const wchar_t *)
|
FMT_CONSTEXPR const wchar_t* format_str_quoted(bool add_space, const wchar_t*) {
|
||||||
{
|
|
||||||
return add_space ? L" \"{}\"" : L"\"{}\"";
|
return add_space ? L" \"{}\"" : L"\"{}\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_CONSTEXPR const char *format_str_quoted(bool add_space, const char)
|
FMT_CONSTEXPR const char* format_str_quoted(bool add_space, const char) {
|
||||||
{
|
|
||||||
return add_space ? " '{}'" : "'{}'";
|
return add_space ? " '{}'" : "'{}'";
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR const wchar_t *format_str_quoted(bool add_space, const wchar_t)
|
FMT_CONSTEXPR const wchar_t* format_str_quoted(bool add_space, const wchar_t) {
|
||||||
{
|
|
||||||
return add_space ? L" '{}'" : L"'{}'";
|
return add_space ? L" '{}'" : L"'{}'";
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
struct is_tuple_like
|
struct is_tuple_like {
|
||||||
{
|
static FMT_CONSTEXPR_DECL const bool value =
|
||||||
static FMT_CONSTEXPR_DECL const bool value = internal::is_tuple_like_<T>::value && !internal::is_range_<T>::value;
|
internal::is_tuple_like_<T>::value && !internal::is_range_<T>::value;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename TupleT, typename Char>
|
template <typename TupleT, typename Char>
|
||||||
struct formatter<TupleT, Char, typename std::enable_if<fmt::is_tuple_like<TupleT>::value>::type>
|
struct formatter<TupleT, Char,
|
||||||
{
|
typename std::enable_if<fmt::is_tuple_like<TupleT>::value>::type> {
|
||||||
private:
|
private:
|
||||||
// C++11 generic lambda for format()
|
// C++11 generic lambda for format()
|
||||||
template<typename FormatContext>
|
template <typename FormatContext>
|
||||||
struct format_each
|
struct format_each {
|
||||||
{
|
template <typename T>
|
||||||
template<typename T>
|
void operator()(const T& v) {
|
||||||
void operator()(const T &v)
|
if (i > 0) {
|
||||||
{
|
if (formatting.add_prepostfix_space) {
|
||||||
if (i > 0)
|
|
||||||
{
|
|
||||||
if (formatting.add_prepostfix_space)
|
|
||||||
{
|
|
||||||
*out++ = ' ';
|
*out++ = ' ';
|
||||||
}
|
}
|
||||||
internal::copy(formatting.delimiter, out);
|
internal::copy(formatting.delimiter, out);
|
||||||
}
|
}
|
||||||
format_to(out, internal::format_str_quoted((formatting.add_delimiter_spaces && i > 0), v), v);
|
format_to(out,
|
||||||
|
internal::format_str_quoted(
|
||||||
|
(formatting.add_delimiter_spaces && i > 0), v),
|
||||||
|
v);
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
|
|
||||||
formatting_tuple<Char> &formatting;
|
formatting_tuple<Char>& formatting;
|
||||||
std::size_t &i;
|
std::size_t& i;
|
||||||
typename std::add_lvalue_reference<decltype(std::declval<FormatContext>().out())>::type out;
|
typename std::add_lvalue_reference<decltype(std::declval<FormatContext>().out())>::type out;
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
formatting_tuple<Char> formatting;
|
formatting_tuple<Char> formatting;
|
||||||
|
|
||||||
template<typename ParseContext>
|
template <typename ParseContext>
|
||||||
FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin())
|
FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
|
||||||
{
|
|
||||||
return formatting.parse(ctx);
|
return formatting.parse(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename FormatContext = format_context>
|
template <typename FormatContext = format_context>
|
||||||
auto format(const TupleT &values, FormatContext &ctx) -> decltype(ctx.out())
|
auto format(const TupleT &values, FormatContext &ctx) -> decltype(ctx.out()) {
|
||||||
{
|
|
||||||
auto out = ctx.out();
|
auto out = ctx.out();
|
||||||
std::size_t i = 0;
|
std::size_t i = 0;
|
||||||
internal::copy(formatting.prefix, out);
|
internal::copy(formatting.prefix, out);
|
||||||
|
|
||||||
internal::for_each(values, format_each<FormatContext>{formatting, i, out});
|
internal::for_each(values, format_each<FormatContext>{formatting, i, out});
|
||||||
if (formatting.add_prepostfix_space)
|
if (formatting.add_prepostfix_space) {
|
||||||
{
|
|
||||||
*out++ = ' ';
|
*out++ = ' ';
|
||||||
}
|
}
|
||||||
internal::copy(formatting.postfix, out);
|
internal::copy(formatting.postfix, out);
|
||||||
@ -287,49 +252,46 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template <typename T>
|
||||||
struct is_range
|
struct is_range {
|
||||||
{
|
static FMT_CONSTEXPR_DECL const bool value =
|
||||||
static FMT_CONSTEXPR_DECL const bool value = internal::is_range_<T>::value && !internal::is_like_std_string<T>::value;
|
internal::is_range_<T>::value && !internal::is_like_std_string<T>::value;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename RangeT, typename Char>
|
template <typename RangeT, typename Char>
|
||||||
struct formatter<RangeT, Char, typename std::enable_if<fmt::is_range<RangeT>::value>::type>
|
struct formatter<RangeT, Char,
|
||||||
{
|
typename std::enable_if<fmt::is_range<RangeT>::value>::type> {
|
||||||
|
|
||||||
formatting_range<Char> formatting;
|
formatting_range<Char> formatting;
|
||||||
|
|
||||||
template<typename ParseContext>
|
template <typename ParseContext>
|
||||||
FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin())
|
FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
|
||||||
{
|
|
||||||
return formatting.parse(ctx);
|
return formatting.parse(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename FormatContext>
|
template <typename FormatContext>
|
||||||
typename FormatContext::iterator format(const RangeT &values, FormatContext &ctx)
|
typename FormatContext::iterator format(
|
||||||
{
|
const RangeT &values, FormatContext &ctx) {
|
||||||
auto out = ctx.out();
|
auto out = ctx.out();
|
||||||
internal::copy(formatting.prefix, out);
|
internal::copy(formatting.prefix, out);
|
||||||
std::size_t i = 0;
|
std::size_t i = 0;
|
||||||
for (auto it = values.begin(), end = values.end(); it != end; ++it)
|
for (auto it = values.begin(), end = values.end(); it != end; ++it) {
|
||||||
{
|
if (i > 0) {
|
||||||
if (i > 0)
|
if (formatting.add_prepostfix_space) {
|
||||||
{
|
|
||||||
if (formatting.add_prepostfix_space)
|
|
||||||
{
|
|
||||||
*out++ = ' ';
|
*out++ = ' ';
|
||||||
}
|
}
|
||||||
internal::copy(formatting.delimiter, out);
|
internal::copy(formatting.delimiter, out);
|
||||||
}
|
}
|
||||||
format_to(out, internal::format_str_quoted((formatting.add_delimiter_spaces && i > 0), *it), *it);
|
format_to(out,
|
||||||
if (++i > formatting.range_length_limit)
|
internal::format_str_quoted(
|
||||||
{
|
(formatting.add_delimiter_spaces && i > 0), *it),
|
||||||
|
*it);
|
||||||
|
if (++i > formatting.range_length_limit) {
|
||||||
format_to(out, " ... <other elements>");
|
format_to(out, " ... <other elements>");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (formatting.add_prepostfix_space)
|
if (formatting.add_prepostfix_space) {
|
||||||
{
|
|
||||||
*out++ = ' ';
|
*out++ = ' ';
|
||||||
}
|
}
|
||||||
internal::copy(formatting.postfix, out);
|
internal::copy(formatting.postfix, out);
|
||||||
@ -340,3 +302,4 @@ struct formatter<RangeT, Char, typename std::enable_if<fmt::is_range<RangeT>::va
|
|||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
|
|
||||||
#endif // FMT_RANGES_H_
|
#endif // FMT_RANGES_H_
|
||||||
|
|
||||||
|
@ -13,66 +13,39 @@
|
|||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace internal {
|
namespace internal{
|
||||||
inline null<> localtime_r(...)
|
inline null<> localtime_r(...) { return null<>(); }
|
||||||
{
|
inline null<> localtime_s(...) { return null<>(); }
|
||||||
return null<>();
|
inline null<> gmtime_r(...) { return null<>(); }
|
||||||
|
inline null<> gmtime_s(...) { return null<>(); }
|
||||||
}
|
}
|
||||||
inline null<> localtime_s(...)
|
|
||||||
{
|
|
||||||
return null<>();
|
|
||||||
}
|
|
||||||
inline null<> gmtime_r(...)
|
|
||||||
{
|
|
||||||
return null<>();
|
|
||||||
}
|
|
||||||
inline null<> gmtime_s(...)
|
|
||||||
{
|
|
||||||
return null<>();
|
|
||||||
}
|
|
||||||
} // namespace internal
|
|
||||||
|
|
||||||
// Thread-safe replacement for std::localtime
|
// Thread-safe replacement for std::localtime
|
||||||
inline std::tm localtime(std::time_t time)
|
inline std::tm localtime(std::time_t time) {
|
||||||
{
|
struct dispatcher {
|
||||||
struct dispatcher
|
|
||||||
{
|
|
||||||
std::time_t time_;
|
std::time_t time_;
|
||||||
std::tm tm_;
|
std::tm tm_;
|
||||||
|
|
||||||
dispatcher(std::time_t t)
|
dispatcher(std::time_t t): time_(t) {}
|
||||||
: time_(t)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool run()
|
bool run() {
|
||||||
{
|
|
||||||
using namespace fmt::internal;
|
using namespace fmt::internal;
|
||||||
return handle(localtime_r(&time_, &tm_));
|
return handle(localtime_r(&time_, &tm_));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool handle(std::tm *tm)
|
bool handle(std::tm *tm) { return tm != FMT_NULL; }
|
||||||
{
|
|
||||||
return tm != FMT_NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool handle(internal::null<>)
|
bool handle(internal::null<>) {
|
||||||
{
|
|
||||||
using namespace fmt::internal;
|
using namespace fmt::internal;
|
||||||
return fallback(localtime_s(&tm_, &time_));
|
return fallback(localtime_s(&tm_, &time_));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool fallback(int res)
|
bool fallback(int res) { return res == 0; }
|
||||||
{
|
|
||||||
return res == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool fallback(internal::null<>)
|
bool fallback(internal::null<>) {
|
||||||
{
|
|
||||||
using namespace fmt::internal;
|
using namespace fmt::internal;
|
||||||
std::tm *tm = std::localtime(&time_);
|
std::tm *tm = std::localtime(&time_);
|
||||||
if (tm)
|
if (tm) tm_ = *tm;
|
||||||
tm_ = *tm;
|
|
||||||
return tm != FMT_NULL;
|
return tm != FMT_NULL;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -84,45 +57,30 @@ inline std::tm localtime(std::time_t time)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Thread-safe replacement for std::gmtime
|
// Thread-safe replacement for std::gmtime
|
||||||
inline std::tm gmtime(std::time_t time)
|
inline std::tm gmtime(std::time_t time) {
|
||||||
{
|
struct dispatcher {
|
||||||
struct dispatcher
|
|
||||||
{
|
|
||||||
std::time_t time_;
|
std::time_t time_;
|
||||||
std::tm tm_;
|
std::tm tm_;
|
||||||
|
|
||||||
dispatcher(std::time_t t)
|
dispatcher(std::time_t t): time_(t) {}
|
||||||
: time_(t)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool run()
|
bool run() {
|
||||||
{
|
|
||||||
using namespace fmt::internal;
|
using namespace fmt::internal;
|
||||||
return handle(gmtime_r(&time_, &tm_));
|
return handle(gmtime_r(&time_, &tm_));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool handle(std::tm *tm)
|
bool handle(std::tm *tm) { return tm != FMT_NULL; }
|
||||||
{
|
|
||||||
return tm != FMT_NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool handle(internal::null<>)
|
bool handle(internal::null<>) {
|
||||||
{
|
|
||||||
using namespace fmt::internal;
|
using namespace fmt::internal;
|
||||||
return fallback(gmtime_s(&tm_, &time_));
|
return fallback(gmtime_s(&tm_, &time_));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool fallback(int res)
|
bool fallback(int res) { return res == 0; }
|
||||||
{
|
|
||||||
return res == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool fallback(internal::null<>)
|
bool fallback(internal::null<>) {
|
||||||
{
|
|
||||||
std::tm *tm = std::gmtime(&time_);
|
std::tm *tm = std::gmtime(&time_);
|
||||||
if (tm)
|
if (tm) tm_ = *tm;
|
||||||
tm_ = *tm;
|
|
||||||
return tm != FMT_NULL;
|
return tm != FMT_NULL;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -134,23 +92,21 @@ inline std::tm gmtime(std::time_t time)
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
inline std::size_t strftime(char *str, std::size_t count, const char *format, const std::tm *time)
|
inline std::size_t strftime(char *str, std::size_t count, const char *format,
|
||||||
{
|
const std::tm *time) {
|
||||||
return std::strftime(str, count, format, time);
|
return std::strftime(str, count, format, time);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::size_t strftime(wchar_t *str, std::size_t count, const wchar_t *format, const std::tm *time)
|
inline std::size_t strftime(wchar_t *str, std::size_t count,
|
||||||
{
|
const wchar_t *format, const std::tm *time) {
|
||||||
return std::wcsftime(str, count, format, time);
|
return std::wcsftime(str, count, format, time);
|
||||||
}
|
}
|
||||||
} // namespace internal
|
}
|
||||||
|
|
||||||
template<typename Char>
|
template <typename Char>
|
||||||
struct formatter<std::tm, Char>
|
struct formatter<std::tm, Char> {
|
||||||
{
|
template <typename ParseContext>
|
||||||
template<typename ParseContext>
|
auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
|
||||||
auto parse(ParseContext &ctx) -> decltype(ctx.begin())
|
|
||||||
{
|
|
||||||
auto it = internal::null_terminating_iterator<Char>(ctx);
|
auto it = internal::null_terminating_iterator<Char>(ctx);
|
||||||
if (*it == ':')
|
if (*it == ':')
|
||||||
++it;
|
++it;
|
||||||
@ -164,22 +120,19 @@ struct formatter<std::tm, Char>
|
|||||||
return pointer_from(end);
|
return pointer_from(end);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const std::tm &tm, FormatContext &ctx) -> decltype(ctx.out())
|
auto format(const std::tm &tm, FormatContext &ctx) -> decltype(ctx.out()) {
|
||||||
{
|
|
||||||
internal::basic_buffer<Char> &buf = internal::get_container(ctx.out());
|
internal::basic_buffer<Char> &buf = internal::get_container(ctx.out());
|
||||||
std::size_t start = buf.size();
|
std::size_t start = buf.size();
|
||||||
for (;;)
|
for (;;) {
|
||||||
{
|
|
||||||
std::size_t size = buf.capacity() - start;
|
std::size_t size = buf.capacity() - start;
|
||||||
std::size_t count = internal::strftime(&buf[start], size, &tm_format[0], &tm);
|
std::size_t count =
|
||||||
if (count != 0)
|
internal::strftime(&buf[start], size, &tm_format[0], &tm);
|
||||||
{
|
if (count != 0) {
|
||||||
buf.resize(start + count);
|
buf.resize(start + count);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (size >= tm_format.size() * 256)
|
if (size >= tm_format.size() * 256) {
|
||||||
{
|
|
||||||
// If the buffer is 256 times larger than the format string, assume
|
// If the buffer is 256 times larger than the format string, assume
|
||||||
// that `strftime` gives an empty result. There doesn't seem to be a
|
// that `strftime` gives an empty result. There doesn't seem to be a
|
||||||
// better way to distinguish the two cases:
|
// better way to distinguish the two cases:
|
||||||
|
Loading…
Reference in New Issue
Block a user