[container.requirements] Reword Result specifications (cplusplus#6824)

Author: eisenwave

source/containers.tex

@@ -340,8 +340,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator};
-\tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -360,8 +360,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator};
-\tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -826,8 +826,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reverse_iterator};
-\tcode{const_reverse_iterator} for constant \tcode{a}.
+\tcode{const_reverse_iterator} if \tcode{a} is of type \tcode{const X};
+\tcode{reverse_iterator} otherwise.
 
 \pnum
 \returns
@@ -846,8 +846,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reverse_iterator};
-\tcode{const_reverse_iterator} for constant \tcode{a}.
+\tcode{const_reverse_iterator} if \tcode{a} is of type \tcode{const X};
+\tcode{reverse_iterator} otherwise.
 
 \pnum
 \returns
@@ -1927,7 +1927,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}.
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \hardexpects
@@ -1956,7 +1957,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}.
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \hardexpects
@@ -2275,7 +2277,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}.
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \hardexpects
@@ -2302,7 +2305,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{reference; const_reference} for constant \tcode{a}.
+\tcode{const_reference} if \tcode{a} is of type \tcode{const X};
+\tcode{reference} otherwise.
 
 \pnum
 \returns
@@ -3792,7 +3796,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3812,7 +3817,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3902,7 +3908,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3922,7 +3929,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3943,7 +3951,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3963,7 +3972,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -3984,8 +3994,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{b}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{b} is of type \tcode{const X};
+\tcode{pair<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \effects
@@ -4004,8 +4015,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{a_tran}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{a_tran} is of type \tcode{const X};
+\tcode{pair<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \effects
@@ -5479,7 +5491,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{b}.
+\tcode{const_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -5499,7 +5512,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{iterator}; \tcode{const_iterator} for constant \tcode{a_tran}.
+\tcode{const_iterator} if \tcode{a_tran} is of type \tcode{const X};
+\tcode{iterator} otherwise.
 
 \pnum
 \returns
@@ -5580,8 +5594,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{b}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{b} is of type \tcode{const X};
+\tcode{pair<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \returns
@@ -5601,8 +5616,9 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{pair<iterator, iterator>};
-\tcode{pair<const_iterator, const_iterator>} for constant \tcode{a_tran}.
+\tcode{pair<const_iterator, const_iterator>}
+if \tcode{a_tran} is of type \tcode{const X};
+\tcode{pair<iter\-ator, iter\-ator>} otherwise.
 
 \pnum
 \returns
@@ -5739,7 +5755,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{local_iterator}; \tcode{const_local_iterator} for constant \tcode{b}.
+\tcode{const_local_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{local_iterator} otherwise.
 
 \pnum
 \expects
@@ -5763,7 +5780,8 @@
 \begin{itemdescr}
 \pnum
 \result
-\tcode{local_iterator}; \tcode{const_local_iterator} for constant \tcode{b}.
+\tcode{const_local_iterator} if \tcode{b} is of type \tcode{const X};
+\tcode{local_iterator} otherwise.
 
 \pnum
 \expects