External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add missing make_printf_args and make_wprintf_args to printf.h

Browse Source 
add minimal test for make_printf_args and make_wprintf_args to printf-test.cc
This commit is contained in:
Thomas Novotny 2018-11-18 21:44:09 +01:00
parent 6c95fb3562
commit b643520c52
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/fmt/printf.h
View File

@ -581,6 +581,33 @@ struct printf_context {
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;
typedef printf_context<internal::buffer>::type printf_char_context;
typedef printf_context<internal::wbuffer>::type printf_wchar_context;
/**
\rst
Constructs an `~fmt::format_arg_store` object that contains references to
arguments and can be implicitly converted to `~fmt::printf_args`. `Context`
can be omitted in which case it defaults to `~fmt::printf_char_context`.
\endrst
*/
template<typename Context=printf_char_context, typename... Args>
inline format_arg_store<Context, Args...>
make_printf_args(const Args &... args) { return {args...}; }
/**
\rst
Constructs an `~fmt::format_arg_store` object that contains references to
arguments and can be implicitly converted to `~fmt::wprintf_args`. `Context`
can be omitted in which case it defaults to `~fmt::printf_wchar_context`.
\endrst
*/
template<typename Context = printf_wchar_context, typename... Args>
inline format_arg_store<Context, Args...>
make_wprintf_args(const Args &... args) { return {args...}; }
template <typename S, typename Char = FMT_CHAR(S)> template <typename S, typename Char = FMT_CHAR(S)>
inline std::basic_string<Char> inline std::basic_string<Char>
vsprintf(const S &format, vsprintf(const S &format,

16
test/printf-test.cc
View File

@ -518,3 +518,19 @@ void check_format_string_regression(fmt::string_view s, const Args&... args) {
TEST(PrintfTest, CheckFormatStringRegression) { TEST(PrintfTest, CheckFormatStringRegression) {
check_format_string_regression("%c%s", 'x', ""); check_format_string_regression("%c%s", 'x', "");
} }
TEST(PrintfTest, VSPrintfMessageExample) {
EXPECT_EQ(
"[42] something happened",
fmt::vsprintf(
"[%d] %s happened", fmt::make_printf_args( 42, "something" ) ) );
}
TEST(PrintfTest, VSPrintfWMessageExample) {
EXPECT_EQ(
L"[42] something happened",
fmt::vsprintf(
L"[%d] %s happened", fmt::make_wprintf_args( 42, L"something" ) ) );
}