From 6c7f2b6460de1aa6d15a6005921ca50e98a54027 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Thu, 5 Jul 2012 11:12:46 +0200
Subject: SI-5907, SI-5009 case-class copy defaults only for first param list

`copy` no longer returns anonymous functions if there are multiple parameter lists, reverts most of 40e7cab7a2.
Cleaned up the special type completer for copy methods.
---
 test/files/run/t5009.check |   1 +
 test/files/run/t5009.scala |   7 +--
 test/files/run/t5907.check |  31 ++++++++++++
 test/files/run/t5907.scala | 118 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 test/files/run/t5907.check
 create mode 100644 test/files/run/t5907.scala

(limited to 'test/files')

diff --git a/test/files/run/t5009.check b/test/files/run/t5009.check
index cc9df54b34..6c567227b5 100644
--- a/test/files/run/t5009.check
+++ b/test/files/run/t5009.check
@@ -1,4 +1,5 @@
 C(1,true)
 10
 C(7283,20)
+C(66,-3)
 100
diff --git a/test/files/run/t5009.scala b/test/files/run/t5009.scala
index b4fe1bc894..db12c0d685 100644
--- a/test/files/run/t5009.scala
+++ b/test/files/run/t5009.scala
@@ -6,12 +6,9 @@ object Test extends App {
   println(c)
   println(c.l)
 
-  val f1a = c.copy(y = 20, x = 7283)
+  println(c.copy(y = 20, x = 7283)("enwa", b = false)(l = -1, s = new Object))
 
-  val f1b = c.copy[Int, String, Object](y = 20, x = 7283)
-  val f2b = f1b("lkdjen", false)
-  val res = f2b(new Object, 100)
+  val res = c.copy[Int, String, Object](y = -3, x = 66)("lkdjen", false)(new Object, 100)
   println(res)
   println(res.l)
-  
 }
diff --git a/test/files/run/t5907.check b/test/files/run/t5907.check
new file mode 100644
index 0000000000..bc23692679
--- /dev/null
+++ b/test/files/run/t5907.check
@@ -0,0 +1,31 @@
+c1: 2
+c1: 2873
+c2: 37
+c3: 1, 2, 27
+c3: 1, 22, 27
+c3: 11, 7, 27
+c4: 1
+c4: 23
+c5: 1, 2, 33, b
+c5: 1, 19, 33, b
+c5: 1, 2, 193, c
+c5: 1, 371, 193, c
+c5: -1, 2, -2, lken
+c6: 29, 18, -12
+c6: 1, 93, 2892
+c6: 1, 93, 761
+c7: 1, 22, 33, elkj
+c7: 1, 283, 29872, me
+c7: 37, 298, 899, ekjr
+c8: 172, 989, 77, eliurna
+c8: 1, 82, 2111, schtring
+c8: -1, 92, 29, lken
+c9: 1, 271, ehebab
+c9: 1, 299, enag
+c9: 1, 299, enag
+c9: 1, 299, enag
+c9: -42, 99, flae
+c9: 10, 298, 27
+c9: elkn, en, emn
+c9: ka, kb, kb
+c9: ka, kb, ka
diff --git a/test/files/run/t5907.scala b/test/files/run/t5907.scala
new file mode 100644
index 0000000000..a005e9fbd3
--- /dev/null
+++ b/test/files/run/t5907.scala
@@ -0,0 +1,118 @@
+object Test extends App {
+  t
+
+  def t {
+    val c1 = C1()(1)
+    println(c1.copy()(2))
+
+    {
+      implicit val i = 2873
+      println(c1.copy())
+    }
+
+    val c2 = C2()(1)
+    println(c2.copy()(37))
+
+    val c3 = C3(1,2)(3)
+    println(c3.copy()(27))
+    println(c3.copy(y = 22)(27))
+    println(c3.copy(y = 7, x = 11)(27))
+
+    val c4 = C4(1)
+    println(c4.copy())
+    println(c4.copy(x = 23))
+
+    val c5 = C5(1,2)(3,"a")
+    println(c5.copy()(33,"b"))
+    println(c5.copy(y = 19)(33,"b"))
+
+    {
+      implicit val i = 193
+      implicit val s = "c"
+      println(c5.copy())
+      println(c5.copy(y = 371))
+      println(c5.copy(x = -1)(-2, "lken"))
+    }
+
+    val c6 = C6(1)(2)(3)
+    println(c6.copy(29)(18)(-12))
+
+    {
+      implicit val i = 2892
+      println(c6.copy(x = 1)(93))
+      println(c6.copy(x = 1)(93)(761))
+    }
+
+    val c7 = C7(1)(2)(3)("h")
+    println(c7.copy()(22)(33)("elkj"))
+
+    {
+      implicit val s = "me"
+      println(c7.copy()(283)(29872))
+      println(c7.copy(37)(298)(899)("ekjr"))
+    }
+
+    val c8 = C8(1)(2,3)()("els")
+    println(c8.copy(x = 172)(989, 77)()("eliurna"))
+
+    {
+      implicit val s = "schtring"
+      println(c8.copy()(82,2111)())
+      println(c8.copy(x = -1)(92,29)()("lken"))
+    }
+
+    val c9 = C9(1)(2)()()("u")
+    println(c9.copy()(271)()()("ehebab"))
+
+    {
+      implicit val s = "enag"
+      println(c9.copy()(299))
+      println(c9.copy()(299)())
+      println(c9.copy()(299)()())
+      println(c9.copy(x = -42)(99)()()("flae"))
+    }
+
+    class KA { override def toString = "ka" }
+    class KB extends KA { override def toString = "kb" }
+    val c10 = C10(10)(3)(19)
+    println(c10.copy()(298)(27))
+    println(c10.copy("elkn")("en")("emn"))
+    println(c10.copy(new KA)(new KB)(new KB))
+
+    {
+      implicit val k = new KA
+      println(c10.copy(new KA)(new KB))
+    }
+  }
+}
+
+case class C1(implicit x: Int) {
+  override def toString = s"c1: $x"
+}
+case class C2()(y: Int) {
+  override def toString = s"c2: $y"
+}
+case class C3(x: Int, y: Int)(z: Int) {
+  override def toString = s"c3: $x, $y, $z"
+}
+case class C4(x: Int) {
+  override def toString = s"c4: $x"
+}
+case class C5(x: Int, y: Int)(implicit z: Int, s: String) {
+  override def toString = s"c5: $x, $y, $z, $s"
+}
+case class C6(x: Int)(y: Int)(implicit z: Int) {
+  override def toString = s"c6: $x, $y, $z"
+}
+case class C7(x: Int)(y: Int)(z: Int)(implicit s: String) {
+  override def toString = s"c7: $x, $y, $z, $s"
+}
+case class C8(x: Int)(y: Int, z: Int)()(implicit s: String) {
+  override def toString = s"c8: $x, $y, $z, $s"
+}
+case class C9(x: Int)(y: Int)()()(implicit s: String) {
+  override def toString = s"c9: $x, $y, $s"
+}
+case class C10[T,U <: T](x: T)(y: U)(implicit z: T) {
+  override def toString = s"c9: $x, $y, $z"
+}
-- 
cgit v1.2.3