diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-11-24 10:17:40 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-11-24 10:17:40 +0100 |
| commit | 86300fe1b3ab87b2e40616ed78709e8f03e707b5 (patch) | |
| tree | 4458169015b02ecf7e29f805d0dbd6645171620a /spec | |
| parent | 3d0cbf9d10416fab8017b5fb46af44f59ee89fd1 (diff) | |
| parent | 8eb1d4c29d85aef7828eeb35169e80c085cea93e (diff) | |
| download | scala-86300fe1b3ab87b2e40616ed78709e8f03e707b5.tar.gz scala-86300fe1b3ab87b2e40616ed78709e8f03e707b5.tar.bz2 scala-86300fe1b3ab87b2e40616ed78709e8f03e707b5.zip | |
Merge commit '8eb1d4c' into merge-2.11-to-2.12-nov-24
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/01-lexical-syntax.md | 10 | ||||
| -rw-r--r-- | spec/06-expressions.md | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/01-lexical-syntax.md b/spec/01-lexical-syntax.md index 72ae6e8794..0232ed9a34 100644 --- a/spec/01-lexical-syntax.md +++ b/spec/01-lexical-syntax.md @@ -90,11 +90,11 @@ syntactic class `id` of lexical identifiers. abstract case catch class def do else extends false final finally for forSome if implicit -import lazy match new null -object override package private protected -return sealed super this throw -trait try true type val -var while with yield +import lazy macro match new +null object override package private +protected return sealed super this +throw trait try true type +val var while with yield _ : = => <- <: <% >: # @ ``` diff --git a/spec/06-expressions.md b/spec/06-expressions.md index 9cd58ea346..c24ca01c3b 100644 --- a/spec/06-expressions.md +++ b/spec/06-expressions.md @@ -1341,7 +1341,7 @@ to $U$ after applying [eta-expansion](#eta-expansion) and ### Value Conversions -The following five implicit conversions can be applied to an +The following seven implicit conversions can be applied to an expression $e$ which has some value type $T$ and which is type-checked with some expected type $\mathit{pt}$. |