Skip to content

Commit b1c4c87

Browse files
jensmaurertkoeppe
jensmaurer
authored and
tkoeppe
committed
[lib] Replace 'requirements of FrobMunchable'
with 'FrobMunchable requirements'.
1 parent 2a1d53b commit b1c4c87

File tree

6 files changed

+113
-116
lines changed

6 files changed

+113
-116
lines changed

‎source/algorithms.tex

Lines changed: 64 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,8 +1627,8 @@
16271627

16281628
\begin{itemdescr}
16291629
\pnum
1630-
\requires \tcode{Function} shall satisfy the requirements of
1631-
\tcode{MoveConstructible} (\tref{moveconstructible}).
1630+
\requires \tcode{Function} shall satisfy the
1631+
\tcode{MoveConstructible} requirements (\tref{moveconstructible}).
16321632
\begin{note} \tcode{Function} need not meet the requirements of
16331633
\tcode{CopyConstructible} (\tref{copyconstructible}). \end{note}
16341634

@@ -1672,7 +1672,7 @@
16721672
\begin{itemdescr}
16731673
\pnum
16741674
\requires
1675-
\tcode{Function} shall satisfy the requirements of \tcode{CopyConstructible}.
1675+
\tcode{Function} shall satisfy the \tcode{CopyConstructible} requirements.
16761676

16771677
\pnum
16781678
\effects
@@ -1710,7 +1710,7 @@
17101710
\begin{itemdescr}
17111711
\pnum
17121712
\requires
1713-
\tcode{Function} shall satisfy the requirements of \tcode{MoveConstructible}
1713+
\tcode{Function} shall satisfy the \tcode{MoveConstructible} requirements
17141714
\begin{note} \tcode{Function} need not meet the requirements of
17151715
\tcode{CopyConstructible}. \end{note}
17161716

@@ -1746,7 +1746,7 @@
17461746
\begin{itemdescr}
17471747
\pnum
17481748
\requires
1749-
\tcode{Function} shall satisfy the requirements of \tcode{CopyConstructible}.
1749+
\tcode{Function} shall satisfy the \tcode{CopyConstructible} requirements.
17501750

17511751
\pnum
17521752
\requires
@@ -3262,8 +3262,8 @@
32623262
\begin{itemdescr}
32633263
\pnum
32643264
\requires
3265-
\tcode{BidirectionalIterator} shall satisfy the requirements of
3266-
\tcode{ValueSwappable}\iref{swappable.requirements}.
3265+
\tcode{BidirectionalIterator} shall satisfy the
3266+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}.
32673267

32683268
\pnum
32693269
\effects
@@ -3346,13 +3346,10 @@
33463346
and
33473347
\range{middle}{last}
33483348
shall be valid ranges.
3349-
\tcode{ForwardIterator} shall satisfy the requirements of
3350-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type of \tcode{*first} shall satisfy
3351-
the requirements of \tcode{MoveConstructible}
3352-
(\tref{moveconstructible}) and the
3353-
requirements of
3354-
\tcode{MoveAssignable}
3355-
(\tref{moveassignable}).
3349+
\tcode{ForwardIterator} shall satisfy the
3350+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type of \tcode{*first} shall satisfy
3351+
the \tcode{MoveConstructible} (\tref{moveconstructible}) and
3352+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
33563353

33573354
\pnum
33583355
\effects
@@ -3500,8 +3497,8 @@
35003497
\begin{itemdescr}
35013498
\pnum
35023499
\requires
3503-
\tcode{RandomAccessIterator} shall satisfy the requirements of
3504-
\tcode{ValueSwappable}\iref{swappable.requirements}.
3500+
\tcode{RandomAccessIterator} shall satisfy the
3501+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}.
35053502
The type
35063503
\tcode{remove_reference_t<UniformRandomBitGenerator>}
35073504
shall satisfy the requirements of a
@@ -3676,11 +3673,11 @@
36763673
\begin{itemdescr}
36773674
\pnum
36783675
\requires
3679-
\tcode{RandomAccessIterator} shall satisfy the requirements of
3680-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
3681-
of \tcode{*first} shall satisfy the requirements of
3682-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
3683-
\tcode{MoveAssignable} (\tref{moveassignable}).
3676+
\tcode{RandomAccessIterator} shall satisfy the
3677+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
3678+
of \tcode{*first} shall satisfy the
3679+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
3680+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
36843681

