diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-16 22:26:04 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-16 22:26:04 +0000 |
| commit | ce223fe7abc47af712382a64404604e75f9f4d20 (patch) | |
| tree | 2af8639c5c9d9bcda88ef59b4598b2b4d5221406 /src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | |
| parent | 44784f3e41c2cc141c3eb5a0dcb656005befcfa4 (diff) | |
| download | scala-ce223fe7abc47af712382a64404604e75f9f4d20.tar.gz scala-ce223fe7abc47af712382a64404604e75f9f4d20.tar.bz2 scala-ce223fe7abc47af712382a64404604e75f9f4d20.zip | |
closes #1569, #3731: refactored dependent metho...
closes #1569, #3731: refactored dependent method types to get rid of
debruijn indices and use singleton types instead.
this is the core of the dependent types refactoring, no implicit or
inference changes
(one baffling discovery: resultType should drop annotations that don't subclass TypeConstraint, even in the trivial case... wow -- thanks to Tiark for helping me figure it out on a terrace in Barcelona
TODO: probably need a more principled approach to the propagation of plugin type-annotations)
review by odersky
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala index 1166f62ddb..be576289f6 100644 --- a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala +++ b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala @@ -139,7 +139,7 @@ trait TypeDiagnostics { def applyErrorMsg(tree: Tree, msg: String, argtpes: List[Type], pt: Type) = { def asParams(xs: List[Any]) = xs.mkString("(", ", ", ")") - def resType = if (isWildcard(pt)) "" else " with expected result type " + pt + def resType = if (pt isWildcard) "" else " with expected result type " + pt def allTypes = (alternatives(tree) flatMap (_.paramTypes)) ++ argtpes :+ pt withDisambiguation(allTypes: _*) { |