astyle
This commit is contained in:
parent
6128a87da2
commit
87ddb9a6c1
File diff suppressed because it is too large
Load Diff
@ -14,12 +14,15 @@ For the license information refer to format.h.
|
|||||||
//#include "format.h"
|
//#include "format.h"
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
|
|
||||||
namespace fmt {
|
namespace fmt
|
||||||
|
{
|
||||||
|
|
||||||
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;
|
||||||
@ -28,12 +31,15 @@ private:
|
|||||||
Char *start_;
|
Char *start_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FormatBuf(Buffer<Char> &buffer) : buffer_(buffer), start_(&buffer[0]) {
|
FormatBuf(Buffer<Char> &buffer) : buffer_(buffer), start_(&buffer[0])
|
||||||
|
{
|
||||||
this->setp(start_, start_ + buffer_.capacity());
|
this->setp(start_, start_ + buffer_.capacity());
|
||||||
}
|
}
|
||||||
|
|
||||||
int_type overflow(int_type ch = traits_type::eof()) {
|
int_type overflow(int_type ch = traits_type::eof())
|
||||||
if (!traits_type::eq_int_type(ch, traits_type::eof())) {
|
{
|
||||||
|
if (!traits_type::eq_int_type(ch, traits_type::eof()))
|
||||||
|
{
|
||||||
size_t buf_size = size();
|
size_t buf_size = size();
|
||||||
buffer_.resize(buf_size);
|
buffer_.resize(buf_size);
|
||||||
buffer_.reserve(buf_size * 2);
|
buffer_.reserve(buf_size * 2);
|
||||||
@ -45,14 +51,16 @@ public:
|
|||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t size() const {
|
size_t size() const
|
||||||
|
{
|
||||||
return to_unsigned(this->pptr() - start_);
|
return to_unsigned(this->pptr() - start_);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Yes &convert(std::ostream &);
|
Yes &convert(std::ostream &);
|
||||||
|
|
||||||
struct DummyStream : std::ostream {
|
struct DummyStream : std::ostream
|
||||||
|
{
|
||||||
DummyStream(); // Suppress a bogus warning in MSVC.
|
DummyStream(); // Suppress a bogus warning in MSVC.
|
||||||
// Hide all operator<< overloads from std::ostream.
|
// Hide all operator<< overloads from std::ostream.
|
||||||
void operator<<(Null<>);
|
void operator<<(Null<>);
|
||||||
@ -61,9 +69,11 @@ struct DummyStream : std::ostream {
|
|||||||
No &operator<<(std::ostream &, int);
|
No &operator<<(std::ostream &, int);
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
struct ConvertToIntImpl<T, true> {
|
struct ConvertToIntImpl<T, true>
|
||||||
|
{
|
||||||
// Convert to int only if T doesn't have an overloaded operator<<.
|
// Convert to int only if T doesn't have an overloaded operator<<.
|
||||||
enum {
|
enum
|
||||||
|
{
|
||||||
value = sizeof(convert(get<DummyStream>() << get<T>())) == sizeof(No)
|
value = sizeof(convert(get<DummyStream>() << get<T>())) == sizeof(No)
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -75,7 +85,8 @@ void write(std::ostream &os, Writer &w);
|
|||||||
// Formats a value.
|
// Formats a value.
|
||||||
template <typename Char, typename ArgFormatter, typename T>
|
template <typename Char, typename ArgFormatter, typename T>
|
||||||
void format_arg(BasicFormatter<Char, ArgFormatter> &f,
|
void format_arg(BasicFormatter<Char, ArgFormatter> &f,
|
||||||
const Char *&format_str, const T &value) {
|
const Char *&format_str, const T &value)
|
||||||
|
{
|
||||||
internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE> buffer;
|
internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE> buffer;
|
||||||
|
|
||||||
internal::FormatBuf<Char> format_buf(buffer);
|
internal::FormatBuf<Char> format_buf(buffer);
|
||||||
|
@ -15,43 +15,54 @@ For the license information refer to format.h.
|
|||||||
|
|
||||||
#include "ostream.h"
|
#include "ostream.h"
|
||||||
|
|
||||||
namespace fmt {
|
namespace fmt
|
||||||
namespace internal {
|
{
|
||||||
|
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 IntChecker {
|
struct IntChecker
|
||||||
|
{
|
||||||
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 IntChecker<true> {
|
struct IntChecker<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() &&
|
return value >= std::numeric_limits<int>::min() &&
|
||||||
value <= std::numeric_limits<int>::max();
|
value <= std::numeric_limits<int>::max();
|
||||||
}
|
}
|
||||||
static bool fits_in_int(int) {
|
static bool fits_in_int(int)
|
||||||
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class PrecisionHandler : public ArgVisitor<PrecisionHandler, int> {
|
class PrecisionHandler : public ArgVisitor<PrecisionHandler, int>
|
||||||
|
{
|
||||||
public:
|
public:
|
||||||
void report_unhandled_arg() {
|
void report_unhandled_arg()
|
||||||
|
{
|
||||||
FMT_THROW(FormatError("precision is not integer"));
|
FMT_THROW(FormatError("precision is not integer"));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
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))
|
if (!IntChecker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
|
||||||
FMT_THROW(FormatError("number is too big"));
|
FMT_THROW(FormatError("number is too big"));
|
||||||
return static_cast<int>(value);
|
return static_cast<int>(value);
|
||||||
@ -59,21 +70,25 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
|
// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
|
||||||
class IsZeroInt : public ArgVisitor<IsZeroInt, bool> {
|
class IsZeroInt : public ArgVisitor<IsZeroInt, bool>
|
||||||
|
{
|
||||||
public:
|
public:
|
||||||
template <typename T>
|
template <typename T>
|
||||||
bool visit_any_int(T value) {
|
bool visit_any_int(T value)
|
||||||
|
{
|
||||||
return value == 0;
|
return value == 0;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename T, typename U>
|
template <typename T, typename U>
|
||||||
struct is_same {
|
struct is_same
|
||||||
|
{
|
||||||
enum { value = 0 };
|
enum { value = 0 };
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
struct is_same<T, T> {
|
struct is_same<T, T>
|
||||||
|
{
|
||||||
enum { value = 1 };
|
enum { value = 1 };
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -82,7 +97,8 @@ struct is_same<T, T> {
|
|||||||
// corresponding signed or unsigned type depending on the type specifier:
|
// corresponding signed or unsigned type depending on the type specifier:
|
||||||
// 'd' and 'i' - signed, other - unsigned)
|
// 'd' and 'i' - signed, other - unsigned)
|
||||||
template <typename T = void>
|
template <typename T = void>
|
||||||
class ArgConverter : public ArgVisitor<ArgConverter<T>, void> {
|
class ArgConverter : public ArgVisitor<ArgConverter<T>, void>
|
||||||
|
{
|
||||||
private:
|
private:
|
||||||
internal::Arg &arg_;
|
internal::Arg &arg_;
|
||||||
wchar_t type_;
|
wchar_t type_;
|
||||||
@ -93,38 +109,46 @@ public:
|
|||||||
ArgConverter(internal::Arg &arg, wchar_t type)
|
ArgConverter(internal::Arg &arg, wchar_t type)
|
||||||
: arg_(arg), type_(type) {}
|
: arg_(arg), type_(type) {}
|
||||||
|
|
||||||
void visit_bool(bool value) {
|
void visit_bool(bool value)
|
||||||
|
{
|
||||||
if (type_ != 's')
|
if (type_ != 's')
|
||||||
visit_any_int(value);
|
visit_any_int(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename U>
|
template <typename U>
|
||||||
void visit_any_int(U value) {
|
void visit_any_int(U value)
|
||||||
|
{
|
||||||
bool is_signed = type_ == 'd' || type_ == 'i';
|
bool is_signed = type_ == 'd' || type_ == 'i';
|
||||||
using internal::Arg;
|
using internal::Arg;
|
||||||
typedef typename internal::Conditional<
|
typedef typename internal::Conditional<
|
||||||
is_same<T, void>::value, U, T>::type TargetType;
|
is_same<T, void>::value, U, T>::type TargetType;
|
||||||
if (sizeof(TargetType) <= sizeof(int)) {
|
if (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_.type = Arg::INT;
|
arg_.type = Arg::INT;
|
||||||
arg_.int_value = static_cast<int>(static_cast<TargetType>(value));
|
arg_.int_value = static_cast<int>(static_cast<TargetType>(value));
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
arg_.type = Arg::UINT;
|
arg_.type = Arg::UINT;
|
||||||
typedef typename internal::MakeUnsigned<TargetType>::Type Unsigned;
|
typedef typename internal::MakeUnsigned<TargetType>::Type Unsigned;
|
||||||
arg_.uint_value = static_cast<unsigned>(static_cast<Unsigned>(value));
|
arg_.uint_value = static_cast<unsigned>(static_cast<Unsigned>(value));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
if (is_signed) {
|
{
|
||||||
|
if (is_signed)
|
||||||
|
{
|
||||||
arg_.type = Arg::LONG_LONG;
|
arg_.type = Arg::LONG_LONG;
|
||||||
// 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_.long_long_value = static_cast<LongLong>(value);
|
arg_.long_long_value = static_cast<LongLong>(value);
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
arg_.type = Arg::ULONG_LONG;
|
arg_.type = Arg::ULONG_LONG;
|
||||||
arg_.ulong_long_value =
|
arg_.ulong_long_value =
|
||||||
static_cast<typename internal::MakeUnsigned<U>::Type>(value);
|
static_cast<typename internal::MakeUnsigned<U>::Type>(value);
|
||||||
@ -134,7 +158,8 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Converts an integer argument to char for printf.
|
// Converts an integer argument to char for printf.
|
||||||
class CharConverter : public ArgVisitor<CharConverter, void> {
|
class CharConverter : public ArgVisitor<CharConverter, void>
|
||||||
|
{
|
||||||
private:
|
private:
|
||||||
internal::Arg &arg_;
|
internal::Arg &arg_;
|
||||||
|
|
||||||
@ -144,7 +169,8 @@ public:
|
|||||||
explicit CharConverter(internal::Arg &arg) : arg_(arg) {}
|
explicit CharConverter(internal::Arg &arg) : arg_(arg) {}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void visit_any_int(T value) {
|
void visit_any_int(T value)
|
||||||
|
{
|
||||||
arg_.type = internal::Arg::CHAR;
|
arg_.type = internal::Arg::CHAR;
|
||||||
arg_.int_value = static_cast<char>(value);
|
arg_.int_value = static_cast<char>(value);
|
||||||
}
|
}
|
||||||
@ -152,7 +178,8 @@ public:
|
|||||||
|
|
||||||
// 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.
|
||||||
class WidthHandler : public ArgVisitor<WidthHandler, unsigned> {
|
class WidthHandler : public ArgVisitor<WidthHandler, unsigned>
|
||||||
|
{
|
||||||
private:
|
private:
|
||||||
FormatSpec &spec_;
|
FormatSpec &spec_;
|
||||||
|
|
||||||
@ -161,15 +188,18 @@ private:
|
|||||||
public:
|
public:
|
||||||
explicit WidthHandler(FormatSpec &spec) : spec_(spec) {}
|
explicit WidthHandler(FormatSpec &spec) : spec_(spec) {}
|
||||||
|
|
||||||
void report_unhandled_arg() {
|
void report_unhandled_arg()
|
||||||
|
{
|
||||||
FMT_THROW(FormatError("width is not integer"));
|
FMT_THROW(FormatError("width is not integer"));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
unsigned visit_any_int(T value) {
|
unsigned visit_any_int(T value)
|
||||||
|
{
|
||||||
typedef typename internal::IntTraits<T>::MainType UnsignedType;
|
typedef typename internal::IntTraits<T>::MainType 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;
|
||||||
}
|
}
|
||||||
@ -199,9 +229,11 @@ superclass will be called.
|
|||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
template <typename Impl, typename Char>
|
template <typename Impl, typename Char>
|
||||||
class BasicPrintfArgFormatter : public internal::ArgFormatterBase<Impl, Char> {
|
class BasicPrintfArgFormatter : public internal::ArgFormatterBase<Impl, Char>
|
||||||
|
{
|
||||||
private:
|
private:
|
||||||
void write_null_pointer() {
|
void write_null_pointer()
|
||||||
|
{
|
||||||
this->spec().type_ = 0;
|
this->spec().type_ = 0;
|
||||||
this->write("(nil)");
|
this->write("(nil)");
|
||||||
}
|
}
|
||||||
@ -220,7 +252,8 @@ public:
|
|||||||
: internal::ArgFormatterBase<Impl, Char>(writer, spec) {}
|
: internal::ArgFormatterBase<Impl, Char>(writer, spec) {}
|
||||||
|
|
||||||
/** Formats an argument of type ``bool``. */
|
/** Formats an argument of type ``bool``. */
|
||||||
void visit_bool(bool value) {
|
void visit_bool(bool value)
|
||||||
|
{
|
||||||
FormatSpec &fmt_spec = this->spec();
|
FormatSpec &fmt_spec = this->spec();
|
||||||
if (fmt_spec.type_ != 's')
|
if (fmt_spec.type_ != 's')
|
||||||
return this->visit_any_int(value);
|
return this->visit_any_int(value);
|
||||||
@ -229,32 +262,38 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Formats a character. */
|
/** Formats a character. */
|
||||||
void visit_char(int value) {
|
void visit_char(int value)
|
||||||
|
{
|
||||||
const FormatSpec &fmt_spec = this->spec();
|
const FormatSpec &fmt_spec = this->spec();
|
||||||
BasicWriter<Char> &w = this->writer();
|
BasicWriter<Char> &w = this->writer();
|
||||||
if (fmt_spec.type_ && fmt_spec.type_ != 'c')
|
if (fmt_spec.type_ && fmt_spec.type_ != 'c')
|
||||||
w.write_int(value, fmt_spec);
|
w.write_int(value, fmt_spec);
|
||||||
typedef typename BasicWriter<Char>::CharPtr CharPtr;
|
typedef typename BasicWriter<Char>::CharPtr CharPtr;
|
||||||
CharPtr out = CharPtr();
|
CharPtr out = CharPtr();
|
||||||
if (fmt_spec.width_ > 1) {
|
if (fmt_spec.width_ > 1)
|
||||||
|
{
|
||||||
Char fill = ' ';
|
Char fill = ' ';
|
||||||
out = w.grow_buffer(fmt_spec.width_);
|
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);
|
std::fill_n(out, fmt_spec.width_ - 1, fill);
|
||||||
out += fmt_spec.width_ - 1;
|
out += fmt_spec.width_ - 1;
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
std::fill_n(out + 1, fmt_spec.width_ - 1, fill);
|
std::fill_n(out + 1, fmt_spec.width_ - 1, fill);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
out = w.grow_buffer(1);
|
out = w.grow_buffer(1);
|
||||||
}
|
}
|
||||||
*out = static_cast<Char>(value);
|
*out = static_cast<Char>(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Formats a null-terminated C string. */
|
/** Formats a null-terminated C string. */
|
||||||
void visit_cstring(const char *value) {
|
void visit_cstring(const char *value)
|
||||||
|
{
|
||||||
if (value)
|
if (value)
|
||||||
Base::visit_cstring(value);
|
Base::visit_cstring(value);
|
||||||
else if (this->spec().type_ == 'p')
|
else if (this->spec().type_ == 'p')
|
||||||
@ -264,7 +303,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Formats a pointer. */
|
/** Formats a pointer. */
|
||||||
void visit_pointer(const void *value) {
|
void visit_pointer(const void *value)
|
||||||
|
{
|
||||||
if (value)
|
if (value)
|
||||||
return Base::visit_pointer(value);
|
return Base::visit_pointer(value);
|
||||||
this->spec().type_ = 0;
|
this->spec().type_ = 0;
|
||||||
@ -272,7 +312,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Formats an argument of a custom (user-defined) type. */
|
/** 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());
|
BasicFormatter<Char> formatter(ArgList(), this->writer());
|
||||||
const Char format_str[] = { '}', 0 };
|
const Char format_str[] = { '}', 0 };
|
||||||
const Char *format = format_str;
|
const Char *format = format_str;
|
||||||
@ -283,7 +324,8 @@ public:
|
|||||||
/** The default printf argument formatter. */
|
/** The default printf argument formatter. */
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
class PrintfArgFormatter
|
class PrintfArgFormatter
|
||||||
: public BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char> {
|
: public BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char>
|
||||||
|
{
|
||||||
public:
|
public:
|
||||||
/** Constructs an argument formatter object. */
|
/** Constructs an argument formatter object. */
|
||||||
PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
|
PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
|
||||||
@ -292,7 +334,8 @@ public:
|
|||||||
|
|
||||||
/** This template formats data and writes the output to a writer. */
|
/** This template formats data and writes the output to a writer. */
|
||||||
template <typename Char, typename ArgFormatter = PrintfArgFormatter<Char> >
|
template <typename Char, typename ArgFormatter = PrintfArgFormatter<Char> >
|
||||||
class PrintfFormatter : private internal::FormatterBase {
|
class PrintfFormatter : private internal::FormatterBase
|
||||||
|
{
|
||||||
private:
|
private:
|
||||||
BasicWriter<Char> &writer_;
|
BasicWriter<Char> &writer_;
|
||||||
|
|
||||||
@ -323,9 +366,12 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
template <typename Char, typename AF>
|
template <typename Char, typename AF>
|
||||||
void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s) {
|
void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s)
|
||||||
for (;;) {
|
{
|
||||||
switch (*s++) {
|
for (;;)
|
||||||
|
{
|
||||||
|
switch (*s++)
|
||||||
|
{
|
||||||
case '-':
|
case '-':
|
||||||
spec.align_ = ALIGN_LEFT;
|
spec.align_ = ALIGN_LEFT;
|
||||||
break;
|
break;
|
||||||
@ -350,7 +396,8 @@ void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s) {
|
|||||||
|
|
||||||
template <typename Char, typename AF>
|
template <typename Char, typename AF>
|
||||||
internal::Arg PrintfFormatter<Char, AF>::get_arg(const Char *s,
|
internal::Arg PrintfFormatter<Char, AF>::get_arg(const Char *s,
|
||||||
unsigned arg_index) {
|
unsigned arg_index)
|
||||||
|
{
|
||||||
(void)s;
|
(void)s;
|
||||||
const char *error = 0;
|
const char *error = 0;
|
||||||
internal::Arg arg = arg_index == std::numeric_limits<unsigned>::max() ?
|
internal::Arg arg = arg_index == std::numeric_limits<unsigned>::max() ?
|
||||||
@ -362,21 +409,26 @@ internal::Arg PrintfFormatter<Char, AF>::get_arg(const Char *s,
|
|||||||
|
|
||||||
template <typename Char, typename AF>
|
template <typename Char, typename AF>
|
||||||
unsigned PrintfFormatter<Char, AF>::parse_header(
|
unsigned PrintfFormatter<Char, AF>::parse_header(
|
||||||
const Char *&s, FormatSpec &spec) {
|
const Char *&s, FormatSpec &spec)
|
||||||
|
{
|
||||||
unsigned arg_index = std::numeric_limits<unsigned>::max();
|
unsigned arg_index = std::numeric_limits<unsigned>::max();
|
||||||
Char c = *s;
|
Char c = *s;
|
||||||
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).
|
||||||
unsigned value = internal::parse_nonnegative_int(s);
|
unsigned value = internal::parse_nonnegative_int(s);
|
||||||
if (*s == '$') { // value is an argument index
|
if (*s == '$') // value is an argument index
|
||||||
|
{
|
||||||
++s;
|
++s;
|
||||||
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;
|
||||||
@ -386,10 +438,12 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
|
|||||||
}
|
}
|
||||||
parse_flags(spec, s);
|
parse_flags(spec, s);
|
||||||
// Parse width.
|
// Parse width.
|
||||||
if (*s >= '0' && *s <= '9') {
|
if (*s >= '0' && *s <= '9')
|
||||||
|
{
|
||||||
spec.width_ = internal::parse_nonnegative_int(s);
|
spec.width_ = internal::parse_nonnegative_int(s);
|
||||||
}
|
}
|
||||||
else if (*s == '*') {
|
else if (*s == '*')
|
||||||
|
{
|
||||||
++s;
|
++s;
|
||||||
spec.width_ = internal::WidthHandler(spec).visit(get_arg(s));
|
spec.width_ = internal::WidthHandler(spec).visit(get_arg(s));
|
||||||
}
|
}
|
||||||
@ -397,13 +451,16 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char, typename AF>
|
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 *start = format_str.c_str();
|
||||||
const Char *s = start;
|
const Char *s = start;
|
||||||
while (*s) {
|
while (*s)
|
||||||
|
{
|
||||||
Char c = *s++;
|
Char c = *s++;
|
||||||
if (c != '%') continue;
|
if (c != '%') continue;
|
||||||
if (*s == c) {
|
if (*s == c)
|
||||||
|
{
|
||||||
write(writer_, start, s);
|
write(writer_, start, s);
|
||||||
start = ++s;
|
start = ++s;
|
||||||
continue;
|
continue;
|
||||||
@ -417,12 +474,15 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|||||||
unsigned arg_index = parse_header(s, spec);
|
unsigned arg_index = parse_header(s, spec);
|
||||||
|
|
||||||
// Parse precision.
|
// Parse precision.
|
||||||
if (*s == '.') {
|
if (*s == '.')
|
||||||
|
{
|
||||||
++s;
|
++s;
|
||||||
if ('0' <= *s && *s <= '9') {
|
if ('0' <= *s && *s <= '9')
|
||||||
|
{
|
||||||
spec.precision_ = static_cast<int>(internal::parse_nonnegative_int(s));
|
spec.precision_ = static_cast<int>(internal::parse_nonnegative_int(s));
|
||||||
}
|
}
|
||||||
else if (*s == '*') {
|
else if (*s == '*')
|
||||||
|
{
|
||||||
++s;
|
++s;
|
||||||
spec.precision_ = internal::PrecisionHandler().visit(get_arg(s));
|
spec.precision_ = internal::PrecisionHandler().visit(get_arg(s));
|
||||||
}
|
}
|
||||||
@ -432,7 +492,8 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|||||||
Arg arg = get_arg(s, arg_index);
|
Arg arg = get_arg(s, arg_index);
|
||||||
if (spec.flag(HASH_FLAG) && internal::IsZeroInt().visit(arg))
|
if (spec.flag(HASH_FLAG) && internal::IsZeroInt().visit(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.type <= Arg::LAST_NUMERIC_TYPE)
|
if (arg.type <= Arg::LAST_NUMERIC_TYPE)
|
||||||
spec.align_ = ALIGN_NUMERIC;
|
spec.align_ = ALIGN_NUMERIC;
|
||||||
else
|
else
|
||||||
@ -441,7 +502,8 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|||||||
|
|
||||||
// Parse length and convert the argument to the required type.
|
// Parse length and convert the argument to the required type.
|
||||||
using internal::ArgConverter;
|
using internal::ArgConverter;
|
||||||
switch (*s++) {
|
switch (*s++)
|
||||||
|
{
|
||||||
case 'h':
|
case 'h':
|
||||||
if (*s == 'h')
|
if (*s == 'h')
|
||||||
ArgConverter<signed char>(arg, *++s).visit(arg);
|
ArgConverter<signed char>(arg, *++s).visit(arg);
|
||||||
@ -476,9 +538,11 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|||||||
if (!*s)
|
if (!*s)
|
||||||
FMT_THROW(FormatError("invalid format string"));
|
FMT_THROW(FormatError("invalid format string"));
|
||||||
spec.type_ = static_cast<char>(*s++);
|
spec.type_ = static_cast<char>(*s++);
|
||||||
if (arg.type <= Arg::LAST_INTEGER_TYPE) {
|
if (arg.type <= Arg::LAST_INTEGER_TYPE)
|
||||||
|
{
|
||||||
// Normalize type.
|
// Normalize type.
|
||||||
switch (spec.type_) {
|
switch (spec.type_)
|
||||||
|
{
|
||||||
case 'i':
|
case 'i':
|
||||||
case 'u':
|
case 'u':
|
||||||
spec.type_ = 'd';
|
spec.type_ = 'd';
|
||||||
@ -499,7 +563,8 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
void printf(BasicWriter<Char> &w, BasicCStringRef<Char> format, ArgList args) {
|
void printf(BasicWriter<Char> &w, BasicCStringRef<Char> format, ArgList args)
|
||||||
|
{
|
||||||
PrintfFormatter<Char>(args, w).format(format);
|
PrintfFormatter<Char>(args, w).format(format);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -512,14 +577,16 @@ Formats arguments and returns the result as a string.
|
|||||||
std::string message = fmt::sprintf("The answer is %d", 42);
|
std::string message = fmt::sprintf("The answer is %d", 42);
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
inline std::string sprintf(CStringRef format, ArgList args) {
|
inline std::string sprintf(CStringRef format, ArgList args)
|
||||||
|
{
|
||||||
MemoryWriter w;
|
MemoryWriter w;
|
||||||
printf(w, format, args);
|
printf(w, format, args);
|
||||||
return w.str();
|
return w.str();
|
||||||
}
|
}
|
||||||
FMT_VARIADIC(std::string, sprintf, CStringRef)
|
FMT_VARIADIC(std::string, sprintf, CStringRef)
|
||||||
|
|
||||||
inline std::wstring sprintf(WCStringRef format, ArgList args) {
|
inline std::wstring sprintf(WCStringRef format, ArgList args)
|
||||||
|
{
|
||||||
WMemoryWriter w;
|
WMemoryWriter w;
|
||||||
printf(w, format, args);
|
printf(w, format, args);
|
||||||
return w.str();
|
return w.str();
|
||||||
@ -547,7 +614,8 @@ Prints formatted data to ``stdout``.
|
|||||||
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
||||||
\endrst
|
\endrst
|
||||||
*/
|
*/
|
||||||
inline int printf(CStringRef format, ArgList args) {
|
inline int printf(CStringRef format, ArgList args)
|
||||||
|
{
|
||||||
return fprintf(stdout, format, args);
|
return fprintf(stdout, format, args);
|
||||||
}
|
}
|
||||||
FMT_VARIADIC(int, printf, CStringRef)
|
FMT_VARIADIC(int, printf, CStringRef)
|
||||||
@ -561,7 +629,8 @@ Prints formatted data to the stream *os*.
|
|||||||
fprintf(cerr, "Don't %s!", "panic");
|
fprintf(cerr, "Don't %s!", "panic");
|
||||||
\endrst
|
\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;
|
MemoryWriter w;
|
||||||
printf(w, format_str, args);
|
printf(w, format_str, args);
|
||||||
internal::write(os, w);
|
internal::write(os, w);
|
||||||
|
Loading…
Reference in New Issue
Block a user