diff options
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/names-defaults.check | 10 | ||||
-rw-r--r-- | test/files/run/names-defaults.scala | 17 | ||||
-rw-r--r-- | test/files/run/t3667.check | 3 | ||||
-rw-r--r-- | test/files/run/t3667.scala | 45 |
4 files changed, 75 insertions, 0 deletions
diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check index b4effa26d2..d31e98be32 100644 --- a/test/files/run/names-defaults.check +++ b/test/files/run/names-defaults.check @@ -106,3 +106,13 @@ blublu1 my text List(1, 2) 3 +3 +3 +3 +3 +3 +3 +3 +3 +3 +3 diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala index 8ddfcd950d..ee0862558a 100644 --- a/test/files/run/names-defaults.scala +++ b/test/files/run/names-defaults.scala @@ -351,6 +351,23 @@ object Test extends Application { (new DBLAH()) + // #3697 + object t3697 { + def a(x: Int*)(s: Int = 3) = s + def b(a: Int, b: Int, c: Int*) = a + b + } + println(t3697.a(Seq(3): _*)()) + println(t3697.a(3)()) + println(t3697.a()()) + println(t3697.a(2,3,1)()) + println(t3697.b(a = 1, b = 2)) + println(t3697.b(a = 1, b = 2, 3)) + println(t3697.b(b = 1, a = 2, c = 3)) + println(t3697.b(a = 1, b = 2, 3, 4)) + println(t3697.b(a = 1, b = 2, Seq(3, 4): _*)) + println(t3697.b(b = 1, a = 2, c = Seq(3, 4): _*)) + + // DEFINITIONS def test1(a: Int, b: String) = println(a +": "+ b) def test2(u: Int, v: Int)(k: String, l: Int) = println(l +": "+ k +", "+ (u + v)) diff --git a/test/files/run/t3667.check b/test/files/run/t3667.check new file mode 100644 index 0000000000..01e79c32a8 --- /dev/null +++ b/test/files/run/t3667.check @@ -0,0 +1,3 @@ +1 +2 +3 diff --git a/test/files/run/t3667.scala b/test/files/run/t3667.scala new file mode 100644 index 0000000000..804432c516 --- /dev/null +++ b/test/files/run/t3667.scala @@ -0,0 +1,45 @@ +object Test { + def main(args: Array[String]) { + val o1 = new Outer1 + val o2 = new Outer2 + val o3 = new Outer3 + + println(1) + ser(new o1.Inner(1)) + o1.Inner // make sure the Inner$module field of the Outer1 instance is initialized! + ser(new o1.Inner(1)) + + println(2) + ser(new o2.Inner(1)) + o2.Inner + ser(new o2.Inner(1)) + + println(3) + ser(new o3.Inner(1)) + o3.Inner + ser(new o3.Inner(1)) + } + + def ser(o: AnyRef) { + val oos = new java.io.ObjectOutputStream(new java.io.ByteArrayOutputStream()) + oos.writeObject(o) + oos.close() + } + +} + +@serializable +class Outer1 { + @serializable + class Inner(x: Int = 1) +} + +@serializable +class Outer2 { + case class Inner(x: Int = 1) +} + +@serializable +class Outer3 { + case class Inner(x: Int) +} |