aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/TypeAssigner.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-08-16 17:38:03 +0200
committerGuillaume Martres <smarter@ubuntu.com>2016-08-17 15:04:05 -0700
commit401b421430592b213220b74ae1c394ba7f8bd479 (patch)
tree96dc8180d0a9185c065659df8c244dafb2943b03 /src/dotty/tools/dotc/typer/TypeAssigner.scala
parent273b184f77950624f6bd2a9e810d78ae390a5487 (diff)
downloaddotty-401b421430592b213220b74ae1c394ba7f8bd479.tar.gz
dotty-401b421430592b213220b74ae1c394ba7f8bd479.tar.bz2
dotty-401b421430592b213220b74ae1c394ba7f8bd479.zip
Fix merge conflict
Diffstat (limited to 'src/dotty/tools/dotc/typer/TypeAssigner.scala')
-rw-r--r--src/dotty/tools/dotc/typer/TypeAssigner.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/typer/TypeAssigner.scala b/src/dotty/tools/dotc/typer/TypeAssigner.scala
index ab151fb1d..22339d470 100644
--- a/src/dotty/tools/dotc/typer/TypeAssigner.scala
+++ b/src/dotty/tools/dotc/typer/TypeAssigner.scala
@@ -203,14 +203,14 @@ trait TypeAssigner {
TryDynamicCallType
} else {
if (!site.isErroneous) {
- def notAMember = d"${if (name.isTypeName) "type" else "value"} $name is not a member of $site"
+ def kind = if (name.isTypeName) "type" else "value"
+ def addendum =
+ if (site.derivesFrom(defn.DynamicClass)) "\npossible cause: maybe a wrong Dynamic method signature?"
+ else ""
ctx.error(
if (name == nme.CONSTRUCTOR) ex"$site does not have a constructor"
- else if (site.derivesFrom(defn.DynamicClass)) {
- ex"$name is not a member of $site\n" +
- "possible cause: maybe a wrong Dynamic method signature?"
- }
- else ex"$name is not a member of $site", pos)
+ else ex"$kind $name is not a member of $site$addendum",
+ pos)
}
ErrorType
}