diff options
| author | michelou <michelou@epfl.ch> | 2007-05-09 13:41:01 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-05-09 13:41:01 +0000 |
| commit | 96a817da9ac2cac73c4994cbc8cd9048e6f2227d (patch) | |
| tree | 4cbbf91dcbe8b6db3c63458ab53d9164c4237678 /src | |
| parent | fbccd6a31839eb0e1f7f67e7c0cc35771226a6e5 (diff) | |
| download | scala-96a817da9ac2cac73c4994cbc8cd9048e6f2227d.tar.gz scala-96a817da9ac2cac73c4994cbc8cd9048e6f2227d.tar.bz2 scala-96a817da9ac2cac73c4994cbc8cd9048e6f2227d.zip | |
added tests for contribs #460 and #461
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/ModelFrames.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/ModelFrames.scala b/src/compiler/scala/tools/nsc/doc/ModelFrames.scala index d7ce08d85f..3d448c83f3 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelFrames.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelFrames.scala @@ -104,6 +104,8 @@ trait ModelFrames extends ModelExtractor { case msym: ModuleSymbol => urlFor0(sym, sym) + FILE_EXTENSION_HTML case csym: ClassSymbol => + if (csym.name == "$colon$colon") + Console.println("****************************" + csym.name) urlFor0(sym, sym) + FILE_EXTENSION_HTML case _ => val cnt = urlFor(decode(sym.owner)) @@ -136,12 +138,11 @@ trait ModelFrames extends ModelExtractor { }), encoding) } - - def urlFor0(sym: Symbol, orig: Symbol): String = { + def urlFor0(sym: Symbol, orig: Symbol): String = (if (sym == NoSymbol) "XXX" - else if (sym.owner.isPackageClass) { - rootFor(sym) + pkgPath(sym); - } else urlFor0(decode(sym.owner), orig) + "." + Utility.escape(sym.nameString)) + + else if (sym.owner.isPackageClass) rootFor(sym) + pkgPath(sym) + else urlFor0(decode(sym.owner), orig) + "." + Utility.escape(sym.nameString) + ) + (sym match { case msym: ModuleSymbol => if (msym hasFlag Flags.PACKAGE) NAME_SUFFIX_PACKAGE @@ -152,7 +153,6 @@ trait ModelFrames extends ModelExtractor { case _ => "" }) - } } def pkgPath(sym : global.Symbol) = sym.fullNameString('/') match { case "<empty>" => "_empty_" |