diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-01-30 00:58:26 +0300 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-14 23:51:21 +0100 |
| commit | da09331324d302d0b85a89cdcfe32ded2587b39a (patch) | |
| tree | 378d9c217e92e6c47af057a4c7bf85b91408c855 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | 465e538ef59171ac7d9e811dbdaec776f8a64ac7 (diff) | |
| download | scala-da09331324d302d0b85a89cdcfe32ded2587b39a.tar.gz scala-da09331324d302d0b85a89cdcfe32ded2587b39a.tar.bz2 scala-da09331324d302d0b85a89cdcfe32ded2587b39a.zip | |
SI-6732 deprecates internal#Symbol.isPackage
This is the first step in disentangling api#Symbol.isPackage, which is
supposed to return false for package classes, and internal#Symbol.isPackage,
which has traditionally being used as a synonym for hasPackageFlag and
hence returned true for package classes (unlike isModule which is false
for module classes).
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 0977e8cd4d..d3b5564f60 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -402,8 +402,8 @@ trait Implicits { } def complexity(tp: Type): Int = tp.dealias match { case NoPrefix => 0 - case SingleType(pre, sym) => if (sym.isPackage) 0 else complexity(tp.dealiasWiden) - case ThisType(sym) => if (sym.isPackage) 0 else 1 + case SingleType(pre, sym) => if (sym.hasPackageFlag) 0 else complexity(tp.dealiasWiden) + case ThisType(sym) => if (sym.hasPackageFlag) 0 else 1 case TypeRef(pre, sym, args) => complexity(pre) + (args map complexity).sum + 1 case RefinedType(parents, _) => (parents map complexity).sum + 1 case _ => 1 |