Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 38be945

Browse files
committed
Fixup: define \oldconcept macro
.... with which to style the names of "requirements tables"
1 parent e550d3c commit 38be945

15 files changed

+486
-485
lines changed

source/algorithms.tex

Lines changed: 79 additions & 79 deletions
Large diffs are not rendered by default.

source/concepts.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@
727727

728728
\pnum
729729
\begin{note}
730-
Unlike the \textit{Cpp98Destructible} requirements~(\tref{destructible}), this concept
730+
Unlike the \oldconcept{Destructible} requirements~(\tref{destructible}), this concept
731731
forbids destructors that are potentially throwing, even if non-throwing.
732732
\end{note}
733733
\end{itemdescr}

source/containers.tex

Lines changed: 130 additions & 130 deletions
Large diffs are not rendered by default.

source/future.tex

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
\begin{itemdescr}
240240
\pnum
241241
\requires
242-
Type \tcode{T} is \textit{Cpp98EqualityComparable} (\tref{equalitycomparable}).
242+
Type \tcode{T} is \oldconcept{EqualityComparable} (\tref{equalitycomparable}).
243243

244244
\pnum
245245
\returns
@@ -254,7 +254,7 @@
254254
\begin{itemdescr}
255255
\pnum
256256
\requires
257-
Type \tcode{T} is \textit{Cpp98LessThanComparable} (\tref{lessthancomparable}).
257+
Type \tcode{T} is \oldconcept{LessThanComparable} (\tref{lessthancomparable}).
258258

259259
\pnum
260260
\returns
@@ -269,7 +269,7 @@
269269
\begin{itemdescr}
270270
\pnum
271271
\requires
272-
Type \tcode{T} is \textit{Cpp98LessThanComparable} (\tref{lessthancomparable}).
272+
Type \tcode{T} is \oldconcept{LessThanComparable} (\tref{lessthancomparable}).
273273

274274
\pnum
275275
\returns
@@ -284,7 +284,7 @@
284284
\begin{itemdescr}
285285
\pnum
286286
\requires
287-
Type \tcode{T} is \textit{Cpp98LessThanComparable} (\tref{lessthancomparable}).
287+
Type \tcode{T} is \oldconcept{LessThanComparable} (\tref{lessthancomparable}).
288288

289289
\pnum
290290
\returns
@@ -2012,7 +2012,7 @@
20122012
\begin{itemdescr}
20132013
\pnum
20142014
\requires
2015-
\tcode{T} shall be \textit{Cpp98CopyConstructible}.
2015+
\tcode{T} shall be \oldconcept{CopyConstructible}.
20162016

20172017
\pnum
20182018
\effects
@@ -2031,7 +2031,7 @@
20312031
\begin{itemdescr}
20322032
\pnum
20332033
\requires
2034-
\tcode{T} shall be \textit{Cpp98MoveConstructible}.
2034+
\tcode{T} shall be \oldconcept{MoveConstructible}.
20352035

20362036
\pnum
20372037
\effects
@@ -2185,7 +2185,7 @@
21852185
\tcode{remove_all_extents_t<T>} shall be a complete type or \cv{}~\tcode{void}.
21862186

21872187
\pnum
2188-
\tcode{is_literal_type<T>} is a \textit{Cpp98UnaryTypeTrait}\iref{meta.rqmts}
2188+
\tcode{is_literal_type<T>} is a \oldconcept{UnaryTypeTrait}\iref{meta.rqmts}
21892189
with a base characteristic of \tcode{true_type}
21902190
if \tcode{T} is a literal type\iref{basic.types}, and
21912191
\tcode{false_type} otherwise.
@@ -2203,7 +2203,7 @@
22032203

22042204
\pnum
22052205
The partial specialization \tcode{result_of<Fn(ArgTypes...)>} is a
2206-
\textit{Cpp98TransformationTrait}\iref{meta.rqmts} whose member typedef \tcode{type} is defined
2206+
\oldconcept{TransformationTrait}\iref{meta.rqmts} whose member typedef \tcode{type} is defined
22072207
if and only if \tcode{invoke_result<Fn, ArgTypes...>::type}\iref{func.invoke} is defined.
22082208
If \tcode{type} is defined, it names the same type as \tcode{invoke_result_t<Fn, ArgTypes...>}.
22092209
\end{itemdescr}
@@ -2218,7 +2218,7 @@
22182218
\tcode{remove_all_extents_t<T>} shall be a complete type or \cv{} \tcode{void}.
22192219

22202220
\pnum
2221-
\tcode{is_pod<T>} is a \textit{Cpp98UnaryTypeTrait}\iref{meta.rqmts}
2221+
\tcode{is_pod<T>} is a \oldconcept{UnaryTypeTrait}\iref{meta.rqmts}
22222222
with a base characteristic of \tcode{true_type}
22232223
if \tcode{T} is a POD type,
22242224
and \tcode{false_type} otherwise.

