[format.arg] Don't use placeholder name for private member char-type.

Author: zygoloid

source/utilities.tex

@@ -20957,27 +20957,27 @@
     class handle;
 
   private:
-    using @\placeholder{char-type}@ = typename Context::char_type; @\itcorr[-1]@                             // \expos
+    using char_type = typename Context::char_type;                              // \expos
 
-    variant<monostate, bool, @\placeholdernc{char-type}@,
+    variant<monostate, bool, char_type,
             int, unsigned int, long long int, unsigned long long int,
             float, double, long double,
-            const @\placeholder{char-type}@*, basic_string_view<@\placeholder{char-type}@>,
+            const char_type*, basic_string_view<char_type>,
             const void*, handle> value;                                         // \expos
 
     template<class T> explicit basic_format_arg(const T& v) noexcept;           // \expos
     explicit basic_format_arg(float n) noexcept;                                // \expos
     explicit basic_format_arg(double n) noexcept;                               // \expos
     explicit basic_format_arg(long double n) noexcept;                          // \expos
-    explicit basic_format_arg(const @\placeholder{char-type}@* s);                              // \expos
+    explicit basic_format_arg(const char_type* s);                              // \expos
 
     template<class traits>
       explicit basic_format_arg(
-        basic_string_view<@\placeholdernc{char-type}@, traits> s) noexcept;                       // \expos
+        basic_string_view<char_type, traits> s) noexcept;                       // \expos
 
     template<class traits, class Allocator>
       explicit basic_format_arg(
-        const basic_string<@\placeholdernc{char-type}@, traits, Allocator>& s) noexcept;          // \expos
+        const basic_string<char_type, traits, Allocator>& s) noexcept;          // \expos
 
     explicit basic_format_arg(nullptr_t) noexcept;                              // \expos
 
@@ -21043,10 +21043,10 @@
 \effects
 \begin{itemize}
 \item
-if \tcode{T} is \tcode{bool} or \tcode{\placeholdernc{char-type}},
+if \tcode{T} is \tcode{bool} or \tcode{char_type},
 initializes \tcode{value} with \tcode{v}; otherwise,
 \item
-if \tcode{T} is \tcode{char} and \tcode{\placeholder{char-type}} is
+if \tcode{T} is \tcode{char} and \tcode{char_type} is
 \tcode{wchar_t}, initializes \tcode{value} with
 \tcode{static_cast<wchar_t>(v)}; otherwise,
 \item
@@ -21086,7 +21086,7 @@
 \end{itemdescr}
 
 \begin{itemdecl}
-explicit basic_format_arg(const @\placeholder{char-type}@* s);
+explicit basic_format_arg(const char_type* s);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -21100,7 +21100,7 @@
 
 \begin{itemdecl}
 template<class traits>
-  explicit basic_format_arg(basic_string_view<@\placeholdernc{char-type}@, traits> s) noexcept;
+  explicit basic_format_arg(basic_string_view<char_type, traits> s) noexcept;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -21111,13 +21111,13 @@
 \begin{itemdecl}
 template<class traits, class Allocator>
   explicit basic_format_arg(
-    const basic_string<@\placeholdernc{char-type}@, traits, Allocator>& s) noexcept;
+    const basic_string<char_type, traits, Allocator>& s) noexcept;
 \end{itemdecl}
 
 \begin{itemdescr}
 \pnum
 \effects Initializes \tcode{value} with
-\tcode{basic_string_view<\placeholder{char-type}>(s.data(), s.size())}.
+\tcode{basic_string_view<char_type>(s.data(), s.size())}.
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -21173,15 +21173,15 @@
   template<class Context>
   class basic_format_arg<Context>::handle {
     const void* ptr_;                                           // \expos
-    void (*format_)(basic_format_parse_context<@\placeholder{char-type}@>&,
+    void (*format_)(basic_format_parse_context<char_type>&,
                     Context&, const void*);                     // \expos
 
     template<class T> explicit handle(const T& val) noexcept;   // \expos
 
     friend class basic_format_arg<Context>;                     // \expos
 
   public:
-    void format(basic_format_parse_context<@\placeholder{char-type}@>&, Context& ctx) const;
+    void format(basic_format_parse_context<char_type>&, Context& ctx) const;
   };
 }
 \end{codeblock}
@@ -21198,7 +21198,7 @@
 \tcode{ptr_} with \tcode{addressof(val)} and
 \tcode{format_} with
 \begin{codeblock}
-[](basic_format_parse_context<@\placeholder{char-type}@>& parse_ctx,
+[](basic_format_parse_context<char_type>& parse_ctx,
    Context& format_ctx, const void* ptr) {
   typename Context::template formatter_type<T> f;
   parse_ctx.advance_to(f.parse(parse_ctx));
@@ -21209,7 +21209,7 @@
 
 \indexlibrarymember{format}{basic_format_arg::handle}%
 \begin{itemdecl}
-void format(basic_format_parse_context<@\placeholder{char-type}@>& parse_ctx, Context& format_ctx) const;
+void format(basic_format_parse_context<char_type>& parse_ctx, Context& format_ctx) const;
 \end{itemdecl}
 
 \begin{itemdescr}