commit 6822466aa390523d588d4ee475be98bb90042e25
author Victor Zverovich <victor.zverovich@gmail.com> Sat Jan 20 06:26:22 2018 -0800
committer Victor Zverovich <victor.zverovich@gmail.com> Sat Jan 20 06:26:22 2018 -0800
tree ffb1c59b8f24f41e2edb9c48e77446937c766f92
parent c719d94473fa97ce48213bb321b25437c7f5a661

Handle nested braces in join (#638)

fmt/format.h

diff --git a/fmt/format.h b/fmt/format.h
index 267ae6c..c6ee44d 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -4111,10 +4111,14 @@
 void format_arg(fmt::BasicFormatter<Char, ArgFormatter> &f,
     const Char *&format_str, const ArgJoin<Char, It>& e) {
   const Char* end = format_str;
-  if (*end == ':')
+  int brace_level = 1;
+  while (*end) {
+    if (*end == '}' && --brace_level == 0)
+      break;
+    if (*end == '{')
+      ++brace_level;
     ++end;
-  while (*end && *end != '}')
-    ++end;
+  }
   if (*end != '}')
     FMT_THROW(FormatError("missing '}' in format string"));
 

test/format-test.cc

diff --git a/test/format-test.cc b/test/format-test.cc
index 3f2ac04..c836541 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -1611,13 +1611,15 @@
   v2.push_back(1.2f);
   v2.push_back(3.4f);
 
-  EXPECT_EQ("(1, 2, 3)", format("({})", join(v1 + 0, v1 + 3, ", ")));
-  EXPECT_EQ("(1)", format("({})", join(v1 + 0, v1 + 1, ", ")));
-  EXPECT_EQ("()", format("({})", join(v1 + 0, v1 + 0, ", ")));
-  EXPECT_EQ("(001, 002, 003)", format("({:03})", join(v1 + 0, v1 + 3, ", ")));
-  EXPECT_EQ("(+01.20, +03.40)", format("({:+06.2f})", join(v2.begin(), v2.end(), ", ")));
+  EXPECT_EQ("(1, 2, 3)", format("({})", join(v1, v1 + 3, ", ")));
+  EXPECT_EQ("(1)", format("({})", join(v1, v1 + 1, ", ")));
+  EXPECT_EQ("()", format("({})", join(v1, v1, ", ")));
+  EXPECT_EQ("(001, 002, 003)", format("({:03})", join(v1, v1 + 3, ", ")));
+  EXPECT_EQ("(+01.20, +03.40)",
+            format("({:+06.2f})", join(v2.begin(), v2.end(), ", ")));
 
-  EXPECT_EQ(L"(1, 2, 3)", format(L"({})", join(v1 + 0, v1 + 3, L", ")));
+  EXPECT_EQ(L"(1, 2, 3)", format(L"({})", join(v1, v1 + 3, L", ")));
+  EXPECT_EQ("1, 2, 3", format("{0:{1}}", join(v1, v1 + 3, ", "), 1)); 
 
 #if FMT_HAS_GXX_CXX11
   EXPECT_EQ("(1, 2, 3)", format("({})", join(v1, ", ")));