Skip to content

Commit 1fcd70d

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

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
@@ -6558,8 +6558,8 @@
65586558
friend bool operator==(const istream_iterator& i, default_sentinel_t);
65596559

65606560
private:
6561-
basic_istream<charT,traits>* in_stream; // \expos
6562-
T value; // \expos
6561+
basic_istream<charT,traits>* @\exposid{in-stream}@; // \expos
6562+
T @\exposid{value}@; // \expos
65636563
};
65646564
}
65656565
\end{codeblock}
@@ -6579,11 +6579,11 @@
65796579
\begin{itemdescr}
65806580
\pnum
65816581
\effects
6582-
Constructs the end-of-stream iterator, value-initializing \tcode{value}.
6582+
Constructs the end-of-stream iterator, value-initializing \exposid{value}.
65836583

65846584
\pnum
65856585
\ensures
6586-
\tcode{in_stream == nullptr} is \tcode{true}.
6586+
\tcode{\exposid{in-stream} == nullptr} is \tcode{true}.
65876587

65886588
\pnum
65896589
\remarks
@@ -6601,9 +6601,9 @@
66016601
\begin{itemdescr}
66026602
\pnum
66036603
\effects
6604-
Initializes \tcode{in_stream} with \tcode{addressof(s)},
6605-
value-initializes \tcode{value},
6606-
and then calls \tcode{operator++()}.
6604+
Initializes \exposid{in-stream} with \tcode{addressof(s)},
6605+
value-initializes \exposid{value},
6606+
and then calls\linebreak \tcode{operator++()}.
66076607
\end{itemdescr}
66086608

66096609

@@ -6615,13 +6615,13 @@
66156615
\begin{itemdescr}
66166616
\pnum
66176617
\effects
6618-
Initializes \tcode{in_stream} with \tcode{x.in_stream} and
6619-
initializes \tcode{value} with \tcode{x.value}.
6618+
Initializes \exposid{in-stream} with \tcode{x.\exposid{in-stream}} and
6619+
initializes \exposid{value} with \tcode{x.\exposid{value}}.
66206620

66216621
\pnum
66226622
\remarks
66236623
An invocation of this constructor may be used in a core constant expression
6624-
if and only if the initialization of \tcode{value} from \tcode{x.value}
6624+
if and only if the initialization of \exposid{value} from \tcode{x.\exposid{value}}
66256625
is a constant subexpression\iref{defns.const.subexpr}.
66266626
The exception specification is equivalent to
66276627
\tcode{is_nothrow_copy_constructible_v<T>}.
@@ -6649,11 +6649,11 @@
66496649
\begin{itemdescr}
66506650
\pnum
66516651
\expects
6652-
\tcode{in_stream != nullptr} is \tcode{true}.
6652+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
66536653

66546654
\pnum
66556655
\returns
6656-
\tcode{value}.
6656+
\exposid{value}.
66576657
\end{itemdescr}
66586658

66596659
\indexlibrarymember{operator->}{istream_iterator}%
@@ -6664,11 +6664,11 @@
66646664
\begin{itemdescr}
66656665
\pnum
66666666
\expects
6667-
\tcode{in_stream != nullptr} is \tcode{true}.
6667+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
66686668

66696669
\pnum
66706670
\returns
6671-
\tcode{addressof(value)}.
6671+
\tcode{addressof(\exposid{value})}.
66726672
\end{itemdescr}
66736673

66746674
\indexlibrarymember{operator++}{istream_iterator}%
@@ -6679,14 +6679,14 @@
66796679
\begin{itemdescr}
66806680
\pnum
66816681
\expects
6682-
\tcode{in_stream != nullptr} is \tcode{true}.
6682+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
66836683

66846684
\pnum
66856685
\effects
66866686
Equivalent to:
66876687
\begin{codeblock}
6688-
if (!(*in_stream >> value))
6689-
in_stream = nullptr;
6688+
if (!(*@\exposid{in-stream}@ >> \exposid{value}))
6689+
@\exposid{in-stream}@ = nullptr;
66906690
\end{codeblock}
66916691

66926692
\pnum
@@ -6702,7 +6702,7 @@
67026702
\begin{itemdescr}
67036703
\pnum
67046704
\expects
6705-
\tcode{in_stream != nullptr} is \tcode{true}.
6705+
\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
67066706

67076707
\pnum
67086708
\effects
@@ -6724,7 +6724,7 @@
67246724
\begin{itemdescr}
67256725
\pnum
67266726
\returns
6727-
\tcode{x.in_stream == y.in_stream}.
6727+
\tcode{x.\exposid{in-stream} == y.\exposid{in-stream}}.
67286728
\end{itemdescr}
67296729

67306730
\indexlibrarymember{operator==}{istream_iterator}%
@@ -6735,7 +6735,7 @@
67356735
\begin{itemdescr}
67366736
\pnum
67376737
\returns
6738-
\tcode{!i.in_stream}.
6738+
\tcode{!i.\exposid{in-stream}}.
67396739
\end{itemdescr}
67406740

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

0 commit comments

Comments
 (0)