diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-04-20 09:34:12 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-04-20 09:34:12 +0200 |
| commit | ec9fb824994ac25ebc8395b6b69daccc92e0be5e (patch) | |
| tree | 7abef081c3f813b3ed741b4d8e972895a107d199 /src | |
| parent | 016bc3db52d6f1ffa3ef2285d5801f82f5f49167 (diff) | |
| download | scala-ec9fb824994ac25ebc8395b6b69daccc92e0be5e.tar.gz scala-ec9fb824994ac25ebc8395b6b69daccc92e0be5e.tar.bz2 scala-ec9fb824994ac25ebc8395b6b69daccc92e0be5e.zip | |
minor fix to macro tracing
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Macros.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala index da32e638d3..cbfa61470c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala @@ -1020,7 +1020,7 @@ trait Macros { self: Analyzer => private def Failure(expandee: Tree) = Other(expandee) private def fail(typer: Typer, expandee: Tree, msg: String = null) = { if (macroDebug || macroCopypaste) { - var msg1 = if (msg contains "exception during macro expansion") msg.split(EOL).drop(1).headOption.getOrElse("?") else msg + var msg1 = if (msg != null && (msg contains "exception during macro expansion")) msg.split(EOL).drop(1).headOption.getOrElse("?") else msg if (macroDebug) println("macro expansion has failed: %s".format(msg1)) } val pos = if (expandee.pos != NoPosition) expandee.pos else openMacros.find(c => c.expandee.pos != NoPosition).map(_.expandee.pos).getOrElse(NoPosition) |