diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-11-14 02:04:19 -0800 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-11-14 02:04:19 -0800 |
| commit | ace401c8084f94a5ca5c38f3a10c5eee18b65645 (patch) | |
| tree | 6afb0ca9a4cc1dbdd51ccec6e434de480ac38b1b /src/compiler | |
| parent | 4c0b9b264246a1ba63196deb3558027413eb3490 (diff) | |
| parent | b9225732889448378ccb880faa6d8421cf40e02c (diff) | |
| download | scala-ace401c8084f94a5ca5c38f3a10c5eee18b65645.tar.gz scala-ace401c8084f94a5ca5c38f3a10c5eee18b65645.tar.bz2 scala-ace401c8084f94a5ca5c38f3a10c5eee18b65645.zip | |
Merge pull request #1618 from scalamacros/ticket/6662
Fix for SI-6662, macro failing too early.
Diffstat (limited to 'src/compiler')
| -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 |