Skip to content

[input.output] Avoid colons in stable labels #2544

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

Merged
merged 1 commit into from
Dec 7, 2018
Merged

[input.output] Avoid colons in stable labels #2544

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
4 changes: 2 additions & 2 deletions source/compatibility.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@

\rSec2[diff.cpp03.input.output]{\ref{input.output}: input/output library}

\diffrefs{istream::sentry}{ostream::sentry}, \ref{iostate.flags}
\diffrefs{istream.sentry}{ostream.sentry}, \ref{iostate.flags}
\change Specify use of \tcode{explicit} in existing boolean conversion functions.
\rationale Clarify intentions, avoid workarounds.
\effect
Expand All @@ -1294,7 +1294,7 @@
\item initializing a \tcode{const bool\&} which would bind to a temporary object.
\end{itemize}

\diffref{ios::failure}
\diffref{ios.failure}
\change Change base class of \tcode{std::ios_base::failure}.
\rationale More detailed error messages.
\effect
Expand Down
36 changes: 18 additions & 18 deletions source/iostreams.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@
public:
class failure; // see below

// \ref{ios::fmtflags}, \tcode{fmtflags}
// \ref{ios.fmtflags}, \tcode{fmtflags}
using fmtflags = @\textit{T1}@;
static constexpr fmtflags boolalpha = @\unspec@;
static constexpr fmtflags dec = @\unspec@;
Expand All @@ -769,14 +769,14 @@
static constexpr fmtflags basefield = @\seebelow@;
static constexpr fmtflags floatfield = @\seebelow@;

// \ref{ios::iostate}, \tcode{iostate}
// \ref{ios.iostate}, \tcode{iostate}
using iostate = @\textit{T2}@;
static constexpr iostate badbit = @\unspec@;
static constexpr iostate eofbit = @\unspec@;
static constexpr iostate failbit = @\unspec@;
static constexpr iostate goodbit = @\seebelow@;

// \ref{ios::openmode}, \tcode{openmode}
// \ref{ios.openmode}, \tcode{openmode}
using openmode = @\textit{T3}@;
static constexpr openmode app = @\unspec@;
static constexpr openmode ate = @\unspec@;
Expand All @@ -785,7 +785,7 @@
static constexpr openmode out = @\unspec@;
static constexpr openmode trunc = @\unspec@;

// \ref{ios::seekdir}, \tcode{seekdir}
// \ref{ios.seekdir}, \tcode{seekdir}
using seekdir = @\textit{T4}@;
static constexpr seekdir beg = @\unspec@;
static constexpr seekdir cur = @\unspec@;
Expand Down Expand Up @@ -889,7 +889,7 @@

\rSec3[ios.types]{Types}

\rSec4[ios::failure]{Class \tcode{ios_base::failure}}
\rSec4[ios.failure]{Class \tcode{ios_base::failure}}

\indexlibrary{\idxcode{ios_base::failure}}%
\indexlibrary{\idxcode{ios_base}!\idxcode{failure}}%
Expand Down Expand Up @@ -952,7 +952,7 @@
\tcode{failure} by constructing the base class with \tcode{msg} and \tcode{ec}.
\end{itemdescr}

\rSec4[ios::fmtflags]{Type \tcode{ios_base::fmtflags}}
\rSec4[ios.fmtflags]{Type \tcode{ios_base::fmtflags}}

\indexlibrarymember{fmtflags}{ios_base}%
\begin{itemdecl}
Expand Down Expand Up @@ -1015,7 +1015,7 @@
\end{floattable}
\end{itemdescr}

\rSec4[ios::iostate]{Type \tcode{ios_base::iostate}}
\rSec4[ios.iostate]{Type \tcode{ios_base::iostate}}

\indexlibrarymember{iostate}{ios_base}%
\begin{itemdecl}
Expand Down Expand Up @@ -1051,7 +1051,7 @@
\end{itemize}
\end{itemdescr}

\rSec4[ios::openmode]{Type \tcode{ios_base::openmode}}
\rSec4[ios.openmode]{Type \tcode{ios_base::openmode}}

\indexlibrarymember{openmode}{ios_base}%
\begin{itemdecl}
Expand Down Expand Up @@ -1081,7 +1081,7 @@
\end{libefftab}
\end{itemdescr}

\rSec4[ios::seekdir]{Type \tcode{ios_base::seekdir}}
\rSec4[ios.seekdir]{Type \tcode{ios_base::seekdir}}

