P2508R1 Expose std::basic-format-string<charT, Args...>

Author: jensmaurer

source/support.tex

@@ -617,7 +617,7 @@
 #define @\defnlibxname{cpp_lib_execution}@                         201902L // also in \libheader{execution}
 #define @\defnlibxname{cpp_lib_expected}@                          202202L // also in \libheader{expected}
 #define @\defnlibxname{cpp_lib_filesystem}@                        201703L // also in \libheader{filesystem}
-#define @\defnlibxname{cpp_lib_format}@                            202110L // also in \libheader{format}
+#define @\defnlibxname{cpp_lib_format}@                            202207L // also in \libheader{format}
 #define @\defnlibxname{cpp_lib_gcd_lcm}@                           201606L // also in \libheader{numeric}
 #define @\defnlibxname{cpp_lib_generic_associative_lookup}@        201304L // also in \libheader{map}, \libheader{set}
 #define @\defnlibxname{cpp_lib_generic_unordered_lookup}@          201811L

source/utilities.tex

@@ -13402,40 +13402,38 @@
   using format_args = basic_format_args<format_context>;
   using wformat_args = basic_format_args<wformat_context>;
 
-  // \ref{format.fmt.string}, class template \exposid{basic-format-string}
+  // \ref{format.fmt.string}, class template \tcode{basic_format_string}
   template<class charT, class... Args>
-    struct @\exposid{basic-format-string}@;                       // \expos
+    struct basic_format_string;
 
   template<class... Args>
-    using @\exposid{format-string}@ =                             // \expos
-      @\exposid{basic-format-string}@<char, type_identity_t<Args>...>;
+    using @\libglobal{format_string}@ = basic_format_string<char, type_identity_t<Args>...>;
   template<class... Args>
-    using @\exposid{wformat-string}@ =                            // \expos
-      @\exposid{basic-format-string}@<wchar_t, type_identity_t<Args>...>;
+    using @\libglobal{wformat_string}@ = basic_format_string<wchar_t, type_identity_t<Args>...>;
 
   // \ref{format.functions}, formatting functions
   template<class... Args>
-    string format(@\exposid{format-string}@<Args...> fmt, Args&&... args);
+    string format(format_string<Args...> fmt, Args&&... args);
   template<class... Args>
