Skip to content

Commit 550bcf5

Browse files
jensmaurerzygoloid
authored andcommitted
[std] Remove 'should' and 'may' from footnotes.
Partially addresses ISO/CS 017 (C++20 DIS)
1 parent f64b589 commit 550bcf5

14 files changed

+51
-36
lines changed

source/algorithms.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4462,7 +4462,7 @@
44624462
Copies elements in the range \range{first}{last}
44634463
into the range \range{result - $N$}{result}
44644464
starting from \tcode{last - 1} and proceeding to \tcode{first}.%
4465-
\footnote{\tcode{copy_backward} should be used instead of copy
4465+
\footnote{\tcode{copy_backward} can be used instead of copy
44664466
when \tcode{last} is in the range \range{result - $N$}{result}.}
44674467
For each positive integer $n \le N$,
44684468
performs \tcode{*(result - $n$) = *(last - $n$)}.
@@ -4613,7 +4613,7 @@
46134613
Moves elements in the range \range{first}{last}
46144614
into the range \range{result - $N$}{result}
46154615
starting from \tcode{last - 1} and proceeding to \tcode{first}.%
4616-
\footnote{\tcode{move_backward} should be used instead of move
4616+
\footnote{\tcode{move_backward} can be used instead of move
46174617
when \tcode{last} is in the range \range{result - $N$}{result}.}
46184618
For each positive integer $n \le N$,
46194619
performs \tcode{*(result - $n$) = $E$}.

source/basic.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@
15311531
A name used in the definition of a class \tcode{X}%
15321532
\footnote{This
15331533
refers to unqualified names following the class name;
1534-
such a name may be used in a \grammarterm{base-specifier} or
1534+
such a name might be used in a \grammarterm{base-specifier} or
15351535
in the \grammarterm{member-specification} of the class definition.}
15361536
outside of a complete-class context\iref{class.mem} of \tcode{X}
15371537
shall be declared in one of the following ways:

source/containers.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5849,7 +5849,7 @@
58495849
\throws
58505850
\tcode{length_error} if \tcode{n >
58515851
max_size()}.\footnote{\tcode{reserve()} uses \tcode{Allocator::allocate()} which
5852-
may throw an appropriate exception.}
5852+
can throw an appropriate exception.}
58535853

58545854
\pnum
58555855
\remarks

source/declarations.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7594,7 +7594,7 @@
75947594
An ambiguity exists if the best match finds two functions with the same
75957595
signature, even if one is in a namespace reachable through
75967596
\grammarterm{using-directive}{s} in the namespace of the other.\footnote{During
7597-
name lookup in a class hierarchy, some ambiguities may be
7597+
name lookup in a class hierarchy, some ambiguities can be
75987598
resolved by considering whether one member hides the other along some
75997599
paths\iref{class.member.lookup}. There is no such disambiguation when
76007600
considering the set of names found as a result of following

source/expressions.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
whose type is not similar\iref{conv.qual} to
293293
one of the following types the behavior is
294294
undefined:\footnote{The intent of this list is to specify those circumstances in which an
295-
object may or may not be aliased.}
295+
object can or cannot be aliased.}
296296
\begin{itemize}
297297
\item the dynamic type of the object,
298298

@@ -3932,7 +3932,7 @@
39323932
\pnum
39333933
An object pointer
39343934
can be explicitly converted to an object pointer of a different type.\footnote{The
3935-
types may have different \cv-qualifiers, subject to
3935+
types can have different \cv-qualifiers, subject to
39363936
the overall
39373937
restriction that a \tcode{reinterpret_cast} cannot cast away constness.}
39383938
When a prvalue \tcode{v} of object pointer type is converted to
@@ -3970,7 +3970,7 @@
39703970
A prvalue of type ``pointer to member of \tcode{X} of type \tcode{T1}''
39713971
can be explicitly converted to a prvalue of a different type ``pointer to member of
39723972
\tcode{Y} of type \tcode{T2}'' if \tcode{T1} and \tcode{T2} are both
3973-
function types or both object types.\footnote{\tcode{T1} and \tcode{T2} may have
3973+
function types or both object types.\footnote{\tcode{T1} and \tcode{T2} can have
39743974
different \cv-qualifiers, subject to
39753975
the overall restriction that a \tcode{reinterpret_cast} cannot cast away
39763976
constness.} The null member pointer value\iref{conv.mem} is converted to the
@@ -4570,7 +4570,7 @@
45704570
potentially-overlapping subobject is
45714571
the size of the type, not the size of the subobject.%
45724572
\footnote{The actual size of a potentially-overlapping subobject
4573-
may be less than the result of
4573+
can be less than the result of
45744574
applying \tcode{sizeof} to the subobject, due to virtual base classes
45754575
and less strict padding requirements on potentially-overlapping subobjects.}
45764576
\indextext{array!\idxcode{sizeof}}%
@@ -5171,7 +5171,7 @@
51715171

51725172
\pnum
51735173
\indextext{\idxcode{new}!exception and}%
5174-
If any part of the object initialization described above\footnote{This may
5174+
If any part of the object initialization described above\footnote{This might
51755175
include evaluating a \grammarterm{new-initializer} and/or calling
51765176
a constructor.}
51775177
terminates by throwing an exception and a suitable deallocation function
@@ -7310,7 +7310,7 @@
73107310
that is usable in constant expressions or
73117311
has constant initialization\iref{basic.start.static}.%
73127312
\footnote{Testing this condition
7313-
may involve a trial evaluation of its initializer as described above.}
7313+
might involve a trial evaluation of its initializer as described above.}
73147314
\begin{example}
73157315
\begin{codeblock}
73167316
template<bool> struct X {};
@@ -7351,12 +7351,12 @@
73517351

73527352
\item
73537353
an immediate subexpression of a \grammarterm{braced-init-list},%
7354-
\footnote{Constant evaluation may be necessary to determine whether a narrowing conversion is performed\iref{dcl.init.list}.}
7354+
\footnote{Constant evaluation might be necessary to determine whether a narrowing conversion is performed\iref{dcl.init.list}.}
73557355

73567356
\item
73577357
an expression of the form \tcode{\&} \grammarterm{cast-expression}
73587358
that occurs within a templated entity,%
7359-
\footnote{Constant evaluation may be necessary to determine whether such an expression is value-dependent\iref{temp.dep.constexpr}.}
7359+
\footnote{Constant evaluation might be necessary to determine whether such an expression is value-dependent\iref{temp.dep.constexpr}.}
73607360
or
73617361

73627362
\item

source/future.tex

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,6 @@
865865
How many additional write positions are made
866866
available is otherwise unspecified.%
867867
\indextext{unspecified}%
868-
\footnote{An implementation should consider \tcode{alsize} in making this
869-
decision.}
870868
If \tcode{palloc} is not a null pointer, the function calls
871869
\tcode{(*palloc)(n)}
872870
to allocate the new dynamic array object.
@@ -890,6 +888,11 @@
890888
or if
891889
\tcode{(strmode \& frozen) != 0},
892890
the function cannot extend the array (reallocate it with greater length) to make a write position available.
891+
892+
\pnum
893+
\recommended
894+
An implementation should consider \tcode{alsize} in making the
895+
decision how many additional write positions to make available.
893896
\end{itemdescr}
894897

895898
\indexlibrarymember{pbackfail}{strstreambuf}%

source/iostreams.tex

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,11 @@
431431
time prior to or during the first time an object of class
432432
\tcode{ios_base::Init} is constructed, and in any case before the body
433433
of \tcode{main}\iref{basic.start.main} begins execution.
434+
435+
\recommended
436+
If it is possible for them to do so, implementations should
437+
initialize the objects earlier than required.
438+
434439
The objects are not destroyed during program execution.\footnote{Constructors and destructors for objects with
435440
static storage duration can
436441
access these objects to read input from
@@ -3046,7 +3051,7 @@
30463051
Initializes:\footnote{The default constructor is protected for class
30473052
\tcode{basic_streambuf}
30483053
to assure that only objects for classes
3049-
derived from this class may be constructed.}
3054+
derived from this class can be constructed.}
30503055
\begin{itemize}
30513056
\item
30523057
all pointer member objects to null pointers,

source/iterators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@
596596
that designate the beginning and end of the computation, or an iterator and a
597597
count that designate the beginning and the number of elements to which the
598598
computation is to be applied.\footnote{The sentinel denoting the end of a range
599-
may have the same type as the iterator denoting the beginning of the range, or a
599+
can have the same type as the iterator denoting the beginning of the range, or a
600600
different type.}
601601

602602
\pnum

source/lex.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,9 @@
637637
specified in \tref{lex.name.disallowed}.
638638
Upper- and lower-case letters are
639639
different. All characters are significant.\footnote{On systems in which linkers cannot accept extended
640-
characters, an encoding of the \grammarterm{universal-character-name} may be used in
640+
characters, an encoding of the \grammarterm{universal-character-name} can be used in
641641
forming valid external identifiers. For example, some otherwise unused
642-
character or sequence of characters may be used to encode the
642+
character or sequence of characters can be used to encode the
643643
\tcode{\textbackslash u} in a \grammarterm{universal-character-name}. Extended
644644
characters may produce a long external identifier, but \Cpp{} does not
645645
place a translation limit on significant characters for external

source/lib-intro.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@
851851
or namespaces nested within namespace
852852
\tcode{std}.\footnote{The C standard library headers\iref{depr.c.headers} also define
853853
names within the global namespace, while the \Cpp{} headers for C library
854-
facilities\iref{headers} may also define names within the global namespace.}%
854+
facilities\iref{headers} can also define names within the global namespace.}%
855855
\indextext{namespace}
856856
It is unspecified whether names declared in a specific namespace are declared
857857
directly in that namespace or in an inline namespace inside that
@@ -2209,7 +2209,7 @@
22092209
that meets the minimum requirements
22102210
of this document.
22112211
Therefore
2212-
an implementation may elect,
2212+
an implementation can elect,
22132213
under the as-if rule\iref{intro.execution},
22142214
to provide any customization point
22152215
in the form
@@ -2775,7 +2775,7 @@
27752775
described in \ref{\firstlibchapter} through \ref{\lastlibchapter} and
27762776
\ref{depr} shall behave as if the implementation declared no additional
27772777
non-member function signatures.\footnote{A valid \Cpp{} program always
2778-
calls the expected library non-member function. An implementation may
2778+
calls the expected library non-member function. An implementation can
27792779
also define additional non-member functions that would otherwise not
27802780
be called by a valid \Cpp{} program.}
27812781

0 commit comments

Comments
 (0)