From 971fb584c3ea548c12dcfa813b0bafb94e1c0fde Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Sat, 9 Dec 2017 08:15:13 -0800
Subject: [PATCH] Allow mixing named and automatic arguments

---
 include/fmt/format.h | 10 ++++------
 test/format-test.cc  |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/fmt/format.h b/include/fmt/format.h
index 7e5b0464..93c0ed1a 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -3001,12 +3001,10 @@ struct dynamic_formatter {
 template <typename Char>
 inline typename basic_context<Char>::format_arg
   basic_context<Char>::get_arg(basic_string_view<Char> name) {
-  if (this->check_no_auto_index()) {
-    map_.init(this->args());
-    if (const format_arg *arg = map_.find(name))
-      return *arg;
-    this->on_error("argument not found");
-  }
+  map_.init(this->args());
+  if (const format_arg *arg = map_.find(name))
+    return *arg;
+  this->on_error("argument not found");
   return format_arg();
 }
 
diff --git a/test/format-test.cc b/test/format-test.cc
index 5712b46f..916dcc47 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -488,6 +488,7 @@ TEST(FormatterTest, NamedArg) {
   EXPECT_THROW_MSG(format("{a}"), format_error, "argument not found");
   EXPECT_EQ(" -42", format("{0:{width}}", -42, fmt::arg("width", 4)));
   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) {