Change handling of enum defs.

The previous scheme did not work because desugaring cannot deal with
repeated expansions. We now sidestep the issue by doing the expansion in the parser. Luckily,
positions work out perfectly, so that one can reconstruct the source precisely from the parsed untyped
trees.

Author: odersky

compiler/src/dotty/tools/dotc/ast/untpd.scala

@@ -9,6 +9,7 @@ import Decorators._
 import util.Property
 import language.higherKinds
 import collection.mutable.ListBuffer
+import reflect.ClassTag
 
 object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
 
@@ -39,9 +40,6 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
     def withName(name: Name)(implicit ctx: Context) = cpy.ModuleDef(this)(name.toTermName, impl)
   }
 
-  /** mods case name impl */
-  case class EnumDef(name: TypeName, impl: Template) extends MemberDef
-
   case class ParsedTry(expr: Tree, handler: Tree, finalizer: Tree) extends TermTree
 
   case class SymbolLit(str: String) extends TermTree
@@ -191,6 +189,10 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
     def hasFlags = flags != EmptyFlags
     def hasAnnotations = annotations.nonEmpty
     def hasPrivateWithin = privateWithin != tpnme.EMPTY
+    def hasMod[T: ClassTag] = {
+      val cls = implicitly[ClassTag[T]].runtimeClass
+      mods.exists(mod => cls.isAssignableFrom(mod.getClass))
+    }
   }
 
   @sharable val EmptyModifiers: Modifiers = new Modifiers()

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

@@ -48,6 +48,13 @@ object Parsers {
     val Class, Type, TypeParam, Def = Value
   }
 
+  private implicit class AddDeco(val buf: ListBuffer[Tree]) extends AnyVal {
+    def +++=(x: Tree) = x match {
+      case x: Thicket => buf ++= x.trees
+      case x => buf += x
+    }
+  }
+
   /** The parse starting point depends on whether the source file is self-contained:
    *  if not, the AST will be supplemented.
    */
@@ -2049,8 +2056,9 @@ object Parsers {
         case CASEOBJECT =>
           objectDef(start, posMods(start, mods | Case | Module))
         case ENUM =>
-          val mods1 = addMod(mods, atPos(in.skipToken()) { Mod.Enum() })
-          if (in.token == CLASS) tmplDef(start, mods1) else enumDef(start, mods)
+          val enumMod = atPos(in.skipToken()) { Mod.Enum() }
+          if (in.token == CLASS) tmplDef(start, addMod(mods, enumMod))
+          else enumDef(start, mods, enumMod)
         case _ =>
           syntaxErrorOrIncomplete("expected start of definition")
           EmptyTree
@@ -2103,20 +2111,29 @@ object Parsers {
     /**  id ClassConstr [`extends' [ConstrApps]]
      *   [nl] ‘{’ EnumCaseStats ‘}’
      */
-    def enumDef(start: Offset, mods: Modifiers): EnumDef = atPos(start, nameStart) {
-      val name = ident().toTypeName
-      val constr = classConstr(name)
+    def enumDef(start: Offset, mods: Modifiers, enumMod: Mod): Thicket = {
+      val point = nameStart
+      val modName = ident()
+      val clsName = modName.toTypeName
+      val constr = classConstr(clsName)
       val parents =
         if (in.token == EXTENDS) {
           in.nextToken();
           newLineOptWhenFollowedBy(LBRACE)
           if (in.token == LBRACE) Nil else tokenSeparated(WITH, constrApp)
         }
         else Nil
+      val clsDef = atPos(start, point) {
+        TypeDef(clsName, Template(constr, parents, EmptyValDef, Nil))
+          .withMods(addMod(mods, enumMod)).setComment(in.getDocComment(start))
+      }
       newLineOptWhenFollowedBy(LBRACE)
-      val body = inBraces(enumCaseStats)
-      EnumDef(name, Template(constr, Nil, EmptyValDef, body))
-        .withMods(mods).setComment(in.getDocComment(start)).asInstanceOf[EnumDef]
+      val modDef = atPos(in.offset) {
+        val body = inBraces(enumCaseStats)
+        ModuleDef(modName, Template(emptyConstructor, Nil, EmptyValDef, body))
+          .withMods(mods)
+      }
+      Thicket(clsDef :: modDef :: Nil)
     }
 
     /** EnumCaseStats = EnumCaseStat {semi EnumCaseStat */
@@ -2237,7 +2254,7 @@ object Parsers {
         else if (in.token == IMPORT)
           stats ++= importClause()
         else if (in.token == AT || isTemplateIntro || isModifier)
-          stats += tmplDef(in.offset, defAnnotsMods(modifierTokens))
+          stats +++= tmplDef(in.offset, defAnnotsMods(modifierTokens))
         else if (!isStatSep) {
           if (in.token == CASE)
             syntaxErrorOrIncomplete("only `case class` or `case object` allowed")
@@ -2287,7 +2304,7 @@ object Parsers {
         else if (isExprIntro)
           stats += expr1()
         else if (isDefIntro(modifierTokensOrCase))
-          stats += defOrDcl(in.offset, defAnnotsMods(modifierTokens))
+          stats +++= defOrDcl(in.offset, defAnnotsMods(modifierTokens))
         else if (!isStatSep) {
           exitOnError = mustStartStat
           syntaxErrorOrIncomplete("illegal start of definition")
@@ -2345,9 +2362,9 @@ object Parsers {
             val start = in.offset
             val imods = implicitMods()
             if (isBindingIntro) stats += implicitClosure(start, Location.InBlock, imods)
-            else stats += localDef(start, imods)
+            else stats +++= localDef(start, imods)
           } else {
-            stats += localDef(in.offset)
+            stats +++= localDef(in.offset)
           }
         else if (!isStatSep && (in.token != CASE)) {
           exitOnError = mustStartStat