[istream.iterator] Exposition-only style for in-stream and value

Also change `in_stream` to `in-stream`

Author: frederick-vs-ja

source/iterators.tex

@@ -6546,8 +6546,8 @@
     friend bool operator==(const istream_iterator& i, default_sentinel_t);
 
   private:
-    basic_istream<charT,traits>* in_stream; // \expos
-    T value;                                // \expos
+    basic_istream<charT,traits>* @\exposid{in-stream}@; // \expos
+    T @\exposid{value}@;                                // \expos
   };
 }
 \end{codeblock}
@@ -6567,11 +6567,11 @@
 \begin{itemdescr}
 \pnum
 \effects
-Constructs the end-of-stream iterator, value-initializing \tcode{value}.
+Constructs the end-of-stream iterator, value-initializing \exposid{value}.
 
 \pnum
 \ensures
-\tcode{in_stream == nullptr} is \tcode{true}.
+\tcode{\exposid{in-stream} == nullptr} is \tcode{true}.
 
 \pnum
 \remarks
@@ -6589,8 +6589,8 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{in_stream} with \tcode{addressof(s)},
-value-initializes \tcode{value},
+Initializes \exposid{in-stream} with \tcode{addressof(s)},
+value-initializes \exposid{value},
 and then calls \tcode{operator++()}.
 \end{itemdescr}
 
@@ -6603,13 +6603,13 @@
 \begin{itemdescr}
 \pnum
 \effects
-Initializes \tcode{in_stream} with \tcode{x.in_stream} and
-initializes \tcode{value} with \tcode{x.value}.
+Initializes \exposid{in-stream} with \tcode{x.\exposid{in-stream}} and
+initializes \exposid{value} with \tcode{x.\exposid{value}}.
 
 \pnum
 \remarks
 An invocation of this constructor may be used in a core constant expression
-if and only if the initialization of \tcode{value} from \tcode{x.value}
+if and only if the initialization of \exposid{value} from \tcode{x.\exposid{value}}
 is a constant subexpression\iref{defns.const.subexpr}.
 The exception specification is equivalent to
 \tcode{is_nothrow_copy_constructible_v<T>}.
@@ -6637,11 +6637,11 @@
 \begin{itemdescr}
 \pnum
 \expects
-\tcode{in_stream != nullptr} is \tcode{true}.
+\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
 
 \pnum
 \returns
-\tcode{value}.
+\exposid{value}.
 \end{itemdescr}
 
 \indexlibrarymember{operator->}{istream_iterator}%
@@ -6652,11 +6652,11 @@
 \begin{itemdescr}
 \pnum
 \expects
-\tcode{in_stream != nullptr} is \tcode{true}.
+\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
 
 \pnum
 \returns
-\tcode{addressof(value)}.
+\tcode{addressof(\exposid{value})}.
 \end{itemdescr}
 
 \indexlibrarymember{operator++}{istream_iterator}%
@@ -6667,14 +6667,14 @@
 \begin{itemdescr}
 \pnum
 \expects
-\tcode{in_stream != nullptr} is \tcode{true}.
+\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
 
 \pnum
 \effects
 Equivalent to:
 \begin{codeblock}
-if (!(*in_stream >> value))
-  in_stream = nullptr;
+if (!(*@\exposid{in-stream}@ >> \exposid{value}))
+  @\exposid{in-stream}@ = nullptr;
 \end{codeblock}
 
 \pnum
@@ -6690,7 +6690,7 @@
 \begin{itemdescr}
 \pnum
 \expects
-\tcode{in_stream != nullptr} is \tcode{true}.
+\tcode{\exposid{in-stream} != nullptr} is \tcode{true}.
 
 \pnum
 \effects
@@ -6712,7 +6712,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{x.in_stream == y.in_stream}.
+\tcode{x.\exposid{in-stream} == y.\exposid{in-stream}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator==}{istream_iterator}%
@@ -6723,7 +6723,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{!i.in_stream}.
+\tcode{!i.\exposid{in-stream}}.
 \end{itemdescr}
 
 \rSec2[ostream.iterator]{Class template \tcode{ostream_iterator}}