diff options
author | Paul Phillips <paulp@improving.org> | 2013-06-03 22:13:38 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-06-03 22:13:38 -0700 |
commit | e317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617 (patch) | |
tree | 49f3009e24ebc993d390f3aecb9ed597d9931ee8 /test/pending | |
parent | 1472dadd03496aa89624c81ded01edeb71420cc3 (diff) | |
parent | 60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a (diff) | |
download | scala-e317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617.tar.gz scala-e317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617.tar.bz2 scala-e317d0bcc9fa8f2a2e6d93c4ad5edf5326f5a617.zip |
Merge remote-tracking branch 'origin/2.10.2' into pr/merge
* origin/2.10.2:
SI-7532 Fix regression in Java inner classfile reader
SI-7517 Fix higher kinded type inference regression
SI-7516 Revert "SI-7234 Make named args play nice w. depmet types"
SI-7486 Regressions in implicit search.
SI-7509 Avoid crasher as erronous args flow through NamesDefaults
Diffstat (limited to 'test/pending')
-rw-r--r-- | test/pending/neg/t7441.check | 6 | ||||
-rw-r--r-- | test/pending/neg/t7441.scala | 7 | ||||
-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 |
5 files changed, 56 insertions, 0 deletions
diff --git a/test/pending/neg/t7441.check b/test/pending/neg/t7441.check new file mode 100644 index 0000000000..f259457197 --- /dev/null +++ b/test/pending/neg/t7441.check @@ -0,0 +1,6 @@ +t7441.scala:4: error: type mismatch; + found : Int(1) + required: List[Any] + def test = apply(1) + ^ +one error found diff --git a/test/pending/neg/t7441.scala b/test/pending/neg/t7441.scala new file mode 100644 index 0000000000..dad7421e3f --- /dev/null +++ b/test/pending/neg/t7441.scala @@ -0,0 +1,7 @@ +object Test { + object Bar { + def apply(xs: List[Any]): Int = 0 + def test = apply(1) + } + implicit def foo = 1 +} 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 + } +} |