Skip to content

Commit c6b97d9

Browse files
EelisEelis
committed
[std] Retire \dcr.
1 parent b688d94 commit c6b97d9

File tree

10 files changed

+48
-49
lines changed

10 files changed

+48
-49
lines changed

‎source/atomics.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,8 +1495,8 @@
14951495
Equivalent to: \tcode{return fetch_add(1);}
14961496
\end{itemdescr}
14971497

1498-
\indexlibrarymember{operator\dcr}{atomic_ref<T*>}%
1499-
\indexlibrarymember{operator\dcr}{atomic_ref<\placeholder{integral}>}%
1498+
\indexlibrarymember{operator--}{atomic_ref<T*>}%
1499+
\indexlibrarymember{operator--}{atomic_ref<\placeholder{integral}>}%
15001500
\begin{itemdecl}
15011501
value_type operator--(int) const noexcept;
15021502
\end{itemdecl}
@@ -1519,8 +1519,8 @@
15191519
Equivalent to: \tcode{return fetch_add(1) + 1;}
15201520
\end{itemdescr}
15211521

1522-
\indexlibrarymember{operator\dcr}{atomic_ref<T*>}%
1523-
\indexlibrarymember{operator\dcr}{atomic_ref<\placeholder{integral}>}%
1522+
\indexlibrarymember{operator--}{atomic_ref<T*>}%
1523+
\indexlibrarymember{operator--}{atomic_ref<\placeholder{integral}>}%
15241524
\begin{itemdecl}
15251525
value_type operator--() const noexcept;
15261526
\end{itemdecl}
@@ -2657,8 +2657,8 @@
26572657
Equivalent to: \tcode{return fetch_add(1);}
26582658
\end{itemdescr}
26592659

2660-
\indexlibrarymember{operator\dcr}{atomic<T*>}%
2661-
\indexlibrarymember{operator\dcr}{atomic<\placeholder{integral}>}%
2660+
\indexlibrarymember{operator--}{atomic<T*>}%
2661+
\indexlibrarymember{operator--}{atomic<\placeholder{integral}>}%
26622662
\begin{itemdecl}
26632663
value_type operator--(int) volatile noexcept;
26642664
value_type operator--(int) noexcept;
@@ -2693,8 +2693,8 @@
26932693
Equivalent to: \tcode{return fetch_add(1) + 1;}
26942694
\end{itemdescr}
26952695

2696-
\indexlibrarymember{operator\dcr}{atomic<T*>}%
2697-
\indexlibrarymember{operator\dcr}{atomic<\placeholder{integral}>}%
2696+
\indexlibrarymember{operator--}{atomic<T*>}%
2697+
\indexlibrarymember{operator--}{atomic<\placeholder{integral}>}%
26982698
\begin{itemdecl}
26992699
value_type operator--() volatile noexcept;
27002700
value_type operator--() noexcept;

‎source/containers.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@
10861086
\tcode{a.back()} &
10871087
\tcode{reference; const_reference} for constant \tcode{a} &
10881088
\tcode{\{ auto tmp = a.end();}\br
1089-
\tcode{ \dcr tmp;}\br
1089+
\tcode{ --tmp;}\br
10901090
\tcode{ return *tmp; \}} &
10911091
\tcode{basic_string},
10921092
\tcode{array},

‎source/expressions.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3371,9 +3371,9 @@
33713371
\pnum
33723372
\indextext{expression!decrement}%
33733373
\indextext{operator!decrement}%
3374-
\indextext{\idxcode{\dcr}|see{operator, decrement}}%
3375-
\indextext{postfix \tcode{\dcr}}%
3376-
The operand of postfix \tcode{\dcr} is decremented analogously to the
3374+
\indextext{\idxcode{--}|see{operator, decrement}}%
3375+
\indextext{postfix \tcode{--}}%
3376+
The operand of postfix \tcode{--} is decremented analogously to the
33773377
postfix \tcode{++} operator.
33783378
\begin{note}
33793379
For prefix increment and decrement, see~\ref{expr.pre.incr}.
@@ -4307,7 +4307,7 @@
43074307
\indextext{operator!increment}%
43084308
\indextext{prefix \tcode{++}}%
43094309
is modified\iref{defns.access} by adding \tcode{1}.
4310-
\indextext{prefix \tcode{\dcr}}%
4310+
\indextext{prefix \tcode{--}}%
43114311
The operand shall be a modifiable lvalue. The type of the operand shall
43124312
be an arithmetic type other than \cv{}~\tcode{bool},
43134313
or a pointer to a completely-defined object type.
@@ -4325,9 +4325,9 @@
43254325
\pnum
43264326
The operand of prefix
43274327
\indextext{operator!decrement}%
4328-
\tcode{\dcr} is modified\iref{defns.access} by subtracting \tcode{1}.
4328+
\tcode{--} is modified\iref{defns.access} by subtracting \tcode{1}.
43294329
The requirements on the operand of prefix
4330-
\tcode{\dcr} and the properties of its result are otherwise the same as
4330+
\tcode{--} and the properties of its result are otherwise the same as
43314331
those of prefix \tcode{++}.
43324332
\begin{note}
43334333
For postfix increment and decrement, see~\ref{expr.post.incr}.

