From b7e547c4c3b6c0c867eb2636671106da2994044c Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Thu, 13 Nov 2014 17:16:20 +0100
Subject: Fixes problem exhibited by ensuring.scala

Need to account for the possibility that function
arguments are wrapped in braces.
---
 src/dotty/tools/dotc/reporting/Reporter.scala |  2 ++
 src/dotty/tools/dotc/typer/Applications.scala | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/dotty/tools/dotc/reporting/Reporter.scala b/src/dotty/tools/dotc/reporting/Reporter.scala
index 7f0c88bc5..5fa34bfce 100644
--- a/src/dotty/tools/dotc/reporting/Reporter.scala
+++ b/src/dotty/tools/dotc/reporting/Reporter.scala
@@ -45,6 +45,8 @@ object Reporter {
 
     override def toString = s"$getClass at $pos: $msg"
     override def getMessage() = msg
+
+    def checkingStr: String = msgFn
   }
 
   class Error(msgFn: => String, pos: SourcePosition) extends Diagnostic(msgFn, pos, ERROR)
diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala
index a237e7781..931acb4b5 100644
--- a/src/dotty/tools/dotc/typer/Applications.scala
+++ b/src/dotty/tools/dotc/typer/Applications.scala
@@ -915,6 +915,10 @@ trait Applications extends Compatibility { self: Typer =>
     val candidates = pt match {
       case pt @ FunProto(args, resultType, _) =>
         val numArgs = args.length
+        val normArgs = args.mapConserve {
+          case Block(Nil, expr) => expr
+          case x => x
+        }
 
         def sizeFits(alt: TermRef, tp: Type): Boolean = tp match {
           case tp: PolyType => sizeFits(alt, tp.resultType)
@@ -933,22 +937,25 @@ trait Applications extends Compatibility { self: Typer =>
         def narrowBySize(alts: List[TermRef]): List[TermRef] =
           alts filter (alt => sizeFits(alt, alt.widen))
 
-        def narrowByShapes(alts: List[TermRef]): List[TermRef] =
-          if (args exists (_.isInstanceOf[untpd.Function]))
+        def narrowByShapes(alts: List[TermRef]): List[TermRef] = {
+          if (normArgs exists (_.isInstanceOf[untpd.Function]))
             if (args exists (_.isInstanceOf[Trees.NamedArg[_]]))
               narrowByTrees(alts, args map treeShape, resultType)
             else
-              narrowByTypes(alts, args map typeShape, resultType)
+              narrowByTypes(alts, normArgs map typeShape, resultType)
           else
             alts
+        }
 
         def narrowByTrees(alts: List[TermRef], args: List[Tree], resultType: Type): List[TermRef] =
           alts filter (isApplicable(_, targs, args, resultType))
 
         val alts1 = narrowBySize(alts)
+        //ctx.log(i"narrowed by size: ${alts1.map(_.symbol.showDcl)}%, %")
         if (isDetermined(alts1)) alts1
         else {
           val alts2 = narrowByShapes(alts1)
+          //ctx.log(i"narrowed by shape: ${alts1.map(_.symbol.showDcl)}%, %")
           if (isDetermined(alts2)) alts2
           else narrowByTrees(alts2, pt.typedArgs, resultType)
         }
-- 
cgit v1.2.3