summaryrefslogtreecommitdiff
path: root/spec/06-expressions.md
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-10-10 14:28:33 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-10-10 14:28:33 +1000
commit2b5df373638d08204b71258928289f6b39e25d5f (patch)
tree265c8cb9b8e43e8195a68e5845dd77693d58e2bb /spec/06-expressions.md
parent22233f40f641815fe7b9304bb386ee27c8422603 (diff)
parent3bbf5e4ed08c9a9c6153bb6373627428702cf6f4 (diff)
downloadscala-2b5df373638d08204b71258928289f6b39e25d5f.tar.gz
scala-2b5df373638d08204b71258928289f6b39e25d5f.tar.bz2
scala-2b5df373638d08204b71258928289f6b39e25d5f.zip
Merge pull request #4039 from roberthoedicke/2.11.x
Minor spelling corrections and fix of the claimed outcome of the examples in the section on repeated parameters
Diffstat (limited to 'spec/06-expressions.md')
-rw-r--r--spec/06-expressions.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/06-expressions.md b/spec/06-expressions.md
index 03b8065f4b..afd1492744 100644
--- a/spec/06-expressions.md
+++ b/spec/06-expressions.md
@@ -1571,7 +1571,7 @@ $T$ is a value type; if it is a method type we apply
means finding a substitution $\sigma$ of types $T_i$ for the type
parameters $a_i$ such that
-- None of inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
+- None of the inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
- All type parameter bounds are respected, i.e.
$\sigma L_i <: \sigma a_i$ and $\sigma a_i <: \sigma U_i$ for $i = 1 , \ldots , n$.
- The expression's type conforms to the expected type, i.e.
@@ -1608,7 +1608,7 @@ constraint system means
finding a substitution $\sigma$ of types $T_i$ for the type parameters
$a_i$ such that
-- None of inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
+- None of the inferred types $T_i$ is a [singleton type](03-types.html#singleton-types)
- All type parameter bounds are respected, i.e. $\sigma L_i <: \sigma a_i$ and
$\sigma a_i <: \sigma U_i$ for $i = 1 , \ldots , n$.
- The method's result type $T'$ conforms to the expected type, i.e. $\sigma T' <: \sigma \mathit{pt}$.
@@ -1750,7 +1750,7 @@ a sub-expression of parameterless method type, is not evaluated in the expanded
### Dynamic Member Selection
The standard Scala library defines a trait `scala.Dynamic` which defines a member
-\@invokeDynamic@ as follows:
+`applyDynamic` as follows:
```scala
package scala