summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorkenji yoshida <6b656e6a69@gmail.com>2015-11-02 14:57:04 +0900
committerkenji yoshida <6b656e6a69@gmail.com>2015-11-02 14:57:04 +0900
commit69db6301598f1271584e3bf56dd248936e504539 (patch)
treeb5634c52c76752db3b1c1b4b1e8bd563412bb342 /spec
parenta24ca7fa617cabada82c43d2d6ac354db698d181 (diff)
downloadscala-69db6301598f1271584e3bf56dd248936e504539.tar.gz
scala-69db6301598f1271584e3bf56dd248936e504539.tar.bz2
scala-69db6301598f1271584e3bf56dd248936e504539.zip
"macro" is a reserved word since Scala 2.11
Diffstat (limited to 'spec')
-rw-r--r--spec/01-lexical-syntax.md10
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
_ : = => <- <: <% >: # @
```