Skip to content

Commit 88cf26f

Browse files
jensmaurerjensmaurer
committed
[reverse.iterators] Dissolve single-item subclauses.
1 parent 1b5e3c9 commit 88cf26f

File tree

2 files changed

+77
-83
lines changed

2 files changed

+77
-83
lines changed

‎source/iterators.tex

+51-83
Original file line numberDiff line numberDiff line change
@@ -1254,24 +1254,22 @@
12541254
\tcode{Iterator}
12551255
shall meet the requirements of a random access iterator\iref{random.access.iterators}
12561256
if any of the members
1257-
\tcode{operator+}~(\ref{reverse.iter.op+}),
1258-
\tcode{operator-}~(\ref{reverse.iter.op-}),
1259-
\tcode{operator+=}~(\ref{reverse.iter.op+=}),
1260-
\tcode{operator-=}~(\ref{reverse.iter.op-=}),
1261-
\tcode{operator[]}\iref{reverse.iter.opindex},
1262-
or the non-member operators
1263-
\tcode{operator<}~(\ref{reverse.iter.op<}),
1264-
\tcode{operator>}~(\ref{reverse.iter.op>}),\\
1265-
\tcode{operator<=}~(\ref{reverse.iter.op<=}),
1266-
\tcode{operator>=}~(\ref{reverse.iter.op>=}),
1267-
\tcode{operator-}\iref{reverse.iter.opdiff}
1257+
\tcode{operator+},
1258+
\tcode{operator-},
1259+
\tcode{operator+=},
1260+
\tcode{operator-=}\iref{reverse.iter.nav},
1261+
\tcode{operator[]}\iref{reverse.iter.elem},
1262+
or the non-member operators\iref{reverse.iter.cmp}
1263+
\tcode{operator<},
1264+
\tcode{operator>},
1265+
\tcode{operator<=},
1266+
\tcode{operator>=},
1267+
\tcode{operator-},
12681268
or
1269-
\tcode{operator+}\iref{reverse.iter.opsum}
1269+
\tcode{operator+}\iref{reverse.iter.nonmember}
12701270
are referenced in a way that requires instantiation\iref{temp.inst}.
12711271

1272-
\rSec3[reverse.iter.ops]{\tcode{reverse_iterator} operations}
1273-
1274-
\rSec4[reverse.iter.cons]{\tcode{reverse_iterator} constructor}
1272+
\rSec3[reverse.iter.cons]{\tcode{reverse_iterator} construction and assignment}
12751273

12761274
\indexlibrary{\idxcode{reverse_iterator}!constructor}%
12771275
\begin{itemdecl}
@@ -1315,8 +1313,6 @@
13151313
\tcode{u.current}.
13161314
\end{itemdescr}
13171315

1318-
\rSec4[reverse.iter.op=]{\tcode{reverse_iterator::operator=}}
1319-
13201316
\indexlibrarymember{operator=}{reverse_iterator}%
13211317
\begin{itemdecl}
13221318
template<class U>
@@ -1334,7 +1330,7 @@
13341330
\tcode{*this}.
13351331
\end{itemdescr}
13361332

1337-
\rSec4[reverse.iter.conv]{Conversion}
1333+
\rSec3[reverse.iter.conv]{Conversion}
13381334

13391335
\indexlibrarymember{base}{reverse_iterator}%
13401336
\begin{itemdecl}
@@ -1347,7 +1343,7 @@
13471343
\tcode{current}.
13481344
\end{itemdescr}
13491345

1350-
\rSec4[reverse.iter.op.star]{\tcode{operator*}}
1346+
\rSec3[reverse.iter.elem]{\tcode{reverse_iterator} element access}
13511347

13521348
\indexlibrarymember{operator*}{reverse_iterator}%
13531349
\begin{itemdecl}
@@ -1365,8 +1361,6 @@
13651361

13661362
\end{itemdescr}
13671363

1368-
\rSec4[reverse.iter.opref]{\tcode{operator->}}
1369-
13701364
\indexlibrarymember{operator->}{reverse_iterator}%
13711365
\begin{itemdecl}
13721366
constexpr pointer operator->() const;
@@ -1377,7 +1371,40 @@
13771371
\returns \tcode{addressof(operator*())}.
13781372
\end{itemdescr}
13791373

