Skip to content

Commit 5cafa0f

Browse files
committed
Use 'well-formed' (with hyphen) consistenly.
Fixes #1618.
1 parent 119b98d commit 5cafa0f

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

source/derived.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@
860860
\end{codeblock}
861861
Both \tcode{VB1::f} and \tcode{VB2::f} override \tcode{A::f} but there
862862
is no overrider of both of them in class \tcode{Error}. This example is
863-
therefore ill-formed. Class \tcode{Okay} is well formed, however,
863+
therefore ill-formed. Class \tcode{Okay} is well-formed, however,
864864
because \tcode{Okay::f} is a final overrider.
865865
\end{example}
866866

source/numerics.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9668,7 +9668,7 @@
96689668
\pnum
96699669
\requires \tcode{T} shall be convertible to \tcode{ForwardIterator}'s value
96709670
type. The expression \tcode{++val}, where \tcode{val} has type \tcode{T}, shall
9671-
be well formed.
9671+
be well-formed.
96729672

96739673
\pnum
96749674
\effects For each element referred to by the iterator \tcode{i} in the range

source/special.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
B& operator=(const B &);
4141
};
4242
B& B::operator=(const B& s) {
43-
this->A::operator=(s); // well formed
43+
this->A::operator=(s); // well-formed
4444
return *this;
4545
}
4646
\end{codeblock}

source/utilities.tex

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4414,7 +4414,7 @@
44144414
unless \tcode{is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
44154415
and unless the expression
44164416
\tcode{\placeholdernc{FUN}(}\brk\tcode{std::forward<T>(t))} (with \tcode{\placeholdernc{FUN}}
4417-
being the above-mentioned set of imaginary functions) is well formed.
4417+
being the above-mentioned set of imaginary functions) is well-formed.
44184418

44194419
\pnum
44204420
\begin{note}
@@ -4736,7 +4736,7 @@
47364736
\tcode{is_assignable_v<$\tcode{T}_j$\&, T> \&\& is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
47374737
and unless the expression \tcode{\placeholdernc{FUN}(std::forward<T>(t))} (with
47384738
\tcode{\placeholdernc{FUN}} being the above-mentioned set of imaginary functions)
4739-
is well formed.
4739+
is well-formed.
47404740

47414741
\pnum
47424742
\begin{note}
@@ -8773,9 +8773,9 @@
87738773
\pnum
87748774
\requires If \tcode{E} is not a reference type,
87758775
construction of the deleter from an rvalue of type
8776-
\tcode{E} shall be well formed and shall not throw an exception.
8776+
\tcode{E} shall be well-formed and shall not throw an exception.
87778777
Otherwise, \tcode{E} is a reference type and construction of the deleter from an
8778-
lvalue of type \tcode{E} shall be well formed and shall not throw an exception.
8778+
lvalue of type \tcode{E} shall be well-formed and shall not throw an exception.
87798779

87808780
\pnum
87818781
\remarks This constructor shall not participate in overload resolution unless:
@@ -8811,7 +8811,7 @@
88118811

88128812
\begin{itemdescr}
88138813
\pnum
8814-
\requires The expression \tcode{get_deleter()(get())} shall be well formed,
8814+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed,
88158815
shall have well-defined behavior, and shall not throw exceptions. \begin{note} The
88168816
use of \tcode{default_delete} requires \tcode{T} to be a complete type.
88178817
\end{note}
@@ -8982,7 +8982,7 @@
89828982

89838983
\begin{itemdescr}
89848984
\pnum
8985-
\requires The expression \tcode{get_deleter()(get())} shall be well formed, shall have
8985+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed, shall have
89868986
well-defined behavior, and shall not throw exceptions.
89878987

89888988
\pnum
@@ -10038,7 +10038,7 @@
1003810038
it is unspecified whether this
1003910039
member function is declared. If it is declared, it is unspecified what its
1004010040
return type is, except that the declaration (although not necessarily the
10041-
definition) of the function shall be well formed.
10041+
definition) of the function shall be well-formed.
1004210042
\end{itemdescr}
1004310043

1004410044
\indexlibrarymember{operator->}{shared_ptr}%
@@ -10055,7 +10055,7 @@
1005510055
it is unspecified whether this member function is declared.
1005610056
If it is declared, it is unspecified what its return type is,
1005710057
except that the declaration (although not necessarily the definition)
10058-
of the function shall be well formed.
10058+
of the function shall be well-formed.
1005910059
\end{itemdescr}
1006010060

1006110061
\indexlibrarymember{operator[]}{shared_ptr}%
@@ -10073,7 +10073,7 @@
1007310073
it is unspecified whether this member function is declared.
1007410074
If it is declared, it is unspecified what its return type is,
1007510075
except that the declaration (although not necessarily the definition)
10076-
of the function shall be well formed.
10076+
of the function shall be well-formed.
1007710077

