diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-08-21 12:04:13 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-08-21 12:04:13 +0200 |
commit | ed230b51affa509a03298182b281afce5a74a87d (patch) | |
tree | 42bd553213abeddaa4e430d7d43b676635b9eca1 /test/pending/pos | |
parent | 7b351dca8458f599f5fafef4daa307351031ef06 (diff) | |
parent | 60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a (diff) | |
download | scala-ed230b51affa509a03298182b281afce5a74a87d.tar.gz scala-ed230b51affa509a03298182b281afce5a74a87d.tar.bz2 scala-ed230b51affa509a03298182b281afce5a74a87d.zip |
Merge remote-tracking branch 'origin/2.10.2' into merge/2.10.2-to-2.10.x
Better late than never.
Conflicts:
src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
Diffstat (limited to 'test/pending/pos')
-rw-r--r-- | test/pending/pos/t7234.scala | 15 | ||||
-rw-r--r-- | test/pending/pos/t7234b.scala | 20 | ||||
-rw-r--r-- | test/pending/pos/t7486.scala | 8 |
3 files changed, 43 insertions, 0 deletions
diff --git a/test/pending/pos/t7234.scala b/test/pending/pos/t7234.scala new file mode 100644 index 0000000000..59a233d835 --- /dev/null +++ b/test/pending/pos/t7234.scala @@ -0,0 +1,15 @@ +trait Main { + trait A { + type B + } + trait C { + def c(a: A, x: Int = 0)(b: a.B) + } + def c: C + def d(a: A, x: Int = 0)(b: a.B) + + def ok1(a: A)(b: a.B) = c.c(a, 42)(b) + def ok2(a: A)(b: a.B) = d(a)(b) + + def fail(a: A)(b: a.B) = c.c(a)(b) +} diff --git a/test/pending/pos/t7234b.scala b/test/pending/pos/t7234b.scala new file mode 100644 index 0000000000..fee98e87a8 --- /dev/null +++ b/test/pending/pos/t7234b.scala @@ -0,0 +1,20 @@ +trait Main { + trait A { + type B + def b: B + } + trait C { + def c(a: A, x: Int = 0)(b: => a.B, bs: a.B*) + def d(a: A = null, x: Int = 0)(b1: => a.B = a.b, b2: a.B = a.b) + } + def c: C + def ok(a: A)(b: a.B) = c.c(a, 42)(b) + def fail(a: A)(b: a.B) = c.c(a)(b) + def fail2(a: A)(b: a.B) = c.c(a)(b, b) + def fail3(a: A)(b: a.B) = c.c(a)(b, Seq[a.B](b): _*) + + def fail4(a: A)(b: a.B) = c.d(a)() + def fail5(a: A)(b: a.B) = c.d(a)(b1 = a.b) + def fail6(a: A)(b: a.B) = c.d(a)(b2 = a.b) + def fail7(a: A)(b: a.B) = c.d()() +} diff --git a/test/pending/pos/t7486.scala b/test/pending/pos/t7486.scala new file mode 100644 index 0000000000..6dd7f4c4ac --- /dev/null +++ b/test/pending/pos/t7486.scala @@ -0,0 +1,8 @@ +object Test{ + var locker = 0 + // remove implicit, or change to `locker = locker + 1` to make it compile. + implicit val davyJones0 = { + locker += 0 + 0 + } +} |