1380-
\rSec4[reverse.iter.op++]{\tcode{operator++}}
1374+
\indexlibrarymember{operator[]}{reverse_iterator}%
1375+
\begin{itemdecl}
1376+
constexpr @\unspec@ operator[](difference_type n) const;
1377+
\end{itemdecl}
1378+
1379+
\begin{itemdescr}
1380+
\pnum
1381+
\returns
1382+
\tcode{current[-n-1]}.
1383+
\end{itemdescr}
1384+
1385+
\rSec3[reverse.iter.nav]{\tcode{reverse_iterator} navigation}
1386+
1387+
\indexlibrarymember{operator+}{reverse_iterator}%
1388+
\begin{itemdecl}
1389+
constexpr reverse_iterator operator+(difference_type n) const;
1390+
\end{itemdecl}
1391+
1392+
\begin{itemdescr}
1393+
\pnum
1394+
\returns
1395+
\tcode{reverse_iterator(current-n)}.
1396+
\end{itemdescr}
1397+
1398+
\indexlibrarymember{operator-}{reverse_iterator}%
1399+
\begin{itemdecl}
1400+
constexpr reverse_iterator operator-(difference_type n) const;
1401+
\end{itemdecl}
1402+
1403+
\begin{itemdescr}
1404+
\pnum
1405+
\returns
1406+
\tcode{reverse_iterator(current+n)}.
1407+
\end{itemdescr}
13811408

13821409
\indexlibrarymember{operator++}{reverse_iterator}%
13831410
\begin{itemdecl}
@@ -1410,8 +1437,6 @@
14101437
\end{codeblock}
14111438
\end{itemdescr}
14121439

1413-
\rSec4[reverse.iter.op\dcr]{\tcode{operator\dcr}}
1414-
14151440
\indexlibrarymember{operator\dcr}{reverse_iterator}%
14161441
\begin{itemdecl}
14171442
constexpr reverse_iterator& operator--();
@@ -1443,21 +1468,6 @@
14431468
\end{codeblock}
14441469
\end{itemdescr}
14451470

1446-
\rSec4[reverse.iter.op+]{\tcode{operator+}}
1447-
1448-
\indexlibrarymember{operator+}{reverse_iterator}%
1449-
\begin{itemdecl}
1450-
constexpr reverse_iterator operator+(difference_type n) const;
1451-
\end{itemdecl}
1452-
1453-
\begin{itemdescr}
1454-
\pnum
1455-
\returns
1456-
\tcode{reverse_iterator(current-n)}.
1457-
\end{itemdescr}
1458-
1459-
\rSec4[reverse.iter.op+=]{\tcode{operator+=}}
1460-
14611471
\indexlibrarymember{operator+=}{reverse_iterator}%
14621472
\begin{itemdecl}
14631473
constexpr reverse_iterator& operator+=(difference_type n);
@@ -1473,21 +1483,6 @@
14731483
\tcode{*this}.
14741484
\end{itemdescr}
14751485

1476-
\rSec4[reverse.iter.op-]{\tcode{operator-}}
1477-
1478-
\indexlibrarymember{operator-}{reverse_iterator}%
1479-
\begin{itemdecl}
1480-
constexpr reverse_iterator operator-(difference_type n) const;
1481-
\end{itemdecl}
1482-
1483-
\begin{itemdescr}
1484-
\pnum
1485-
\returns
1486-
\tcode{reverse_iterator(current+n)}.
1487-
\end{itemdescr}
1488-
1489-
\rSec4[reverse.iter.op-=]{\tcode{operator-=}}
1490-
14911486
\indexlibrarymember{operator-=}{reverse_iterator}%
14921487
\begin{itemdecl}
14931488
constexpr reverse_iterator& operator-=(difference_type n);
@@ -1503,20 +1498,7 @@
15031498
\tcode{*this}.
15041499
\end{itemdescr}
15051500

1506-
\rSec4[reverse.iter.opindex]{\tcode{operator[]}}
1507-
1508-
\indexlibrarymember{operator[]}{reverse_iterator}%
1509-
\begin{itemdecl}
1510-
constexpr @\unspec@ operator[](difference_type n) const;
1511-
\end{itemdecl}
1512-
1513-
\begin{itemdescr}
1514-
\pnum
1515-
\returns
1516-
\tcode{current[-n-1]}.
1517-
\end{itemdescr}
1518-
1519-
\rSec4[reverse.iter.op==]{\tcode{operator==}}
1501+
\rSec3[reverse.iter.cmp]{\tcode{reverse_iterator} comparisons}
15201502

15211503
\indexlibrarymember{operator==}{reverse_iterator}%
15221504
\begin{itemdecl}
@@ -1532,8 +1514,6 @@
15321514
\tcode{x.current == y.current}.
15331515
\end{itemdescr}
15341516

1535-
\rSec4[reverse.iter.op<]{\tcode{operator<}}
1536-
15371517
\indexlibrarymember{operator<}{reverse_iterator}%
15381518
\begin{itemdecl}
15391519
template<class Iterator1, class Iterator2>
@@ -1548,8 +1528,6 @@
15481528
\tcode{x.current > y.current}.
15491529
\end{itemdescr}
15501530

