From 20f986ecf42cf3018bf3a90b84b2f84669838b10 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 30 Mar 2009 16:21:49 +0000 Subject: changed overloaing resolution to make Builders ... changed overloaing resolution to make Builders work. generalized companion object generation in Namers. Fixed a problem in Types that made the collection build crash. --- test/files/neg/implicits.check | 7 +++---- test/files/neg/overload.check | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'test/files/neg') diff --git a/test/files/neg/implicits.check b/test/files/neg/implicits.check index 409d6ce6a7..b84586fc16 100644 --- a/test/files/neg/implicits.check +++ b/test/files/neg/implicits.check @@ -2,10 +2,9 @@ implicits.scala:21: error: type mismatch; found : Pos required: ?{val +: ?} Note that implicit conversions are not applicable because they are ambiguous: - most specific definition is: method pos2int in object Super of type (Pos)int - yet alternative definition method any2plus in object Sub of type (Any)Sub.Plus - is defined in a subclass. - Both definitions are possible conversion functions from Pos to ?{val +: ?} + both method any2plus in object Sub of type (Any)Sub.Plus + and method pos2int in object Super of type (Pos)int + are possible conversion functions from Pos to ?{val +: ?} f(p+1) ^ one error found diff --git a/test/files/neg/overload.check b/test/files/neg/overload.check index 5f7644eda7..760702778b 100644 --- a/test/files/neg/overload.check +++ b/test/files/neg/overload.check @@ -1,7 +1,7 @@ -overload.scala:10: error: erroneous reference to overloaded definition, -most specific definition is: method f in class C of type (int)Unit, -yet alternative definition method f in class D of type (Any)Unit -is defined in a subclass +overload.scala:10: error: ambiguous reference to overloaded definition, +both method f in class D of type (Any)Unit +and method f in class C of type (int)Unit +match argument types (Int) (new D).f(1) ^ one error found -- cgit v1.2.3