Stylistical improvements to the Enums code

Author: anatoliykmetyuk

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

@@ -74,11 +74,8 @@ object DesugarEnums {
     else if (isEnumCase(cdef)) cdef.withMods(cdef.mods.withFlags(cdef.mods.flags | Final))
     else cdef
 
-  private def valuesDotTerm(name: TermName)(implicit src: SourceFile) =
-    Select(Ident(nme.DOLLAR_VALUES), name)
-
-  private def valuesDot(name: String)(implicit src: SourceFile) =
-    valuesDotTerm(name.toTermName)
+  private def valuesDot(name: PreName)(implicit src: SourceFile) =
+    Select(Ident(nme.DOLLAR_VALUES), name.toTermName)
 
   private def registerCall(implicit ctx: Context): List[Tree] =
     if (enumClass.typeParams.nonEmpty) Nil
@@ -97,7 +94,7 @@ object DesugarEnums {
    */
   private def enumScaffolding(implicit ctx: Context): List[Tree] = {
     val valuesDef =
-      DefDef(nme.values, Nil, Nil, TypeTree(), Select(valuesDotTerm(nme.values), nme.toArray))
+      DefDef(nme.values, Nil, Nil, TypeTree(), Select(valuesDot(nme.values), nme.toArray))
     val privateValuesDef =
       ValDef(nme.DOLLAR_VALUES, TypeTree(),
         New(TypeTree(defn.EnumValuesType.appliedTo(enumClass.typeRef :: Nil)), ListOfNil))

compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala

@@ -369,7 +369,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
 
   /** For an enum T:
    *
-   *     def ordinal(x: MirroredMonoType) = x.$ordinal
+   *     def ordinal(x: MirroredMonoType) = x.ordinal
    *
    *  For  sealed trait with children of normalized types C_1, ..., C_n:
    *
@@ -384,13 +384,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) {
    *  O is O.type.
    */
   def ordinalBody(cls: Symbol, param: Tree)(implicit ctx: Context): Tree =
-    if (cls.is(Enum)) {
-      val ordinalMeth = param.select(nme.ordinal)
-      val derivesFromJEnum =
-        cls.is(Enum, butNot = Case) &&
-        cls.info.parents.exists(p => p.typeSymbol == defn.JEnumClass)
-      if (derivesFromJEnum) Apply(ordinalMeth, Nil) else ordinalMeth
-    }
+    if (cls.is(Enum)) param.select(nme.ordinal).ensureApplied
     else {
       val cases =
         for ((child, idx) <- cls.children.zipWithIndex) yield {