Merge pull request scala#4833 from xuwei-k/patch-2

SethTisue · SethTisue · commit e10413e501f5 · 2015-11-09T19:39:51.000-05:00
"macro" is a reserved word since Scala 2.11
diff --git 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
 _    :    =    =>    <-    <:    <%     >:    #    @
 ```
 
