From d58cc8a4a80079348cc1c6edbe220dec7568738c Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Sun, 20 Nov 2016 07:42:38 -0800
Subject: [PATCH] Merge BasicPrintfArgFormatter and PrintfArgFormatter

---
 fmt/format.h                  |  8 ++++----
 fmt/printf.h                  | 37 ++++++++---------------------------
 test/custom-formatter-test.cc | 15 +++++++-------
 3 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/fmt/format.h b/fmt/format.h
index e6f01725..4ce0c1b1 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -374,8 +374,8 @@ typedef BasicWriter<wchar_t> WWriter;
 template <typename Char>
 class ArgFormatter;
 
-template <typename Impl, typename Char>
-class BasicPrintfArgFormatter;
+template <typename Char>
+class PrintfArgFormatter;
 
 template <typename Char>
 class basic_format_context;
@@ -2489,8 +2489,8 @@ class BasicWriter {
   template <typename Impl, typename Char_>
   friend class internal::ArgFormatterBase;
 
-  template <typename Impl, typename Char_>
-  friend class BasicPrintfArgFormatter;
+  template <typename Char_>
+  friend class PrintfArgFormatter;
 
  protected:
   /**
diff --git a/fmt/printf.h b/fmt/printf.h
index c8ae99b2..f0adf71c 100644
--- a/fmt/printf.h
+++ b/fmt/printf.h
@@ -204,30 +204,19 @@ class WidthHandler {
 
 /**
   \rst
-  A ``printf`` argument formatter based on the `curiously recurring template
-  pattern <http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern>`_.
-
-  To use `~fmt::BasicPrintfArgFormatter` define a subclass that implements some
-  or all of the visit methods with the same signatures as the methods in
-  `~fmt::ArgVisitor`, for example, `~fmt::ArgVisitor::visit_int()`.
-  Pass the subclass as the *Impl* template parameter. When a formatting
-  function processes an argument, it will dispatch to a visit method
-  specific to the argument type. For example, if the argument type is
-  ``double`` then the `~fmt::ArgVisitor::visit_double()` method of a subclass
-  will be called. If the subclass doesn't contain a method with this signature,
-  then a corresponding method of `~fmt::BasicPrintfArgFormatter` or its
-  superclass will be called.
+  The ``printf`` argument formatter.
   \endrst
  */
-template <typename Impl, typename Char>
-class BasicPrintfArgFormatter : public internal::ArgFormatterBase<Impl, Char> {
+template <typename Char>
+class PrintfArgFormatter :
+    public internal::ArgFormatterBase<PrintfArgFormatter<Char>, Char> {
  private:
   void write_null_pointer() {
     this->spec().type_ = 0;
     this->write("(nil)");
   }
 
-  typedef internal::ArgFormatterBase<Impl, Char> Base;
+  typedef internal::ArgFormatterBase<PrintfArgFormatter<Char>, Char> Base;
 
  public:
   /**
@@ -237,8 +226,8 @@ class BasicPrintfArgFormatter : public internal::ArgFormatterBase<Impl, Char> {
     specifier information for standard argument types.
     \endrst
    */
-  BasicPrintfArgFormatter(BasicWriter<Char> &writer, FormatSpec &spec)
-  : internal::ArgFormatterBase<Impl, Char>(writer, spec) {}
+  PrintfArgFormatter(BasicWriter<Char> &writer, FormatSpec &spec)
+  : internal::ArgFormatterBase<PrintfArgFormatter<Char>, Char>(writer, spec) {}
 
   using Base::operator();
 
@@ -246,7 +235,7 @@ class BasicPrintfArgFormatter : public internal::ArgFormatterBase<Impl, Char> {
   void operator()(bool value) {
     FormatSpec &fmt_spec = this->spec();
     if (fmt_spec.type_ != 's')
-      return this->visit_any_int(value);
+      return (*this)(value ? 1 : 0);
     fmt_spec.type_ = 0;
     this->write(value);
   }
@@ -301,16 +290,6 @@ class BasicPrintfArgFormatter : public internal::ArgFormatterBase<Impl, Char> {
   }
 };
 
-/** The default printf argument formatter. */
-template <typename Char>
-class PrintfArgFormatter
-    : public BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char> {
- public:
-  /** Constructs an argument formatter object. */
-  PrintfArgFormatter(BasicWriter<Char> &w, FormatSpec &s)
-  : BasicPrintfArgFormatter<PrintfArgFormatter<Char>, Char>(w, s) {}
-};
-
 /** This template formats data and writes the output to a writer. */
 template <typename Char,
           typename ArgFormatter = PrintfArgFormatter<Char> >
diff --git a/test/custom-formatter-test.cc b/test/custom-formatter-test.cc
index 83648aba..779c1ea2 100644
--- a/test/custom-formatter-test.cc
+++ b/test/custom-formatter-test.cc
@@ -10,7 +10,7 @@
 #include "fmt/printf.h"
 #include "gtest-extra.h"
 
-using fmt::BasicPrintfArgFormatter;
+using fmt::PrintfArgFormatter;
 
 // A custom argument formatter that doesn't print `-` for floating-point values
 // rounded to 0.
@@ -30,18 +30,17 @@ class CustomArgFormatter
 
 // A custom argument formatter that doesn't print `-` for floating-point values
 // rounded to 0.
-class CustomPrintfArgFormatter :
-    public BasicPrintfArgFormatter<CustomPrintfArgFormatter, char> {
+class CustomPrintfArgFormatter : public PrintfArgFormatter<char> {
  public:
-  typedef BasicPrintfArgFormatter<CustomPrintfArgFormatter, char> Base;
-
   CustomPrintfArgFormatter(fmt::BasicWriter<char> &w, fmt::FormatSpec &spec)
-  : Base(w, spec) {}
+  : PrintfArgFormatter<char>(w, spec) {}
 
-  void visit_double(double value) {
+  using PrintfArgFormatter<char>::operator();
+
+  void operator()(double value) {
     if (round(value * pow(10, spec().precision())) == 0)
       value = 0;
-    Base::visit_double(value);
+    PrintfArgFormatter<char>::operator()(value);
   }
 };