1007810078
\pnum\throws Nothing.
1007910079
\end{itemdescr}
@@ -10149,7 +10149,7 @@
1014910149
\pnum
1015010150
\requires The expression \tcode{::new (pv) T(std::forward<Args>(args)...)},
1015110151
where \tcode{pv} has type \tcode{void*} and points to storage suitable
10152-
to hold an object of type \tcode{T}, shall be well formed. \tcode{A} shall
10152+
to hold an object of type \tcode{T}, shall be well-formed. \tcode{A} shall
1015310153
be an allocator~(\ref{allocator.requirements}). The copy constructor
1015410154
and destructor of \tcode{A} shall not throw exceptions.
1015510155

@@ -10327,7 +10327,7 @@
1032710327
\begin{itemdescr}
1032810328
\pnum
1032910329
\requires The expression \tcode{static_cast<T*>((U*)nullptr)} shall
10330-
be well formed.
10330+
be well-formed.
1033110331

1033210332
\pnum
1033310333
\returns
@@ -10353,7 +10353,7 @@
1035310353
\begin{itemdescr}
1035410354
\pnum
1035510355
\requires The expression \tcode{dynamic_cast<T*>((U*)nullptr)}
10356-
shall be well formed and shall have well-defined behavior.
10356+
shall be well-formed and shall have well-defined behavior.
1035710357

1035810358
\pnum
1035910359
\returns
@@ -10380,7 +10380,7 @@
1038010380
\begin{itemdescr}
1038110381
\pnum
1038210382
\requires The expression \tcode{const_cast<T*>((U*)nullptr)} shall
10383-
be well formed.
10383+
be well-formed.
1038410384

1038510385
\pnum
1038610386
\returns
@@ -10405,7 +10405,7 @@
1040510405
\begin{itemdescr}
1040610406
\pnum
1040710407
\requires The expression \tcode{reinterpret_cast<T*>((U*)nullptr)}
10408-
shall be well formed.
10408+
shall be well-formed.
1040910409

1041010410
\pnum\returns
1041110411
\begin{codeblock}
@@ -11422,7 +11422,7 @@
1142211422
with allocator \tcode{resource()} (see~\ref{allocator.uses.construction})
1142311423
and constructor arguments \tcode{std::forward<Args>(args)...} is well-formed.
1142411424
\begin{note}
11425-
Uses-allocator construction is always well formed
11425+
Uses-allocator construction is always well-formed
1142611426
for types that do not use allocators.\end{note}
1142711427

1142811428
\pnum
@@ -14551,7 +14551,7 @@
1455114551
if the expression
1455214552
\tcode{\placeholdernc{INVOKE}<R>(declval<F\&>(), declval<ArgTypes>()...)},
1455314553
considered as an unevaluated operand (Clause~\ref{expr}), is
14554-
well formed~(\ref{func.require}).
14554+
well-formed~(\ref{func.require}).
1455514555

1455614556
\pnum
1455714557
The \tcode{function} class template is a call
@@ -16439,7 +16439,7 @@
1643916439
\tcode{template <class Fn, class... ArgTypes>}\br
1644016440
\tcode{struct is_invocable;} &
1644116441
The expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16442-
is well formed when treated as an unevaluated operand &
16442+
is well-formed when treated as an unevaluated operand &
1644316443
\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes}
1644416444
shall be complete types, \cv{}~\tcode{void}, or
1644516445
arrays of unknown bound. \\ \rowsep
@@ -16448,7 +16448,7 @@
1644816448
\tcode{template <class R, class Fn, class... ArgTypes>}\br
1644916449
\tcode{struct is_invocable_r;} &
1645016450
The expression \tcode{\placeholdernc{INVOKE}<R>(declval<Fn>(), declval<ArgTypes>()...)}
16451-
is well formed when treated as an unevaluated operand &
16451+
is well-formed when treated as an unevaluated operand &
1645216452
\tcode{Fn}, \tcode{R}, and all types in the parameter pack \tcode{ArgTypes}
1645316453
shall be complete types, \cv{}~\tcode{void}, or
1645416454
arrays of unknown bound. \\ \rowsep
@@ -16850,7 +16850,7 @@
1685016850
\tcode{struct invoke_result;}
1685116851
&
1685216852
If the expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16853-
is well formed when treated as an unevaluated operand (Clause~\ref{expr}),
16853+
is well-formed when treated as an unevaluated operand (Clause~\ref{expr}),
1685416854
the member typedef \tcode{type} names the type
1685516855
\tcode{decltype(\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...))};
1685616856
otherwise, there shall be no member \tcode{type}. Access checking is

0 commit comments

Comments
 (0)