diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-03-25 12:40:48 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-03-25 12:45:54 +0100 |
| commit | b95ca32062ae980fb45b3e93d8c90219bc1d2530 (patch) | |
| tree | 0334a78ac5196d391d454d00412cabffa25666c5 /src/compiler | |
| parent | fcc22e22248992abffe2506ddef7c0f7c0b23044 (diff) | |
| download | scala-b95ca32062ae980fb45b3e93d8c90219bc1d2530.tar.gz scala-b95ca32062ae980fb45b3e93d8c90219bc1d2530.tar.bz2 scala-b95ca32062ae980fb45b3e93d8c90219bc1d2530.zip | |
SI-7299 Improve error message for eta-expanding 23+ param method
Before, we got `error: missing arguments for method f`.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 2458fc54e1..a98f20a971 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -4461,6 +4461,12 @@ trait Typers extends Modes with Adaptations with Tags { treeCopy.New(tree, tpt1).setType(tp) } + def functionTypeWildcard(tree: Tree, arity: Int): Type = { + val tp = functionType(List.fill(arity)(WildcardType), WildcardType) + if (tp == NoType) MaxFunctionArityError(tree) + tp + } + def typedEta(expr1: Tree): Tree = expr1.tpe match { case TypeRef(_, ByNameParamClass, _) => val expr2 = Function(List(), expr1) setPos expr1.pos @@ -4472,7 +4478,7 @@ trait Typers extends Modes with Adaptations with Tags { typed1(expr2, mode, pt) case PolyType(_, MethodType(formals, _)) => if (isFunctionType(pt)) expr1 - else adapt(expr1, mode, functionType(formals map (t => WildcardType), WildcardType)) + else adapt(expr1, mode, functionTypeWildcard(expr1, formals.length)) case MethodType(formals, _) => if (isFunctionType(pt)) expr1 else expr1 match { @@ -4491,7 +4497,7 @@ trait Typers extends Modes with Adaptations with Tags { val rhs = Apply(f, args) typed(rhs) case _ => - adapt(expr1, mode, functionType(formals map (t => WildcardType), WildcardType)) + adapt(expr1, mode, functionTypeWildcard(expr1, formals.length)) } case ErrorType => expr1 |