diff options
author | James Iry <jamesiry@gmail.com> | 2013-08-26 09:29:35 -0700 |
---|---|---|
committer | James Iry <jamesiry@gmail.com> | 2013-08-26 09:29:35 -0700 |
commit | ba86ac61f489573d10590c5fc601e73673f204f1 (patch) | |
tree | 192ce37d6fad25c18b93408aaa31936ea687a711 /test/pending | |
parent | 9600d2b7432ddde7c19ecf672ad3247615bd6475 (diff) | |
parent | bc6d4b5c1d6746528fd442d8504f30909d7e6067 (diff) | |
download | scala-ba86ac61f489573d10590c5fc601e73673f204f1.tar.gz scala-ba86ac61f489573d10590c5fc601e73673f204f1.tar.bz2 scala-ba86ac61f489573d10590c5fc601e73673f204f1.zip |
Merge pull request #2860 from retronym/merge/2.10.2-to-2.10.x
Merge/2.10.2 to 2.10.x
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 |
4 files changed, 48 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()() +} |