AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-09 21:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

args -> format_args

Browse Source
This commit is contained in:
Victor Zverovich 2017-12-03 07:32:04 -08:00
parent 10e70a06c9
commit 81bd9e8ea3
11 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/fmt/format.cc
View File

@ -219,7 +219,7 @@ void report_error(FormatFunc func, int error_code,
} // namespace
FMT_FUNC void system_error::init(
int err_code, string_view format_str, args args) {
int err_code, string_view format_str, format_args args) {
error_code_ = err_code;
memory_buffer buffer;
format_system_error(buffer, err_code, vformat(format_str, args));
@ -412,17 +412,17 @@ FMT_FUNC void report_windows_error(
}
#endif
FMT_FUNC void vprint(std::FILE *f, string_view format_str, args args) {
FMT_FUNC void vprint(std::FILE *f, string_view format_str, format_args args) {
memory_buffer buffer;
vformat_to(buffer, format_str, args);
std::fwrite(buffer.data(), 1, buffer.size(), f);
}
FMT_FUNC void vprint(string_view format_str, args args) {
FMT_FUNC void vprint(string_view format_str, format_args args) {
vprint(stdout, format_str, args);
}
FMT_FUNC void vprint_colored(Color c, string_view format, args args) {
FMT_FUNC void vprint_colored(Color c, string_view format, format_args args) {
char escape[] = "\x1b[30m";
escape[3] = static_cast<char>('0' + c);
std::fputs(escape, stdout);
@ -438,7 +438,7 @@ template struct internal::basic_data<void>;
template void basic_fixed_buffer<char>::grow(std::size_t);
template void internal::arg_map<context>::init(const args &args);
template void internal::arg_map<context>::init(const format_args &args);
template int internal::char_traits<char>::format_float(
char *buffer, std::size_t size, const char *format,
@ -454,7 +454,7 @@ template class basic_context<wchar_t>;
template void basic_fixed_buffer<wchar_t>::grow(std::size_t);
template void internal::arg_map<wcontext>::init(const wargs &args);
template void internal::arg_map<wcontext>::init(const wformat_args &args);
template int internal::char_traits<wchar_t>::format_float(
wchar_t *buffer, std::size_t size, const wchar_t *format,

68
include/fmt/format.h
View File

@ -1129,10 +1129,11 @@ struct string_value {
std::size_t size;
};
template <typename Char>
template <typename Context>
struct custom_value {
typedef void (*format_func)(
basic_buffer<Char> &buffer, const void *arg, void *ctx);
basic_buffer<typename Context::char_type> &buffer,
const void *arg, Context &ctx);
const void *value;
format_func format;
@ -1226,7 +1227,7 @@ class value {
string_value<char_type> string;
string_value<signed char> sstring;
string_value<unsigned char> ustring;
custom_value<char_type> custom;
custom_value<Context> custom;
};
constexpr value() : int_value(0) {}
@ -1343,8 +1344,7 @@ class value {
// Formats an argument of a custom type, such as a user-defined class.
template <typename T>
static void format_custom_arg(
basic_buffer<char_type> &buffer, const void *arg, void *context) {
Context &ctx = *static_cast<Context*>(context);
basic_buffer<char_type> &buffer, const void *arg, Context &ctx) {
// Get the formatter type through the context to allow different contexts
// have different extension points, e.g. `formatter<T>` for `format` and
// `printf_formatter<T>` for `printf`.
@ -1365,7 +1365,7 @@ constexpr basic_arg<Context> make_arg(const T &value);
struct monostate {};
template <typename Context>
class basic_args;
class basic_format_args;
// A formatting argument. It is a trivially copyable/constructible type to
// allow storage in basic_memory_buffer.
@ -1382,7 +1382,7 @@ class basic_arg {
friend constexpr typename std::result_of<Visitor(int)>::type
visit(Visitor &&vis, basic_arg<Ctx> arg);
friend class basic_args<Context>;
friend class basic_format_args<Context>;
friend class internal::arg_map<Context>;
using char_type = typename Context::char_type;
@ -1390,15 +1390,15 @@ class basic_arg {
public:
class handle {
public:
explicit handle(internal::custom_value<char_type> custom)
explicit handle(internal::custom_value<Context> custom)
: custom_(custom) {}
void format(basic_buffer<char_type> &buf, Context &ctx) {
custom_.format(buf, custom_.value, &ctx);
custom_.format(buf, custom_.value, ctx);
}
private:
internal::custom_value<char_type> custom_;
internal::custom_value<Context> custom_;
};
constexpr basic_arg() : type_(internal::NONE) {}
@ -1548,7 +1548,7 @@ inline arg_store<context, Args...> make_args(const Args & ... args) {
/** Formatting arguments. */
template <typename Context>
class basic_args {
class basic_format_args {
public:
typedef unsigned size_type;
typedef basic_arg<Context> format_arg;
@ -1597,10 +1597,10 @@ class basic_args {
}
public:
basic_args() : types_(0) {}
basic_format_args() : types_(0) {}
template <typename... Args>
basic_args(const arg_store<Context, Args...> &store)
basic_format_args(const arg_store<Context, Args...> &store)
: types_(store.TYPES) {
set_data(store.data());
}
@ -1613,8 +1613,8 @@ class basic_args {
}
};
typedef basic_args<context> args;
typedef basic_args<wcontext> wargs;
typedef basic_format_args<context> format_args;
typedef basic_format_args<wcontext> wformat_args;
enum alignment {
ALIGN_DEFAULT, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_NUMERIC
@ -1924,7 +1924,7 @@ class arg_map {
MapType map_;
public:
void init(const basic_args<Context> &args);
void init(const basic_format_args<Context> &args);
const basic_arg<Context>
*find(const fmt::basic_string_view<Char> &name) const {
@ -1939,7 +1939,7 @@ class arg_map {
};
template <typename Context>
void arg_map<Context>::init(const basic_args<Context> &args) {
void arg_map<Context>::init(const basic_format_args<Context> &args) {
if (!map_.empty())
return;
typedef internal::named_arg<Context> NamedArg;
@ -2102,16 +2102,17 @@ class arg_formatter_base {
template <typename Char, typename Context>
class context_base : public basic_parse_context<Char>{
private:
basic_args<Context> args_;
basic_format_args<Context> args_;
protected:
typedef basic_arg<Context> format_arg;
context_base(basic_string_view<Char> format_str, basic_args<Context> args)
context_base(basic_string_view<Char> format_str,
basic_format_args<Context> args)
: basic_parse_context<Char>(format_str), args_(args) {}
~context_base() {}
basic_args<Context> args() const { return args_; }
basic_format_args<Context> args() const { return args_; }
// Returns the argument with specified index.
format_arg do_get_arg(unsigned arg_id) {
@ -2843,7 +2844,7 @@ class basic_context :
\endrst
*/
basic_context(
basic_string_view<Char> format_str, basic_args<basic_context> args)
basic_string_view<Char> format_str, basic_format_args<basic_context> args)
: Base(format_str, args) {}
format_arg next_arg() { return this->do_get_arg(this->next_arg_id()); }
@ -2860,7 +2861,7 @@ class basic_context :
*/
class system_error : public std::runtime_error {
private:
void init(int err_code, string_view format_str, args args);
void init(int err_code, string_view format_str, format_args args);
protected:
int error_code_;
@ -3553,7 +3554,7 @@ FMT_API void report_system_error(int error_code,
/** A Windows error. */
class windows_error : public system_error {
private:
FMT_API void init(int error_code, string_view format_str, args args);
FMT_API void init(int error_code, string_view format_str, format_args args);
public:
/**
@ -3599,7 +3600,7 @@ FMT_API void report_windows_error(int error_code,
enum Color { BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE };
FMT_API void vprint_colored(Color c, string_view format, args args);
FMT_API void vprint_colored(Color c, string_view format, format_args args);
/**
Formats a string and prints it to stdout using ANSI escape sequences
@ -3615,13 +3616,14 @@ inline void print_colored(Color c, string_view format_str,
template <typename ArgFormatter, typename Char, typename Context>
void vformat_to(basic_buffer<Char> &buffer, basic_string_view<Char> format_str,
basic_args<Context> args);
basic_format_args<Context> args);
inline void vformat_to(buffer &buf, string_view format_str, args args) {
inline void vformat_to(buffer &buf, string_view format_str, format_args args) {
vformat_to<arg_formatter<char>>(buf, format_str, args);
}
inline void vformat_to(wbuffer &buf, wstring_view format_str, wargs args) {
inline void vformat_to(wbuffer &buf, wstring_view format_str,
wformat_args args) {
vformat_to<arg_formatter<wchar_t>>(buf, format_str, args);
}
@ -3637,7 +3639,7 @@ inline void format_to(wbuffer &buf, wstring_view format_str,
vformat_to(buf, format_str, make_args<wcontext>(args...));
}
inline std::string vformat(string_view format_str, args args) {
inline std::string vformat(string_view format_str, format_args args) {
memory_buffer buffer;
vformat_to(buffer, format_str, args);
return to_string(buffer);
@ -3668,7 +3670,7 @@ inline typename std::enable_if<
return vformat(format_str.value(), make_args(args...));
}
inline std::wstring vformat(wstring_view format_str, wargs args) {
inline std::wstring vformat(wstring_view format_str, wformat_args args) {
wmemory_buffer buffer;
vformat_to(buffer, format_str, args);
return to_string(buffer);
@ -3679,7 +3681,7 @@ inline std::wstring format(wstring_view format_str, const Args & ... args) {
return vformat(format_str, make_args<wcontext>(args...));
}
FMT_API void vprint(std::FILE *f, string_view format_str, args args);
FMT_API void vprint(std::FILE *f, string_view format_str, format_args args);
/**
\rst
@ -3696,7 +3698,7 @@ inline void print(std::FILE *f, string_view format_str,
vprint(f, format_str, make_args(args...));
}
FMT_API void vprint(string_view format_str, args args);
FMT_API void vprint(string_view format_str, format_args args);
/**
\rst
@ -4004,12 +4006,12 @@ inline typename basic_context<Char>::format_arg
/** Formats arguments and writes the output to the buffer. */
template <typename ArgFormatter, typename Char, typename Context>
void vformat_to(basic_buffer<Char> &buffer, basic_string_view<Char> format_str,
basic_args<Context> args) {
basic_format_args<Context> args) {
using iterator = internal::null_terminating_iterator<Char>;
struct handler : internal::error_handler {
handler(basic_buffer<Char> &b, basic_string_view<Char> str,
basic_args<Context> format_args)
basic_format_args<Context> format_args)
: buffer(b), context(str, format_args) {}
void on_text(iterator begin, iterator end) {

3
include/fmt/ostream.cc
View File

@ -27,7 +27,8 @@ FMT_FUNC void write(std::ostream &os, buffer &buf) {
}
}
FMT_FUNC void vprint(std::ostream &os, string_view format_str, args args) {
FMT_FUNC void vprint(std::ostream &os, string_view format_str,
format_args args) {
memory_buffer buffer;
vformat_to(buffer, format_str, args);
internal::write(os, buffer);

2
include/fmt/ostream.h
View File

@ -100,7 +100,7 @@ struct formatter<T, Char,
}
};
FMT_API void vprint(std::ostream &os, string_view format_str, args args);
FMT_API void vprint(std::ostream &os, string_view format_str, format_args args);
/**
\rst

8
include/fmt/posix.h
View File

@ -214,13 +214,13 @@ public:
// of MinGW that define fileno as a macro.
int (fileno)() const;
void vprint(string_view format_str, args format_args) {
fmt::vprint(file_, format_str, format_args);
void vprint(string_view format_str, format_args args) {
fmt::vprint(file_, format_str, args);
}
template <typename... Args>
inline void print(string_view format_str, const Args & ... format_args) {
vprint(format_str, make_args(format_args...));
inline void print(string_view format_str, const Args & ... args) {
vprint(format_str, make_args(args...));
}
};

3
include/fmt/printf.cc
View File

@ -3,7 +3,8 @@
namespace fmt {
template <typename Char>
void printf(basic_writer<Char> &w, basic_string_view<Char> format, args args);
void printf(basic_writer<Char> &w, basic_string_view<Char> format,
format_args args);
FMT_FUNC int vfprintf(std::FILE *f, string_view format, printf_args args) {
memory_buffer buffer;

10
include/fmt/printf.h
View File

@ -330,8 +330,8 @@ class printf_context :
appropriate lifetimes.
\endrst
*/
printf_context(
basic_string_view<Char> format_str, basic_args<printf_context> args)
printf_context(basic_string_view<Char> format_str,
basic_format_args<printf_context> args)
: Base(format_str, args) {}
using Base::parse_context;
@ -516,11 +516,11 @@ void printf_context<Char, AF>::format(basic_buffer<Char> &buffer) {
template <typename Char>
void printf(basic_buffer<Char> &buf, basic_string_view<Char> format,
basic_args<printf_context<Char>> args) {
basic_format_args<printf_context<Char>> args) {
printf_context<Char>(format, args).format(buf);
}
typedef basic_args<printf_context<char>> printf_args;
typedef basic_format_args<printf_context<char>> printf_args;
inline std::string vsprintf(string_view format, printf_args args) {
memory_buffer buffer;
@ -543,7 +543,7 @@ inline std::string sprintf(string_view format_str, const Args & ... args) {
}
inline std::wstring vsprintf(
wstring_view format, basic_args<printf_context<wchar_t>> args) {
wstring_view format, basic_format_args<printf_context<wchar_t>> args) {
wmemory_buffer buffer;
printf(buffer, format, args);
return to_string(buffer);

2
test/custom-formatter-test.cc
View File

@ -29,7 +29,7 @@ class CustomArgFormatter : public fmt::arg_formatter<char> {
}
};
std::string custom_vformat(fmt::string_view format_str, fmt::args args) {
std::string custom_vformat(fmt::string_view format_str, fmt::format_args args) {
fmt::memory_buffer buffer;
// Pass custom argument formatter as a template arg to vwrite.
fmt::vformat_to<CustomArgFormatter>(buffer, format_str, args);

4
test/format-test.cc
View File

@ -1425,7 +1425,7 @@ TEST(StrTest, Convert) {
EXPECT_EQ("2012-12-9", s);
}
std::string vformat_message(int id, const char *format, fmt::args args) {
std::string vformat_message(int id, const char *format, fmt::format_args args) {
fmt::memory_buffer buffer;
format_to(buffer, "[{}] ", id);
vformat_to(buffer, format, args);
@ -1512,7 +1512,7 @@ class MockArgFormatter : public fmt::internal::arg_formatter_base<char> {
void operator()(fmt::basic_arg<fmt::context>::handle) {}
};
void custom_vformat(fmt::string_view format_str, fmt::args args) {
void custom_vformat(fmt::string_view format_str, fmt::format_args args) {
fmt::memory_buffer buffer;
fmt::vformat_to<MockArgFormatter>(buffer, format_str, args);
}

2
test/ostream-test.cc
View File

@ -65,7 +65,7 @@ struct TestArgFormatter : fmt::arg_formatter<char> {
TEST(OStreamTest, CustomArg) {
fmt::memory_buffer buffer;
fmt::context ctx("", fmt::args());
fmt::context ctx("", fmt::format_args());
fmt::format_specs spec;
TestArgFormatter af(buffer, ctx, spec);
visit(af, fmt::internal::make_arg<fmt::context>(TestEnum()));

6
test/util-test.cc
View File

@ -427,7 +427,7 @@ TEST(UtilTest, Increment) {
}
TEST(UtilTest, FormatArgs) {
fmt::args args;
fmt::format_args args;
EXPECT_FALSE(args[1]);
}
@ -456,7 +456,7 @@ TEST(UtilTest, MakeValueWithCustomFormatter) {
fmt::internal::value<CustomContext> arg(t);
CustomContext ctx = {false};
fmt::memory_buffer buffer;
arg.custom.format(buffer, &t, &ctx);
arg.custom.format(buffer, &t, ctx);
EXPECT_TRUE(ctx.called);
}
@ -595,7 +595,7 @@ TEST(UtilTest, CustomArg) {
testing::StrictMock<visitor> v;
EXPECT_CALL(v, visit(_)).WillOnce(testing::Invoke([&](handle h) {
fmt::memory_buffer buffer;
fmt::context ctx("", fmt::args());
fmt::context ctx("", fmt::format_args());
h.format(buffer, ctx);
EXPECT_EQ("test", std::string(buffer.data(), buffer.size()));
return visitor::Result();