diff options
| author | Paul Phillips <paulp@improving.org> | 2012-11-13 13:39:46 -0800 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-11-14 07:33:23 +0100 |
| commit | b9225732889448378ccb880faa6d8421cf40e02c (patch) | |
| tree | 832414a2240b60de97db1bc2b1aa1ea02d95ab9a /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 1a6c8597109a9eee122d01c142d8955a14f704c8 (diff) | |
| download | scala-b9225732889448378ccb880faa6d8421cf40e02c.tar.gz scala-b9225732889448378ccb880faa6d8421cf40e02c.tar.bz2 scala-b9225732889448378ccb880faa6d8421cf40e02c.zip | |
Fix for SI-6662, macro failing too early.
Don't give up before you try tupling. Who knows what
someone might be doing with a Unit.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index df3731794a..d3847de894 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3078,7 +3078,7 @@ trait Typers extends Modes with Adaptations with Tags { def checkNotMacro() = { if (fun.symbol != null && fun.symbol.filter(sym => sym != null && sym.isTermMacro && !sym.isErroneous) != NoSymbol) - duplErrorTree(NamedAndDefaultArgumentsNotSupportedForMacros(tree, fun)) + tryTupleApply getOrElse duplErrorTree(NamedAndDefaultArgumentsNotSupportedForMacros(tree, fun)) } if (mt.isErroneous) duplErrTree |