From 40e7cab7a22a8531bdd310bfb57fda51b798c690 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Fri, 11 May 2012 16:00:54 +0200
Subject: Fix SI-5009: case-class copy method now eta-expands over higher
 parameter lists.

Example: Given

  case class C(a: Int)(b: Int)

if you call (new C(1)(2)).copy(a = 10)), you get a function (f: Int => C) such
that (f.apply(20)) yields a (new C(10)(20)).
---
 test/files/run/names-defaults.check |  2 +-
 test/files/run/names-defaults.scala |  4 ++--
 test/files/run/t5009.check          |  4 ++++
 test/files/run/t5009.scala          | 17 +++++++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 test/files/run/t5009.check
 create mode 100644 test/files/run/t5009.scala

(limited to 'test/files/run')

diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check
index 5656d1a276..f253de71d6 100644
--- a/test/files/run/names-defaults.check
+++ b/test/files/run/names-defaults.check
@@ -92,7 +92,7 @@ test5
 test5
 5
 10: 2
-slkdfj1
+slkdfj2
 1
 lskfdjlk
 11
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index e1bc7cbf59..220414f02a 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -176,7 +176,7 @@ object Test extends App {
 
   println(Fact2()("jyp"))
   println(Fact2(x = 1)())
-  println(Fact2(10)().copy(y = "blabla")())
+  println(Fact2(10)().copy(y = "blabla")(3))
 
 
   // assignment to var <-> named argument
@@ -195,7 +195,7 @@ object Test extends App {
   // dependent types and copy method
   val a11 = new A2
   val b11 = a11.B2(new a11.C2)(1)
-  println(b11.copy()())
+  println(b11.copy()(2))
 
 
 
diff --git a/test/files/run/t5009.check b/test/files/run/t5009.check
new file mode 100644
index 0000000000..cc9df54b34
--- /dev/null
+++ b/test/files/run/t5009.check
@@ -0,0 +1,4 @@
+C(1,true)
+10
+C(7283,20)
+100
diff --git a/test/files/run/t5009.scala b/test/files/run/t5009.scala
new file mode 100644
index 0000000000..b4fe1bc894
--- /dev/null
+++ b/test/files/run/t5009.scala
@@ -0,0 +1,17 @@
+object Test extends App {
+
+  case class C[T, U <: String, O >: Object](x: Int, y: T)(z: U, b: Boolean)(s: O, val l: Int)
+
+  val c = C(1, true)("dlkfj", true)("dlkfjlk", 10)
+  println(c)
+  println(c.l)
+
+  val f1a = c.copy(y = 20, x = 7283)
+
+  val f1b = c.copy[Int, String, Object](y = 20, x = 7283)
+  val f2b = f1b("lkdjen", false)
+  val res = f2b(new Object, 100)
+  println(res)
+  println(res.l)
+  
+}
-- 
cgit v1.2.3