36853682
\pnum
36863683
\effects
@@ -3714,11 +3711,11 @@
37143711
\begin{itemdescr}
37153712
\pnum
37163713
\requires
3717-
\tcode{RandomAccessIterator} shall satisfy the requirements of
3718-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
3719-
of \tcode{*first} shall satisfy the requirements of
3720-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
3721-
\tcode{MoveAssignable} (\tref{moveassignable}).
3714+
\tcode{RandomAccessIterator} shall satisfy the
3715+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
3716+
of \tcode{*first} shall satisfy the
3717+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
3718+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
37223719

37233720
\pnum
37243721
\effects
@@ -3765,11 +3762,11 @@
37653762
\begin{itemdescr}
37663763
\pnum
37673764
\requires
3768-
\tcode{RandomAccessIterator} shall satisfy the requirements of
3769-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
3770-
of \tcode{*first} shall satisfy the requirements of
3771-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
3772-
\tcode{MoveAssignable} (\tref{moveassignable}).
3765+
\tcode{RandomAccessIterator} shall satisfy the
3766+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
3767+
of \tcode{*first} shall satisfy the
3768+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
3769+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
37733770

37743771
\pnum
37753772
\effects
@@ -3827,11 +3824,11 @@
38273824
\begin{itemdescr}
38283825
\pnum
38293826
\requires
3830-
\tcode{RandomAccessIterator} shall satisfy the requirements of
3831-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
3832-
of \tcode{*result_first} shall satisfy the requirements of
3833-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
3834-
\tcode{Move\-Assignable} (\tref{moveassignable}).
3827+
\tcode{RandomAccessIterator} shall satisfy the
3828+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
3829+
of \tcode{*result_first} shall satisfy the
3830+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
3831+
\tcode{Move\-Assignable} (\tref{moveassignable}) requirements.
38353832

38363833
\pnum
38373834
\effects
@@ -3966,11 +3963,11 @@
39663963
\begin{itemdescr}
39673964
\pnum
39683965
\requires
3969-
\tcode{RandomAccessIterator} shall satisfy the requirements of
3970-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
3971-
of \tcode{*first} shall satisfy the requirements of
3972-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
3973-
\tcode{MoveAssignable} (\tref{moveassignable}).
3966+
\tcode{RandomAccessIterator} shall satisfy the
3967+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
3968+
of \tcode{*first} shall satisfy the
3969+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
3970+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
39743971

39753972
\pnum
39763973
\effects
@@ -4278,8 +4275,8 @@
42784275
\begin{itemdescr}
42794276
\pnum
42804277
\requires
4281-
\tcode{ForwardIterator} shall satisfy the requirements of
4282-
\tcode{ValueSwappable}\iref{swappable.requirements}.
4278+
\tcode{ForwardIterator} shall satisfy the
4279+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}.
42834280

42844281
\pnum
42854282
\effects Places all the elements in the range \range{first}{last} that satisfy \tcode{pred} before all the elements that do not satisfy it.
@@ -4315,11 +4312,11 @@
43154312
\begin{itemdescr}
43164313
\pnum
43174314
\requires
4318-
\tcode{BidirectionalIterator} shall satisfy the requirements of
4319-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
4320-
of \tcode{*first} shall satisfy the requirements of
4321-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
4322-
\tcode{MoveAssignable} (\tref{moveassignable}).
4315+
\tcode{BidirectionalIterator} shall satisfy the
4316+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
4317+
of \tcode{*first} shall satisfy the
4318+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
4319+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
43234320

43244321
\pnum
43254322
\effects
@@ -4516,11 +4513,11 @@
45164513
\requires
45174514
The ranges \range{first}{middle} and \range{middle}{last} shall be
45184515
sorted with respect to \tcode{operator<} or \tcode{comp}.
4519-
\tcode{BidirectionalIterator} shall satisfy the requirements of
4520-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
4521-
of \tcode{*first} shall satisfy the requirements of
4522-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
4523-
\tcode{MoveAssignable} (\tref{moveassignable}).
4516+
\tcode{BidirectionalIterator} shall satisfy the
4517+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
4518+
of \tcode{*first} shall satisfy the
4519+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
4520+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
45244521

45254522
\pnum
45264523
\effects
@@ -4968,11 +4965,11 @@
49684965
The range
49694966
\range{first}{last}
49704967
shall be a valid non-empty heap.
4971-
\tcode{RandomAccessIterator} shall satisfy the requirements of
4972-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
4973-
of \tcode{*first} shall satisfy the requirements of
4974-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
4975-
\tcode{MoveAssignable} (\tref{moveassignable}).
4968+
\tcode{RandomAccessIterator} shall satisfy the
4969+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
4970+
of \tcode{*first} shall satisfy the
4971+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
4972+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
49764973

49774974

