aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/Typer.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-09-05 18:20:25 +0200
committerMartin Odersky <odersky@gmail.com>2016-10-02 16:11:21 +0200
commit60b6c6a3059b23cf0cc1968cc3c7ee3886784721 (patch)
treebb167f7f4ea164aa49c56e35065abceeb710bf2b /src/dotty/tools/dotc/typer/Typer.scala
parent5a345e7100450d39edf0034cc5b83bdb9a851cfa (diff)
downloaddotty-60b6c6a3059b23cf0cc1968cc3c7ee3886784721.tar.gz
dotty-60b6c6a3059b23cf0cc1968cc3c7ee3886784721.tar.bz2
dotty-60b6c6a3059b23cf0cc1968cc3c7ee3886784721.zip
Harden ReTyper so that it's fit for inlining
1. Imlement typedUnapply 2. Disable implicit view searches and searches for equality checks - these should have already happened in the first typer run.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
-rw-r--r--src/dotty/tools/dotc/typer/Typer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index 8bc156606..22a5095ec 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -1570,7 +1570,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
}
}
- def adapt(tree: Tree, pt: Type, original: untpd.Tree = untpd.EmptyTree)(implicit ctx: Context) = /*>|>*/ track("adapt") /*<|<*/ {
+ def adapt(tree: Tree, pt: Type, original: untpd.Tree = untpd.EmptyTree)(implicit ctx: Context): Tree = /*>|>*/ track("adapt") /*<|<*/ {
/*>|>*/ ctx.traceIndented(i"adapting $tree of type ${tree.tpe} to $pt", typr, show = true) /*<|<*/ {
if (tree.isDef) interpolateUndetVars(tree, tree.symbol)
else if (!tree.tpe.widen.isInstanceOf[MethodOrPoly]) interpolateUndetVars(tree, NoSymbol)