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

Allow mixing named and automatic arguments

Browse Source
This commit is contained in:
Victor Zverovich 2017-12-09 08:15:13 -08:00
parent 7cea163809
commit 971fb584c3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/fmt/format.h
View File

@ -3001,12 +3001,10 @@ struct dynamic_formatter {
template <typename Char> template <typename Char>
inline typename basic_context<Char>::format_arg inline typename basic_context<Char>::format_arg
basic_context<Char>::get_arg(basic_string_view<Char> name) { basic_context<Char>::get_arg(basic_string_view<Char> name) {
if (this->check_no_auto_index()) { map_.init(this->args());
map_.init(this->args()); if (const format_arg *arg = map_.find(name))
if (const format_arg *arg = map_.find(name)) return *arg;
return *arg; this->on_error("argument not found");
this->on_error("argument not found");
}
return format_arg(); return format_arg();
} }

1
test/format-test.cc
View File

@ -488,6 +488,7 @@ TEST(FormatterTest, NamedArg) {
EXPECT_THROW_MSG(format("{a}"), format_error, "argument not found"); EXPECT_THROW_MSG(format("{a}"), format_error, "argument not found");
EXPECT_EQ(" -42", format("{0:{width}}", -42, fmt::arg("width", 4))); EXPECT_EQ(" -42", format("{0:{width}}", -42, fmt::arg("width", 4)));
EXPECT_EQ("st", format("{0:.{precision}}", "str", fmt::arg("precision", 2))); EXPECT_EQ("st", format("{0:.{precision}}", "str", fmt::arg("precision", 2)));
EXPECT_EQ("1 2", format("{} {two}", 1, fmt::arg("two", 2)));
} }
TEST(FormatterTest, AutoArgIndex) { TEST(FormatterTest, AutoArgIndex) {