diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-12-22 12:22:56 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2009-12-22 12:22:56 +0000 |
| commit | ff1ecb531615bf12dcbe21fe1bbd0d066023cc36 (patch) | |
| tree | ccea95fe9a546a0f704df9fb9dc0915a7876f25e | |
| parent | 192c943c33bf387241e45785073ab14618fbd5fc (diff) | |
| download | scala-ff1ecb531615bf12dcbe21fe1bbd0d066023cc36.tar.gz scala-ff1ecb531615bf12dcbe21fe1bbd0d066023cc36.tar.bz2 scala-ff1ecb531615bf12dcbe21fe1bbd0d066023cc36.zip | |
fix the build. no review.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/names-defaults-neg-ref.check | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index a51797fe25..bfd771b1cf 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -87,7 +87,7 @@ abstract class RefChecks extends InfoTransform { if (!others.isEmpty) { val all = x :: others val rest = if (all.exists(_.owner != clazz)) ".\nThe members with defaults are defined in "+ - all.map(_.owner).mkString("", " and ", ".") else "" + all.map(_.owner).mkString("", " and ", ".") else "." unit.error(clazz.pos, "in "+ clazz +", multiple overloaded alternatives of "+ x + " define default arguments"+ rest) } diff --git a/test/files/neg/names-defaults-neg-ref.check b/test/files/neg/names-defaults-neg-ref.check index ac37816762..00052c72dc 100644 --- a/test/files/neg/names-defaults-neg-ref.check +++ b/test/files/neg/names-defaults-neg-ref.check @@ -2,7 +2,7 @@ names-defaults-neg-ref.scala:3: error: in anonymous class $anon, multiple overlo The members with defaults are defined in trait B2235 and trait A2235. new A2235 with B2235 ^ -names-defaults-neg-ref.scala:7: error: in class A, multiple overloaded alternatives of method foo define default arguments() +names-defaults-neg-ref.scala:7: error: in class A, multiple overloaded alternatives of method foo define default arguments. class A { ^ names-defaults-neg-ref.scala:17: error: in class C, multiple overloaded alternatives of method bar define default arguments. |