Skip to content

Commit 00dd021

Browse files
committed
fixups: addressing comments from Jens
1 parent a499302 commit 00dd021

File tree

5 files changed

+12
-22
lines changed

5 files changed

+12
-22
lines changed

source/basic.tex

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,10 @@
551551
between the point at which the entity is introduced and the scope
552552
(where \tcode{*\keyword{this}} is considered to be introduced
553553
within the innermost enclosing class or non-lambda function definition scope),
554-
either: %JMB: Potential drive-by, we should remove the : and the first two "or"s.
554+
either
555555
\begin{itemize}
556-
\item the intervening scope is a block scope, or
557-
\item the intervening scope is a contract-assertion scope\iref{basic.scope.contract}, or
556+
\item the intervening scope is a block scope,
557+
\item the intervening scope is a contract-assertion scope\iref{basic.scope.contract},
558558
\item the intervening scope is the function parameter scope of
559559
a \grammarterm{lambda-expression} or \grammarterm{requires-expression}, or
560560
\item the intervening scope is the lambda scope of
@@ -6178,12 +6178,12 @@
61786178
every argument expression and
61796179
the postfix expression designating \placeholder{f}
61806180
are sequenced before
6181-
every precondition assertion of \placeholder{f}\iref{dcl.contract.func}, %JMB: This said "of the called function", changed to "of f"
6181+
every precondition assertion of \placeholder{f}\iref{dcl.contract.func},
61826182
which in turn are sequenced before
61836183
every expression or statement
61846184
in the body of \placeholder{f},
61856185
which in turn are sequenced before
6186-
every postcondition assertion of \placeholder{f}. %JMB: This says "the called function" again in P2900
6186+
every postcondition assertion of \placeholder{f}.
61876187

61886188
\pnum
61896189
For each
@@ -7004,7 +7004,7 @@
70047004
\pnum
70057005
\indextext{termination!program}%
70067006
\indextext{\idxcode{main} function!return from}%
7007-
A \keyword{return} statement\iref{stmt.return} in \tcode{main} has the effect of leaving the main %JMB: Why is the second main here not in code font?
7007+
A \keyword{return} statement\iref{stmt.return} in \tcode{main} has the effect of leaving the \tcode{main}
70087008
function (destroying any objects with automatic storage duration
70097009
and evaluating any postcondition assertions of \tcode{main})
70107010
and calling \tcode{std::exit} with the return value as the argument.
@@ -7371,14 +7371,13 @@
73717371
of the predicate of a contract assertion,
73727372
no diagnostic required.
73737373

7374-
%JMB: This paragraph was not in P2900, but the note is not directly tied to the paragraph above.
73757374
\pnum
73767375
\begin{note}
73777376
Within the predicate of a contract assertion,
73787377
\grammarterm{id-expression}s referring to
73797378
variables declared outside the contract assertion
7380-
are const\iref{expr.prim.id.unqual}, %JMB: P2900 had this const in code font
7381-
\tcode{this} is a pointer to const\iref{expr.prim.this}, %JMB: P2900 had this const in code font
7379+
are const\iref{expr.prim.id.unqual},
7380+
\tcode{this} is a pointer to const\iref{expr.prim.this},
73827381
and the result object can be named
73837382
if a \grammarterm{result-name-introducer}\iref{dcl.contract.res} has been specified.
73847383
\end{note}

source/intro.tex

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@
795795
\begin{itemize}
796796
\item
797797
a preprocessing translation unit containing
798-
a \tcode{\#error} preprocessing directive\iref{cpp.error}, %JMB: this last comma was a mistake in P2900, it was not in green.
798+
a \tcode{\#error} preprocessing directive\iref{cpp.error},
799799
\item
800800
a translation unit with
801801
a \grammarterm{static_assert-declaration} that fails\iref{dcl.pre}, or
@@ -936,15 +936,6 @@
936936
are termed \defnadj{observable}{checkpoints}.
937937
\begin{note}
938938
A call to \tcode{std::observable}\iref{utility.undefined}
939-
is an observable checkpoint.
940-
\end{note}
941-
942-
\pnum
943-
\indextext{observable checkpoint}
944-
Certain events in the execution of a program
945-
are termed \defnadj{observable}{checkpoints}.
946-
\begin{note}
947-
A call to \tcode{std::observable}\iref{utility.undefined}
948939
is an observable checkpoint,
949940
as are certain parts of
950941
the evaluation of contract assertions\iref{basic.contract}.

source/lib-intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3559,7 +3559,7 @@
35593559
in~\ref{global.functions}, member functions in~\ref{member.functions}, data race
35603560
avoidance in~\ref{res.on.data.races}, access specifiers
35613561
in~\ref{protection.within.classes}, class derivation in~\ref{derivation}, and
3562-
exceptions in~\ref{res.on.exception.handling}. %JMB: This intro fluff should add "and contract assertions in~\ref{res.contract.assertions} Also, the "its use" doesn't seem right in this sentence. Can I make this a bulleted list so that it resembles a sentence again?
3562+
exceptions in~\ref{res.on.exception.handling}.
35633563

35643564
\rSec3[res.on.headers]{Headers}
35653565

source/overloading.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
\item
475475
otherwise,
476476
the implied object argument is
477-
\tcode{(*\keyword{this})}. %JMB: The \keyword on this was missing
477+
\tcode{(*\keyword{this})}.
478478
\end{itemize}
479479
Otherwise,
480480
\begin{itemize}

source/statements.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@
10701070
by those \grammarterm{assertion-statement}s.
10711071
\begin{note}
10721072
A sequence of \grammarterm{assertion-statement}s
1073-
can thus be repeatedly evaluated as a group. %JMB: Should we remove the "thus"?
1073+
can thus be repeatedly evaluated as a group.
10741074
\begin{example}
10751075
\begin{codeblock}
10761076
int f(int i)

0 commit comments

Comments
 (0)