summaryrefslogtreecommitdiff
path: root/07-classes-and-objects.md
diff options
context:
space:
mode:
authorSimon Ochsenreither <simon@ochsenreither.de>2013-02-21 03:54:08 +0100
committerIain McGinniss <iainmcgin@gmail.com>2013-02-21 10:08:05 +0000
commit50ce3228b80475d1a0d748ec40ef532afb96df8f (patch)
tree94f28c3aee44315bca931ac12ebdadfa6ba922ef /07-classes-and-objects.md
parent2311e3498bea8d149cc38a6d3585de245134add9 (diff)
downloadscala-50ce3228b80475d1a0d748ec40ef532afb96df8f.tar.gz
scala-50ce3228b80475d1a0d748ec40ef532afb96df8f.tar.bz2
scala-50ce3228b80475d1a0d748ec40ef532afb96df8f.zip
Miscellaneous cleanups:
- Value of Unit is (), not {} - Fix desugared pattern matching code - Mention object-protected values - Use uppercase type variables for Tuple/Function code - Replace Application with App
Diffstat (limited to '07-classes-and-objects.md')
-rw-r--r--07-classes-and-objects.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/07-classes-and-objects.md b/07-classes-and-objects.md
index 1be54809a8..4bf7e55107 100644
--- a/07-classes-and-objects.md
+++ b/07-classes-and-objects.md
@@ -524,7 +524,7 @@ the validity and meaning of a modifier are as follows.
from templates inside $C$.
An different form of qualification is `private[this]`. A member
- $M$ marked with this modifier can be accessed only from within
+ $M$ marked with this modifier is called {\em object-protected}; it can be accessed only from within
the object in which it is defined. That is, a selection $p.M$ is only
legal if the prefix is `this` or `$O$.this`, for some
class $O$ enclosing the reference. In addition, the restrictions for