diff options
author | Seth Tisue <seth@tisue.net> | 2015-11-09 19:39:51 -0500 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2015-11-09 19:39:51 -0500 |
commit | e10413e501f599e866db37b2d4b180cf96a35ace (patch) | |
tree | b5634c52c76752db3b1c1b4b1e8bd563412bb342 | |
parent | a24ca7fa617cabada82c43d2d6ac354db698d181 (diff) | |
parent | 69db6301598f1271584e3bf56dd248936e504539 (diff) | |
download | scala-e10413e501f599e866db37b2d4b180cf96a35ace.tar.gz scala-e10413e501f599e866db37b2d4b180cf96a35ace.tar.bz2 scala-e10413e501f599e866db37b2d4b180cf96a35ace.zip |
Merge pull request #4833 from xuwei-k/patch-2
"macro" is a reserved word since Scala 2.11
-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 b26e5b2328..53c8caf745 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 _ : = => <- <: <% >: # @ ``` |