Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[reverse.iterators] Dissolve single-item subclauses. #1832

Merged
merged 1 commit into from
Mar 31, 2018
Merged

[reverse.iterators] Dissolve single-item subclauses. #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 51 additions & 83 deletions source/iterators.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,24 +1254,22 @@
\tcode{Iterator}
shall meet the requirements of a random access iterator\iref{random.access.iterators}
if any of the members
\tcode{operator+}~(\ref{reverse.iter.op+}),
\tcode{operator-}~(\ref{reverse.iter.op-}),
\tcode{operator+=}~(\ref{reverse.iter.op+=}),
\tcode{operator-=}~(\ref{reverse.iter.op-=}),
\tcode{operator[]}\iref{reverse.iter.opindex},
or the non-member operators
\tcode{operator<}~(\ref{reverse.iter.op<}),
\tcode{operator>}~(\ref{reverse.iter.op>}),\\
\tcode{operator<=}~(\ref{reverse.iter.op<=}),
\tcode{operator>=}~(\ref{reverse.iter.op>=}),
\tcode{operator-}\iref{reverse.iter.opdiff}
\tcode{operator+},
\tcode{operator-},
\tcode{operator+=},
\tcode{operator-=}\iref{reverse.iter.nav},
\tcode{operator[]}\iref{reverse.iter.elem},
or the non-member operators\iref{reverse.iter.cmp}
\tcode{operator<},
\tcode{operator>},
\tcode{operator<=},
\tcode{operator>=},
\tcode{operator-},
or
\tcode{operator+}\iref{reverse.iter.opsum}
\tcode{operator+}\iref{reverse.iter.nonmember}
are referenced in a way that requires instantiation\iref{temp.inst}.

\rSec3[reverse.iter.ops]{\tcode{reverse_iterator} operations}

\rSec4[reverse.iter.cons]{\tcode{reverse_iterator} constructor}
\rSec3[reverse.iter.cons]{\tcode{reverse_iterator} construction and assignment}

\indexlibrary{\idxcode{reverse_iterator}!constructor}%
\begin{itemdecl}
Expand Down Expand Up @@ -1315,8 +1313,6 @@
\tcode{u.current}.
\end{itemdescr}

