diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-02-01 16:14:26 -0800 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-02-01 16:14:26 -0800 |
| commit | 01eb6f4958b64667dfae6240effa55d44fa0d392 (patch) | |
| tree | 592ce02e080c9480993a89ee836011276325d815 /src/compiler/scala/tools/nsc/typechecker/Macros.scala | |
| parent | 283924bfa5c266ccaea1bdb87521581e1ceb38cd (diff) | |
| parent | 941c56918e052a1c619f35b24c6aa6c736390dc5 (diff) | |
| download | scala-01eb6f4958b64667dfae6240effa55d44fa0d392.tar.gz scala-01eb6f4958b64667dfae6240effa55d44fa0d392.tar.bz2 scala-01eb6f4958b64667dfae6240effa55d44fa0d392.zip | |
Merge pull request #2024 from scalamacros/ticket/6812
SI-6812 scaladoc can opt out of expanding macros
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Macros.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Macros.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala index 0ba76643ca..245656e2d7 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala @@ -684,6 +684,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces { * the expandee with an error marker set if there has been an error */ def macroExpand(typer: Typer, expandee: Tree, mode: Int = EXPRmode, pt: Type = WildcardType): Tree = { + if (settings.Ymacronoexpand.value) return expandee // SI-6812 val start = if (Statistics.canEnable) Statistics.startTimer(macroExpandNanos) else null if (Statistics.canEnable) Statistics.incCounter(macroExpandCount) try { |