diff options
| author | Seth Tisue <seth@tisue.net> | 2015-11-24 08:35:38 -0500 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-11-24 08:35:38 -0500 |
| commit | e8f3836578c5153fae3f9ded7c4afec6d6d3a6f8 (patch) | |
| tree | 4458169015b02ecf7e29f805d0dbd6645171620a /spec/01-lexical-syntax.md | |
| parent | 3d0cbf9d10416fab8017b5fb46af44f59ee89fd1 (diff) | |
| parent | 86300fe1b3ab87b2e40616ed78709e8f03e707b5 (diff) | |
| download | scala-e8f3836578c5153fae3f9ded7c4afec6d6d3a6f8.tar.gz scala-e8f3836578c5153fae3f9ded7c4afec6d6d3a6f8.tar.bz2 scala-e8f3836578c5153fae3f9ded7c4afec6d6d3a6f8.zip | |
Merge pull request #4864 from lrytz/merge-2.11-to-2.12-nov-24
Merge 2.11 to 2.12 nov 24
Diffstat (limited to 'spec/01-lexical-syntax.md')
| -rw-r--r-- | spec/01-lexical-syntax.md | 10 |
1 files changed, 5 insertions, 5 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 _ : = => <- <: <% >: # @ ``` |