Extend ProductN for N <= 22, Product above that

Author: OlivierBlanvillain

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

@@ -333,27 +333,24 @@ object desugar {
     lazy val creatorExpr = New(classTypeRef, constrVparamss nestedMap refOfDef)
 
     // Methods to add to a case class C[..](p1: T1, ..., pN: Tn)(moreParams)
-    //     def productArity = N
-    //     def productElement(i: Int): Any = i match { ... }
     //     def _1 = this.p1
     //     ...
     //     def _N = this.pN
     //     def copy(p1: T1 = p1: @uncheckedVariance, ...,
     //              pN: TN = pN: @uncheckedVariance)(moreParams) =
     //       new C[...](p1, ..., pN)(moreParams)
     //
+    // Above arity 22 we also synthesize:
+    //     def productArity = N
+    //     def productElement(i: Int): Any = i match { ... }
+    //
     // Note: copy default parameters need @uncheckedVariance; see
     // neg/t1843-variances.scala for a test case. The test would give
     // two errors without @uncheckedVariance, one of them spurious.
     val caseClassMeths = {
       def syntheticProperty(name: TermName, rhs: Tree) =
         DefDef(name, Nil, Nil, TypeTree(), rhs).withMods(synthetic)
-      // The override here is less than ideal: user defined productArity / productElement
-      // methods would be silently ignored. This is necessary to compile `scala.TupleN`.
-      // The long term solution is to remove `ProductN` entirely from stdlib.
-      def productArity =
-        DefDef(nme.productArity, Nil, Nil, TypeTree(), Literal(Constant(arity)))
-          .withMods(Modifiers(Synthetic | Override))
+      def productArity = syntheticProperty(nme.productArity, Literal(Constant(arity)))
       def productElement = {
         val param = makeSyntheticParameter(tpt = ref(defn.IntType))
         // case N => _${N + 1}
@@ -366,7 +363,7 @@ object desugar {
         val defaultCase = CaseDef(untpd.Ident(nme.WILDCARD), EmptyTree, error)
         val body = Match(refOfDef(param), (cases :+ defaultCase).toList)
         DefDef(nme.productElement, Nil, List(List(param)), TypeTree(defn.AnyType), body)
-          .withMods(Modifiers(Synthetic | Override))
+          .withMods(synthetic)
       }
       def productElemMeths = {
         val caseParams = constrVparamss.head.toArray
@@ -396,18 +393,31 @@ object desugar {
         }
       }
 
+      // Above MaxTupleArity we extend Product instead of ProductN, in this
+      // case we need to synthesise productElement & productArity.
+      def largeProductMeths =
+        if (arity > Definitions.MaxTupleArity) List(productElement, productArity)
+        else Nil
+
       if (isCaseClass)
-        productElement :: productArity :: copyMeths ::: productElemMeths.toList
-      else if (isCaseObject)
-        productElement :: productArity :: Nil
+        largeProductMeths ::: copyMeths ::: productElemMeths.toList
       else Nil
     }
 
     def anyRef = ref(defn.AnyRefAlias.typeRef)
+    def productConstr(n: Int) = {
+      val tycon = scalaDot((tpnme.Product.toString + n).toTypeName)
+      val targs = constrVparamss.head map (_.tpt)
+      if (targs.isEmpty) tycon else AppliedTypeTree(tycon, targs)
+    }
+    def product =
+      if (arity > Definitions.MaxTupleArity) scalaDot(nme.Product.toTypeName)
+      else productConstr(arity)
 
-    // Case classes and case objects get NameBasedPattern and Product parents
+    // Case classes and case objects get NameBasedPattern and Product/ProductN parents
     val parents1: List[Tree] =
-      if (mods.is(Case)) parents :+ scalaDot(nme.Product.toTypeName) :+ scalaDot(nme.NameBasedPattern.toTypeName)
+      if (mods.is(Case))
+        parents :+ product :+ scalaDot(nme.NameBasedPattern.toTypeName)
       else parents
 
     // The thicket which is the desugared version of the companion object

tests/neg/t1843-variances.scala

@@ -6,7 +6,7 @@
 
 object Crash {
   trait UpdateType[A]
-  case class StateUpdate[+A](updateType : UpdateType[A], value : A) // error // error
+  case class StateUpdate[+A](updateType : UpdateType[A], value : A) // error
   case object IntegerUpdateType extends UpdateType[Integer]
 
   //However this method will cause a crash

tests/run/1938.scala

@@ -0,0 +1,45 @@
+case class Large(
+  e1: Int,
+  e2: Int,
+  e3: Int,
+  e4: Int,
+  e5: Int,
+  e6: Int,
+  e7: Int,
+  e8: Int,
+  e9: Int,
+  e10: Int,
+  e11: Int,
+  e12: Int,
+  e13: Int,
+  e14: Int,
+  e15: Int,
+  e16: Int,
+  e17: Int,
+  e18: Int,
+  e19: Int,
+  e20: Int,
+  e21: Int,
+  e22: Int,
+  e23: Int
+)
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val l = Large(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23)
+
+    assert(l.productArity == 23)
+
+    assert(l.productElement(0) == 1)
+    assert(l.productElement(1) == 2)
+    assert(l.productElement(21) == 22)
+    assert(l.productElement(22) == 23)
+
+    try {
+      l.productElement(23)
+      ???
+    } catch {
+      case e: IndexOutOfBoundsException => assert(e.getMessage == "23")
+    }
+  }
+}