‎source/future.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
\rSec1[depr.volatile.type]{Deprecated \tcode{volatile} types}
9797

9898
\pnum
99-
Postfix \tcode{++} and \tcode{\dcr} expressions\iref{expr.post.incr} and
100-
prefix \tcode{++} and \tcode{\dcr} expressions\iref{expr.pre.incr}
99+
Postfix \tcode{++} and \tcode{--} expressions\iref{expr.post.incr} and
100+
prefix \tcode{++} and \tcode{--} expressions\iref{expr.pre.incr}
101101
of volatile-qualified arithmetic and pointer types are deprecated.
102102

103103
\begin{example}
@@ -912,7 +912,7 @@
912912
if the input sequence has a putback position available, and if
913913
\tcode{strmode \& constant} is zero,
914914
assigns \tcode{c} to
915-
\tcode{*\dcr{}gnext}.
915+
\tcode{*--gnext}.
916916

917917
Returns
918918
\tcode{c}.

‎source/iostreams.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7961,7 +7961,7 @@
79617961
\tcode{ios_base::out} is
79627962
nonzero,
79637963
assigns \tcode{c} to
7964-
\tcode{*\dcr gptr()}.
7964+
\tcode{*--gptr()}.
79657965

79667966
Returns:
79677967
\tcode{c}.

‎source/iterators.tex

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2194,22 +2194,22 @@
21942194
\lhdr{Expression} & \chdr{Return type} & \chdr{Operational} & \rhdr{Assertion/note} \\
21952195
& & \chdr{semantics} & \rhdr{pre-/post-condition} \\ \capsep
21962196
\endhead
2197-
\tcode{\dcr r} &
2197+
\tcode{--r} &
21982198
\tcode{X\&} &
21992199
&
22002200
\expects there exists \tcode{s} such that \tcode{r == ++s}.\br
22012201
\ensures \tcode{r} is dereferenceable.\br
2202-
\tcode{\dcr(++r) == r}.\br
2203-
\tcode{\dcr r == \dcr s} implies \tcode{r == s}.\br
2204-
\tcode{addressof(r) == addressof(\dcr r)}. \\ \hline
2202+
\tcode{--(++r) == r}.\br
2203+
\tcode{--r == --s} implies \tcode{r == s}.\br
2204+
\tcode{addressof(r) == addressof(--r)}. \\ \hline
22052205

2206-
\tcode{r\dcr} &
2206+
\tcode{r--} &
22072207
convertible to \tcode{const X\&} &
22082208
\tcode{\{ X tmp = r;}\br
2209-
\tcode{ \dcr r;}\br
2209+
\tcode{ --r;}\br
22102210
\tcode{ return tmp; \}}& \\ \rowsep
22112211

2212-
\tcode{*r\dcr} &
2212+
\tcode{*r--} &
22132213
\tcode{reference} && \\
22142214
\end{libreqtab4b}
22152215

@@ -2243,11 +2243,11 @@
22432243
\tcode{X\&} &
22442244
\tcode{\{ difference_type m = n;}\br
22452245
\tcode{ if (m >= 0)}\br
2246-
\tcode{ while (m\dcr)}\br
2246+
\tcode{ while (m--)}\br
22472247
\tcode{ ++r;}\br
22482248
\tcode{ else}\br
22492249
\tcode{ while (m++)}\br
2250-
\tcode{ \dcr r;}\br
2250+
\tcode{ --r;}\br
22512251
\tcode{ return r; \}}& \\ \rowsep
22522252

