aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Types.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-01-17 11:24:33 +0100
committerMartin Odersky <odersky@gmail.com>2013-01-17 11:24:33 +0100
commitdc90608f2646be48eaf643ae7c19604b6333189c (patch)
tree78dd73019584d91761614c37414371de9f6c9688 /src/dotty/tools/dotc/core/Types.scala
parent4ad6538f7d67a42747d578feaaee633c390c4cbc (diff)
downloaddotty-dc90608f2646be48eaf643ae7c19604b6333189c.tar.gz
dotty-dc90608f2646be48eaf643ae7c19604b6333189c.tar.bz2
dotty-dc90608f2646be48eaf643ae7c19604b6333189c.zip
Defined Denotation parameters.
Diffstat (limited to 'src/dotty/tools/dotc/core/Types.scala')
-rw-r--r--src/dotty/tools/dotc/core/Types.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala
index 4db037a86..be627faf4 100644
--- a/src/dotty/tools/dotc/core/Types.scala
+++ b/src/dotty/tools/dotc/core/Types.scala
@@ -62,7 +62,7 @@ object Types {
/** The type symbol associated with the type */
final def typeSymbol(implicit ctx: Context): Symbol = this match {
case tp: TypeRef => tp.symbol
- case tp: ClassInfo => tp.classd.clazz
+ case tp: ClassInfo => tp.classd.symbol
case _ => NoSymbol
}
@@ -283,7 +283,7 @@ object Types {
val resultSyms = candidates
.filterAccessibleFrom(pre)
.filterExcluded(excluded)
- .asSeenFrom(pre, classd.clazz)
+ .asSeenFrom(pre, classd.symbol)
if (resultSyms.exists) resultSyms.toRef
else new ErrorRefd // todo: refine
case tp: AndType =>
@@ -860,21 +860,21 @@ object Types {
abstract case class ClassInfo(prefix: Type, classd: ClassDenotation) extends CachedGroundType {
def typeTemplate(implicit ctx: Context): Type =
- classd.typeTemplate asSeenFrom (prefix, classd.clazz)
+ classd.typeTemplate asSeenFrom (prefix, classd.symbol)
def typeConstructor(implicit ctx: Context): Type =
- NamedType(prefix, classd.clazz.name)
+ NamedType(prefix, classd.symbol.name)
// cached because baseType needs parents
private var parentsCache: List[Type] = null
override def parents(implicit ctx: Context): List[Type] = {
if (parentsCache == null)
- parentsCache = classd.parents.mapConserve(_.substThis(classd.clazz, prefix))
+ parentsCache = classd.parents.mapConserve(_.substThis(classd.symbol, prefix))
parentsCache
}
- override def computeHash = doHash(classd.clazz, prefix)
+ override def computeHash = doHash(classd.symbol, prefix)
}
final class CachedClassInfo(prefix: Type, classd: ClassDenotation) extends ClassInfo(prefix, classd)