diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-11-29 16:45:55 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-11-29 16:45:55 +0100 |
| commit | b508185cc3fe5c740d5ff6ecfd0dc1482596018b (patch) | |
| tree | 8f647883784d3399ebf690eeab180c0271b7c752 /src/dotty/tools/dotc/typer/Typer.scala | |
| parent | 6dabcdaabf49ecc72468c6e712d6bc5c927ec87e (diff) | |
| download | dotty-b508185cc3fe5c740d5ff6ecfd0dc1482596018b.tar.gz dotty-b508185cc3fe5c740d5ff6ecfd0dc1482596018b.tar.bz2 dotty-b508185cc3fe5c740d5ff6ecfd0dc1482596018b.zip | |
Tweaks to Inferencing
Also: Making VarianceMap a SimpleMap for replayability
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 5fd995839..5a953004a 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -928,7 +928,7 @@ class Typer extends Namer with Applications with Implicits { def adapt(tree: Tree, pt: Type)(implicit ctx: Context) = track("adapt") { ctx.traceIndented(i"adapting $tree of type ${tree.tpe} to $pt", show = true) { - ctx.interpolateUndetVars(tree) + interpolateUndetVars(tree) tree overwriteType tree.tpe.simplified adaptInterpolated(tree, pt) } @@ -1102,7 +1102,7 @@ class Typer extends Namer with Applications with Implicits { case poly: PolyType => if (pt.isInstanceOf[PolyProto]) tree else { - val (_, tvars) = ctx.track(poly, tree) + val (_, tvars) = constrained(poly, tree) adaptInterpolated(tree appliedToTypes tvars, pt) } case wtp => |