-    wstring format(@\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+    wstring format(wformat_string<Args...> fmt, Args&&... args);
   template<class... Args>
-    string format(const locale& loc, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+    string format(const locale& loc, format_string<Args...> fmt, Args&&... args);
   template<class... Args>
-    wstring format(const locale& loc, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+    wstring format(const locale& loc, wformat_string<Args...> fmt, Args&&... args);
 
   string vformat(string_view fmt, format_args args);
   wstring vformat(wstring_view fmt, wformat_args args);
   string vformat(const locale& loc, string_view fmt, format_args args);
   wstring vformat(const locale& loc, wstring_view fmt, wformat_args args);
 
   template<class Out, class... Args>
-    Out format_to(Out out, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+    Out format_to(Out out, format_string<Args...> fmt, Args&&... args);
   template<class Out, class... Args>
-    Out format_to(Out out, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+    Out format_to(Out out, wformat_string<Args...> fmt, Args&&... args);
   template<class Out, class... Args>
-    Out format_to(Out out, const locale& loc, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+    Out format_to(Out out, const locale& loc, format_string<Args...> fmt, Args&&... args);
   template<class Out, class... Args>
-    Out format_to(Out out, const locale& loc, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+    Out format_to(Out out, const locale& loc, wformat_string<Args...> fmt, Args&&... args);
 
   template<class Out>
     Out vformat_to(Out out, string_view fmt, format_args args);
@@ -13452,27 +13450,27 @@
   };
   template<class Out, class... Args>
     format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                        @\exposid{format-string}@<Args...> fmt, Args&&... args);
+                                        format_string<Args...> fmt, Args&&... args);
   template<class Out, class... Args>
     format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                        @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+                                        wformat_string<Args...> fmt, Args&&... args);
   template<class Out, class... Args>
     format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                        const locale& loc, @\exposid{format-string}@<Args...> fmt,
+                                        const locale& loc, format_string<Args...> fmt,
                                         Args&&... args);
   template<class Out, class... Args>
     format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                        const locale& loc, @\exposid{wformat-string}@<Args...> fmt,
+                                        const locale& loc, wformat_string<Args...> fmt,
                                         Args&&... args);
 
   template<class... Args>
-    size_t formatted_size(@\exposid{format-string}@<Args...> fmt, Args&&... args);
+    size_t formatted_size(format_string<Args...> fmt, Args&&... args);
   template<class... Args>
-    size_t formatted_size(@\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+    size_t formatted_size(wformat_string<Args...> fmt, Args&&... args);
   template<class... Args>
-    size_t formatted_size(const locale& loc, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+    size_t formatted_size(const locale& loc, format_string<Args...> fmt, Args&&... args);
   template<class... Args>
-    size_t formatted_size(const locale& loc, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+    size_t formatted_size(const locale& loc, wformat_string<Args...> fmt, Args&&... args);
 
   // \ref{format.formatter}, formatter
   template<class T, class charT = char> struct formatter;
@@ -14213,21 +14211,25 @@
 Failure to allocate storage is reported by
 throwing an exception as described in~\ref{res.on.exception.handling}.
 
-\rSec2[format.fmt.string]{Class template \exposid{basic-format-string}}
+\rSec2[format.fmt.string]{Class template \tcode{basic_format_string}}
 
 \begin{codeblock}
-template<class charT, class... Args>
-struct @\exposid{basic-format-string}@ {            // \expos
-private:
-  basic_string_view<charT> @\exposid{str}@;         // \expos
+namespace std {
+  template<class charT, class... Args>
+  struct @\libglobal{basic_format_string}@ {
+  private:
+    basic_string_view<charT> @\exposid{str}@;         // \expos
 
-public:
-  template<class T> consteval @\exposid{basic-format-string}@(const T& s);
-};
+  public:
+    template<class T> consteval basic_format_string(const T& s);
+
+    constexpr basic_string_view<charT> get() const noexcept { return @\exposid{str}@; }
+  };
+}
 \end{codeblock}
 
 \begin{itemdecl}
-template<class T> consteval @\exposid{basic-format-string}@(const T& s);
+template<class T> consteval basic_format_string(const T& s);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14257,7 +14259,7 @@
 \indexlibraryglobal{format}%
 \begin{itemdecl}
 template<class... Args>
-  string format(@\exposid{format-string}@<Args...> fmt, Args&&... args);
+  string format(format_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14272,7 +14274,7 @@
 \indexlibraryglobal{format}%
 \begin{itemdecl}
 template<class... Args>
-  wstring format(@\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+  wstring format(wformat_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14287,7 +14289,7 @@
 \indexlibraryglobal{format}%
 \begin{itemdecl}
 template<class... Args>
-  string format(const locale& loc, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+  string format(const locale& loc, format_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14302,7 +14304,7 @@
 \indexlibraryglobal{format}%
 \begin{itemdecl}
 template<class... Args>
-  wstring format(const locale& loc, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+  wstring format(const locale& loc, wformat_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14338,7 +14340,7 @@
 \indexlibraryglobal{format_to}%
 \begin{itemdecl}
 template<class Out, class... Args>
-  Out format_to(Out out, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+  Out format_to(Out out, format_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14353,7 +14355,7 @@
 \indexlibraryglobal{format_to}%
 \begin{itemdecl}
 template<class Out, class... Args>
-  Out format_to(Out out, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+  Out format_to(Out out, wformat_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14368,7 +14370,7 @@
 \indexlibraryglobal{format_to}%
 \begin{itemdecl}
 template<class Out, class... Args>
-  Out format_to(Out out, const locale& loc, @\exposid{format-string}@<Args...>  fmt, Args&&... args);
+  Out format_to(Out out, const locale& loc, format_string<Args...>  fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14383,7 +14385,7 @@
 \indexlibraryglobal{format_to}%
 \begin{itemdecl}
 template<class Out, class... Args>
-  Out format_to(Out out, const locale& loc, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+  Out format_to(Out out, const locale& loc, wformat_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -14441,17 +14443,17 @@
 \begin{itemdecl}
 template<class Out, class... Args>
   format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                      @\exposid{format-string}@<Args...> fmt, Args&&... args);
+                                      format_string<Args...> fmt, Args&&... args);
 template<class Out, class... Args>
   format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                      @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+                                      wformat_string<Args...> fmt, Args&&... args);
 template<class Out, class... Args>
   format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                      const locale& loc, @\exposid{format-string}@<Args...> fmt,
+                                      const locale& loc, format_string<Args...> fmt,
                                       Args&&... args);
 template<class Out, class... Args>
   format_to_n_result<Out> format_to_n(Out out, iter_difference_t<Out> n,
-                                      const locale& loc, @\exposid{wformat-string}@<Args...> fmt,
+                                      const locale& loc, wformat_string<Args...> fmt,
                                       Args&&... args);
 \end{itemdecl}
 
@@ -14497,13 +14499,13 @@
 \indexlibraryglobal{formatted_size}%
 \begin{itemdecl}
 template<class... Args>
-  size_t formatted_size(@\exposid{format-string}@<Args...> fmt, Args&&... args);
+  size_t formatted_size(format_string<Args...> fmt, Args&&... args);
 template<class... Args>
-  size_t formatted_size(@\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+  size_t formatted_size(wformat_string<Args...> fmt, Args&&... args);
 template<class... Args>
-  size_t formatted_size(const locale& loc, @\exposid{format-string}@<Args...> fmt, Args&&... args);
+  size_t formatted_size(const locale& loc, format_string<Args...> fmt, Args&&... args);
 template<class... Args>
-  size_t formatted_size(const locale& loc, @\exposid{wformat-string}@<Args...> fmt, Args&&... args);
+  size_t formatted_size(const locale& loc, wformat_string<Args...> fmt, Args&&... args);
 \end{itemdecl}
 
 \begin{itemdescr}