-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6116 from dotty-staging/fix-ext-overload
Strengthen overloading resolution to deal with extension methods
- Loading branch information
Showing
8 changed files
with
218 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| object Test { | ||
| implied A { | ||
| def (x: Int) |+| (y: Int) = x + y | ||
| } | ||
| implied B { | ||
| def (x: Int) |+| (y: String) = x + y.length | ||
| } | ||
| assert((1 |+| 2) == 3) // error ambiguous | ||
|
|
||
| locally { | ||
| import B.|+| | ||
| assert((1 |+| "2") == 2) // OK | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| class A { | ||
| def f(x: Int)(y: Int): Int = 0 | ||
| def (x: Int) g (y: Int): Int = 1 | ||
| } | ||
| class B extends A { | ||
| override def (x: Int) f (y: Int): Int = 1 // error | ||
| override def g(x: Int)(y: Int): Int = 0 // error | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| object Test extends App { | ||
| // warmup | ||
| def f(x: Int)(y: Int) = y | ||
| def f(x: Int)(y: String) = y.length | ||
| assert(f(1)(2) == 2) | ||
| assert(f(1)("two") == 3) | ||
|
|
||
| def g[T](x: T)(y: Int) = y | ||
| def g[T](x: T)(y: String) = y.length | ||
| assert(g[Int](1)(2) == 2) | ||
| assert(g[Int](1)("two") == 3) | ||
| assert(g(1)(2) == 2) | ||
| assert(g(1)("two") == 3) | ||
|
|
||
| def h[T](x: T)(y: T)(z: Int) = z | ||
| def h[T](x: T)(y: T)(z: String) = z.length | ||
| assert(h[Int](1)(1)(2) == 2) | ||
| assert(h[Int](1)(1)("two") == 3) | ||
| assert(h(1)(1)(2) == 2) | ||
| assert(h(1)(1)("two") == 3) | ||
|
|
||
| // Test with extension methods in implied object | ||
| object test1 { | ||
|
|
||
| implied Foo { | ||
| def (x: Int) |+| (y: Int) = x + y | ||
| def (x: Int) |+| (y: String) = x + y.length | ||
|
|
||
| def (xs: List[T]) +++ [T] (ys: List[T]): List[T] = xs ++ ys ++ ys | ||
| def (xs: List[T]) +++ [T] (ys: Iterator[T]): List[T] = xs ++ ys ++ ys | ||
| } | ||
|
|
||
| assert((1 |+| 2) == 3) | ||
| assert((1 |+| "2") == 2) | ||
|
|
||
| val xs = List(1, 2) | ||
| assert((xs +++ xs).length == 6) | ||
| assert((xs +++ xs.iterator).length == 4, xs +++ xs.iterator) | ||
| } | ||
| test1 | ||
|
|
||
| // Test with imported extension methods | ||
| object test2 { | ||
| import test1.Foo._ | ||
|
|
||
| assert((1 |+| 2) == 3) | ||
| assert((1 |+| "2") == 2) | ||
|
|
||
| val xs = List(1, 2) | ||
| assert((xs +++ xs).length == 6) | ||
| assert((xs +++ xs.iterator).length == 4, xs +++ xs.iterator) | ||
| } | ||
| test2 | ||
|
|
||
| // Test with implied extension methods coming from base class | ||
| object test3 { | ||
| class Foo { | ||
| def (x: Int) |+| (y: Int) = x + y | ||
| def (x: Int) |+| (y: String) = x + y.length | ||
|
|
||
| def (xs: List[T]) +++ [T] (ys: List[T]): List[T] = xs ++ ys ++ ys | ||
| def (xs: List[T]) +++ [T] (ys: Iterator[T]): List[T] = xs ++ ys ++ ys | ||
| } | ||
| implied Bar for Foo | ||
|
|
||
| assert((1 |+| 2) == 3) | ||
| assert((1 |+| "2") == 2) | ||
|
|
||
| val xs = List(1, 2) | ||
| assert((xs +++ xs).length == 6) | ||
| assert((xs +++ xs.iterator).length == 4, xs +++ xs.iterator) | ||
| } | ||
| test3 | ||
|
|
||
| // Test with implied extension methods coming from implied alias | ||
| object test4 { | ||
| implied for test3.Foo = test3.Bar | ||
|
|
||
| assert((1 |+| 2) == 3) | ||
| assert((1 |+| "2") == 2) | ||
|
|
||
| val xs = List(1, 2) | ||
| assert((xs +++ xs).length == 6) | ||
| assert((xs +++ xs.iterator).length == 4, xs +++ xs.iterator) | ||
| } | ||
| test4 | ||
|
|
||
| class C { | ||
| def xx (x: Any) = 2 | ||
| } | ||
| def (c: C) xx (x: Int) = 1 | ||
|
|
||
| val c = new C | ||
| assert(c.xx(1) == 2) // member method takes precedence | ||
|
|
||
| object D { | ||
| def (x: Int) yy (y: Int) = x + y | ||
| } | ||
|
|
||
| implied { | ||
| def (x: Int) yy (y: Int) = x - y | ||
| } | ||
|
|
||
| import D._ | ||
| assert((1 yy 2) == 3) // imported extension method takes precedence | ||
|
|
||
| trait Rectangle { | ||
| def a: Long | ||
| def b: Long | ||
| } | ||
|
|
||
| case class GenericRectangle(a: Long, b: Long) extends Rectangle | ||
| case class Square(a: Long) extends Rectangle { | ||
| def b: Long = a | ||
| } | ||
|
|
||
| def (rectangle: Rectangle) area: Long = 0 | ||
| def (square: Square) area: Long = square.a * square.a | ||
| val rectangles = List(GenericRectangle(2, 3), Square(5)) | ||
| val areas = rectangles.map(_.area) | ||
| assert(areas.sum == 0) | ||
| } |