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 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | bbad15b59167dbf9780abbec56d6f817372c40c7 (diff) | |
| download | scala-b27abca41a2503747b3aeeecf8b8cb355159265f.tar.gz scala-b27abca41a2503747b3aeeecf8b8cb355159265f.tar.bz2 scala-b27abca41a2503747b3aeeecf8b8cb355159265f.zip | |
tpe -> tpeHK here and there.
Review by @moors.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
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) |