summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-03-12 17:58:34 +0100
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-03-19 17:06:51 +0100
commit910a701fcc93e0663f0a6a15ac11499beb1ca6a9 (patch)
tree77e246101fc16226237b5a22a2b904908e1d7287 /src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
parent78c15103d54e58b0ecd193b90e2d56b967967d6c (diff)
downloadscala-910a701fcc93e0663f0a6a15ac11499beb1ca6a9.tar.gz
scala-910a701fcc93e0663f0a6a15ac11499beb1ca6a9.tar.bz2
scala-910a701fcc93e0663f0a6a15ac11499beb1ca6a9.zip
SI-5189: refined GADT soundness fix
extrapolate GADT skolems: only complicate types when needed make sure we only deskolemize GADT skolems after typedCase
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala2
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 1434002121..e17a271dd0 100644
--- a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
@@ -157,7 +157,7 @@ trait TypeDiagnostics {
}
// todo: use also for other error messages
- def existentialContext(tp: Type) = tp.existentialSkolems match {
+ def existentialContext(tp: Type) = tp.skolemsExceptMethodTypeParams match {
case Nil => ""
case xs => " where " + (disambiguate(xs map (_.existentialToString)) mkString ", ")
}