diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-01-30 21:27:59 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-01-31 11:59:40 +0100 |
| commit | 941c56918e052a1c619f35b24c6aa6c736390dc5 (patch) | |
| tree | 24ce6935593baa26fe276e9ef91994bb69ef023d /src/compiler/scala/tools/nsc/typechecker/Macros.scala | |
| parent | 2fa859e1b3eb2ac57058feaba87d96adfbac9209 (diff) | |
| download | scala-941c56918e052a1c619f35b24c6aa6c736390dc5.tar.gz scala-941c56918e052a1c619f35b24c6aa6c736390dc5.tar.bz2 scala-941c56918e052a1c619f35b24c6aa6c736390dc5.zip | |
SI-6812 scaladoc can opt out of expanding macros
This is a temporary change, possible only because macros currently can't
affect the global symbol table (except for the case when they will steer
inference of a method's return type).
Later on, e.g. with the addition of c.introduceTopLevel in master,
we will have to upgrade Scaladoc to allow for separate generation of
documentation, because then we'll be forced to expand macros in order to
get the whole picture of the code.
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 b20a9ea626..203367c1d5 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 { |