Make toplevel wrappers unexpressible as normal objects

Author: odersky

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

@@ -1023,7 +1023,7 @@ object desugar {
   }
 
   /** Group all patterm, value and method definitions and all non-class type definitions
-   *  in an object named `<source>$object` where `<source>` is the name of the source file.
+   *  in an object named `<source>#object` where `<source>` is the name of the source file.
    */
   def packageDef(pdef: PackageDef)(implicit ctx: Context): PackageDef = {
     def needsObject(stat: Tree) = stat match {
@@ -1036,8 +1036,7 @@ object desugar {
     else {
       val sourceName = ctx.source.file.name.takeWhile(_ != '.')
       val groupName = (sourceName ++ str.TOPLEVEL_SUFFIX).toTermName
-      val templ = Template(emptyConstructor, Nil, Nil, EmptyValDef, nestedStats)
-      val grouped = ModuleDef(groupName, templ)
+      val grouped = ModuleDef(groupName, Template(emptyConstructor, Nil, Nil, EmptyValDef, nestedStats))
       cpy.PackageDef(pdef)(pdef.pid, grouped :: topStats)
     }
   }

compiler/src/dotty/tools/dotc/core/NameOps.scala

@@ -87,6 +87,7 @@ object NameOps {
         false
     }
 
+    /** is this the name of an object enclosing packagel-level definitions? */
     def isPackageObjectName: Boolean = name match {
       case name: TermName => name == nme.PACKAGE || name.endsWith(str.TOPLEVEL_SUFFIX)
       case name: TypeName =>

compiler/src/dotty/tools/dotc/core/StdNames.scala

@@ -20,7 +20,7 @@ object StdNames {
     final val INITIALIZER_PREFIX       = "initial$"
     final val AVOID_CLASH_SUFFIX       = "$_avoid_name_clash_$"
     final val MODULE_SUFFIX            = "$"
-    final val TOPLEVEL_SUFFIX          = "__object"
+    final val TOPLEVEL_SUFFIX          = "#object"
     final val NAME_JOIN                = "$"
     final val DEFAULT_GETTER           = "$default$"
     final val LOCALDUMMY_PREFIX        = "<local "       // owner of local blocks