X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/64d9458347710b87cb2ca9bf1ad8e2565060a866..c3e28c92f639126436db713381309200eaba3ba2:/doc/concepts.tex diff --git a/doc/concepts.tex b/doc/concepts.tex index fc83714..397920f 100644 --- a/doc/concepts.tex +++ b/doc/concepts.tex @@ -169,8 +169,8 @@ in~\cite{barrett-1996:monot-super-linear-dylan}. It works as follows. have no merge then they are said to be \emph{inconsistent}. \item The class precedence list of a class $C$ is a merge of the local precedence list of $C$ together with the class precedence lists of each of - $C$'s direct superclasses. -\item If there are no such merges, then the definition of $C$ is invalid. + $C$'s direct superclasses. If these lists are inconsistent, then the + definition of $C$ is invalid. \item Suppose that there are multiple candidate merges. Consider the earliest position in these candidate merges at which they disagree. The \emph{candidate classes} at this position are the classes appearing at this