source/iostreams.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10418,7 +10418,7 @@
1041810418
\end{codeblock}
1041910419

1042010420
\pnum
10421-
\tcode{Allocator} shall satisfy the \textit{Cpp98Allocator} requirements
10421+
\tcode{Allocator} shall satisfy the \oldconcept{Allocator} requirements
1042210422
(\tref{utilities.allocator.requirements}).
1042310423

1042410424
\pnum
@@ -10750,7 +10750,7 @@
1075010750

1075110751
\pnum
1075210752
Template parameters named \tcode{InputIterator} shall satisfy the
10753-
\textit{Cpp98InputIterator} requirements\iref{input.iterators} and shall
10753+
\oldconcept{InputIterator} requirements\iref{input.iterators} and shall
1075410754
have a value type that is one of the encoded character types.
1075510755

1075610756
\pnum
@@ -10762,7 +10762,7 @@
1076210762

1076310763
\pnum
1076410764
Template parameters named \tcode{Allocator} shall satisfy the
10765-
\textit{Cpp98Allocator} requirements (\tref{utilities.allocator.requirements}).
10765+
\oldconcept{Allocator} requirements (\tref{utilities.allocator.requirements}).
1076610766

1076710767
\rSec3[fs.req.namespace]{Namespaces and headers}
1076810768

@@ -10987,7 +10987,7 @@
1098710987

1098810988
\pnum
1098910989
\tcode{\textit{trivial-clock}} is an \impldef{type of filesystem trivial clock} type
10990-
that satisfies the \textit{Cpp98TrivialClock} requirements\iref{time.clock.req}
10990+
that satisfies the \oldconcept{TrivialClock} requirements\iref{time.clock.req}
1099110991
and that is capable of representing and measuring file time values.
1099210992
Implementations should ensure that the resolution and range of
1099310993
\tcode{file_time_type} reflect the operating system dependent resolution and range
@@ -11550,7 +11550,7 @@
1155011550
\item \tcode{basic_string_view<EcharT, traits>}. A function
1155111551
argument \tcode{const Source\&} \tcode{source} shall have an
1155211552
effective range \range{source.begin()}{source.end()}.
11553-
\item A type meeting the \textit{Cpp98InputIterator} requirements that iterates over a NTCTS.
11553+
\item A type meeting the \oldconcept{InputIterator} requirements that iterates over a NTCTS.
1155411554
The value type shall be an encoded character type. A function argument
1155511555
\tcode{const Source\&} \tcode{source} shall have an effective range
1155611556
\range{source}{end} where \tcode{end} is the first
@@ -13866,7 +13866,7 @@
1386613866

1386713867
\pnum
1386813868
\tcode{directory_iterator} satisfies the
13869-
\textit{Cpp98InputIterator} requirements\iref{input.iterators}.
13869+
\oldconcept{InputIterator} requirements\iref{input.iterators}.
1387013870

1387113871
\pnum
1387213872
If an iterator of type \tcode{directory_iterator} reports an error or

source/iterators.tex

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
the only exceptions are destroying an iterator that holds a singular value,
157157
the assignment of a non-singular value to
158158
an iterator that holds a singular value, and, for iterators that satisfy the
159-
\textit{Cpp98DefaultConstructible} requirements, using a value-initialized iterator
159+
\oldconcept{DefaultConstructible} requirements, using a value-initialized iterator
160160
as the source of a copy or move operation. \begin{note} This guarantee is not
161161
offered for default-initialization, although the distinction only matters for types
162162
with trivial default constructors such as pointers or aggregates holding pointers.
@@ -266,31 +266,31 @@
266266
\begin{note} For an iterator type \tcode{X} there must be an instantiation
267267
of \tcode{iterator_traits<X>}\iref{iterator.traits}. \end{note}
268268

269-
\rSec2[iterator.iterators]{\textit{Cpp98Iterator}}
269+
\rSec2[iterator.iterators]{\oldconcept{Iterator}}
270270

271271
\pnum
272-
The \textit{Cpp98Iterator} requirements form the basis of the iterator
273-
taxonomy; every iterator satisfies the \textit{Cpp98Iterator} requirements. This
272+
The \oldconcept{Iterator} requirements form the basis of the iterator
273+
taxonomy; every iterator satisfies the \oldconcept{Iterator} requirements. This
274274
set of requirements specifies operations for dereferencing and incrementing
275275
an iterator. Most algorithms will require additional operations to
276276
read\iref{input.iterators} or write\iref{output.iterators} values, or
277277
to provide a richer set of iterator movements~(\ref{forward.iterators},
278278
\ref{bidirectional.iterators}, \ref{random.access.iterators}).
279279

