Skip to content

Commit 417d713

Browse files
committed
[over.match.best, over.ics.rank] Remove premature ends of sentences.
This addresses a major part of #90.
1 parent d76a411 commit 417d713

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

source/overloading.tex

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,20 +1550,19 @@
15501550
\pnum
15511551
\indextext{conversion!overload resolution and}%
15521552
Define ICS\textit{i}(\tcode{F}) as follows:
1553-
15541553
\begin{itemize}
15551554
\item
1556-
if
1555+
If
15571556
\tcode{F}
15581557
is a static member function, ICS\textit{1}(\tcode{F}) is defined such that
15591558
ICS\textit{1}(\tcode{F}) is neither better nor worse than ICS\textit{1}(\tcode{G})
15601559
for any function
15611560
\tcode{G},
15621561
and, symmetrically, ICS\textit{1}(\tcode{G}) is neither better nor worse than
1563-
ICS\textit{1}(\tcode{F})\footnote{If a function is a static member function, this
1562+
ICS\textit{1}(\tcode{F});\footnote{If a function is a static member function, this
15641563
definition means that the first argument, the implied object argument,
15651564
has no effect in the determination of whether the function is better
1566-
or worse than any other function.};
1565+
or worse than any other function.}
15671566
otherwise,
15681567
\item
15691568
let ICS\textit{i}(\tcode{F}) denote the implicit conversion sequence that converts
@@ -1591,7 +1590,6 @@
15911590
ICS\textit{i}(\tcode{F1}) is not a worse conversion
15921591
sequence than ICS\textit{i}(\tcode{F2}), and then
15931592
\begin{itemize}
1594-
15951593
\item
15961594
for some argument
15971595
\textit{j},
@@ -1608,7 +1606,7 @@
16081606
is a better conversion sequence than the standard conversion sequence
16091607
from the return type of
16101608
\tcode{F2}
1611-
to the destination type.
1609+
to the destination type
16121610
\begin{example}
16131611
\begin{codeblock}
16141612
struct A {
@@ -1629,7 +1627,6 @@
16291627
return type of \tcode{F1} is the same kind of reference (i.e. lvalue or rvalue)
16301628
as the reference being initialized, and the return type of \tcode{F2} is not
16311629
\begin{example}
1632-
16331630
\begin{codeblock}
16341631
template <class T> struct A {
16351632
operator T&(); // \#1
@@ -1640,7 +1637,6 @@
16401637
Fn& lf = a; // calls \#1
16411638
Fn&& rf = a; // calls \#2
16421639
\end{codeblock}
1643-
16441640
\end{example}
16451641
or, if not that,
16461642

@@ -2409,8 +2405,7 @@
24092405
neither refers to an implicit object parameter of a non-static member function
24102406
declared without a \grammarterm{ref-qualifier},
24112407
and \tcode{S1} binds an rvalue reference to an
2412-
rvalue and \tcode{S2} binds an lvalue reference.
2413-
2408+
rvalue and \tcode{S2} binds an lvalue reference
24142409
\begin{example}
24152410
\begin{codeblock}
24162411
int i;
@@ -2442,7 +2437,8 @@
24422437
\item
24432438
\tcode{S1} and \tcode{S2} are reference bindings~(\ref{dcl.init.ref}) and
24442439
\tcode{S1} binds an lvalue reference to a function lvalue and \tcode{S2} binds
2445-
an rvalue reference to a function lvalue. \begin{example}
2440+
an rvalue reference to a function lvalue
2441+
\begin{example}
24462442
\begin{codeblock}
24472443
int f(void(&)()); // \#1
24482444
int f(void(&&)()); // \#2
@@ -2462,9 +2458,8 @@
24622458
\tcode{T2}~(\ref{conv.qual}), respectively, and the cv-qualification signature of type
24632459
\tcode{T1}
24642460
is a proper subset of the cv-qualification signature of type
2465-
\tcode{T2}.
2461+
\tcode{T2}
24662462
\begin{example}
2467-
24682463
\begin{codeblock}
24692464
int f(const volatile int *);
24702465
int f(const int *);
@@ -2486,7 +2481,6 @@
24862481
\tcode{S1}
24872482
refers.
24882483
\begin{example}
2489-
24902484
\begin{codeblock}
24912485
int f(const int &);
24922486
int f(int &);

0 commit comments

Comments
 (0)