Skip to content

Commit aa4b1ae

Browse files
committed
[temp.constr.order] Clarify description of subsumption and ordering by constraints.
1 parent 5a605d4 commit aa4b1ae

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

source/templates.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,16 +1882,16 @@
18821882
\end{example}%
18831883
}.
18841884
%
1885-
Then, $P$ \defnx{subsumes}{constraint!subsumption} $Q$ if and only if
1886-
\begin{itemize}
1887-
\item for every disjunctive clause $P_i$ in the disjunctive normal
1885+
Then, $P$ \defnx{subsumes}{constraint!subsumption} $Q$ if and only if,
1886+
for every disjunctive clause $P_i$ in the disjunctive normal
18881887
form of $P$, $P_i$ subsumes every conjunctive clause $Q_j$
18891888
in the conjuctive normal form of $Q$, where
18901889

1890+
\begin{itemize}
18911891
\item
18921892
a disjunctive clause $P_i$ subsumes a conjunctive clause $Q_j$ if and only
18931893
if there exists an atomic constraint $P_{ia}$ in $P_i$ for which there exists
1894-
an atomic constraint $Q_{jb}$ in $Q_j$ such that $P_{ia}$ subsumes $Q_{jb}$.
1894+
an atomic constraint $Q_{jb}$ in $Q_j$ such that $P_{ia}$ subsumes $Q_{jb}$, and
18951895

18961896
\item an atomic constraint $A$ subsumes another atomic constraint
18971897
$B$ if and only if the $A$ and $B$ are identical using the
@@ -1926,9 +1926,9 @@
19261926
%%% into the constraints before comparing them, otherwise they will be
19271927
%%% referring to unrelated template parameters.
19281928
\pnum
1929-
When two declarations \tcode{D1} and \tcode{D2} are
1930-
partially ordered by their associated constraints~(\ref{temp.constr.decl}),
1931-
\tcode{D1} is \defn{at least as constrained} as \tcode{D2} if
1929+
A declaration \tcode{D1} is
1930+
\defn{at least as constrained} as
1931+
a declaration \tcode{D2} if
19321932

19331933
\begin{itemize}
19341934
\item \tcode{D1} and \tcode{D2} are both constrained declarations and

0 commit comments

Comments
 (0)