From 5af6ff8286614998e58f0bc5ef2fe4135d993209 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 4 Mar 2013 11:53:46 +0100 Subject: Renamed RefinedType#name, #info… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … to refinedName, refinedInfo. Also some other polishings in Types. --- src/dotty/tools/dotc/core/TypeOps.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/dotty/tools/dotc/core/TypeOps.scala') diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala index 6628aa824..ddab2743d 100644 --- a/src/dotty/tools/dotc/core/TypeOps.scala +++ b/src/dotty/tools/dotc/core/TypeOps.scala @@ -50,8 +50,8 @@ trait TypeOps { this: Context => case tp: RefinedType => tp.derivedRefinedType( asSeenFrom(tp.parent, pre, clazz, theMap), - tp.name, - asSeenFrom(tp.info, pre, clazz, theMap)) + tp.refinedName, + asSeenFrom(tp.refinedInfo, pre, clazz, theMap)) case _ => (if (theMap != null) theMap else new AsSeenFromMap(pre, clazz)) .mapOver(tp) @@ -76,7 +76,7 @@ trait TypeOps { this: Context => case tp: RefinedType => tp.parent.isVolatile || isAbstractIntersection(tp.parent) && - (tp.abstractMemberNames contains tp.name) + (tp.abstractMemberNames() contains tp.refinedName) case tp: TypeProxy => tp.underlying.isVolatile case AndType(l, r) => @@ -204,8 +204,8 @@ trait TypeOps { this: Context => case tp @ RefinedType(tp1, name: TypeName) => refinements = refinements.updated(name, refinements get name match { - case Some(info) => info & tp.info - case none => tp.info + case Some(info) => info & tp.refinedInfo + case none => tp.refinedInfo }) formals = formals.updated(name, tp1.member(name).symbol) normalizeToRef(tp1) -- cgit v1.2.3