Various improvements to SIP 18 diagnostics. Made scala library and compiler feature clean.

1 files changed, 13 insertions, 10 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
index 81d81a4fb7..fa63ea33d0 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
@@ -119,6 +119,16 @@ trait Scanners extends ScannersCommon {
       cbuf.clear()
     }
 
+    /** Convert name to token */
+    private def name2token(name: Name) = {
+      val idx = name.start - kwOffset
+      if (idx >= 0 && idx < kwArray.length) {
+        val token = kwArray(idx)
+        if (token == IDENTIFIER) deprecationWarning(name+" is now a reserved word; usage as an identifier is deprecated")
+        token
+      } else IDENTIFIER
+    }
+
     /** Clear buffer and set string */
     private def setStrVal() {
       strVal = cbuf.toString
@@ -1124,9 +1134,9 @@ trait Scanners extends ScannersCommon {
     nme.VIEWBOUNDkw -> VIEWBOUND,
     nme.SUPERTYPEkw -> SUPERTYPE,
     nme.HASHkw      -> HASH,
-    nme.ATkw        -> AT
-  ) ++
-  (if (settings.Xmacros.value) List(nme.MACROkw -> MACRO) else List())
+    nme.ATkw        -> AT,
+    nme.MACROkw     -> IDENTIFIER,
+    nme.THENkw      -> IDENTIFIER)
 
   private var kwOffset: Int = -1
   private val kwArray: Array[Int] = {
@@ -1137,13 +1147,6 @@ trait Scanners extends ScannersCommon {
 
   final val token2name = allKeywords map (_.swap) toMap
 
-  /** Convert name to token */
-  final def name2token(name: Name) = {
-    val idx = name.start - kwOffset
-    if (idx >= 0 && idx < kwArray.length) kwArray(idx)
-    else IDENTIFIER
-  }
-
 // Token representation ----------------------------------------------------
 
   /** Returns the string representation of given token. */