Various bug fixes for typer.

3 files changed, 14 insertions, 5 deletions

diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala
index 66fb4c3e1..05b0c50ce 100644
--- a/src/dotty/tools/dotc/typer/Applications.scala
+++ b/src/dotty/tools/dotc/typer/Applications.scala
@@ -410,6 +410,7 @@ trait Applications extends Compatibility { self: Typer =>
 
     val result = {
       var typedArgs = typedArgBuf.toList
+      println(s"typed args of $methRef = $typedArgs")
       val ownType =
         if (!success) ErrorType
         else {
@@ -611,9 +612,17 @@ trait Applications extends Compatibility { self: Typer =>
   /** Is given method reference applicable to argument types `args`?
    *  @param  resultType   The expected result type of the application
    */
-  def isApplicableToTrees(methRef: TermRef, args: List[Tree], resultType: Type)(implicit ctx: Context) =
+  def isApplicableToTrees(methRef: TermRef, args: List[Tree], resultType: Type)(implicit ctx: Context): Boolean =
     new ApplicableToTrees(methRef, args, resultType)(ctx.fresh.withNewTyperState).success
 
+  def isApplicableToTrees(tp: Type, args: List[Tree], resultType: Type)(implicit ctx: Context): Boolean = tp match {
+    case methRef: TermRef => isApplicableToTrees(methRef, args, resultType)
+    case _ =>
+      val app = tp.member(nme.apply)
+      app.exists && app.hasAltWith(d =>
+        isApplicableToTrees(TermRef(tp, nme.apply).withDenot(d), args, resultType))
+  }
+
   /** Is given method reference applicable to arguments `args`?
    *  @param  resultType   The expected result type of the application
    */
diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala
index cc5d041b9..bedaf55c3 100644
--- a/src/dotty/tools/dotc/typer/Namer.scala
+++ b/src/dotty/tools/dotc/typer/Namer.scala
@@ -168,7 +168,7 @@ class Namer { typer: Typer =>
       println(s"entered: $sym in ${ctx.owner} and ${ctx.effectiveScope}")
       if (sym.owner is PackageClass) {
         val preExisting = sym.owner.decls.lookup(sym.name)
-        if (preExisting.defRunId == ctx.runId)
+        if (preExisting.isDefinedInCurrentRun)
           ctx.error(s"${sym.showLocated} is compiled twice", sym.pos)
         }
       ctx.enter(sym)
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index 7702b1750..82b2e25b6 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -394,7 +394,7 @@ class Typer extends Namer with Applications with Implicits {
     case _ =>
       val tpt1 = typedType(tree.tpt)
       val expr1 = typedExpr(tree.expr, tpt1.tpe)
-      cpy.Typed(tree, tpt1, expr1).withType(tpt1.tpe)
+      cpy.Typed(tree, expr1, tpt1).withType(tpt1.tpe)
   }
 
   def typedNamedArg(tree: untpd.NamedArg, pt: Type)(implicit ctx: Context) = {
@@ -823,7 +823,7 @@ class Typer extends Namer with Applications with Implicits {
     }
   }
 
-  def typed(tree: untpd.Tree, pt: Type = WildcardType)(implicit ctx: Context): Tree = ctx.traceIndented (i"typing $tree") {
+  def typed(tree: untpd.Tree, pt: Type = WildcardType)(implicit ctx: Context): Tree = ctx.traceIndented (i"typing $tree", show = true) {
 
     def encodeName(tree: untpd.Tree) = tree match {
       case tree: NameTree => tree.withName(tree.name.encode)
@@ -928,7 +928,7 @@ class Typer extends Namer with Applications with Implicits {
    *  (14) When in mode EXPRmode, apply a view
    *  If all this fails, error
    */
-  def adapt(tree: Tree, pt: Type)(implicit ctx: Context): Tree = ctx.traceIndented(i"adapting $tree of type ${tree.tpe} to $pt") {
+  def adapt(tree: Tree, pt: Type)(implicit ctx: Context): Tree = ctx.traceIndented(i"adapting $tree of type ${tree.tpe} to $pt", show = false) {
 
     def adaptOverloaded(ref: TermRef) = {
       val altDenots = ref.denot.alternatives