wip namer.

1 files changed, 23 insertions, 3 deletions

diff --git a/src/dotty/tools/dotc/ast/UntypedTrees.scala b/src/dotty/tools/dotc/ast/UntypedTrees.scala
index 3087772a8..bc64bc465 100644
--- a/src/dotty/tools/dotc/ast/UntypedTrees.scala
+++ b/src/dotty/tools/dotc/ast/UntypedTrees.scala
@@ -70,13 +70,18 @@ object untpd extends Trees.Instance[Untyped] {
     case _ => Tuple(ts)
   }
 
+  def makeParameter(pname: TermName, tpe: Tree, mods: Modifiers = Modifiers()): ValDef =
+    ValDef(mods | Param, pname, tpe, emptyTree())
+
+  def makeSyntheticParameter(n: Int = 1, tpt: Tree = EmptyTree)(implicit ctx: Context): ValDef =
+    ValDef(Modifiers(SyntheticTermParam), nme.syntheticParamName(n), TypeTree(), EmptyTree)
+
+  def refOfDef(tree: NameTree) = Ident(tree.name)
+
 // ------ Untyped tree desugaring ------------------------------------------
 
   def desugar(tree: Tree, mode: Mode.Value)(implicit ctx: Context): Tree = {
 
-    def makeSyntheticParameter(): ValDef =
-      ValDef(Modifiers(SyntheticTermParam), ctx.freshName().toTermName, TypeTree(), EmptyTree)
-
     def labelDefAndCall(lname: TermName, rhs: Tree, call: Tree) = {
       val ldef = DefDef(Modifiers(Label), lname, Nil, ListOfNil, TypeTree(), rhs)
       Block(ldef, call)
@@ -439,6 +444,21 @@ object untpd extends Trees.Instance[Untyped] {
     case _ => tree
   }
 
+  /** Expand to:
+   *  <module> val name: name$ = New(name$)
+   *  <module> final class name$ extends parents { self: name.type => body }
+   */
+  def desugarModuleDef(mdef: ModuleDef): Tree = {
+    val ModuleDef(mods, name, tmpl @ Template(constr, parents, self, body)) = mdef
+    val clsName = name.moduleClassName
+    val clsRef = Ident(clsName)
+    val modul = ValDef(mods | ModuleCreationFlags, name, clsRef, New(clsRef, Nil))
+    val clsSelf = self.derivedValDef(self.mods, self.name, SingletonTypeTree(Ident(name)), self.rhs)
+    val clsTmpl = tmpl.derivedTemplate(constr, parents, clsSelf, body)
+    val cls = ClassDef(mods.toTypeFlags & AccessFlags | ModuleClassCreationFlags, clsName, Nil, clsTmpl)
+    Thicket(modul, cls)
+  }
+
   def desugarAnonClass(templ: Template): Tree = {
     val x = tpnme.ANON_CLASS
     val clsDef = ClassDef(Modifiers(Final), x, Nil, templ)