\rSec4[reverse.iter.op=]{\tcode{reverse_iterator::operator=}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're missing an xrefdelta entry for this.


\indexlibrarymember{operator=}{reverse_iterator}%
\begin{itemdecl}
template<class U>
Expand All @@ -1334,7 +1330,7 @@
\tcode{*this}.
\end{itemdescr}

\rSec4[reverse.iter.conv]{Conversion}
\rSec3[reverse.iter.conv]{Conversion}

\indexlibrarymember{base}{reverse_iterator}%
\begin{itemdecl}
Expand All @@ -1347,7 +1343,7 @@
\tcode{current}.
\end{itemdescr}

\rSec4[reverse.iter.op.star]{\tcode{operator*}}
\rSec3[reverse.iter.elem]{\tcode{reverse_iterator} element access}

\indexlibrarymember{operator*}{reverse_iterator}%
\begin{itemdecl}
Expand All @@ -1365,8 +1361,6 @@

\end{itemdescr}

\rSec4[reverse.iter.opref]{\tcode{operator->}}

\indexlibrarymember{operator->}{reverse_iterator}%
\begin{itemdecl}
constexpr pointer operator->() const;
Expand All @@ -1377,7 +1371,40 @@
\returns \tcode{addressof(operator*())}.
\end{itemdescr}

\rSec4[reverse.iter.op++]{\tcode{operator++}}
\indexlibrarymember{operator[]}{reverse_iterator}%
\begin{itemdecl}
constexpr @\unspec@ operator[](difference_type n) const;
\end{itemdecl}

\begin{itemdescr}
\pnum
\returns
\tcode{current[-n-1]}.
\end{itemdescr}

\rSec3[reverse.iter.nav]{\tcode{reverse_iterator} navigation}

\indexlibrarymember{operator+}{reverse_iterator}%
\begin{itemdecl}
constexpr reverse_iterator operator+(difference_type n) const;
\end{itemdecl}

\begin{itemdescr}
\pnum
\returns
\tcode{reverse_iterator(current-n)}.
\end{itemdescr}

\indexlibrarymember{operator-}{reverse_iterator}%
\begin{itemdecl}
constexpr reverse_iterator operator-(difference_type n) const;
\end{itemdecl}

\begin{itemdescr}
\pnum
\returns
\tcode{reverse_iterator(current+n)}.
\end{itemdescr}

\indexlibrarymember{operator++}{reverse_iterator}%
\begin{itemdecl}
Expand Down Expand Up @@ -1410,8 +1437,6 @@
\end{codeblock}
\end{itemdescr}

\rSec4[reverse.iter.op\dcr]{\tcode{operator\dcr}}

\indexlibrarymember{operator\dcr}{reverse_iterator}%
\begin{itemdecl}
constexpr reverse_iterator& operator--();
Expand Down Expand Up @@ -1443,21 +1468,6 @@
\end{codeblock}
\end{itemdescr}

\rSec4[reverse.iter.op+]{\tcode{operator+}}

\indexlibrarymember{operator+}{reverse_iterator}%
\begin{itemdecl}
constexpr reverse_iterator operator+(difference_type n) const;
\end{itemdecl}

\begin{itemdescr}
\pnum
\returns
\tcode{reverse_iterator(current-n)}.
\end{itemdescr}

\rSec4[reverse.iter.op+=]{\tcode{operator+=}}

\indexlibrarymember{operator+=}{reverse_iterator}%
\begin{itemdecl}
constexpr reverse_iterator& operator+=(difference_type n);
Expand All @@ -1473,21 +1483,6 @@
\tcode{*this}.
\end{itemdescr}

\rSec4[reverse.iter.op-]{\tcode{operator-}}

\indexlibrarymember{operator-}{reverse_iterator}%
\begin{itemdecl}
constexpr reverse_iterator operator-(difference_type n) const;
\end{itemdecl}

\begin{itemdescr}
\pnum
\returns
\tcode{reverse_iterator(current+n)}.
\end{itemdescr}

\rSec4[reverse.iter.op-=]{\tcode{operator-=}}

\indexlibrarymember{operator-=}{reverse_iterator}%
\begin{itemdecl}
constexpr reverse_iterator& operator-=(difference_type n);
Expand All @@ -1503,20 +1498,7 @@
\tcode{*this}.
\end{itemdescr}

\rSec4[reverse.iter.opindex]{\tcode{operator[]}}

\indexlibrarymember{operator[]}{reverse_iterator}%
\begin{itemdecl}
constexpr @\unspec@ operator[](difference_type n) const;
\end{itemdecl}

\begin{itemdescr}
\pnum
\returns
\tcode{current[-n-1]}.
\end{itemdescr}

\rSec4[reverse.iter.op==]{\tcode{operator==}}
\rSec3[reverse.iter.cmp]{\tcode{reverse_iterator} comparisons}

\indexlibrarymember{operator==}{reverse_iterator}%
\begin{itemdecl}
Expand All @@ -1532,8 +1514,6 @@
\tcode{x.current == y.current}.
\end{itemdescr}

\rSec4[reverse.iter.op<]{\tcode{operator<}}

\indexlibrarymember{operator<}{reverse_iterator}%
\begin{itemdecl}
template<class Iterator1, class Iterator2>
Expand All @@ -1548,8 +1528,6 @@
\tcode{x.current > y.current}.
\end{itemdescr}

\rSec4[reverse.iter.op!=]{\tcode{operator!=}}

\indexlibrarymember{operator"!=}{reverse_iterator}%
\begin{itemdecl}
template<class Iterator1, class Iterator2>
Expand All @@ -1564,8 +1542,6 @@
\tcode{x.current != y.current}.
\end{itemdescr}

\rSec4[reverse.iter.op>]{\tcode{operator>}}

\indexlibrarymember{operator>}{reverse_iterator}%
\begin{itemdecl}
template<class Iterator1, class Iterator2>
Expand All @@ -1580,8 +1556,6 @@
\tcode{x.current < y.current}.
\end{itemdescr}

\rSec4[reverse.iter.op>=]{\tcode{operator>=}}

\indexlibrarymember{operator>=}{reverse_iterator}%
\begin{itemdecl}
template<class Iterator1, class Iterator2>
Expand All @@ -1596,8 +1570,6 @@
\tcode{x.current <= y.current}.
\end{itemdescr}

\rSec4[reverse.iter.op<=]{\tcode{operator<=}}

\indexlibrarymember{operator<=}{reverse_iterator}%
\begin{itemdecl}
template<class Iterator1, class Iterator2>
Expand All @@ -1612,7 +1584,7 @@
\tcode{x.current >= y.current}.
\end{itemdescr}

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

\indexlibrarymember{operator-}{reverse_iterator}%
\begin{itemdecl}
Expand All @@ -1628,8 +1600,6 @@
\tcode{y.current - x.current}.
\end{itemdescr}

\rSec4[reverse.iter.opsum]{\tcode{operator+}}

\indexlibrarymember{operator+}{reverse_iterator}%
\begin{itemdecl}
template<class Iterator>
Expand All @@ -1644,8 +1614,6 @@
\tcode{reverse_iterator<Iterator> (x.current - n)}.
\end{itemdescr}

\rSec4[reverse.iter.make]{Non-member function \tcode{make_reverse_iterator()}}

\indexlibrary{\idxcode{reverse_iterator}!\idxcode{make_reverse_iterator} non-member function}%
\indexlibrary{\idxcode{make_reverse_iterator}}%
\begin{itemdecl}
Expand Down
26 changes: 26 additions & 0 deletions source/xrefdelta.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,31 @@
% Deprecated free-function atomic access to shared pointers
\movedxref{util.smartptr.shared.atomic}{depr.util.smartptr.shared.atomic}

% Single-item [reverse.iterators] subclauses were dissolved.
\movedxref{reverse.iter.op==}{reverse.iter.cmp}
\movedxref{reverse.iter.op<}{reverse.iter.cmp}
\movedxref{reverse.iter.op!=}{reverse.iter.cmp}
\movedxref{reverse.iter.op>}{reverse.iter.cmp}
\movedxref{reverse.iter.op>=}{reverse.iter.cmp}
\movedxref{reverse.iter.op<=}{reverse.iter.cmp}

\movedxref{reverse.iter.star}{reverse.iter.elem}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was called reverse.iter.op.star, not reverse.iter.star, for some reason.

\movedxref{reverse.iter.opref}{reverse.iter.elem}
\movedxref{reverse.iter.opindex}{reverse.iter.elem}

\movedxref{reverse.iter.op+}{reverse.iter.nav}
\movedxref{reverse.iter.op-}{reverse.iter.nav}
\movedxref{reverse.iter.op++}{reverse.iter.nav}
\movedxref{reverse.iter.op+=}{reverse.iter.nav}
\movedxref{reverse.iter.op\dcr}{reverse.iter.nav}
\movedxref{reverse.iter.op-=}{reverse.iter.nav}
\movedxref{reverse.iter.op++}{reverse.iter.nav}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already did this one.


\movedxref{reverse.iter.opdiff}{reverse.iter.nonmember}
\movedxref{reverse.iter.opsum}{reverse.iter.nonmember}
\movedxref{reverse.iter.make}{reverse.iter.nonmember}

\removedxref{reverse.iter.ops}

% Deprecated features.
%\deprxref{old.label} (if moved to depr.old.label, otherwise use \movedxref)