diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-07 14:28:08 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-07 14:28:08 +0200 |
| commit | e8ed2d2e535d5473187b246befbf4b1eddf161c8 (patch) | |
| tree | 150d86bacfdd09be293edb3f61c5c774b1212bb6 | |
| parent | e735cb3c402c01149c170ea1e6906a7455e15a0b (diff) | |
| parent | 8317266f34dce29078dc7c4447605701ba82e82a (diff) | |
| download | scala-e8ed2d2e535d5473187b246befbf4b1eddf161c8.tar.gz scala-e8ed2d2e535d5473187b246befbf4b1eddf161c8.tar.bz2 scala-e8ed2d2e535d5473187b246befbf4b1eddf161c8.zip | |
Merge pull request #3703 from huitseeker/issue/SI-8537
SI-8537 Puts SI-8157 fix under Xsource
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 11 | ||||
| -rw-r--r-- | test/files/pos/t8157-2.10.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t8157-2.10.scala | 5 |
3 files changed, 16 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) diff --git a/test/files/pos/t8157-2.10.flags b/test/files/pos/t8157-2.10.flags new file mode 100644 index 0000000000..94c8056747 --- /dev/null +++ b/test/files/pos/t8157-2.10.flags @@ -0,0 +1 @@ +-Xsource:2.10 diff --git a/test/files/pos/t8157-2.10.scala b/test/files/pos/t8157-2.10.scala new file mode 100644 index 0000000000..597585a96d --- /dev/null +++ b/test/files/pos/t8157-2.10.scala @@ -0,0 +1,5 @@ +object Test { // PolyTYped function default arg unicity check, + // fails in 2.11, authorized under -Xsource:2.10 + def foo(printer: Any, question: => String, show: Boolean = false)(op: => Any): Any = ??? + def foo[T](question: => String, show: Boolean)(op: => Any = ()): Any = ??? +} |