|
|
|
@ -15,39 +15,54 @@
|
|
|
|
|
|
|
|
|
|
#include "ostream.h"
|
|
|
|
|
|
|
|
|
|
namespace fmt {
|
|
|
|
|
namespace internal {
|
|
|
|
|
namespace fmt
|
|
|
|
|
{
|
|
|
|
|
namespace internal
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
// Checks if a value fits in int - used to avoid warnings about comparing
|
|
|
|
|
// signed and unsigned integers.
|
|
|
|
|
template <bool IsSigned>
|
|
|
|
|
struct IntChecker {
|
|
|
|
|
struct IntChecker
|
|
|
|
|
{
|
|
|
|
|
template <typename T>
|
|
|
|
|
static bool fits_in_int(T value) {
|
|
|
|
|
static bool fits_in_int(T value)
|
|
|
|
|
{
|
|
|
|
|
unsigned max = std::numeric_limits<int>::max();
|
|
|
|
|
return value <= max;
|
|
|
|
|
}
|
|
|
|
|
static bool fits_in_int(bool) { return true; }
|
|
|
|
|
static bool fits_in_int(bool)
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
template <>
|
|
|
|
|
struct IntChecker<true> {
|
|
|
|
|
struct IntChecker<true>
|
|
|
|
|
{
|
|
|
|
|
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();
|
|
|
|
|
}
|
|
|
|
|
static bool fits_in_int(int) { return true; }
|
|
|
|
|
static bool fits_in_int(int)
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class PrecisionHandler : public ArgVisitor<PrecisionHandler, int> {
|
|
|
|
|
class PrecisionHandler : public ArgVisitor<PrecisionHandler, int>
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
void report_unhandled_arg() {
|
|
|
|
|
void report_unhandled_arg()
|
|
|
|
|
{
|
|
|
|
|
FMT_THROW(FormatError("precision is not integer"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
int visit_any_int(T value) {
|
|
|
|
|
int visit_any_int(T value)
|
|
|
|
|
{
|
|
|
|
|
if (!IntChecker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
|
|
|
|
|
FMT_THROW(FormatError("number is too big"));
|
|
|
|
|
return static_cast<int>(value);
|
|
|
|
@ -55,37 +70,62 @@ class PrecisionHandler : public ArgVisitor<PrecisionHandler, int> {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
|
|
|
|
|
class IsZeroInt : public ArgVisitor<IsZeroInt, bool> {
|
|
|
|
|
class IsZeroInt : public ArgVisitor<IsZeroInt, bool>
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
template <typename T>
|
|
|
|
|
bool visit_any_int(T value) { return value == 0; }
|
|
|
|
|
bool visit_any_int(T value)
|
|
|
|
|
{
|
|
|
|
|
return value == 0;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// returns the default type for format specific "%s"
|
|
|
|
|
class DefaultType : public ArgVisitor<DefaultType, char> {
|
|
|
|
|
class DefaultType : public ArgVisitor<DefaultType, char>
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
char visit_char(int) { return 'c'; }
|
|
|
|
|
char visit_char(int)
|
|
|
|
|
{
|
|
|
|
|
return 'c';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char visit_bool(bool) { return 's'; }
|
|
|
|
|
char visit_bool(bool)
|
|
|
|
|
{
|
|
|
|
|
return 's';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char visit_pointer(const void *) { return 'p'; }
|
|
|
|
|
char visit_pointer(const void *)
|
|
|
|
|
{
|
|
|
|
|
return 'p';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
char visit_any_int(T) { return 'd'; }
|
|
|
|
|
char visit_any_int(T)
|
|
|
|
|
{
|
|
|
|
|
return 'd';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
char visit_any_double(T) { return 'g'; }
|
|
|
|
|
char visit_any_double(T)
|
|
|
|
|
{
|
|
|
|
|
return 'g';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char visit_unhandled_arg() { return 's'; }
|
|
|
|
|
char visit_unhandled_arg()
|
|
|
|
|
{
|
|
|
|
|
return 's';
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
template <typename T, typename U>
|
|
|
|
|
struct is_same {
|
|
|
|
|
struct is_same
|
|
|
|
|
{
|
|
|
|
|
enum { value = 0 };
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
struct is_same<T, T> {
|
|
|
|
|
struct is_same<T, T>
|
|
|
|
|
{
|
|
|
|
|
enum { value = 1 };
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -94,7 +134,8 @@ struct is_same<T, T> {
|
|
|
|
|
// corresponding signed or unsigned type depending on the type specifier:
|
|
|
|
|
// 'd' and 'i' - signed, other - unsigned)
|
|
|
|
|
template <typename T = void>
|
|
|
|
|
class ArgConverter : public ArgVisitor<ArgConverter<T>, void> {
|
|
|
|
|
class ArgConverter : public ArgVisitor<ArgConverter<T>, void>
|
|
|
|
|
{
|
|
|
|
|
private:
|
|
|
|
|
internal::Arg &arg_;
|
|
|
|
|
wchar_t type_;
|
|
|
|
@ -105,44 +146,57 @@ class ArgConverter : public ArgVisitor<ArgConverter<T>, void> {
|
|
|
|
|
ArgConverter(internal::Arg &arg, wchar_t type)
|
|
|
|
|
: arg_(arg), type_(type) {}
|
|
|
|
|
|
|
|
|
|
void visit_bool(bool value) {
|
|
|
|
|
void visit_bool(bool value)
|
|
|
|
|
{
|
|
|
|
|
if (type_ != 's')
|
|
|
|
|
visit_any_int(value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void visit_char(int value) {
|
|
|
|
|
void visit_char(int value)
|
|
|
|
|
{
|
|
|
|
|
if (type_ != 's')
|
|
|
|
|
visit_any_int(value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename U>
|
|
|
|
|
void visit_any_int(U value) {
|
|
|
|
|
void visit_any_int(U value)
|
|
|
|
|
{
|
|
|
|
|
bool is_signed = type_ == 'd' || type_ == 'i';
|
|
|
|
|
if (type_ == 's') {
|
|
|
|
|
if (type_ == 's')
|
|
|
|
|
{
|
|
|
|
|
is_signed = std::numeric_limits<U>::is_signed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
using internal::Arg;
|
|
|
|
|
typedef typename internal::Conditional<
|
|
|
|
|
is_same<T, void>::value, U, T>::type TargetType;
|
|
|
|
|
if (const_check(sizeof(TargetType) <= sizeof(int))) {
|
|
|
|
|
if (const_check(sizeof(TargetType) <= sizeof(int)))
|
|
|
|
|
{
|
|
|
|
|
// Extra casts are used to silence warnings.
|
|
|
|
|
if (is_signed) {
|
|
|
|
|
if (is_signed)
|
|
|
|
|
{
|
|
|
|
|
arg_.type = Arg::INT;
|
|
|
|
|
arg_.int_value = static_cast<int>(static_cast<TargetType>(value));
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
arg_.type = Arg::UINT;
|
|
|
|
|
typedef typename internal::MakeUnsigned<TargetType>::Type Unsigned;
|
|
|
|
|
arg_.uint_value = static_cast<unsigned>(static_cast<Unsigned>(value));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (is_signed) {
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (is_signed)
|
|
|
|
|
{
|
|
|
|
|
arg_.type = Arg::LONG_LONG;
|
|
|
|
|
// glibc's printf doesn't sign extend arguments of smaller types:
|
|
|
|
|
// std::printf("%lld", -42); // prints "4294967254"
|
|
|
|
|
// but we don't have to do the same because it's a UB.
|
|
|
|
|
arg_.long_long_value = static_cast<LongLong>(value);
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
arg_.type = Arg::ULONG_LONG;
|
|
|
|
|
arg_.ulong_long_value =
|
|
|
|
|
static_cast<typename internal::MakeUnsigned<U>::Type>(value);
|
|
|
|
@ -152,7 +206,8 @@ class ArgConverter : public ArgVisitor<ArgConverter<T>, void> {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Converts an integer argument to char for printf.
|
|
|
|
|
class CharConverter : public ArgVisitor<CharConverter, void> {
|
|
|
|
|
class CharConverter : public ArgVisitor<CharConverter, void>
|
|
|
|
|
{
|
|
|
|
|
private:
|
|
|
|
|
internal::Arg &arg_;
|
|
|
|
|
|
|
|
|
@ -162,7 +217,8 @@ class CharConverter : public ArgVisitor<CharConverter, void> {
|
|
|
|
|
explicit CharConverter(internal::Arg &arg) : arg_(arg) {}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
void visit_any_int(T value) {
|
|
|
|
|
void visit_any_int(T value)
|
|
|
|
|
{
|
|
|
|
|
arg_.type = internal::Arg::CHAR;
|
|
|
|
|
arg_.int_value = static_cast<char>(value);
|
|
|
|
|
}
|
|
|
|
@ -170,7 +226,8 @@ class CharConverter : public ArgVisitor<CharConverter, void> {
|
|
|
|
|
|
|
|
|
|
// Checks if an argument is a valid printf width specifier and sets
|
|
|
|
|
// left alignment if it is negative.
|
|
|
|
|
class WidthHandler : public ArgVisitor<WidthHandler, unsigned> {
|
|
|
|
|
class WidthHandler : public ArgVisitor<WidthHandler, unsigned>
|
|
|
|
|
{
|
|
|
|
|
private:
|
|
|
|
|
FormatSpec &spec_;
|
|
|
|
|
|
|
|
|
@ -179,15 +236,18 @@ class WidthHandler : public ArgVisitor<WidthHandler, unsigned> {
|
|
|
|
|
public:
|
|
|
|
|
explicit WidthHandler(FormatSpec &spec) : spec_(spec) {}
|
|
|
|
|
|
|
|
|
|
void report_unhandled_arg() {
|
|
|
|
|
void report_unhandled_arg()
|
|
|
|
|
{
|
|
|
|
|
FMT_THROW(FormatError("width is not integer"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
|
unsigned visit_any_int(T value) {
|
|
|
|
|
unsigned visit_any_int(T value)
|
|
|
|
|
{
|
|
|
|
|
typedef typename internal::IntTraits<T>::MainType UnsignedType;
|
|
|
|
|
UnsignedType width = static_cast<UnsignedType>(value);
|
|
|
|
|
if (internal::is_negative(value)) {
|
|
|
|
|
if (internal::is_negative(value))
|
|
|
|
|
{
|
|
|
|
|
spec_.align_ = ALIGN_LEFT;
|
|
|
|
|
width = 0 - width;
|
|
|
|
|
}
|
|
|
|
@ -218,9 +278,11 @@ class WidthHandler : public ArgVisitor<WidthHandler, unsigned> {
|
|
|
|
|
*/
|
|
|
|
|
template <typename Impl, typename Char, typename Spec>
|
|
|
|
|
class BasicPrintfArgFormatter :
|
|
|
|
|
public internal::ArgFormatterBase<Impl, Char, Spec> {
|
|
|
|
|
public internal::ArgFormatterBase<Impl, Char, Spec>
|
|
|
|
|
{
|
|
|
|
|
private:
|
|
|
|
|
void write_null_pointer() {
|
|
|
|
|
void write_null_pointer()
|
|
|
|
|
{
|
|
|
|
|
this->spec().type_ = 0;
|
|
|
|
|
this->write("(nil)");
|
|
|
|
|
}
|
|
|
|
@ -239,7 +301,8 @@ class BasicPrintfArgFormatter :
|
|
|
|
|
: internal::ArgFormatterBase<Impl, Char, Spec>(w, s) {}
|
|
|
|
|
|
|
|
|
|
/** Formats an argument of type ``bool``. */
|
|
|
|
|
void visit_bool(bool value) {
|
|
|
|
|
void visit_bool(bool value)
|
|
|
|
|
{
|
|
|
|
|
Spec &fmt_spec = this->spec();
|
|
|
|
|
if (fmt_spec.type_ != 's')
|
|
|
|
|
return this->visit_any_int(value);
|
|
|
|
@ -248,30 +311,38 @@ class BasicPrintfArgFormatter :
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** Formats a character. */
|
|
|
|
|
void visit_char(int value) {
|
|
|
|
|
void visit_char(int value)
|
|
|
|
|
{
|
|
|
|
|
const Spec &fmt_spec = this->spec();
|
|
|
|
|
BasicWriter<Char> &w = this->writer();
|
|
|
|
|
if (fmt_spec.type_ && fmt_spec.type_ != 'c')
|
|
|
|
|
w.write_int(value, fmt_spec);
|
|
|
|
|
typedef typename BasicWriter<Char>::CharPtr CharPtr;
|
|
|
|
|
CharPtr out = CharPtr();
|
|
|
|
|
if (fmt_spec.width_ > 1) {
|
|
|
|
|
if (fmt_spec.width_ > 1)
|
|
|
|
|
{
|
|
|
|
|
Char fill = ' ';
|
|
|
|
|
out = w.grow_buffer(fmt_spec.width_);
|
|
|
|
|
if (fmt_spec.align_ != ALIGN_LEFT) {
|
|
|
|
|
if (fmt_spec.align_ != ALIGN_LEFT)
|
|
|
|
|
{
|
|
|
|
|
std::fill_n(out, fmt_spec.width_ - 1, fill);
|
|
|
|
|
out += fmt_spec.width_ - 1;
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
std::fill_n(out + 1, fmt_spec.width_ - 1, fill);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
out = w.grow_buffer(1);
|
|
|
|
|
}
|
|
|
|
|
*out = static_cast<Char>(value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** Formats a null-terminated C string. */
|
|
|
|
|
void visit_cstring(const char *value) {
|
|
|
|
|
void visit_cstring(const char *value)
|
|
|
|
|
{
|
|
|
|
|
if (value)
|
|
|
|
|
Base::visit_cstring(value);
|
|
|
|
|
else if (this->spec().type_ == 'p')
|
|
|
|
@ -281,7 +352,8 @@ class BasicPrintfArgFormatter :
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** Formats a pointer. */
|
|
|
|
|
void visit_pointer(const void *value) {
|
|
|
|
|
void visit_pointer(const void *value)
|
|
|
|
|
{
|
|
|
|
|
if (value)
|
|
|
|
|
return Base::visit_pointer(value);
|
|
|
|
|
this->spec().type_ = 0;
|
|
|
|
@ -289,7 +361,8 @@ class BasicPrintfArgFormatter :
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** Formats an argument of a custom (user-defined) type. */
|
|
|
|
|
void visit_custom(internal::Arg::CustomValue c) {
|
|
|
|
|
void visit_custom(internal::Arg::CustomValue c)
|
|
|
|
|
{
|
|
|
|
|
BasicFormatter<Char> formatter(ArgList(), this->writer());
|
|
|
|
|
const Char format_str[] = {'}', 0};
|
|
|
|
|
const Char *format = format_str;
|
|
|
|
@ -300,7 +373,8 @@ class BasicPrintfArgFormatter :
|
|
|
|
|
/** The default printf argument formatter. */
|
|
|
|
|
template <typename Char>
|
|
|
|
|
class PrintfArgFormatter :
|
|
|
|
|
public BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char, FormatSpec> {
|
|
|
|
|
public BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char, FormatSpec>
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
/** Constructs an argument formatter object. */
|
|
|
|
|
PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
|
|
|
|
@ -309,7 +383,8 @@ class PrintfArgFormatter :
|
|
|
|
|
|
|
|
|
|
/** This template formats data and writes the output to a writer. */
|
|
|
|
|
template <typename Char, typename ArgFormatter = PrintfArgFormatter<Char> >
|
|
|
|
|
class PrintfFormatter : private internal::FormatterBase {
|
|
|
|
|
class PrintfFormatter : private internal::FormatterBase
|
|
|
|
|
{
|
|
|
|
|
private:
|
|
|
|
|
BasicWriter<Char> &writer_;
|
|
|
|
|
|
|
|
|
@ -340,9 +415,12 @@ class PrintfFormatter : private internal::FormatterBase {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
template <typename Char, typename AF>
|
|
|
|
|
void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s) {
|
|
|
|
|
for (;;) {
|
|
|
|
|
switch (*s++) {
|
|
|
|
|
void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s)
|
|
|
|
|
{
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
switch (*s++)
|
|
|
|
|
{
|
|
|
|
|
case '-':
|
|
|
|
|
spec.align_ = ALIGN_LEFT;
|
|
|
|
|
break;
|
|
|
|
@ -367,7 +445,8 @@ void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s) {
|
|
|
|
|
|
|
|
|
|
template <typename Char, typename AF>
|
|
|
|
|
internal::Arg PrintfFormatter<Char, AF>::get_arg(const Char *s,
|
|
|
|
|
unsigned arg_index) {
|
|
|
|
|
unsigned arg_index)
|
|
|
|
|
{
|
|
|
|
|
(void)s;
|
|
|
|
|
const char *error = FMT_NULL;
|
|
|
|
|
internal::Arg arg = arg_index == std::numeric_limits<unsigned>::max() ?
|
|
|
|
@ -379,20 +458,26 @@ internal::Arg PrintfFormatter<Char, AF>::get_arg(const Char *s,
|
|
|
|
|
|
|
|
|
|
template <typename Char, typename AF>
|
|
|
|
|
unsigned PrintfFormatter<Char, AF>::parse_header(
|
|
|
|
|
const Char *&s, FormatSpec &spec) {
|
|
|
|
|
const Char *&s, FormatSpec &spec)
|
|
|
|
|
{
|
|
|
|
|
unsigned arg_index = std::numeric_limits<unsigned>::max();
|
|
|
|
|
Char c = *s;
|
|
|
|
|
if (c >= '0' && c <= '9') {
|
|
|
|
|
if (c >= '0' && c <= '9')
|
|
|
|
|
{
|
|
|
|
|
// Parse an argument index (if followed by '$') or a width possibly
|
|
|
|
|
// preceded with '0' flag(s).
|
|
|
|
|
unsigned value = internal::parse_nonnegative_int(s);
|
|
|
|
|
if (*s == '$') { // value is an argument index
|
|
|
|
|
if (*s == '$') // value is an argument index
|
|
|
|
|
{
|
|
|
|
|
++s;
|
|
|
|
|
arg_index = value;
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (c == '0')
|
|
|
|
|
spec.fill_ = '0';
|
|
|
|
|
if (value != 0) {
|
|
|
|
|
if (value != 0)
|
|
|
|
|
{
|
|
|
|
|
// Nonzero value means that we parsed width and don't need to
|
|
|
|
|
// parse it or flags again, so return now.
|
|
|
|
|
spec.width_ = value;
|
|
|
|
@ -402,9 +487,12 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
|
|
|
|
|
}
|
|
|
|
|
parse_flags(spec, s);
|
|
|
|
|
// Parse width.
|
|
|
|
|
if (*s >= '0' && *s <= '9') {
|
|
|
|
|
if (*s >= '0' && *s <= '9')
|
|
|
|
|
{
|
|
|
|
|
spec.width_ = internal::parse_nonnegative_int(s);
|
|
|
|
|
} else if (*s == '*') {
|
|
|
|
|
}
|
|
|
|
|
else if (*s == '*')
|
|
|
|
|
{
|
|
|
|
|
++s;
|
|
|
|
|
spec.width_ = internal::WidthHandler(spec).visit(get_arg(s));
|
|
|
|
|
}
|
|
|
|
@ -412,13 +500,16 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
template <typename Char, typename AF>
|
|
|
|
|
void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|
|
|
|
void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
|
|
|
|
|
{
|
|
|
|
|
const Char *start = format_str.c_str();
|
|
|
|
|
const Char *s = start;
|
|
|
|
|
while (*s) {
|
|
|
|
|
while (*s)
|
|
|
|
|
{
|
|
|
|
|
Char c = *s++;
|
|
|
|
|
if (c != '%') continue;
|
|
|
|
|
if (*s == c) {
|
|
|
|
|
if (*s == c)
|
|
|
|
|
{
|
|
|
|
|
write(writer_, start, s);
|
|
|
|
|
start = ++s;
|
|
|
|
|
continue;
|
|
|
|
@ -432,14 +523,20 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|
|
|
|
unsigned arg_index = parse_header(s, spec);
|
|
|
|
|
|
|
|
|
|
// Parse precision.
|
|
|
|
|
if (*s == '.') {
|
|
|
|
|
if (*s == '.')
|
|
|
|
|
{
|
|
|
|
|
++s;
|
|
|
|
|
if ('0' <= *s && *s <= '9') {
|
|
|
|
|
if ('0' <= *s && *s <= '9')
|
|
|
|
|
{
|
|
|
|
|
spec.precision_ = static_cast<int>(internal::parse_nonnegative_int(s));
|
|
|
|
|
} else if (*s == '*') {
|
|
|
|
|
}
|
|
|
|
|
else if (*s == '*')
|
|
|
|
|
{
|
|
|
|
|
++s;
|
|
|
|
|
spec.precision_ = internal::PrecisionHandler().visit(get_arg(s));
|
|
|
|
|
} else {
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
spec.precision_ = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -448,7 +545,8 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|
|
|
|
Arg arg = get_arg(s, arg_index);
|
|
|
|
|
if (spec.flag(HASH_FLAG) && internal::IsZeroInt().visit(arg))
|
|
|
|
|
spec.flags_ &= ~internal::to_unsigned<int>(HASH_FLAG);
|
|
|
|
|
if (spec.fill_ == '0') {
|
|
|
|
|
if (spec.fill_ == '0')
|
|
|
|
|
{
|
|
|
|
|
if (arg.type <= Arg::LAST_NUMERIC_TYPE)
|
|
|
|
|
spec.align_ = ALIGN_NUMERIC;
|
|
|
|
|
else
|
|
|
|
@ -457,7 +555,8 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|
|
|
|
|
|
|
|
|
// Parse length and convert the argument to the required type.
|
|
|
|
|
using internal::ArgConverter;
|
|
|
|
|
switch (*s++) {
|
|
|
|
|
switch (*s++)
|
|
|
|
|
{
|
|
|
|
|
case 'h':
|
|
|
|
|
if (*s == 'h')
|
|
|
|
|
ArgConverter<signed char>(arg, *++s).visit(arg);
|
|
|
|
@ -493,15 +592,19 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|
|
|
|
FMT_THROW(FormatError("invalid format string"));
|
|
|
|
|
spec.type_ = static_cast<char>(*s++);
|
|
|
|
|
|
|
|
|
|
if (spec.type_ == 's') {
|
|
|
|
|
if (spec.type_ == 's')
|
|
|
|
|
{
|
|
|
|
|
// set the format type to the default if 's' is specified
|
|
|
|
|
spec.type_ = internal::DefaultType().visit(arg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (arg.type <= Arg::LAST_INTEGER_TYPE) {
|
|
|
|
|
if (arg.type <= Arg::LAST_INTEGER_TYPE)
|
|
|
|
|
{
|
|
|
|
|
// Normalize type.
|
|
|
|
|
switch (spec.type_) {
|
|
|
|
|
case 'i': case 'u':
|
|
|
|
|
switch (spec.type_)
|
|
|
|
|
{
|
|
|
|
|
case 'i':
|
|
|
|
|
case 'u':
|
|
|
|
|
spec.type_ = 'd';
|
|
|
|
|
break;
|
|
|
|
|
case 'c':
|
|
|
|
@ -519,12 +622,14 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|
|
|
|
write(writer_, start, s);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
inline void printf(Writer &w, CStringRef format, ArgList args) {
|
|
|
|
|
inline void printf(Writer &w, CStringRef format, ArgList args)
|
|
|
|
|
{
|
|
|
|
|
PrintfFormatter<char>(args, w).format(format);
|
|
|
|
|
}
|
|
|
|
|
FMT_VARIADIC(void, printf, Writer &, CStringRef)
|
|
|
|
|
|
|
|
|
|
inline void printf(WWriter &w, WCStringRef format, ArgList args) {
|
|
|
|
|
inline void printf(WWriter &w, WCStringRef format, ArgList args)
|
|
|
|
|
{
|
|
|
|
|
PrintfFormatter<wchar_t>(args, w).format(format);
|
|
|
|
|
}
|
|
|
|
|
FMT_VARIADIC(void, printf, WWriter &, WCStringRef)
|
|
|
|
@ -538,14 +643,16 @@ FMT_VARIADIC(void, printf, WWriter &, WCStringRef)
|
|
|
|
|
std::string message = fmt::sprintf("The answer is %d", 42);
|
|
|
|
|
\endrst
|
|
|
|
|
*/
|
|
|
|
|
inline std::string sprintf(CStringRef format, ArgList args) {
|
|
|
|
|
inline std::string sprintf(CStringRef format, ArgList args)
|
|
|
|
|
{
|
|
|
|
|
MemoryWriter w;
|
|
|
|
|
printf(w, format, args);
|
|
|
|
|
return w.str();
|
|
|
|
|
}
|
|
|
|
|
FMT_VARIADIC(std::string, sprintf, CStringRef)
|
|
|
|
|
|
|
|
|
|
inline std::wstring sprintf(WCStringRef format, ArgList args) {
|
|
|
|
|
inline std::wstring sprintf(WCStringRef format, ArgList args)
|
|
|
|
|
{
|
|
|
|
|
WMemoryWriter w;
|
|
|
|
|
printf(w, format, args);
|
|
|
|
|
return w.str();
|
|
|
|
@ -573,7 +680,8 @@ FMT_VARIADIC(int, fprintf, std::FILE *, CStringRef)
|
|
|
|
|
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
|
|
|
|
\endrst
|
|
|
|
|
*/
|
|
|
|
|
inline int printf(CStringRef format, ArgList args) {
|
|
|
|
|
inline int printf(CStringRef format, ArgList args)
|
|
|
|
|
{
|
|
|
|
|
return fprintf(stdout, format, args);
|
|
|
|
|
}
|
|
|
|
|
FMT_VARIADIC(int, printf, CStringRef)
|
|
|
|
@ -587,7 +695,8 @@ FMT_VARIADIC(int, printf, CStringRef)
|
|
|
|
|
fprintf(cerr, "Don't %s!", "panic");
|
|
|
|
|
\endrst
|
|
|
|
|
*/
|
|
|
|
|
inline int fprintf(std::ostream &os, CStringRef format_str, ArgList args) {
|
|
|
|
|
inline int fprintf(std::ostream &os, CStringRef format_str, ArgList args)
|
|
|
|
|
{
|
|
|
|
|
MemoryWriter w;
|
|
|
|
|
printf(w, format_str, args);
|
|
|
|
|
internal::write(os, w);
|
|
|
|
|