diff options
author | Daniel Barclay <dbarclay@savi.com> | 2016-08-21 12:38:04 -0400 |
---|---|---|
committer | Daniel Barclay <dbarclay@savi.com> | 2016-08-21 12:38:04 -0400 |
commit | 34bbd14189b70d2757bb8e973f6a768f9b3b3459 (patch) | |
tree | b4e5ad0813f440e7577fe239c90f04d967946b65 /spec/05-classes-and-objects.md | |
parent | ebc7f8ffb0927e79da8e6ecbbd8dca2e0d2e56a0 (diff) | |
download | scala-34bbd14189b70d2757bb8e973f6a768f9b3b3459.tar.gz scala-34bbd14189b70d2757bb8e973f6a768f9b3b3459.tar.bz2 scala-34bbd14189b70d2757bb8e973f6a768f9b3b3459.zip |
Editorial: Italicized more defining occurrences of terms.
Diffstat (limited to 'spec/05-classes-and-objects.md')
-rw-r--r-- | spec/05-classes-and-objects.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/05-classes-and-objects.md b/spec/05-classes-and-objects.md index 69828ec7fe..cff5174297 100644 --- a/spec/05-classes-and-objects.md +++ b/spec/05-classes-and-objects.md @@ -27,7 +27,7 @@ SelfType ::= id [`:' Type] `=>' | this `:' Type `=>' ``` -A template defines the type signature, behavior and initial state of a +A _template_ defines the type signature, behavior and initial state of a trait or class of objects or of a single object. Templates form part of instance creation expressions, class definitions, and object definitions. A template @@ -972,7 +972,7 @@ TraitDef ::= id [TypeParamClause] TraitTemplateOpt TraitTemplateOpt ::= `extends' TraitTemplate | [[`extends'] TemplateBody] ``` -A trait is a class that is meant to be added to some other class +A _trait_ is a class that is meant to be added to some other class as a mixin. Unlike normal classes, traits cannot have constructor parameters. Furthermore, no constructor arguments are passed to the superclass of the trait. This is not necessary as traits are @@ -1074,7 +1074,7 @@ in `MyTable`. ObjectDef ::= id ClassTemplate ``` -An object definition defines a single object of a new class. Its +An _object definition_ defines a single object of a new class. Its most general form is `object $m$ extends $t$`. Here, $m$ is the name of the object to be defined, and |