diff options
| author | François Garillot <francois@garillot.net> | 2014-04-25 15:52:50 +0200 |
|---|---|---|
| committer | François Garillot <francois@garillot.net> | 2014-04-25 15:52:50 +0200 |
| commit | 8317266f34dce29078dc7c4447605701ba82e82a (patch) | |
| tree | a12e512a8445ec6bf379359dcdfebb670483cef1 /src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | |
| parent | 57b6b90af6218e96cb554e9563199d7889c0004a (diff) | |
| download | scala-8317266f34dce29078dc7c4447605701ba82e82a.tar.gz scala-8317266f34dce29078dc7c4447605701ba82e82a.tar.bz2 scala-8317266f34dce29078dc7c4447605701ba82e82a.zip | |
SI-8537 Puts SI-8157 fix under Xsource
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/RefChecks.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index b166bf988d..4540017b62 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -132,7 +132,16 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans defaultMethodNames.toList.distinct foreach { name => val methods = clazz.info.findMember(name, 0L, requiredFlags = METHOD, stableOnly = false).alternatives - val haveDefaults = methods filter (sym => mexists(sym.info.paramss)(_.hasDefault) && !nme.isProtectedAccessorName(sym.name)) + def hasDefaultParam(tpe: Type): Boolean = tpe match { + case MethodType(params, restpe) => (params exists (_.hasDefault)) || hasDefaultParam(restpe) + case _ => false + } + val haveDefaults = methods filter ( + if (settings.isScala211) + (sym => mexists(sym.info.paramss)(_.hasDefault) && !nme.isProtectedAccessorName(sym.name)) + else + (sym => hasDefaultParam(sym.info) && !nme.isProtectedAccessorName(sym.name)) + ) if (haveDefaults.lengthCompare(1) > 0) { val owners = haveDefaults map (_.owner) |