22532253
\tcode{a + n}\br
@@ -3329,7 +3329,7 @@
33293329
\begin{itemdescr}
33303330
\pnum
33313331
\effects
3332-
As if by: \tcode{\dcr current;}
3332+
As if by: \tcode{--current;}
33333333

33343334
\pnum
33353335
\returns
@@ -3352,7 +3352,7 @@
33523352
\end{codeblock}
33533353
\end{itemdescr}
33543354

3355-
\indexlibrarymember{operator\dcr}{reverse_iterator}%
3355+
\indexlibrarymember{operator--}{reverse_iterator}%
33563356
\begin{itemdecl}
33573357
constexpr reverse_iterator& operator--();
33583358
\end{itemdecl}
@@ -3367,7 +3367,7 @@
33673367
\tcode{*this}.
33683368
\end{itemdescr}
33693369

3370-
\indexlibrarymember{operator\dcr}{reverse_iterator}%
3370+
\indexlibrarymember{operator--}{reverse_iterator}%
33713371
\begin{itemdecl}
33723372
constexpr reverse_iterator operator--(int);
33733373
\end{itemdecl}
@@ -4300,22 +4300,22 @@
43004300
Otherwise, equivalent to \tcode{++current}.
43014301
\end{itemdescr}
43024302

4303-
\indexlibrarymember{operator\dcr}{move_iterator}%
4303+
\indexlibrarymember{operator--}{move_iterator}%
43044304
\begin{itemdecl}
43054305
constexpr move_iterator& operator--();
43064306
\end{itemdecl}
43074307

43084308
\begin{itemdescr}
43094309
\pnum
43104310
\effects
4311-
As if by \tcode{\dcr current}.
4311+
As if by \tcode{--current}.
43124312

43134313
\pnum
43144314
\returns
43154315
\tcode{*this}.
43164316
\end{itemdescr}
43174317

4318-
\indexlibrarymember{operator\dcr}{move_iterator}%
4318+
\indexlibrarymember{operator--}{move_iterator}%
43194319
\begin{itemdecl}
43204320
constexpr move_iterator operator--(int);
43214321
\end{itemdecl}

