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

Fix name parsing

Browse Source
This commit is contained in:
jamboree 2015-06-11 12:03:22 +08:00
parent 7487bde587
commit 3c99ed4498
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format.cc
View File

@ -762,7 +762,7 @@ inline Arg fmt::BasicFormatter<Char>::parse_arg_name(const Char *&s) {
Char c; Char c;
do { do {
c = *++s; c = *++s;
} while (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9')); } while (is_name_start(c) || ('0' <= c && c <= '9'));
const char *error = 0; const char *error = 0;
Arg arg = get_arg(fmt::BasicStringRef<Char>(start, s - start), error); Arg arg = get_arg(fmt::BasicStringRef<Char>(start, s - start), error);
if (error) if (error)

3
test/format-test.cc
View File

@ -610,8 +610,9 @@ TEST(FormatterTest, ManyArgs) {
#endif #endif
TEST(FormatterTest, NamedArg) { TEST(FormatterTest, NamedArg) {
EXPECT_EQ("1/a/A", format("{_1}/{a_}/{A_}", fmt::arg("a_", 'a'), fmt::arg("A_", "A"), fmt::arg("_1", 1)));
char a = 'A', b = 'B', c = 'C'; char a = 'A', b = 'B', c = 'C';
EXPECT_EQ("BBAACC", format("{1}{b}{0}{a}{2}{c}", FMT_CAPTURE(a, b, c))); EXPECT_EQ("BB/AA/CC", format("{1}{b}/{0}{a}/{2}{c}", FMT_CAPTURE(a, b, c)));
EXPECT_EQ(" A", format("{a:>2}", FMT_CAPTURE(a))); EXPECT_EQ(" A", format("{a:>2}", FMT_CAPTURE(a)));
EXPECT_THROW_MSG(format("{a+}", FMT_CAPTURE(a)), FormatError, "missing '}' in format string"); EXPECT_THROW_MSG(format("{a+}", FMT_CAPTURE(a)), FormatError, "missing '}' in format string");
EXPECT_THROW_MSG(format("{a}"), FormatError, "argument not found"); EXPECT_THROW_MSG(format("{a}"), FormatError, "argument not found");