diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-17 12:06:40 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-17 12:06:40 -0800 |
| commit | 930d895caae2dd0d098ea39679e663ce22caa9b2 (patch) | |
| tree | a23c6dad534ee5e0ded32a70bf3f9e9991484b54 | |
| parent | df75794426236186dcef0dfd1a72ad55d7b870c2 (diff) | |
| parent | ca05d22006dd528eae26c8ab4d6ca0a4f27fb69f (diff) | |
| download | scala-930d895caae2dd0d098ea39679e663ce22caa9b2.tar.gz scala-930d895caae2dd0d098ea39679e663ce22caa9b2.tar.bz2 scala-930d895caae2dd0d098ea39679e663ce22caa9b2.zip | |
Merge pull request #3380 from retronym/ticket/8157
Make overloading, defaults restriction PolyType aware
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 6 | ||||
| -rw-r--r-- | test/files/neg/t8157.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t8157.scala | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 95f2620061..4ba8d56da0 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -132,11 +132,7 @@ 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 - def hasDefaultParam(tpe: Type): Boolean = tpe match { - case MethodType(params, restpe) => (params exists (_.hasDefault)) || hasDefaultParam(restpe) - case _ => false - } - val haveDefaults = methods filter (sym => hasDefaultParam(sym.info) && !nme.isProtectedAccessorName(sym.name)) + val haveDefaults = methods filter (sym => mexists(sym.info.paramss)(_.hasDefault) && !nme.isProtectedAccessorName(sym.name)) if (haveDefaults.lengthCompare(1) > 0) { val owners = haveDefaults map (_.owner) diff --git a/test/files/neg/t8157.check b/test/files/neg/t8157.check new file mode 100644 index 0000000000..9a21a49a07 --- /dev/null +++ b/test/files/neg/t8157.check @@ -0,0 +1,4 @@ +t8157.scala:1: error: in object Test, multiple overloaded alternatives of method foo define default arguments. +object Test { + ^ +one error found diff --git a/test/files/neg/t8157.scala b/test/files/neg/t8157.scala new file mode 100644 index 0000000000..462d4fa3f1 --- /dev/null +++ b/test/files/neg/t8157.scala @@ -0,0 +1,4 @@ +object Test { + def foo(printer: Any, question: => String, show: Boolean = false)(op: => Any): Any = ??? + def foo[T](question: => String, show: Boolean)(op: => Any = ()): Any = ??? +} |