Interface type and subtype rule fixes

Author: eernstg

specification/dartLangSpec.tex

@@ -19991,7 +19991,8 @@ \section{Types}
 \LMLabel{types}
 
 \LMHash{}%
-Dart supports optional typing based on interface types.
+Dart supports optional typing based on interface types
+(\ref{interfaceTypes}).
 
 \rationale{%
 The type system is unsound, due to the covariance of generic classes.
@@ -20787,8 +20788,7 @@ \subsection{Subtypes}
       T \in \{\code{Object?}, \DYNAMIC, \VOID\}}{S}{T}
     % ------------------------------------------------ Right Object
     \RuleRaw{\SrnRightObjectFour}{%
-      \mbox{$S$ is an interface type,}\\
-      \mbox{a function type, or \FUNCTION}}{S}{\code{Object}}
+      \mbox{$S$ is an interface type or \FUNCTION}}{S}{\code{Object}}
     % ------------------------------------------------ Left Null 2
     \Rule{\SrnNullTwo}{\code{Null}}{T}{%
       \code{Null}}{\code{FutureOr<$T$>}}
@@ -21163,8 +21163,7 @@ \subsubsection{Informal Subtype Rule Descriptions}
 \Item{\SrnBottom}{Bottom}
   \code{Never} is a subtype of every type.
 \Item{\SrnRightObjectFour}{Right Object}
-  Interface types, function types, and \FUNCTION{}
-  are subtypes of \code{Object}.
+  Interface types and \FUNCTION{} are subtypes of \code{Object}.
 \Item{\SrnNullOne}{Null Nullable}
   \code{Null} is a subtype of every type of the form \code{$T$?}.
 \Item{\SrnNullTwo}{Null FutureOr}
@@ -21352,7 +21351,7 @@ \subsection{Type Nullability}
 \item \code{Never}.
 \item Any function type.
 \item The type \FUNCTION.
-\item Any interface type except \code{Null}.
+\item Any interface type.
 \item \code{FutureOr<$S$>}, for any non-nullable type $S$.
 \item Any type variable $X$ whose bound is non-nullable.
 \item Any type of the form \code{$X$\,\&\,$S$}, where
@@ -22671,15 +22670,13 @@ \subsubsection{The Standard Upper Bound of Distinct Interface Types}
 
 \LMHash{}%
 We define the auxiliary function \NominalTypeDepthName{}
-on interface types and \code{Object?} as follows:
+on interface types as follows:
 
 \begin{itemize}
 \item
-  \DefEquals{\NominalTypeDepth{Object?}}{0}.
-\item
-  \DefEquals{\NominalTypeDepth{Object}}{1}.
-\item
-  \DefEquals{\NominalTypeDepth{Null}}{1}.
+  % We could make it 1 rather than 0, to "reserve space" for `Object?`,
+  % but this function is never used with `Object?` anyway.
+  \DefEquals{\NominalTypeDepth{Object}}{0}.
 \item
   Let $T$ be a class or a mixin,
   and let $M$ be the set of immediate superinterfaces of $T$.
@@ -22688,10 +22685,6 @@ \subsubsection{The Standard Upper Bound of Distinct Interface Types}
   $\metavar{max}\,\{\;\NominalTypeDepth{$S$}\;|\;S\;\in M\;\}$.
 \end{itemize}
 
-\commentary{%
-
-}
-
 \LMHash{}%
 \BlindDefineSymbol{I, J, M}%
 The algorithm that determines
@@ -23080,21 +23073,22 @@ \subsection{Interface Types}
 (\ref{typedef}).
 We say that $T$ is an \Index{interface type} if{}f
 $T'$ is of the form \code{$C$<\List{T}{1}{k}>},
-where $C$ denotes a class different from \code{Never},
+where $C$ denotes a class different from \code{Never} and \code{Null},
 or $C$ denotes a mixin.
 
 \commentary{%
 Note that \List{T}{1}{k} can be arbitrary types.
 Non-generic classes are included because we can have $k = 0$.
 
 In particular, the following types are \emph{not} interface types:
-\VOID, \DYNAMIC, \FUNCTION, \code{FutureOr<$T$>} for any $T$, \code{Never},
+\VOID, \DYNAMIC, \FUNCTION, \code{FutureOr<$T$>} for any $T$,
+\code{Never}, \code{Null},
 any function type, any type variable, any intersection type,
 and any type of the form \code{$T$?}.
 
-Conversely, built-in classes
-like \code{Object}, \code{Null}, \code{num}, \code{int},
-\code{String}, and \code{Exception} are interface types,
+Conversely, built-in classes like, e.g.,
+\code{Object}, \code{num}, \code{int}, \code{String}, and \code{Exception}
+are interface types,
 and so are
 \code{Future<$T$>}, \code{Stream<$T$>}, \code{Iterable<$T$>},
 \code{List<$T$>}, \code{Map<$S$,\,\,$T$}, and \code{Set<$T$>},