diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-02 20:14:30 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-05-01 23:41:46 -0700 |
commit | b27abca41a2503747b3aeeecf8b8cb355159265f (patch) | |
tree | 72d919a389fb5eefaef3bc6ad1a565d56c06b7a2 | |
parent | bbad15b59167dbf9780abbec56d6f817372c40c7 (diff) | |
download | scala-b27abca41a2503747b3aeeecf8b8cb355159265f.tar.gz scala-b27abca41a2503747b3aeeecf8b8cb355159265f.tar.bz2 scala-b27abca41a2503747b3aeeecf8b8cb355159265f.zip |
tpe -> tpeHK here and there.
Review by @moors.
3 files changed, 10 insertions, 10 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index c049df47af..026cd35d23 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -2548,8 +2548,8 @@ trait Types extends api.Types { self: SymbolTable => override def prefix = maybeRewrap(underlying.prefix) override def typeArgs = underlying.typeArgs map maybeRewrap override def params = underlying.params mapConserve { param => - val tpe1 = rewrap(param.tpe) - if (tpe1 eq param.tpe) param else param.cloneSymbol.setInfo(tpe1) + val tpe1 = rewrap(param.tpeHK) + if (tpe1 eq param.tpeHK) param else param.cloneSymbol.setInfo(tpe1) } override def paramTypes = underlying.paramTypes map maybeRewrap override def instantiateTypeParams(formals: List[Symbol], actuals: List[Type]) = { @@ -5884,8 +5884,8 @@ trait Types extends api.Types { self: SymbolTable => foreach3(tvars, tparams, variances)((tvar2, tparam2, variance2) => { val ok = (tparam2 != tparam) && ( (bound contains tparam2) - || up && (tparam2.info.bounds.lo =:= tparam.tpe) - || !up && (tparam2.info.bounds.hi =:= tparam.tpe) + || up && (tparam2.info.bounds.lo =:= tparam.tpeHK) + || !up && (tparam2.info.bounds.hi =:= tparam.tpeHK) ) if (ok) { if (tvar2.constr.inst eq null) cyclic = true @@ -5899,7 +5899,7 @@ trait Types extends api.Types { self: SymbolTable => for (tparam2 <- tparams) tparam2.info.bounds.lo.dealias match { case TypeRef(_, `tparam`, _) => - tvar addHiBound tparam2.tpe.instantiateTypeParams(tparams, tvars) + tvar addHiBound tparam2.tpeHK.instantiateTypeParams(tparams, tvars) case _ => } } else { @@ -5909,7 +5909,7 @@ trait Types extends api.Types { self: SymbolTable => for (tparam2 <- tparams) tparam2.info.bounds.hi.dealias match { case TypeRef(_, `tparam`, _) => - tvar addLoBound tparam2.tpe.instantiateTypeParams(tparams, tvars) + tvar addLoBound tparam2.tpeHK.instantiateTypeParams(tparams, tvars) case _ => } } diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 3d3cea75d6..b51c8baa31 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -732,7 +732,7 @@ abstract class ClassfileParser { } val newtparam = sym.newExistential(newTypeName("?"+i), sym.pos) setInfo bounds existentials += newtparam - xs += newtparam.tpe //@M should probably be .tpeHK + xs += newtparam.tpeHK i += 1 case _ => xs += sig2type(tparams, skiptvs) @@ -746,7 +746,7 @@ abstract class ClassfileParser { } else { // raw type - existentially quantify all type parameters val eparams = typeParamsToExistentials(classSym, classSym.unsafeTypeParams) - val t = typeRef(pre, classSym, eparams.map(_.tpe)) + val t = typeRef(pre, classSym, eparams.map(_.tpeHK)) val res = newExistentialType(eparams, t) if (settings.debug.value && settings.verbose.value) println("raw type " + classSym + " -> " + res) diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 9c13c630b1..41b896eb93 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1057,7 +1057,7 @@ trait Typers extends Modes with Adaptations with Taggings with PatMatVirtualiser val tparams1 = cloneSymbols(tparams) val tree1 = if (tree.isType) tree else TypeApply(tree, tparams1 map (tparam => - TypeTree(tparam.tpeHK) setPos tree.pos.focus)) setPos tree.pos //@M/tcpolyinfer: changed tparam.tpe to tparam.tpeHK + TypeTree(tparam.tpeHK) setPos tree.pos.focus)) setPos tree.pos context.undetparams ++= tparams1 notifyUndetparamsAdded(tparams1) adapt(tree1 setType restpe.substSym(tparams, tparams1), mode, pt, original) @@ -2960,7 +2960,7 @@ trait Typers extends Modes with Adaptations with Taggings with PatMatVirtualiser assert(!inPatternMode(mode), modeString(mode)) // this case cannot arise for patterns val lenientTargs = protoTypeArgs(tparams, formals, mt.resultApprox, pt) val strictTargs = map2(lenientTargs, tparams)((targ, tparam) => - if (targ == WildcardType) tparam.tpe else targ) //@M TODO: should probably be .tpeHK + if (targ == WildcardType) tparam.tpeHK else targ) var remainingParams = paramTypes def typedArgToPoly(arg: Tree, formal: Type): Tree = { //TR TODO: cleanup val lenientPt = formal.instantiateTypeParams(tparams, lenientTargs) |