|
1882 | 1882 | \end{example}%
|
1883 | 1883 | }.
|
1884 | 1884 | %
|
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 |
1888 | 1887 | form of $P$, $P_i$ subsumes every conjunctive clause $Q_j$
|
1889 | 1888 | in the conjuctive normal form of $Q$, where
|
1890 | 1889 |
|
| 1890 | +\begin{itemize} |
1891 | 1891 | \item
|
1892 | 1892 | a disjunctive clause $P_i$ subsumes a conjunctive clause $Q_j$ if and only
|
1893 | 1893 | 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 |
1895 | 1895 |
|
1896 | 1896 | \item an atomic constraint $A$ subsumes another atomic constraint
|
1897 | 1897 | $B$ if and only if the $A$ and $B$ are identical using the
|
|
1926 | 1926 | %%% into the constraints before comparing them, otherwise they will be
|
1927 | 1927 | %%% referring to unrelated template parameters.
|
1928 | 1928 | \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 |
1932 | 1932 |
|
1933 | 1933 | \begin{itemize}
|
1934 | 1934 | \item \tcode{D1} and \tcode{D2} are both constrained declarations and
|
|
0 commit comments