Skip to content

Commit 3fc30aa

Browse files
committed
[lib.intro, iterator.concept.inc, concept.regularinvocable] Avoid "annotation"; hyphenate "freestanding-deleted"
Now that many sections use "annotation" to mean a specific core-language construct, we should avoid using "annotation" to mean anything but that construct, i.e. stop using it to mean "code comment." (There will be an NB comment to this effect.) Drive-by hyphenate "freestanding-deleted function". Not all freestanding-deleted functions are freestanding functions, and not all freestanding-deleted functions are deleted functions; hyphenating helps the reader understand that this is a term of art that cannot meaningfully be broken down into its component notions.
1 parent fbd1a70 commit 3fc30aa

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

source/concepts.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
\pnum
7676
Expressions declared in a \grammarterm{requires-expression} in the library clauses are
7777
required to be equality-preserving, except for those annotated with the comment
78-
``not required to be equality-preserving.'' An expression so annotated
78+
``not required to be equality-preserving.'' An expression annotated with such a comment
7979
may be equality-preserving, but is not required to be so.
8080

8181
\pnum
@@ -1261,7 +1261,7 @@
12611261
equality-preserving\iref{concepts.equality} and
12621262
shall not modify the function object or the arguments.
12631263
\begin{note}
1264-
This requirement supersedes the annotation in the definition of
1264+
This requirement supersedes the comment in the definition of
12651265
\libconcept{invocable}.
12661266
\end{note}
12671267

source/iterators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,7 @@
15881588
and post-increment operators. The increment operations are required to be equality-preserving,
15891589
and the type is required to be \libconcept{equality_comparable}.
15901590
\begin{note}
1591-
This supersedes the annotations on the increment expressions
1591+
These requirements supersede the comments on the increment expressions
15921592
in the definition of \libconcept{weakly_incrementable}.
15931593
\end{note}
15941594

source/lib-intro.tex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -991,10 +991,10 @@
991991
\pnum
992992
Function declarations and function template declarations
993993
followed by a comment that include \textit{freestanding-deleted} are
994-
\defnadjx{freestanding deleted}{functions}{function}.
994+
\defnadjx{freestanding-deleted}{functions}{function}.
995995
On freestanding implementations,
996-
it is \impldef{whether a freestanding deleted function is a deleted function}
997-
whether each entity introduced by a freestanding deleted function
996+
it is \impldef{whether a freestanding-deleted function is a deleted function}
997+
whether each entity introduced by a freestanding-deleted function
998998
is a deleted function\iref{dcl.fct.def.delete} or
999999
whether the requirements are the same as
10001000
the corresponding requirements for a hosted implementation.
@@ -1067,15 +1067,15 @@
10671067

10681068
\pnum
10691069
\begin{note}
1070-
Freestanding annotations follow some additional exposition conventions
1070+
Such comments follow some additional exposition conventions
10711071
that do not impose any additional normative requirements.
1072-
Header synopses that begin with a comment containing "all freestanding"
1073-
contain no hosted items and no freestanding deleted functions.
1074-
Header synopses that begin with a comment containing "mostly freestanding"
1075-
contain at least one hosted item or freestanding deleted function.
1072+
Header synopses that begin with a comment containing ``all freestanding''
1073+
contain no hosted items and no freestanding-deleted functions.
1074+
Header synopses that begin with a comment containing ``mostly freestanding''
1075+
contain at least one hosted item or freestanding-deleted function.
10761076
Classes and class templates followed by a comment
1077-
containing "partially freestanding"
1078-
contain at least one hosted item or freestanding deleted function.
1077+
containing ``partially freestanding''
1078+
contain at least one hosted item or freestanding-deleted function.
10791079
\end{note}
10801080
\begin{example}
10811081
\begin{codeblock}

0 commit comments

Comments
 (0)