diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-06 13:28:53 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-06 13:28:53 -0800 |
| commit | 5464973a8d159b6f097dc18c69c68f9e57d193b0 (patch) | |
| tree | 67bae9244f9e6332c7772c263f05738db1782067 /src | |
| parent | 2d865327a993bf0a75a9a75be45258070bf66c76 (diff) | |
| parent | 4f99c2e589164c300d3e86c0de5a0d3ca9efd3f7 (diff) | |
| download | scala-5464973a8d159b6f097dc18c69c68f9e57d193b0.tar.gz scala-5464973a8d159b6f097dc18c69c68f9e57d193b0.tar.bz2 scala-5464973a8d159b6f097dc18c69c68f9e57d193b0.zip | |
Merge remote-tracking branches 'adriaanm/ticket/5546' and 'hubertp/issue/5553' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Infer.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala index c09e535117..896d8c711d 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala @@ -1385,9 +1385,10 @@ trait Infer { case _ => } } + // todo: missing test case NoBestExprAlternativeError(tree, pt) } else if (!competing.isEmpty) { - if (secondTry) NoBestExprAlternativeError(tree, pt) + if (secondTry) { NoBestExprAlternativeError(tree, pt); setError(tree) } else if (!pt.isErroneous) AmbiguousExprAlternativeError(tree, pre, best, competing.head, pt) } else { // val applicable = alts1 filter (alt => |