Skip to content

Commit 3f49ea5

Browse files
committed
[streambuf.virtuals] Simplify the logic of exposition; remove several unneeded lists
1 parent f3d1ffb commit 3f49ea5

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
@@ -3712,97 +3712,73 @@
37123712
\pnum
37133713
The
37143714
\term{pending sequence}
3715-
of characters is defined as the concatenation of:
3716-
\begin{enumeratea}
3717-
\item
3718-
If
3719-
\tcode{gptr()}
3720-
is non-null, then the
3715+
of characters is defined as the concatenation of
3716+
\begin{itemize}
3717+
\item the empty sequence if \tcode{gptr()} is null, otherwise the
37213718
\tcode{egptr() - gptr()}
37223719
characters starting at
37233720
\tcode{gptr()},
3724-
otherwise the empty sequence.
3721+
followed by
37253722
\item
3726-
Some sequence (possibly empty) of characters read from the input sequence.
3727-
\end{enumeratea}
3723+
some (possibly empty) sequence of characters read from the input sequence.
3724+
\end{itemize}
37283725

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

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

37583742
\pnum
37593743
\effects
37603744
The function sets up the
37613745
\tcode{gptr()}
37623746
and
37633747
\tcode{egptr()}
3764-
satisfying one of:
3765-
\begin{enumeratea}
3766-
\item
3767-
If the pending sequence is non-empty,
3748+
such that
3749+
if the pending sequence is non-empty, then
37683750
\tcode{egptr()}
37693751
is non-null and
37703752
\tcode{egptr() - gptr()}
37713753
characters starting at
37723754
\tcode{gptr()}
3773-
are the characters in the pending sequence
3774-
\item
3775-
If the pending sequence is empty, either
3776-
\tcode{gptr()}
3755+
are the characters in the pending sequence, otherwise
3756+
either \tcode{gptr()}
37773757
is null or
3778-
\tcode{gptr()}
3779-
and
3780-
\tcode{egptr()}
3781-
are set to the same non-null pointer value.
3782-
\end{enumeratea}
3758+
\tcode{gptr() == egptr()}.
37833759

37843760
\pnum
37853761
If
37863762
\tcode{eback()}
37873763
and
37883764
\tcode{gptr()}
3789-
are non-null then the function is not constrained as to their contents, but the ``usual backup condition'' is that either:
3790-
\begin{enumeratea}
3765+
are non-null then the function is not constrained as to their contents, but the ``usual backup condition'' is that either
3766+
\begin{itemize}
37913767
\item
3792-
If the backup sequence contains at least
3768+
the backup sequence contains at least
37933769
\tcode{gptr() - eback()}
3794-
characters, then the
3770+
characters, and then the
37953771
\tcode{gptr() - eback()}
37963772
characters starting at
37973773
\tcode{eback()}
37983774
agree with the last
37993775
\tcode{gptr() - eback()}
3800-
characters of the backup sequence.
3776+
characters of the backup sequence, or
38013777
\item
3802-
Or the \tcode{n} characters starting at
3778+
the \tcode{n} characters starting at
38033779
\tcode{gptr() - n}
3804-
agree with the backup sequence (where \tcode{n} is the length of the backup sequence)
3805-
\end{enumeratea}
3780+
agree with the backup sequence (where \tcode{n} is the length of the backup sequence).
3781+
\end{itemize}
38063782

38073783
\pnum
38083784
\default
@@ -3953,22 +3929,19 @@
39533929
Consumes some initial subsequence of the characters of the
39543930
\term{pending sequence}.
39553931
The pending sequence is defined as the concatenation of
3956-
\begin{enumeratea}
3932+
\begin{itemize}
39573933
\item
3958-
if
3959-
\tcode{pbase()}
3960-
is null then the empty sequence otherwise,
3934+
the empty sequence if \tcode{pbase()} is not null, otherwise the
39613935
\tcode{pptr() - pbase()}
39623936
characters beginning at
3963-
\tcode{pbase()}.
3937+
\tcode{pbase()}, followed by
39643938
\item
3939+
the empty sequence
39653940
if
39663941
\tcode{traits::eq_int_type(c, traits::eof())}
39673942
returns
3968-
\tcode{true},
3969-
then the empty sequence
3970-
otherwise, the sequence consisting of \tcode{c}.
3971-
\end{enumeratea}
3943+
\tcode{true}, otherwise the sequence consisting of \tcode{c}.
3944+
\end{itemize}
39723945

39733946
\pnum
39743947
\remarks

0 commit comments

Comments
 (0)