From 6bd2f4b6980d95b00db236a2fc29703453dcb932 Mon Sep 17 00:00:00 2001 From: Sean McDirmid Date: Mon, 13 Mar 2006 18:58:08 +0000 Subject: Fixed package treated as object bug. --- src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.3