\indexlibrarymember{seekdir}{ios_base}%
\begin{itemdecl}
Expand All @@ -1105,7 +1105,7 @@
\end{libefftabmean}
\end{itemdescr}

\rSec4[ios::Init]{Class \tcode{ios_base::Init}}
\rSec4[ios.init]{Class \tcode{ios_base::Init}}

\indexlibrary{\idxcode{ios_base::Init}}%
\indexlibrary{\idxcode{ios_base}!\idxcode{Init}}%
Expand Down Expand Up @@ -2256,7 +2256,7 @@
If \tcode{((state | (rdbuf() ? goodbit : badbit)) \& exceptions()) == 0},
returns.
Otherwise, the function throws an object of class
\tcode{basic_ios::failure}\iref{ios::failure},
\tcode{basic_ios::failure}\iref{ios.failure},
constructed with
\impldef{argument values to construct \tcode{basic_ios::failure}}
argument values.%
Expand All @@ -2273,7 +2273,7 @@
Calls
\tcode{clear(rdstate() | state)}
(which may throw
\tcode{basic_ios::failure}\iref{ios::failure}).
\tcode{basic_ios::failure}\iref{ios.failure}).
\end{itemdescr}

\indexlibrarymember{good}{basic_ios}%
Expand Down Expand Up @@ -4206,7 +4206,7 @@
explicit basic_istream(basic_streambuf<charT, traits>* sb);
virtual ~basic_istream();

// \ref{istream::sentry}, prefix/suffix
// \ref{istream.sentry}, prefix/suffix
class sentry;

// \ref{istream.formatted}, formatted input
Expand Down Expand Up @@ -4417,7 +4417,7 @@
\tcode{rhs.gcount()}.
\end{itemdescr}

\rSec4[istream::sentry]{Class \tcode{basic_istream::sentry}}
\rSec4[istream.sentry]{Class \tcode{basic_istream::sentry}}

\indexlibrary{\idxcode{basic_istream::sentry}}%
\indexlibrary{\idxcode{sentry}!\idxcode{basic_istream}}%
Expand Down Expand Up @@ -5587,7 +5587,7 @@
constructing a sentry object extracts characters as long as the next available
character \tcode{c} is whitespace or until there are no more characters in the sequence.
Whitespace characters are distinguished with the same criterion as used by
\tcode{sentry::sentry}\iref{istream::sentry}.
\tcode{sentry::sentry}\iref{istream.sentry}.
If
\tcode{ws}
stops extracting characters because there are no more available it sets
Expand Down Expand Up @@ -5767,7 +5767,7 @@
explicit basic_ostream(basic_streambuf<char_type, traits>* sb);
virtual ~basic_ostream();

// \ref{ostream::sentry}, prefix/suffix
// \ref{ostream.sentry}, prefix/suffix
class sentry;

// \ref{ostream.formatted}, formatted output
Expand Down Expand Up @@ -5963,7 +5963,7 @@
\effects Calls \tcode{basic_ios<charT, traits>::swap(rhs)}.
\end{itemdescr}

\rSec4[ostream::sentry]{Class \tcode{basic_ostream::sentry}}
\rSec4[ostream.sentry]{Class \tcode{basic_ostream::sentry}}

\indexlibrary{\idxcode{basic_ostream::sentry}}%
\indexlibrary{\idxcode{sentry}!\idxcode{basic_ostream}}%
Expand Down Expand Up @@ -7271,7 +7271,7 @@
\tcode{in >> quoted(s, delim, escape)} behaves as if it extracts the following
characters from \tcode{in} using
\tcode{operator>>(basic_istream<charT, traits>\&, charT\&)}\iref{istream.extractors}
which may throw \tcode{ios_base::failure}\iref{ios::failure}:
which may throw \tcode{ios_base::failure}\iref{ios.failure}:
\begin{itemize}
\item If the first character extracted is equal to \tcode{delim}, as
determined by \tcode{traits_type::eq}, then:
Expand Down
9 changes: 9 additions & 0 deletions source/xrefdelta.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,15 @@
\movedxref{string.op<=}{string.cmp}
\movedxref{string.op>=}{string.cmp}

\movedxref{istream::sentry}{istream.sentry}
\movedxref{ostream::sentry}{ostream.sentry}
\movedxref{ios::failure}{ios.failure}
\movedxref{ios::fmtflatgs}{ios.fmtflags}
\movedxref{ios::iostate}{ios.iostate}
\movedxref{ios::openmode}{ios.openmode}
\movedxref{ios::seekdir}{ios.seekdir}
\movedxref{ios::Init}{ios.init}

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

Expand Down