Skip to content

Commit fbd3bd5

Browse files
committed
fixups: minor grammar and spelling corrections
1 parent a12c711 commit fbd3bd5

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

source/basic.tex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
A declaration of an entity or \grammarterm{typedef-name} $X$ is
151151
a redeclaration of $X$
152152
if another declaration of $X$ is reachable from it\iref{module.reach};
153-
otherwise it is a \defnadj{first}{declaration}.
153+
otherwise, it is a \defnadj{first}{declaration}.
154154
A declaration may also have effects including:
155155
\begin{itemize}
156156
\item a static assertion\iref{dcl.pre},
@@ -895,7 +895,7 @@
895895
\grammarterm{handler}, or
896896
contract assertion
897897
(as described in the following subclauses of \ref{basic.scope})
898-
appearing in another scope which thereby contains $S$.
898+
appearing in another scope, which thereby contains $S$.
899899
An \defnadj{enclosing}{scope} at a program point is any scope that contains it;
900900
the smallest such scope is said to be the \defnadj{immediate}{scope}
901901
at that point.
@@ -4521,7 +4521,7 @@
45214521
if \tcode{X} is
45224522
\begin{itemize}
45234523
\item
4524-
a scalar type, or
4524+
a scalar type or
45254525
\item
45264526
a class type that
45274527
has at least one eligible copy or move constructor\iref{special},
@@ -7404,7 +7404,7 @@
74047404
for any given evaluation of a contract assertion.
74057405
\begin{note}
74067406
The range and flexibility of available choices of
7407-
evaluation semantics depends on the implementation,
7407+
evaluation semantics depends on the implementation
74087408
and need not allow all four evaluation semantics as possibilities.
74097409
The evaluation semantics can differ
74107410
for different evaluations of the same contract assertion,
@@ -7440,8 +7440,8 @@
74407440
To determine whether a predicate would evaluate
74417441
to \keyword{true} or \keyword{false},
74427442
an alternative evaluation
7443-
that produces the same value as the predicate,
7444-
but has no side effects,
7443+
that produces the same value as the predicate
7444+
but has no side effects
74457445
can occur.
74467446
\begin{example}
74477447
\begin{codeblock}
@@ -7452,7 +7452,7 @@
74527452
pre(( s.g++, false )); // \#1
74537453
void g()
74547454
{
7455-
f(); // Increment of \tcode{s.g} might not occur, even if \#1 uses a checking semantic
7455+
f(); // Increment of \tcode{s.g} might not occur, even if \#1 uses a checking semantic.
74567456
}
74577457
\end{codeblock}
74587458
\end{example}
@@ -7553,7 +7553,7 @@
75537553
\tcode{std::terminate} or \tcode{std::abort}
75547554
without actually making a library call
75557555
is a conforming implementation of
7556-
contract-terminating\iref{intro.abstract}.
7556+
contract-termination\iref{intro.abstract}.
75577557
\end{note}
75587558

75597559
\pnum
@@ -7572,7 +7572,7 @@
75727572
If a contract violation occurs
75737573
in a context that is not manifestly constant-evaluated
75747574
and the evaluation semantic is enforce or observe,
7575-
the contract-violation handle\iref{basic.contract.handler}
7575+
the contract-violation handler\iref{basic.contract.handler}
75767576
is invoked with an lvalue referring to
75777577
an object \tcode{v}
75787578
of type \tcode{const std::contracts::contract_violation}\iref{support.contract.violation}
@@ -7638,7 +7638,7 @@
76387638
the enforce semantic provides the opportunity to
76397639
log information about the contract violation
76407640
before terminating the program
7641-
or throw an exception to avoid termination,
7641+
or to throw an exception to avoid termination,
76427642
and the quick-enforce semantic is intended
76437643
to terminate the program as soon as possible
76447644
as well as

source/classes.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@
475475

476476
\begin{bnf}
477477
\nontermdef{member-declarator}\br
478-
declarator \opt{virt-specifier-seq} \opt{function-contract-spceifier-seq} \opt{pure-specifier}\br
478+
declarator \opt{virt-specifier-seq} \opt{function-contract-specifier-seq} \opt{pure-specifier}\br
479479
declarator requires-clause \opt{function-contract-specifier-seq}\br
480480
declarator brace-or-equal-initializer\br
481481
\opt{identifier} \opt{attribute-specifier-seq} \terminal{:} constant-expression \opt{brace-or-equal-initializer}

source/declarations.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4612,7 +4612,7 @@
46124612

46134613
void f() pre (b1) pre ([]{ return b2; }());
46144614
void f(); // OK, \grammarterm{function-contract-specifier}s omitted
4615-
void f() pre (b1) pre ([]{ return b2; }()); // error: closures have different types
4615+
void f() pre (b1) pre ([]{ return b2; }()); // error: closures have different types.
46164616
void f() pre (b1); // error: \grammarterm{function-contract-specifier}s only partially repeated
46174617

46184618
int g() post(r : b1);
@@ -4622,7 +4622,7 @@
46224622
void h() pre (b1);
46234623
bool b1;
46244624
void h() pre (b1); // error: \grammarterm{function-contract-specifier}s differ according to
4625-
// the one-definition rule\iref{basic.def.odr}
4625+
// the one-definition rule\iref{basic.def.odr}.
46264626
}
46274627
\end{codeblock}
46284628
\end{example}
@@ -4757,7 +4757,7 @@
47574757

47584758
int main() {
47594759
A a = f(&a); // The postcondition check can fail if the implementation introduces
4760-
// a temporary for the return value\iref{class.temporary}
4760+
// a temporary for the return value\iref{class.temporary}.
47614761
B b = f(&b); // The postcondition check succeeds, no temporary is introduced.
47624762
}
47634763
\end{codeblock}

source/expressions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,7 @@
16301630
whose corresponding variable
16311631
is declared outside of $C$,
16321632
\end{itemize}
1633-
then the type of the expression is \tcode{const T}.
1633+
then the type of the expression is \tcode{const}~\tcode{T}.
16341634

16351635
\pnum
16361636
\begin{example}
@@ -1917,7 +1917,7 @@
19171917
whose corresponding variable
19181918
is declared outside of $C$,
19191919
\end{itemize}
1920-
then the type of the expression is \tcode{const} \tcode{T}.
1920+
then the type of the expression is \tcode{const}~\tcode{T}.
19211921

19221922

19231923
\pnum

0 commit comments

Comments
 (0)