From f4ad5357ffeb4b90777f73e4f1e32cbacbebd33c Mon Sep 17 00:00:00 2001 From: liu fengyun Date: Tue, 14 Mar 2017 09:45:27 +0100 Subject: fix #2051: allow override T with => T or ()T --- compiler/src/dotty/tools/dotc/core/Types.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'compiler/src/dotty/tools/dotc/core/Types.scala') diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 639f5d142..271dcda7c 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -727,8 +727,8 @@ object Types { /** Is this type a legal type for a member that overrides another * member of type `that`? This is the same as `<:<`, except that - * the types ()T and => T are identified, and T is seen as overriding - * either type. + * the types `()T`, `=> T` and `T` are seen as overriding + * each other. */ final def overrides(that: Type)(implicit ctx: Context) = { def result(tp: Type): Type = tp match { @@ -737,7 +737,8 @@ object Types { } (this frozen_<:< that) || { val rthat = result(that) - (rthat ne that) && (result(this) frozen_<:< rthat) + val rthis = result(this) + (rthat.ne(that) || rthis.ne(this)) && (rthis frozen_<:< rthat) } } -- cgit v1.2.3