diff options
author | Antoine Gourlay <antoine@gourlay.fr> | 2014-11-15 18:08:30 +0100 |
---|---|---|
committer | Antoine Gourlay <antoine@gourlay.fr> | 2014-11-15 18:20:41 +0100 |
commit | af49d9c61c805dd689bdeb9e508e78edd29fedd0 (patch) | |
tree | 39e1a6ac6efc559caf8196dbbedae0e8b8071317 /src | |
parent | d28d4f49088eb5e0809cbb68655319c68e981caa (diff) | |
download | scala-af49d9c61c805dd689bdeb9e508e78edd29fedd0.tar.gz scala-af49d9c61c805dd689bdeb9e508e78edd29fedd0.tar.bz2 scala-af49d9c61c805dd689bdeb9e508e78edd29fedd0.zip |
SI-8948 resurrect the scaladoc for Any/AnyRef/Nothing/Null.
They disappeared in dc1cd96 when `scala.tools.nsc.doc.DocParser` lost
its `override def forScaladoc = true`, which used to trigger whether to
parse `DocDef` nodes. This was deprecated in favor of a custom global
when scaladoc was modularized out (#2226), but `DocParser` didn't get it
since it didn't override `forScaladoc` anymore...
I added back `forScaladoc` in `DocParser` for consistency with
`ScaladocGlobal`, although it doesn't do anything anymore.
Diffstat (limited to 'src')
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/DocParser.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/DocParser.scala b/src/scaladoc/scala/tools/nsc/doc/DocParser.scala index 6dc3e5a62b..f03b848af6 100644 --- a/src/scaladoc/scala/tools/nsc/doc/DocParser.scala +++ b/src/scaladoc/scala/tools/nsc/doc/DocParser.scala @@ -15,13 +15,14 @@ import DocParser.Parsed * right after parsing so it can read `DocDefs` from source code which would * otherwise cause the compiler to go haywire. */ -class DocParser(settings: nsc.Settings, reporter: Reporter) extends Global(settings, reporter) { +class DocParser(settings: nsc.Settings, reporter: Reporter) extends Global(settings, reporter) with ScaladocGlobalTrait { def this(settings: Settings) = this(settings, new ConsoleReporter(settings)) def this() = this(new Settings(Console println _)) // the usual global initialization locally { new Run() } + override def forScaladoc = true override protected def computeInternalPhases() { phasesSet += syntaxAnalyzer } |