diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2006-03-13 18:58:08 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2006-03-13 18:58:08 +0000 |
| commit | 6bd2f4b6980d95b00db236a2fc29703453dcb932 (patch) | |
| tree | 01c7689e9835c70b6dc90bfb4390b4aadf6c4ff3 /src | |
| parent | 739ba95896fb2c10fa1fa93b5e5aabc961adc981 (diff) | |
| download | scala-6bd2f4b6980d95b00db236a2fc29703453dcb932.tar.gz scala-6bd2f4b6980d95b00db236a2fc29703453dcb932.tar.bz2 scala-6bd2f4b6980d95b00db236a2fc29703453dcb932.zip | |
Fixed package treated as object bug.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 2c2decc311..656b91f405 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -68,9 +68,14 @@ abstract class DocGenerator extends Models { "XXX"; } else if (sym.owner.isPackageClass) sym.fullNameString('/'); else urlFor0(sym.owner, orig) + "." + Utility.escape(sym.nameString)) + (sym match { - case msym : ModuleSymbol => "$object"; + case msym : ModuleSymbol => + if (msym.hasFlag(scala.tools.nsc.symtab.Flags.PACKAGE)) ""; + else "$object"; case csym : ClassSymbol => - if (csym.isModuleClass) "$object"; + if (csym.isModuleClass) { + if (csym.hasFlag(scala.tools.nsc.symtab.Flags.PACKAGE)) ""; + else "$object"; + } else ""; case _ => //System.err.println("XXX: class or object " + orig + " not found in " + sym); |