Skip to content

Commit 0b640ed

Browse files
authored
[streambuf.virtuals] Simplify the logic of exposition; remove several unneeded lists (#1111)
1 parent 44e46e6 commit 0b640ed

File tree

1 file changed

+29
-56
lines changed

1 file changed

+29
-56
lines changed

source/iostreams.tex

Lines changed: 29 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -3711,97 +3711,73 @@
37113711
\pnum
37123712
The
37133713
\term{pending sequence}
3714-
of characters is defined as the concatenation of:
3715-
\begin{enumeratea}
3716-
\item
3717-
If
3718-
\tcode{gptr()}
3719-
is non-null, then the
3714+
of characters is defined as the concatenation of
3715+
\begin{itemize}
3716+
\item the empty sequence if \tcode{gptr()} is null, otherwise the
37203717
\tcode{egptr() - gptr()}
37213718
characters starting at
37223719
\tcode{gptr()},
3723-
otherwise the empty sequence.
3720+
followed by
37243721
\item
3725-
Some sequence (possibly empty) of characters read from the input sequence.
3726-
\end{enumeratea}
3722+
some (possibly empty) sequence of characters read from the input sequence.
3723+
\end{itemize}
37273724

37283725
\pnum
37293726
The
37303727
\term{result character}
37313728
is
3732-
\begin{enumeratea}
3733-
\item
3734-
If the pending sequence is non-empty, the first character of the sequence.
3735-
\item
3736-
If the pending sequence
3737-
is
3738-
empty then the next character that would be read from the input sequence.
3739-
\end{enumeratea}
3729+
the first character of the pending sequence if it is non-empty,
3730+
otherwise
3731+
the next character that would be read from the input sequence.
37403732

37413733
\pnum
37423734
The
37433735
\term{backup sequence}
3744-
is defined as the concatenation of:
3745-
\begin{enumeratea}
3746-
\item
3747-
If
3748-
\tcode{eback()}
3749-
is null then empty,
3750-
\item
3751-
Otherwise the
3736+
is the empty sequence if \tcode{eback()} is null, otherwise the
37523737
\tcode{gptr() - eback()}
37533738
characters beginning at
37543739
\tcode{eback()}.
3755-
\end{enumeratea}
37563740

37573741
\pnum
37583742
\effects
37593743
The function sets up the
37603744
\tcode{gptr()}
37613745
and
37623746
\tcode{egptr()}
3763-
satisfying one of:
3764-
\begin{enumeratea}
3765-
\item
3766-
If the pending sequence is non-empty,
3747+
such that
3748+
if the pending sequence is non-empty, then
37673749
\tcode{egptr()}
37683750
is non-null and
37693751
\tcode{egptr() - gptr()}
37703752
characters starting at
37713753
\tcode{gptr()}
3772-
are the characters in the pending sequence
3773-
\item
3774-
If the pending sequence is empty, either
3775-
\tcode{gptr()}
3754+
are the characters in the pending sequence, otherwise
3755+
either \tcode{gptr()}
37763756
is null or
3777-
\tcode{gptr()}
3778-
and
3779-
\tcode{egptr()}
3780-
are set to the same non-null pointer value.
3781-
\end{enumeratea}
3757+
\tcode{gptr() == egptr()}.
37823758

37833759
\pnum
37843760
If
37853761
\tcode{eback()}
37863762
and
37873763
\tcode{gptr()}
3788-
are non-null then the function is not constrained as to their contents, but the ``usual backup condition'' is that either:
3789-
\begin{enumeratea}
3764+
are non-null then the function is not constrained as to their contents, but the ``usual backup condition'' is that either
3765+
\begin{itemize}
37903766
\item
3791-
If the backup sequence contains at least
3767+
the backup sequence contains at least
37923768
\tcode{gptr() - eback()}
3793-
characters, then the
3769+
characters, in which case the
37943770
\tcode{gptr() - eback()}
37953771
characters starting at
37963772
\tcode{eback()}
37973773
agree with the last
37983774
\tcode{gptr() - eback()}
3799-
characters of the backup sequence.
3775+
characters of the backup sequence, or
38003776
\item
3801-
Or the \tcode{n} characters starting at
3777+
the \tcode{n} characters starting at
38023778
\tcode{gptr() - n}
3803-
agree with the backup sequence (where \tcode{n} is the length of the backup sequence)
3804-
\end{enumeratea}
3779+
agree with the backup sequence (where \tcode{n} is the length of the backup sequence).
3780+
\end{itemize}
38053781

38063782
\pnum
38073783
\default
@@ -3952,22 +3928,19 @@
39523928
Consumes some initial subsequence of the characters of the
39533929
\term{pending sequence}.
39543930
The pending sequence is defined as the concatenation of
3955-
\begin{enumeratea}
3931+
\begin{itemize}
39563932
\item
3957-
if
3958-
\tcode{pbase()}
3959-
is null then the empty sequence otherwise,
3933+
the empty sequence if \tcode{pbase()} is not null, otherwise the
39603934
\tcode{pptr() - pbase()}
39613935
characters beginning at
3962-
\tcode{pbase()}.
3936+
\tcode{pbase()}, followed by
39633937
\item
3938+
the empty sequence
39643939
if
39653940
\tcode{traits::eq_int_type(c, traits::eof())}
39663941
returns
3967-
\tcode{true},
3968-
then the empty sequence
3969-
otherwise, the sequence consisting of \tcode{c}.
3970-
\end{enumeratea}
3942+
\tcode{true}, otherwise the sequence consisting of \tcode{c}.
3943+
\end{itemize}
39713944

39723945
\pnum
39733946
\remarks

0 commit comments

Comments
 (0)