49784975
\pnum
@@ -5038,11 +5035,11 @@
50385035
\begin{itemdescr}
50395036
\pnum
50405037
\requires The range \range{first}{last} shall be a valid heap.
5041-
\tcode{RandomAccessIterator} shall satisfy the requirements of
5042-
\tcode{ValueSwappable}\iref{swappable.requirements}. The type
5043-
of \tcode{*first} shall satisfy the requirements of
5044-
\tcode{MoveConstructible} (\tref{moveconstructible}) and of
5045-
\tcode{MoveAssignable} (\tref{moveassignable}).
5038+
\tcode{RandomAccessIterator} shall satisfy the
5039+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}. The type
5040+
of \tcode{*first} shall satisfy the
5041+
\tcode{MoveConstructible} (\tref{moveconstructible}) and
5042+
\tcode{MoveAssignable} (\tref{moveassignable}) requirements.
50465043

50475044
\pnum
50485045
\effects
@@ -5640,8 +5637,8 @@
56405637
\begin{itemdescr}
56415638
\pnum
56425639
\requires
5643-
\tcode{BidirectionalIterator} shall satisfy the requirements of
5644-
\tcode{ValueSwappable}\iref{swappable.requirements}.
5640+
\tcode{BidirectionalIterator} shall satisfy the
5641+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}.
56455642

56465643
\pnum
56475644
\effects
@@ -5682,8 +5679,8 @@
56825679
\begin{itemdescr}
56835680
\pnum
56845681
\requires
5685-
\tcode{BidirectionalIterator} shall satisfy the requirements of
5686-
\tcode{ValueSwappable}\iref{swappable.requirements}.
5682+
\tcode{BidirectionalIterator} shall satisfy the
5683+
\tcode{ValueSwappable} requirements\iref{swappable.requirements}.
56875684

56885685
\pnum
56895686
\effects

‎source/lib-intro.tex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,7 @@
16241624

16251625
\pnum
16261626
A type \tcode{X} satisfying any of the iterator requirements\iref{iterator.requirements}
1627-
satisfies the requirements of \tcode{ValueSwappable} if,
1627+
satisfies the \tcode{ValueSwappable} requirements if,
16281628
for any dereferenceable object
16291629
\tcode{x} of type \tcode{X},
16301630
\tcode{*x} is swappable.
@@ -1677,12 +1677,12 @@
16771677

16781678
\pnum
16791679
A \tcode{NullablePointer} type is a pointer-like type that supports null values.
1680-
A type \tcode{P} meets the requirements of \tcode{NullablePointer} if:
1680+
A type \tcode{P} satisfies the \tcode{Nullable\-Pointer} requirements if:
16811681

16821682
\begin{itemize}
1683-
\item \tcode{P} satisfies the requirements of \tcode{EqualityComparable},
1683+
\item \tcode{P} satisfies the \tcode{EqualityComparable},
16841684
\tcode{DefaultConstructible}, \tcode{CopyConstructible}, \tcode{CopyAssignable},
1685-
and \tcode{Destructible},
1685+
and \tcode{Destructible} requirements,
16861686

16871687
\item lvalues of type \tcode{P} are swappable\iref{swappable.requirements},
16881688

@@ -1759,8 +1759,8 @@
17591759

17601760
\begin{itemize}
17611761
\item it is a function object type\iref{function.objects},
1762-
\item it satisfies the requirements of \tcode{CopyConstructible} (\tref{copyconstructible}) and
1763-
\tcode{Destructible} (\tref{destructible}), and
1762+
\item it satisfies the \tcode{CopyConstructible} (\tref{copyconstructible}) and
1763+
\tcode{Destructible} (\tref{destructible}) requirements, and
17641764
\item the expressions shown in \tref{hash}
17651765
are valid and have the indicated semantics.
17661766
\end{itemize}
@@ -2084,11 +2084,11 @@
20842084
and the \tcode{swap} operation shall not throw exceptions.
20852085

20862086
\pnum
2087-
An allocator type \tcode{X} shall satisfy the requirements of
2088-
\tcode{CopyConstructible} (\tref{copyconstructible}).
2087+
An allocator type \tcode{X} shall satisfy the
2088+
\tcode{CopyConstructible} requirements (\tref{copyconstructible}).
20892089
The \tcode{X::pointer}, \tcode{X::const_pointer}, \tcode{X::void_pointer}, and
2090-
\tcode{X::const_void_pointer} types shall satisfy the requirements of
2091-
\tcode{NullablePointer} (\tref{nullablepointer}).
2090+
\tcode{X::const_void_pointer} types shall satisfy the
2091+
\tcode{Nullable\-Pointer} requirements (\tref{nullablepointer}).
20922092
No constructor,
20932093
comparison function, copy operation, move operation, or swap operation on
20942094
these pointer types shall exit via an exception. \tcode{X::pointer} and \tcode{X::const_pointer} shall also