‎source/macros.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@
245245
\newcommand{\CppXVII}{\Cpp{} 2017}
246246
\newcommand{\CppXX}{\Cpp{} 2020}
247247
\newcommand{\opt}[1]{#1\ensuremath{_\mathit{\color{black}opt}}}
248-
\newcommand{\dcr}{-{-}}
249248
\newcommand{\bigoh}[1]{\ensuremath{\mathscr{O}(#1)}}
250249

251250
% Make all tildes a little larger to avoid visual similarity with hyphens.

‎source/overloading.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3542,7 +3542,7 @@
35423542
\keyword{operator} \terminal{@} \terminal{(} cast-expression \terminal{)}
35433543
\end{ncsimplebnf}
35443544
\begin{note}
3545-
The operators \tcode{++} and \tcode{\dcr}\iref{expr.pre.incr}
3545+
The operators \tcode{++} and \tcode{--}\iref{expr.pre.incr}
35463546
are described in~\ref{over.inc}.
35473547
\end{note}
35483548

@@ -3728,8 +3728,8 @@
37283728
\rSec2[over.inc]{Increment and decrement}
37293729
\indextext{increment operator!overloaded|see{overloading, increment operator}}%
37303730
\indextext{decrement operator!overloaded|see{overloading, decrement operator}}%
3731-
\indextext{prefix ++ and -{-} overloading@prefix \tcode{++} and \tcode{\dcr}!overloading}%
3732-
\indextext{postfix ++ and -{-} overloading@postfix \tcode{++} and \tcode{\dcr}!overloading}%
3731+
\indextext{prefix ++ and -{-} overloading@prefix \tcode{++} and \tcode{--}!overloading}%
3732+
\indextext{postfix ++ and -{-} overloading@postfix \tcode{++} and \tcode{--}!overloading}%
37333733

37343734
\pnum
37353735
An \defnadj{increment}{operator function}
@@ -3786,7 +3786,7 @@
37863786

37873787
\pnum
37883788
A \defnadj{decrement}{operator function}
3789-
is a function named \tcode{\keyword{operator}\dcr}
3789+
is a function named \tcode{\keyword{operator}--}
37903790
and is handled analogously to an increment operator function.
37913791
\indextext{overloading!operator|)}
37923792

‎source/ranges.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2414,7 +2414,7 @@
24142414
\end{codeblock}
24152415
\end{itemdescr}
24162416

2417-
\indexlibrarymember{operator\dcr}{iota_view::iterator}
2417+
\indexlibrarymember{operator--}{iota_view::iterator}
24182418
\begin{itemdecl}
24192419
constexpr @\exposid{iterator}@& operator--() requires @\exposconcept{decrementable}@<W>;
24202420
\end{itemdecl}
@@ -2429,7 +2429,7 @@
24292429
\end{codeblock}
24302430
\end{itemdescr}
24312431

2432-
\indexlibrarymember{operator\dcr}{iota_view::iterator}
2432+
\indexlibrarymember{operator--}{iota_view::iterator}
24332433
\begin{itemdecl}
24342434
constexpr @\exposid{iterator}@ operator--(int) requires @\exposconcept{decrementable}@<W>;
24352435
\end{itemdecl}
@@ -3401,7 +3401,7 @@
34013401
\end{codeblock}
34023402
\end{itemdescr}
34033403

3404-
\indexlibrarymember{operator\dcr}{filter_view::iterator}%
3404+
\indexlibrarymember{operator--}{filter_view::iterator}%
34053405
\begin{itemdecl}
34063406
constexpr @\exposid{iterator}@& operator--() requires @\libconcept{bidirectional_range}@<V>;
34073407
\end{itemdecl}
@@ -3418,7 +3418,7 @@
34183418
\end{codeblock}
34193419
\end{itemdescr}
34203420

3421-
\indexlibrarymember{operator\dcr}{filter_view::iterator}%
3421+
\indexlibrarymember{operator--}{filter_view::iterator}%
34223422
\begin{itemdecl}
34233423
constexpr @\exposid{iterator}@ operator--(int) requires @\libconcept{bidirectional_range}@<V>;
34243424
\end{itemdecl}
@@ -3924,7 +3924,7 @@
39243924
\end{codeblock}
39253925
\end{itemdescr}
39263926

3927-
\indexlibrarymember{operator\dcr}{transform_view::iterator}%
3927+
\indexlibrarymember{operator--}{transform_view::iterator}%
39283928
\begin{itemdecl}
39293929
constexpr @\exposid{iterator}@& operator--() requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>;
39303930
\end{itemdecl}
@@ -3939,7 +3939,7 @@
39393939
\end{codeblock}
39403940
\end{itemdescr}
39413941

3942-
\indexlibrarymember{operator\dcr}{transform_view::iterator}%
3942+
\indexlibrarymember{operator--}{transform_view::iterator}%
39433943
\begin{itemdecl}
39443944
constexpr @\exposid{iterator}@ operator--(int) requires @\libconcept{bidirectional_range}@<@\exposid{Base}@>;
39453945
\end{itemdecl}
@@ -5219,7 +5219,7 @@
52195219
\end{codeblock}
52205220
\end{itemdescr}
52215221

5222-
\indexlibrarymember{operator\dcr}{join_view::iterator}%
5222+
\indexlibrarymember{operator--}{join_view::iterator}%
52235223
\begin{itemdecl}
52245224
constexpr @\exposid{iterator}@& operator--()
52255225
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&
@@ -5241,7 +5241,7 @@
52415241
\end{codeblock}
52425242
\end{itemdescr}
52435243

5244-
\indexlibrarymember{operator\dcr}{join_view::iterator}%
5244+
\indexlibrarymember{operator--}{join_view::iterator}%
52455245
\begin{itemdecl}
52465246
constexpr @\exposid{iterator}@ operator--(int)
52475247
requires @\exposid{ref-is-glvalue}@ && @\libconcept{bidirectional_range}@<@\exposid{Base}@> &&

‎source/time.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@
14011401
Equivalent to: \tcode{return duration(rep_++);}
14021402
\end{itemdescr}
14031403

1404-
\indexlibrarymember{operator\dcr}{duration}%
1404+
\indexlibrarymember{operator--}{duration}%
14051405
\begin{itemdecl}
14061406
constexpr duration& operator--();
14071407
\end{itemdecl}
@@ -1416,7 +1416,7 @@
14161416
\tcode{*this}.
14171417
\end{itemdescr}
14181418

1419-
\indexlibrarymember{operator\dcr}{duration}%
1419+
\indexlibrarymember{operator--}{duration}%
14201420
\begin{itemdecl}
14211421
constexpr duration operator--(int);
14221422
\end{itemdecl}

0 commit comments

Comments
 (0)