diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-10-20 22:28:44 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2011-10-20 22:28:44 +0000 |
| commit | 3921e5be742ff9523825037056e82b7b82db5932 (patch) | |
| tree | 046e7f6ff585ba66c80825132974f52f5a3638e0 /src/compiler/scala/reflect/internal/Types.scala | |
| parent | 24eb4c5bb5b3ed0e6bb4ede3e68876cdbe7d18fc (diff) | |
| download | scala-3921e5be742ff9523825037056e82b7b82db5932.tar.gz scala-3921e5be742ff9523825037056e82b7b82db5932.tar.bz2 scala-3921e5be742ff9523825037056e82b7b82db5932.zip | |
dependent methods types are now always enabled
for now, left the old if(settings.YdepMethTpes.value) guards in comments
removed *.flags containing -Ydependent-method-types also updated one
check file with one fewer error
no review
Diffstat (limited to 'src/compiler/scala/reflect/internal/Types.scala')
| -rw-r--r-- | src/compiler/scala/reflect/internal/Types.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index 7b77c8addf..1f238d666a 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -400,7 +400,7 @@ trait Types extends api.Types { self: SymbolTable => def resultType(actuals: List[Type]) = this /** Only used for dependent method types. */ - def resultApprox: Type = if (settings.YdepMethTpes.value) ApproximateDependentMap(resultType) else resultType + def resultApprox: Type = ApproximateDependentMap(resultType) // if (!settings.YdepMethTpes.value) resultType else /** If this is a TypeRef `clazz`[`T`], return the argument `T` * otherwise return this type @@ -2079,7 +2079,7 @@ A type's typeSymbol should never be inspected directly. override def isTrivial: Boolean = isTrivial0 && (resultType eq resultType.withoutAnnotations) private lazy val isTrivial0 = resultType.isTrivial && params.forall{p => p.tpe.isTrivial && ( - !settings.YdepMethTpes.value || !(params.exists(_.tpe.contains(p)) || resultType.contains(p))) + /*!settings.YdepMethTpes.value ||*/ !(params.exists(_.tpe.contains(p)) || resultType.contains(p))) } def isImplicit = params.nonEmpty && params.head.isImplicit @@ -2104,7 +2104,7 @@ A type's typeSymbol should never be inspected directly. else existentialAbstraction(params, resultType) // implicit args can only be depended on in result type: TODO this may be generalised so that the only constraint is dependencies are acyclic - def approximate: MethodType = MethodType(params, resultApprox) + def approximate: MethodType = MethodType(params, resultApprox) // if (!settings.YdepMethTpes.value) this else override def finalResultType: Type = resultType.finalResultType |