1551-
\rSec4[reverse.iter.op!=]{\tcode{operator!=}}
1552-
15531531
\indexlibrarymember{operator"!=}{reverse_iterator}%
15541532
\begin{itemdecl}
15551533
template<class Iterator1, class Iterator2>
@@ -1564,8 +1542,6 @@
15641542
\tcode{x.current != y.current}.
15651543
\end{itemdescr}
15661544

1567-
\rSec4[reverse.iter.op>]{\tcode{operator>}}
1568-
15691545
\indexlibrarymember{operator>}{reverse_iterator}%
15701546
\begin{itemdecl}
15711547
template<class Iterator1, class Iterator2>
@@ -1580,8 +1556,6 @@
15801556
\tcode{x.current < y.current}.
15811557
\end{itemdescr}
15821558

1583-
\rSec4[reverse.iter.op>=]{\tcode{operator>=}}
1584-
15851559
\indexlibrarymember{operator>=}{reverse_iterator}%
15861560
\begin{itemdecl}
15871561
template<class Iterator1, class Iterator2>
@@ -1596,8 +1570,6 @@
15961570
\tcode{x.current <= y.current}.
15971571
\end{itemdescr}
15981572

1599-
\rSec4[reverse.iter.op<=]{\tcode{operator<=}}
1600-
16011573
\indexlibrarymember{operator<=}{reverse_iterator}%
16021574
\begin{itemdecl}
16031575
template<class Iterator1, class Iterator2>
@@ -1612,7 +1584,7 @@
16121584
\tcode{x.current >= y.current}.
16131585
\end{itemdescr}
16141586

1615-
\rSec4[reverse.iter.opdiff]{\tcode{operator-}}
1587+
\rSec3[reverse.iter.nonmember]{Non-member functions}
16161588

16171589
\indexlibrarymember{operator-}{reverse_iterator}%
16181590
\begin{itemdecl}
@@ -1628,8 +1600,6 @@
16281600
\tcode{y.current - x.current}.
16291601
\end{itemdescr}
16301602

1631-
\rSec4[reverse.iter.opsum]{\tcode{operator+}}
1632-
16331603
\indexlibrarymember{operator+}{reverse_iterator}%
16341604
\begin{itemdecl}
16351605
template<class Iterator>
@@ -1644,8 +1614,6 @@
16441614
\tcode{reverse_iterator<Iterator> (x.current - n)}.
16451615
\end{itemdescr}
16461616

1647-
\rSec4[reverse.iter.make]{Non-member function \tcode{make_reverse_iterator()}}
1648-
16491617
\indexlibrary{\idxcode{reverse_iterator}!\idxcode{make_reverse_iterator} non-member function}%
16501618
\indexlibrary{\idxcode{make_reverse_iterator}}%
16511619
\begin{itemdecl}

‎source/xrefdelta.tex

+26
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,31 @@
5252
% Deprecated free-function atomic access to shared pointers
5353
\movedxref{util.smartptr.shared.atomic}{depr.util.smartptr.shared.atomic}
5454

55+
% Single-item [reverse.iterators] subclauses were dissolved.
56+
\movedxref{reverse.iter.op==}{reverse.iter.cmp}
57+
\movedxref{reverse.iter.op<}{reverse.iter.cmp}
58+
\movedxref{reverse.iter.op!=}{reverse.iter.cmp}
59+
\movedxref{reverse.iter.op>}{reverse.iter.cmp}
60+
\movedxref{reverse.iter.op>=}{reverse.iter.cmp}
61+
\movedxref{reverse.iter.op<=}{reverse.iter.cmp}
62+
63+
\movedxref{reverse.iter.star}{reverse.iter.elem}
64+
\movedxref{reverse.iter.opref}{reverse.iter.elem}
65+
\movedxref{reverse.iter.opindex}{reverse.iter.elem}
66+
67+
\movedxref{reverse.iter.op+}{reverse.iter.nav}
68+
\movedxref{reverse.iter.op-}{reverse.iter.nav}
69+
\movedxref{reverse.iter.op++}{reverse.iter.nav}
70+
\movedxref{reverse.iter.op+=}{reverse.iter.nav}
71+
\movedxref{reverse.iter.op\dcr}{reverse.iter.nav}
72+
\movedxref{reverse.iter.op-=}{reverse.iter.nav}
73+
\movedxref{reverse.iter.op++}{reverse.iter.nav}
74+
75+
\movedxref{reverse.iter.opdiff}{reverse.iter.nonmember}
76+
\movedxref{reverse.iter.opsum}{reverse.iter.nonmember}
77+
\movedxref{reverse.iter.make}{reverse.iter.nonmember}
78+
79+
\removedxref{reverse.iter.ops}
80+
5581
% Deprecated features.
5682
%\deprxref{old.label} (if moved to depr.old.label, otherwise use \movedxref)

0 commit comments

Comments
 (0)