Merge branch 'cplusplus:main' into main

Author: hewillk

source/algorithms.tex

@@ -5174,7 +5174,7 @@
 into the range \range{result - $N$}{result}
 starting from \tcode{last - 1} and proceeding to \tcode{first}.
 \begin{footnote}
-\tcode{move_backward} can be used instead of move
+\tcode{move_backward} can be used instead of \tcode{move}
 when \tcode{last} is in the range \range{result - $N$}{result}.
 \end{footnote}
 For each positive integer $n \le N$,
@@ -5613,7 +5613,6 @@
   ForwardIterator fill_n(ExecutionPolicy&& exec,
                          ForwardIterator first, Size n, const T& value);
 
-
 template<class T, @\libconcept{output_iterator}@<const T&> O, @\libconcept{sentinel_for}@<O> S>
   constexpr O ranges::fill(O first, S last, const T& value);
 template<class T, @\libconcept{output_range}@<const T&> R>
@@ -7561,13 +7560,12 @@
 \item \tcode{\{i, last\}} for the overloads in namespace \tcode{ranges}.
 \end{itemize}
 
-
 \pnum
 \complexity
 Let $N$ = \tcode{last - first}:
 \begin{itemize}
 \item
-  For the overloads with no \tcode{ExecutionPolicy}, at most $N \log N$ swaps,
+  For the overloads with no \tcode{ExecutionPolicy}, at most $N \log_2 N$ swaps,
   but only \bigoh{N} swaps if there is enough extra memory.
   Exactly $N$ applications of the predicate and projection.
 \item
@@ -8232,7 +8230,7 @@
 \range{first2}{last2} contains $n$ elements
 that are equivalent to them,
 the last $\max(m - n, 0)$ elements from \range{first1}{last1}
-is copied to the output range, in order.
+are copied to the output range, in order.
 \end{itemdescr}
 
 \rSec3[set.symmetric.difference]{\tcode{set_symmetric_difference}}
@@ -11192,7 +11190,7 @@
 
 \pnum
 \begin{note}
-If an exception is thrown, some objects in the range \range{first}{last} are
+If an exception is thrown, some objects in the range \range{ifirst}{ilast} are
 left in a valid, but unspecified state.
 \end{note}
 \end{itemdescr}
@@ -11247,7 +11245,7 @@
 \pnum
 \begin{note}
 If an exception is thrown, some objects in the range
-\countedrange{first}{n}
+\countedrange{ifirst}{n}
 are left in a valid but unspecified state.
 \end{note}
 \end{itemdescr}

source/iostreams.tex

@@ -1458,7 +1458,7 @@
 \tcode{iarray} as necessary to include the element
 \tcode{iarray[idx]}.
 Each newly allocated element of the array is initialized to zero.
-The reference returned is invalid after any other operations on the
+The reference returned is invalid after any other operation on the
 object.
 \begin{footnote}
 An implementation is free to implement both the integer
@@ -1515,7 +1515,7 @@
 \tcode{parray[idx]}.
 Each newly allocated element of the array is initialized to a null
 pointer.
-The reference returned is invalid after any other operations on the
+The reference returned is invalid after any other operation on the
 object.
 However, the value of the storage referred to is retained, so
 that until the next call to
@@ -1636,7 +1636,7 @@
     // \ref{fpos.members}, members
     stateT state() const;
     void state(stateT);
-  private;
+  private:
     stateT st;                  // \expos
   };
 }
@@ -1681,7 +1681,7 @@
 \oldconcept{Destructible} (\tref{cpp17.destructible}) requirements.
 If \tcode{is_trivially_copy_constructible_v<stateT>} is \tcode{true},
 then \tcode{fpos<stateT>} has a trivial copy constructor.
-If \tcode{is_trivially_copy_assignable<stateT>} is \tcode{true},
+If \tcode{is_trivially_copy_assignable_v<stateT>} is \tcode{true},
 then \tcode{fpos<stateT>} has a trivial copy assignment operator.
 If \tcode{is_trivially_destructible_v<stateT>} is \tcode{true},
 then \tcode{fpos<stateT>} has a trivial destructor.
@@ -3108,7 +3108,7 @@
 \item
 the
 \tcode{getloc()}
-member to a copy the global locale,
+member to a copy of the global locale,
 \tcode{locale()},
 at the time of construction.
 \end{itemize}

source/locales.tex

@@ -1655,7 +1655,7 @@
 \indextext{UTF-32}%
 The specialization \tcode{codecvt<char16_t, char8_t, mbstate_t>}
 converts between the UTF-16 and UTF-8 encoding forms, and
-the specialization \tcode{codecvt} \tcode{<char32_t, char8_t, mbstate_t>}
+the specialization \tcode{codecvt<char32_t, char8_t, mbstate_t>}
 converts between the UTF-32 and UTF-8 encoding forms.
 \tcode{codecvt<wchar_t, char, mbstate_t>}
 converts between the native character sets for ordinary and wide characters.
@@ -3014,7 +3014,7 @@
 The specializations
 required in \tref{locale.category.facets}\iref{locale.category},
 namely \tcode{collate<char>} and \tcode{collate<wchar_t>},
-apply lexicographic ordering\iref{alg.lex.comparison}.
+apply lexicographical ordering\iref{alg.lex.comparison}.
 
 \pnum
 Each function compares a string of characters \tcode{*p}

source/numerics.tex

@@ -3093,7 +3093,7 @@
     void discard(unsigned long long z);
 
     // property functions
-    const Engine& base() const noexcept { return e; };
+    const Engine& base() const noexcept { return e; }
 
     // inserters and extractors
     template<class charT, class traits>
