diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-12 17:47:43 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-12 17:47:43 -0700 |
| commit | 78d96eafe9c7404b43da38892134ba380dd77db5 (patch) | |
| tree | 0543532be3babed081af3f169f2400ca833ab067 /05-types.md | |
| parent | 3c0d964c350b5a2eaa3fdc53e4f24a6b86d27eba (diff) | |
| download | scala-78d96eafe9c7404b43da38892134ba380dd77db5.tar.gz scala-78d96eafe9c7404b43da38892134ba380dd77db5.tar.bz2 scala-78d96eafe9c7404b43da38892134ba380dd77db5.zip | |
formatting: tables and headings
Diffstat (limited to '05-types.md')
| -rw-r--r-- | 05-types.md | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/05-types.md b/05-types.md index 22998b11f5..7f701c6cf0 100644 --- a/05-types.md +++ b/05-types.md @@ -791,10 +791,10 @@ These notions are defined mutually recursively as follows. We define two relations between types. ------------------ ---------------- ------------------------------------------------- -Type equivalence $T \equiv U$ $T$ and $U$ are interchangeable in all contexts. -Conformance $T <: U$ Type $T$ conforms to type $U$. ------------------ ---------------- ------------------------------------------------- +| | | | +|-----------------|----------------|-------------------------------------------------| +|Type equivalence |$T \equiv U$ |$T$ and $U$ are interchangeable in all contexts. | +|Conformance |$T <: U$ |Type $T$ conforms to type $U$. | ### Type Equivalence @@ -913,8 +913,7 @@ _subsumes_ another declaration of the same name in some compound type or class type $C'$, if one of the following holds. - A value declaration or definition that defines a name $x$ with type $T$ - subsumes - a value or method declaration that defines $x$ with type $T'$, provided + subsumes a value or method declaration that defines $x$ with type $T'$, provided $T <: T'$. - A method declaration or definition that defines a name $x$ with type $T$ subsumes a method declaration that defines $x$ with type $T'$, provided |