Merge pull request #5972 from dotty-staging/add/macro-kw

Parse `macro ???` as `???` to compile the standard library

Author: odersky

compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

@@ -104,9 +104,6 @@ object JavaParsers {
     def arrayOf(tpt: Tree): AppliedTypeTree =
       AppliedTypeTree(Ident(nme.Array.toTypeName), List(tpt))
 
-    def unimplementedExpr(implicit ctx: Context): Select =
-      Select(Select(rootDot(nme.scala_), nme.Predef), nme.???)
-
     def makeTemplate(parents: List[Tree], stats: List[Tree], tparams: List[TypeDef], needsDummyConstr: Boolean): Template = {
       def pullOutFirstConstr(stats: List[Tree]): (Tree, List[Tree]) = stats match {
         case (meth: DefDef) :: rest if meth.name == nme.CONSTRUCTOR => (meth, rest)

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -141,6 +141,9 @@ object Parsers {
      */
     def syntaxError(msg: => Message, span: Span): Unit =
       ctx.error(msg, source.atSpan(span))
+
+    def unimplementedExpr(implicit ctx: Context): Select =
+      Select(Select(rootDot(nme.scala_), nme.Predef), nme.???)
   }
 
   trait OutlineParserCommon extends ParserCommon {
@@ -1520,6 +1523,17 @@ object Parsers {
         case NEW =>
           canApply = false
           newExpr()
+        case MACRO =>
+          val start = in.skipToken()
+          val call = ident()
+          // The standard library uses "macro ???" to denote "fast track" macros
+          // hardcoded in the compiler, don't issue an error for those macros
+          // since we want to be able to compile the standard library.
+          if (call `ne` nme.???)
+            syntaxError(
+              "Scala 2 macros are not supported, see http://dotty.epfl.ch/docs/reference/dropped-features/macros.html",
+              start)
+          unimplementedExpr
         case _ =>
           if (isLiteral) literal()
           else {

compiler/src/dotty/tools/dotc/parsing/Tokens.scala

@@ -180,6 +180,7 @@ object Tokens extends TokensCommon {
   final val ERASED = 63;           enter(ERASED, "erased")
   final val IMPLIED = 64;          enter(IMPLIED, "implied")
   final val GIVEN = 65;            enter(GIVEN, "given")
+  final val MACRO = 66;            enter(MACRO, "macro") // TODO: remove
 
   /** special symbols */
   final val NEWLINE = 78;          enter(NEWLINE, "end of statement", "new line")
@@ -198,7 +199,7 @@ object Tokens extends TokensCommon {
   /** XML mode */
   final val XMLSTART = 96;         enter(XMLSTART, "$XMLSTART$<") // TODO: deprecate
 
-  final val alphaKeywords: TokenSet = tokenRange(IF, GIVEN)
+  final val alphaKeywords: TokenSet = tokenRange(IF, MACRO)
   final val symbolicKeywords: TokenSet = tokenRange(USCORE, VIEWBOUND)
   final val keywords: TokenSet = alphaKeywords | symbolicKeywords
 

compiler/test/dotc/pos-decompilation.blacklist

@@ -21,3 +21,5 @@ implicit-match.scala
 implicit-match-nested.scala
 implicit-match-and-inline-match.scala
 
+# Need to add backquotes around "macro" since it's a keyword
+macro-deprecate-dont-touch-backquotedidents.scala

tests/neg/macro.scala

@@ -0,0 +1,4 @@
+class A {
+  def bla = ???
+  def foo: Int = macro bla // error
+}

tests/pos/macro.scala

@@ -0,0 +1,3 @@
+class A {
+  def foo: Int = macro ???
+}