From 9144a8fbbe8ad5a761fccee06b6399a642c73481 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Wed, 16 Jul 2014 07:59:45 -0700
Subject: [PATCH] PrintfParser -> PrintfFormatter.

---
 format.cc | 12 ++++++------
 format.h  |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/format.cc b/format.cc
index 9e479fc4..11233006 100644
--- a/format.cc
+++ b/format.cc
@@ -707,7 +707,7 @@ void fmt::BasicFormatter<Char>::CheckSign(
 }
 
 template <typename Char>
-void fmt::internal::PrintfParser<Char>::ParseFlags(
+void fmt::internal::PrintfFormatter<Char>::ParseFlags(
     FormatSpec &spec, const Char *&s) {
   for (;;) {
     switch (*s++) {
@@ -734,7 +734,7 @@ void fmt::internal::PrintfParser<Char>::ParseFlags(
 }
 
 template <typename Char>
-unsigned fmt::internal::PrintfParser<Char>::ParseHeader(
+unsigned fmt::internal::PrintfFormatter<Char>::ParseHeader(
   const Char *&s, FormatSpec &spec, const char *&error) {
   unsigned arg_index = UINT_MAX;
   Char c = *s;
@@ -769,7 +769,7 @@ unsigned fmt::internal::PrintfParser<Char>::ParseHeader(
 
 // TODO: move to a base class that doesn't depend on template argument
 template <typename Char>
-const Arg &fmt::internal::PrintfParser<Char>::HandleArgIndex(
+const Arg &fmt::internal::PrintfFormatter<Char>::HandleArgIndex(
     unsigned arg_index, const char *&error) {
   if (arg_index != UINT_MAX) {
     if (next_arg_index_ <= 0) {
@@ -791,7 +791,7 @@ const Arg &fmt::internal::PrintfParser<Char>::HandleArgIndex(
 }
 
 template <typename Char>
-void fmt::internal::PrintfParser<Char>::Format(
+void fmt::internal::PrintfFormatter<Char>::Format(
     BasicWriter<Char> &writer, BasicStringRef<Char> format,
     const ArgList &args) {
   const Char *start = format.c_str();
@@ -1166,7 +1166,7 @@ template fmt::BasicWriter<char>::CharPtr
 template void fmt::BasicFormatter<char>::Format(
   BasicStringRef<char> format, const ArgList &args);
 
-template void fmt::internal::PrintfParser<char>::Format(
+template void fmt::internal::PrintfFormatter<char>::Format(
   BasicWriter<char> &writer, BasicStringRef<char> format, const ArgList &args);
 
 // Explicit instantiations for wchar_t.
@@ -1178,7 +1178,7 @@ template fmt::BasicWriter<wchar_t>::CharPtr
 template void fmt::BasicFormatter<wchar_t>::Format(
     BasicStringRef<wchar_t> format, const ArgList &args);
 
-template void fmt::internal::PrintfParser<wchar_t>::Format(
+template void fmt::internal::PrintfFormatter<wchar_t>::Format(
     BasicWriter<wchar_t> &writer, BasicStringRef<wchar_t> format,
     const ArgList &args);
 
diff --git a/format.h b/format.h
index d10c2a3c..66f6a32a 100644
--- a/format.h
+++ b/format.h
@@ -871,9 +871,9 @@ public:
 };
 
 namespace internal {
-// Printf format string parser.
+// A printf formatter.
 template <typename Char>
-class PrintfParser {
+class PrintfFormatter {
  private:
   ArgList args_;
   int next_arg_index_;
@@ -1351,7 +1351,7 @@ class BasicWriter {
 
   friend class internal::ArgFormatter<Char>;
   friend class BasicFormatter<Char>;
-  friend class internal::PrintfParser<Char>;
+  friend class internal::PrintfFormatter<Char>;
 
  public:
   /**
@@ -1800,7 +1800,7 @@ void print(std::ostream &os, StringRef format, const ArgList &args);
 template <typename Char>
 void printf(BasicWriter<Char> &w,
     BasicStringRef<Char> format, const ArgList &args) {
-  internal::PrintfParser<Char>().Format(w, format, args);
+  internal::PrintfFormatter<Char>().Format(w, format, args);
 }
 
 inline std::string sprintf(StringRef format, const ArgList &args) {