@@ -3132,7 +3132,7 @@
 sets \tcode{n} to $0$.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% independent_bits_engine engine adaptor:
+% independent_bits_engine engine adaptor:\exposid{
 
 \rSec3[rand.adapt.ibits]{Class template \tcode{independent_bits_engine}}%
 \indexlibraryglobal{independent_bits_engine}%
@@ -3241,7 +3241,7 @@
     void discard(unsigned long long z);
 
     // property functions
-    const Engine& base() const noexcept { return e; };
+    const Engine& base() const noexcept { return e; }
 
     // inserters and extractors
     template<class charT, class traits>
@@ -3343,7 +3343,7 @@
     void discard(unsigned long long z);
 
     // property functions
-    const Engine& base() const noexcept { return e; };
+    const Engine& base() const noexcept { return e; }
 
     // inserters and extractors
     template<class charT, class traits>
@@ -7554,7 +7554,7 @@
 \begin{example}
 If the argument has the value $-2$,
 the first two elements of the result will be value-initialized\iref{dcl.init}; the third element of the result will be assigned the value
-of the first element of the argument; etc.
+of the first element of \tcode{*this}; etc.
 \end{example}
 \end{itemdescr}
 

source/ranges.tex

@@ -4278,6 +4278,7 @@
       (invoke(f, std::forward<Ts>(elements)), ...);
     }, std::forward<Tuple>(t));
   }
+}
 \end{codeblock}
 
 \rSec2[range.all]{All view}
@@ -14288,8 +14289,7 @@
 
   template<class First, class... Vs>
   concept @\defexposconcept{cartesian-product-is-common}@ =                 // \expos
-    (@\exposconcept{cartesian-product-common-arg}@<First> && ... &&
-     @\exposconcept{cartesian-product-common-arg}@<Vs>);
+    @\exposconcept{cartesian-product-common-arg}@<First>;
 
   template<class... Vs>
   concept @\defexposconcept{cartesian-product-is-sized}@ =                  // \expos
@@ -14954,7 +14954,7 @@
 the logical AND of the following expressions:
 \begin{itemize}
 \item
-\tcode{noexcept(ranges::iter_move(std::get<$N$>(i.\exposid{current_}))}
+\tcode{noexcept(ranges::iter_move(std::get<$N$>(i.\exposid{current_})))}
 for every integer\newline $0 \le N \le \tcode{sizeof...(Vs)}$,
 \item
 \tcode{is_nothrow_move_constructible_v<range_rvalue_reference_t<\exposid{maybe-const}<Const, T>>>}\newline

source/time.tex

@@ -2145,7 +2145,7 @@
 
 In the list above,
 the use of \tcode{\placeholder{num}} and \tcode{\placeholder{den}}
-refer to the static data members of \tcode{Period::type},
+refers to the static data members of \tcode{Period::type},
 which are converted to arrays of \tcode{charT} using a decimal conversion with no leading zeroes.
 
 \pnum
@@ -4681,7 +4681,7 @@
 
 \indexlibrarymember{operator-}{year}%
 \begin{itemdecl}
-constexpr year year::operator-() const noexcept;
+constexpr year operator-() const noexcept;
 \end{itemdecl}
 
 \begin{itemdescr}

source/utilities.tex

@@ -14265,6 +14265,26 @@
 % alter its behavior?
 trailing zeros are not removed from the result.
 
+\pnum
+A zero (\tcode{0}) character
+preceding the \fmtgrammarterm{width} field
+pads the field with leading zeros (following any indication of sign or base)
+to the field width,
+except when applied to an infinity or NaN.
+This option is only valid for
+arithmetic types other than \tcode{charT} and \tcode{bool}
+or when an integer presentation type is specified.
+If the \tcode{0} character and an \fmtgrammarterm{align} option both appear,
+the \tcode{0} character is ignored.
+\begin{example}
+\begin{codeblock}
+char c = 120;
+string s1 = format("{:+06d}", c);       // value of \tcode{s1} is \tcode{"+00120"}
+string s2 = format("{:#06x}", 0xa);     // value of \tcode{s2} is \tcode{"0x000a"}
+string s3 = format("{:<06}", -42);      // value of \tcode{s3} is \tcode{"-42\ \ \ "} (\tcode{0} is ignored because of \tcode{<} alignment)
+\end{codeblock}
+\end{example}
+
 \pnum
 If \tcode{\{ \opt{\fmtgrammarterm{arg-id}} \}} is used in
 a \fmtgrammarterm{width} or \fmtgrammarterm{precision},
@@ -14336,26 +14356,6 @@
 \pnum
 For a string in a non-Unicode encoding, the width of a string is unspecified.
 
-\pnum
-A zero (\tcode{0}) character
-preceding the \fmtgrammarterm{width} field
-pads the field with leading zeros (following any indication of sign or base)
-to the field width,
-except when applied to an infinity or NaN.
-This option is only valid for
-arithmetic types other than \tcode{charT} and \tcode{bool}
-or when an integer presentation type is specified.
-If the \tcode{0} character and an \fmtgrammarterm{align} option both appear,
-the \tcode{0} character is ignored.
-\begin{example}
-\begin{codeblock}
-char c = 120;
-string s1 = format("{:+06d}", c);       // value of \tcode{s1} is \tcode{"+00120"}
-string s2 = format("{:#06x}", 0xa);     // value of \tcode{s2} is \tcode{"0x000a"}
-string s3 = format("{:<06}", -42);      // value of \tcode{s3} is \tcode{"-42\ \ \ "} (\tcode{0} is ignored because of \tcode{<} alignment)
-\end{codeblock}
-\end{example}
-
 \pnum
 % FIXME: What if it's an arg-id?
 The \fmtgrammarterm{nonnegative-integer} in