Skip to content

Commit b2c521e

Browse files
[istream.iterator] Exposition-only style for in-stream and value
Also change `in_stream` to `in-stream` and add `\linebreak`
1 parent e100bd2 commit b2c521e

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

source/iterators.tex

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6544,8 +6544,8 @@
65446544
friend bool operator==(const istream_iterator& i, default_sentinel_t);
65456545

65466546
private:
6547-
basic_istream<charT,traits>* in_stream; // \expos
6548-
T value; // \expos
6547+
basic_istream<charT,traits>* @\exposid{in-stream}@; // \expos
6548+
T @\exposid{value}@; // \expos
65496549
};
65506550
}
65516551
\end{codeblock}
@@ -6565,11 +6565,11 @@
65656565
\begin{itemdescr}
65666566
\pnum
65676567
\effects
6568-
Constructs the end-of-stream iterator, value-initializing \tcode{value}.
6568+
Constructs the end-of-stream iterator, value-initializing \exposid{value}.
65696569

65706570
\pnum
65716571
\ensures
6572-
\tcode{in_stream == nullptr} is \tcode{true}.
6572+
\tcode{\exposid{in-stream} == nullptr} is \tcode{true}.
65736573

65746574
\pnum
65756575
\remarks
@@ -6587,9 +6587,9 @@
65876587
\begin{itemdescr}
65886588
\pnum
65896589
\effects
6590-
Initializes \tcode{in_stream} with \tcode{addressof(s)},
6591-
value-initializes \tcode{value},
6592-
and then calls \tcode{operator++()}.
6590+
Initializes \exposid{in-stream} with \tcode{addressof(s)},
6591+
value-initializes \exposid{value},
6592+
and then calls\linebreak \tcode{operator++()}.
65936593
\end{itemdescr}
65946594

65956595

@@ -6601,13 +6601,13 @@
66016601
\begin{itemdescr}
66026602
\pnum
66036603
\effects
6604-
Initializes \tcode{in_stream} with \tcode{x.in_stream} and
6605-
initializes \tcode{value} with \tcode{x.value}.
6604+
Initializes \exposid{in-stream} with \tcode{x.\exposid{in-stream}} and
6605+
initializes \exposid{value} with \tcode{x.\exposid{value}}.
66066606

66076607
\pnum
66086608
\remarks
66096609
An invocation of this constructor may be used in a core constant expression
6610-
if and only if the initialization of \tcode{value} from \tcode{x.value}
6610+
if and only if the initialization of \exposid{value} from \tcode{x.\exposid{value}}
66116611
is a constant subexpression\iref{defns.const.subexpr}.
66126612
The exception specification is equivalent to
66136613
\tcode{is_nothrow_copy_constructible_v<T>}.
@@ -6635,11 +6635,11 @@
66356635
\begin{itemdescr}
66366636
\pnum
66376637
\expects
6638-
\tcode{in_stream != nullptr} is \tcode{true}.
6638+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
66396639

66406640
\pnum
66416641
\returns
6642-
\tcode{value}.
6642+
\exposid{value}.
66436643
\end{itemdescr}
66446644

66456645
\indexlibrarymember{operator->}{istream_iterator}%
@@ -6650,11 +6650,11 @@
66506650
\begin{itemdescr}
66516651
\pnum
66526652
\expects
6653-
\tcode{in_stream != nullptr} is \tcode{true}.
6653+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
66546654

66556655
\pnum
66566656
\returns
6657-
\tcode{addressof(value)}.
6657+
\tcode{addressof(\exposid{value})}.
66586658
\end{itemdescr}
66596659

66606660
\indexlibrarymember{operator++}{istream_iterator}%
@@ -6665,14 +6665,14 @@
66656665
\begin{itemdescr}
66666666
\pnum
66676667
\expects
6668-
\tcode{in_stream != nullptr} is \tcode{true}.
6668+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
66696669

66706670
\pnum
66716671
\effects
66726672
Equivalent to:
66736673
\begin{codeblock}
6674-
if (!(*in_stream >> value))
6675-
in_stream = nullptr;
6674+
if (!(*@\exposid{in-stream}@ >> \exposid{value}))
6675+
@\exposid{in-stream}@ = nullptr;
66766676
\end{codeblock}
66776677

66786678
\pnum
@@ -6688,7 +6688,7 @@
66886688
\begin{itemdescr}
66896689
\pnum
66906690
\expects
6691-
\tcode{in_stream != nullptr} is \tcode{true}.
6691+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
66926692

66936693
\pnum
66946694
\effects
@@ -6710,7 +6710,7 @@
67106710
\begin{itemdescr}
67116711
\pnum
67126712
\returns
6713-
\tcode{x.in_stream == y.in_stream}.
6713+
\tcode{x.\exposid{in-stream} == y.\exposid{in-stream}}.
67146714
\end{itemdescr}
67156715

67166716
\indexlibrarymember{operator==}{istream_iterator}%
@@ -6721,7 +6721,7 @@
67216721
\begin{itemdescr}
67226722
\pnum
67236723
\returns
6724-
\tcode{!i.in_stream}.
6724+
\tcode{!i.\exposid{in-stream}}.
67256725
\end{itemdescr}
67266726

67276727
\rSec2[ostream.iterator]{Class template \tcode{ostream_iterator}}

0 commit comments

Comments
 (0)