‎source/numerics.tex

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,9 +2054,9 @@
20542054
\end{libreqtab4d}
20552055

20562056
\pnum
2057-
\tcode{E} shall satisfy the requirements
2058-
of \tcode{CopyConstructible} (\tref{copyconstructible})
2059-
and \tcode{CopyAssignable} (\tref{copyassignable}) types.
2057+
\tcode{E} shall satisfy the
2058+
\tcode{CopyConstructible} (\tref{copyconstructible})
2059+
and \tcode{CopyAssignable} (\tref{copyassignable}) requirements.
20602060
These operations shall each be of complexity
20612061
no worse than \bigoh{\text{size of state}}.
20622062

@@ -2433,9 +2433,9 @@
24332433
\end{libreqtab4d}
24342434

24352435
\pnum
2436-
\tcode{D} shall satisfy the requirements
2437-
of \tcode{CopyConstructible} (\tref{copyconstructible})
2438-
and \tcode{CopyAssignable} (\tref{copyassignable}) types.
2436+
\tcode{D} shall satisfy the
2437+
\tcode{CopyConstructible} (\tref{copyconstructible})
2438+
and \tcode{CopyAssignable} (\tref{copyassignable}) requirements.
24392439

24402440
\pnum
24412441
The sequence of numbers
@@ -2465,11 +2465,11 @@
24652465
for convenience of exposition only.
24662466

24672467
\pnum
2468-
\tcode{P} shall satisfy the requirements
2469-
of \tcode{CopyConstructible} (\tref{copyconstructible}),
2468+
\tcode{P} shall satisfy the
2469+
\tcode{CopyConstructible} (\tref{copyconstructible}),
24702470
\tcode{CopyAssignable} (\tref{copyassignable}),
24712471
and
2472-
\tcode{EqualityComparable} (\tref{equalitycomparable}) types.
2472+
\tcode{EqualityComparable} (\tref{equalitycomparable}) requirements.
24732473

24742474
\pnum
24752475
For each of the constructors of \tcode{D}
@@ -8790,8 +8790,8 @@
87908790
\begin{itemdescr}
87918791
\pnum
87928792
\requires
8793-
\tcode{T} shall satisfy the requirements of \tcode{CopyConstructible} (\tref{copyconstructible})
8794-
and \tcode{CopyAssignable} (\tref{copyassignable}) types.
8793+
\tcode{T} shall satisfy the \tcode{CopyConstructible} (\tref{copyconstructible})
8794+
and \tcode{CopyAssignable} (\tref{copyassignable}) requirements.
87958795
In the range
87968796
\crange{first}{last},
87978797
\tcode{binary_op}
@@ -8940,8 +8940,8 @@
89408940
\begin{itemdescr}
89418941
\pnum
89428942
\requires
8943-
\tcode{T} shall satisfy the requirements of \tcode{CopyConstructible} (\tref{copyconstructible})
8944-
and \tcode{CopyAssignable} (\tref{copyassignable}) types.
8943+
\tcode{T} shall satisfy the \tcode{CopyConstructible} (\tref{copyconstructible})
8944+
and \tcode{CopyAssignable} (\tref{copyassignable}) requirements.
89458945
In the ranges
89468946
\crange{first1}{last1}
89478947
and

‎source/regex.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2980,7 +2980,7 @@
29802980
\begin{itemdescr}
29812981
\pnum
29822982
\requires The type \tcode{BidirectionalIterator} shall satisfy the requirements
2983-
of a Bidirectional Iterator\iref{bidirectional.iterators}.
2983+
of a bidirectional iterator\iref{bidirectional.iterators}.
29842984

29852985
\pnum
29862986
\effects Determines whether there is a match between the
@@ -3162,8 +3162,8 @@
31623162

31633163
\begin{itemdescr}
31643164
\pnum
3165-
\requires Type \tcode{BidirectionalIterator} shall satisfy the requirements of a Bidirectional
3166-
Iterator\iref{bidirectional.iterators}.
3165+
\requires Type \tcode{BidirectionalIterator} shall satisfy the requirements of a bidirectional
3166+
iterator\iref{bidirectional.iterators}.
31673167

31683168
\pnum
31693169
\effects Determines whether there is some sub-sequence within \range{first}{last} that matches

0 commit comments

Comments
 (0)