280280
\pnum
281-
A type \tcode{X} satisfies the \textit{Cpp98Iterator} requirements if:
281+
A type \tcode{X} satisfies the \oldconcept{Iterator} requirements if:
282282

283283
\begin{itemize}
284-
\item \tcode{X} satisfies the \textit{Cpp98CopyConstructible}, \textit{Cpp98CopyAssignable}, and
285-
\textit{Cpp98Destructible} requirements\iref{utility.arg.requirements} and lvalues
284+
\item \tcode{X} satisfies the \oldconcept{CopyConstructible}, \oldconcept{CopyAssignable}, and
285+
\oldconcept{Destructible} requirements\iref{utility.arg.requirements} and lvalues
286286
of type \tcode{X} are swappable\iref{swappable.requirements}, and
287287

288288
\item the expressions in \tref{iterator.requirements} are valid and have
289289
the indicated semantics.
290290
\end{itemize}
291291

292292
\begin{libreqtab4b}
293-
{\textit{Cpp98Iterator} requirements}
293+
{\oldconcept{Iterator} requirements}
294294
{tab:iterator.requirements}
295295
\\ \topline
296296
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
@@ -322,8 +322,8 @@
322322
satisfies the requirements of an input iterator for the value type
323323
\tcode{T}
324324
if
325-
\tcode{X} satisfies the \textit{Cpp98Iterator}\iref{iterator.iterators} and
326-
\textit{Cpp98EqualityComparable} (\tref{equalitycomparable}) requirements and
325+
\tcode{X} satisfies the \oldconcept{Iterator}\iref{iterator.iterators} and
326+
\oldconcept{EqualityComparable} (\tref{equalitycomparable}) requirements and
327327
the expressions in \tref{iterator.input.requirements} are valid and have
328328
the indicated semantics.
329329

@@ -357,7 +357,7 @@
357357
\end{example}
358358

359359
\begin{libreqtab4b}
360-
{\textit{Cpp98InputIterator} requirements (in addition to \textit{Cpp98Iterator})}
360+
{\oldconcept{InputIterator} requirements (in addition to \oldconcept{Iterator})}
361361
{tab:iterator.input.requirements}
362362
\\ \topline
363363
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
@@ -415,7 +415,7 @@
415415
They should be
416416
\term{single pass}
417417
algorithms.
418-
Value type \tcode{T} is not required to be a \textit{Cpp98CopyAssignable} type (\tref{copyassignable}).
418+
Value type \tcode{T} is not required to be a \oldconcept{CopyAssignable} type (\tref{copyassignable}).
419419
These algorithms can be used with istreams as the source of the input data through the
420420
\tcode{istream_iterator}
421421
class template.
@@ -427,12 +427,12 @@
427427
A class or pointer type
428428
\tcode{X}
429429
satisfies the requirements of an output iterator
430-
if \tcode{X} satisfies the \textit{Cpp98Iterator} requirements\iref{iterator.iterators}
430+
if \tcode{X} satisfies the \oldconcept{Iterator} requirements\iref{iterator.iterators}
431431
and the expressions in \tref{iterator.output.requirements}
432432
are valid and have the indicated semantics.
433433

434434
\begin{libreqtab4b}
435-
{\textit{Cpp98OutputIterator} requirements (in addition to \textit{Cpp98Iterator})}
435+
{\oldconcept{OutputIterator} requirements (in addition to \oldconcept{Iterator})}
436436
{tab:iterator.output.requirements}
437437
\\ \topline
438438
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
@@ -495,9 +495,9 @@
495495
satisfies the requirements of a forward iterator if
496496

497497
\begin{itemize}
498-
\item \tcode{X} satisfies the \textit{Cpp98InputIterator} requirements\iref{input.iterators},
498+
\item \tcode{X} satisfies the \oldconcept{InputIterator} requirements\iref{input.iterators},
499499

500-
\item \tcode{X} satisfies the \textit{Cpp98DefaultConstructible}
500+
\item \tcode{X} satisfies the \oldconcept{DefaultConstructible}
501501
requirements\iref{utility.arg.requirements},
502502

503503
\item if \tcode{X} is a mutable iterator, \tcode{reference} is a reference to \tcode{T};
@@ -540,7 +540,7 @@
540540
\end{note}
541541

542542
\begin{libreqtab4b}
543-
{\textit{Cpp98ForwardIterator} requirements (in addition to \textit{Cpp98InputIterator})}
543+
{\oldconcept{ForwardIterator} requirements (in addition to \oldconcept{InputIterator})}
544544
{tab:iterator.forward.requirements}
545545
\\ \topline
546546
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
@@ -577,11 +577,11 @@
577577
A class or pointer type
578578
\tcode{X}
579579
satisfies the requirements of a bidirectional iterator if,
580-
in addition to satisfying the \textit{Cpp98ForwardIterator} requirements,
580+
in addition to satisfying the \oldconcept{ForwardIterator} requirements,
581581
the following expressions are valid as shown in \tref{iterator.bidirectional.requirements}.
582582

583583
\begin{libreqtab4b}
584-
{\textit{Cpp98BidirectionalIterator} requirements (in addition to \textit{Cpp98ForwardIterator})}
584+
{\oldconcept{BidirectionalIterator} requirements (in addition to \oldconcept{ForwardIterator})}
585585
{tab:iterator.bidirectional.requirements}
586586
\\ \topline
587587
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
@@ -622,11 +622,11 @@
622622
A class or pointer type
623623
\tcode{X}
624624
satisfies the requirements of a random access iterator if,
625-
in addition to satisfying the \textit{Cpp98BidirectionalIterator} requirements,
625+
in addition to satisfying the \oldconcept{BidirectionalIterator} requirements,
626626
the following expressions are valid as shown in \tref{iterator.random.access.requirements}.
627627

628628
\begin{libreqtab4b}
629-
{\textit{Cpp98RandomAccessIterator} requirements (in addition to \textit{Cpp98BidirectionalIterator})}
629+
{\oldconcept{RandomAccessIterator} requirements (in addition to \oldconcept{BidirectionalIterator})}
630630
{tab:iterator.random.access.requirements}
631631
\\ \topline
632632
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
@@ -1128,7 +1128,7 @@
11281128
\begin{itemdescr}
11291129
\pnum
11301130
\effects
1131-
If \tcode{InputIterator} meets the \textit{Cpp98RandomAccessIterator} requirements,
1131+
If \tcode{InputIterator} meets the \oldconcept{RandomAccessIterator} requirements,
11321132
returns \tcode{(last - first)}; otherwise, returns
11331133
the number of increments needed to get from
11341134
\tcode{first}
@@ -1137,7 +1137,7 @@
11371137

11381138
\pnum
11391139
\requires
1140-
If \tcode{InputIterator} meets the \textit{Cpp98RandomAccessIterator} requirements,
1140+
If \tcode{InputIterator} meets the \oldconcept{RandomAccessIterator} requirements,
11411141
\tcode{last} shall be reachable from \tcode{first} or \tcode{first} shall be
11421142
reachable from \tcode{last}; otherwise,
11431143
\tcode{last}
@@ -1262,12 +1262,12 @@
12621262
\pnum
12631263
The template parameter
12641264
\tcode{Iterator}
1265-
shall satisfy all the requirements of a \textit{Cpp98BidirectionalIterator}\iref{bidirectional.iterators}.
1265+
shall satisfy all the requirements of a \oldconcept{BidirectionalIterator}\iref{bidirectional.iterators}.
12661266

12671267
\pnum
12681268
Additionally,
12691269
\tcode{Iterator}
1270-
shall satisfy the requirements of a \textit{Cpp98RandomAccessIterator}\iref{random.access.iterators}
1270+
shall satisfy the requirements of a \oldconcept{RandomAccessIterator}\iref{random.access.iterators}
12711271
if any of the members
12721272
\tcode{operator+},
12731273
\tcode{operator-},
@@ -2149,11 +2149,11 @@
21492149

21502150
\pnum
21512151
The template parameter \tcode{Iterator} shall satisfy
2152-
the \textit{Cpp98InputIterator} requirements\iref{input.iterators}.
2152+
the \oldconcept{InputIterator} requirements\iref{input.iterators}.
21532153
Additionally, if any of the bidirectional or random access traversal
21542154
functions are instantiated, the template parameter shall satisfy the
2155-
\textit{Cpp98BidirectionalIterator} requirements\iref{bidirectional.iterators}
2156-
or \textit{Cpp98RandomAccessIterator} requirements\iref{random.access.iterators}, respectively.
2155+
\oldconcept{BidirectionalIterator} requirements\iref{bidirectional.iterators}
2156+
or \oldconcept{RandomAccessIterator} requirements\iref{random.access.iterators}, respectively.
21572157

21582158
\rSec3[move.iter.ops]{\tcode{move_iterator} operations}
21592159

@@ -2549,8 +2549,8 @@
25492549
The behavior of a program that applies \tcode{operator++()} to an end-of-stream
25502550
iterator is undefined.
25512551
It is impossible to store things into istream iterators.
2552-
The type \tcode{T} shall satisfy the \textit{Cpp98DefaultConstructible},
2553-
\textit{Cpp98CopyConstructible}, and \textit{Cpp98CopyAssignable} requirements.
2552+
The type \tcode{T} shall satisfy the \oldconcept{DefaultConstructible},
2553+
\oldconcept{CopyConstructible}, and \oldconcept{CopyAssignable} requirements.
25542554

25552555
\pnum
25562556
Two end-of-stream iterators are always equal.

0 commit comments

Comments
 (0)