diff options
author | paltherr <paltherr@epfl.ch> | 2004-04-10 00:53:45 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-04-10 00:53:45 +0000 |
commit | 9fa2048e5cecc7b488611f89b403c3738d8dae45 (patch) | |
tree | 82a29523c0a82cdc1676716114b3acedfc6d6e16 /sources | |
parent | 0c3b2c8af02b44fca5aa44a5d0a67d9eb4ec0cfe (diff) | |
download | scala-9fa2048e5cecc7b488611f89b403c3738d8dae45.tar.gz scala-9fa2048e5cecc7b488611f89b403c3738d8dae45.tar.bz2 scala-9fa2048e5cecc7b488611f89b403c3738d8dae45.zip |
- Removed calls to Symbol.module()
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scala/tools/scaladoc/HTMLGenerator.java | 1 | ||||
-rw-r--r-- | sources/scala/tools/scaladoc/Location.java | 17 | ||||
-rw-r--r-- | sources/scala/tools/scaladoc/ScalaSearch.java | 20 | ||||
-rw-r--r-- | sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java | 2 |
4 files changed, 18 insertions, 22 deletions
diff --git a/sources/scala/tools/scaladoc/HTMLGenerator.java b/sources/scala/tools/scaladoc/HTMLGenerator.java index b6e088aa75..23b6e1315d 100644 --- a/sources/scala/tools/scaladoc/HTMLGenerator.java +++ b/sources/scala/tools/scaladoc/HTMLGenerator.java @@ -1446,7 +1446,6 @@ public abstract class HTMLGenerator { * symbol (including itself). */ protected void printPath(Symbol sym, String destinationFrame, Page page) { - sym = sym.isModuleClass() ? sym.module() : sym; String name = removeHtmlSuffix(Location.getURI(sym).toString()); if (isDocumented.apply(sym)) { String target = definitionURL(sym, page); diff --git a/sources/scala/tools/scaladoc/Location.java b/sources/scala/tools/scaladoc/Location.java index 7f83b6bec4..cc7cfcccab 100644 --- a/sources/scala/tools/scaladoc/Location.java +++ b/sources/scala/tools/scaladoc/Location.java @@ -38,9 +38,9 @@ public class Location { if (uris.get(sym) == null) { URI uri; try { - if (sym.isModuleClass()) - uri = getURI(sym.module()); - else if (sym.isRoot() || sym.isClass() || sym.isModule() || sym.isPackage() || sym.isPackageClass()) + if (sym.isModule()) + uri = getURI(sym.moduleClass()); + else if (sym.isClassType()) uri = new URI(getPath(sym).toString() + HTML_SUFFIX); else if (sym.isParameter()) uri = getURI(sym.classOwner()); @@ -53,10 +53,9 @@ public class Location { } // where static private URI getPath(Symbol sym) { + assert sym.isClassType(): Debug.show(sym); try { - if (sym.isModuleClass()) - return getPath(sym.module()); - else if (sym.isRoot()) + if (sym.isRoot()) return new URI(ROOT_NAME); else if (sym.owner().isRoot()) return new URI(getName(sym)); @@ -66,7 +65,11 @@ public class Location { } // where static public String getName(Symbol sym) { - return sym.isClass() ? sym.simpleName().toString() + CLASS_SUFFIX : sym.simpleName().toString(); + if (sym.isModule()) return getName(sym.moduleClass()); + assert sym.isClassType(): Debug.show(sym); + String name = sym.simpleName().toString(); + if (!sym.isRoot() && !sym.isModuleClass()) name += CLASS_SUFFIX; + return name; } // where static private final Map/*<Symbol, Integer>*/ ids = new HashMap(); diff --git a/sources/scala/tools/scaladoc/ScalaSearch.java b/sources/scala/tools/scaladoc/ScalaSearch.java index 634f3a023d..b697e9c862 100644 --- a/sources/scala/tools/scaladoc/ScalaSearch.java +++ b/sources/scala/tools/scaladoc/ScalaSearch.java @@ -569,28 +569,22 @@ public class DocSyms { ScalaSearch.foreach(pack, new ScalaSearch.SymFun() { public void apply(Symbol sym) { - syms.add(sym); + syms.add(sym.isModule() ? sym.moduleClass() : sym); } } ); // add all super packages. - if (!pack.isRoot()) { - Symbol owner = pack.owner(); - while (!owner.isRoot()) { - syms.add(owner.module()); - owner = owner.owner(); - } + while (!pack.isRoot()) { + pack = pack.owner(); + syms.add(pack); } } } public boolean contains(Symbol sym) { - boolean res = false; - if (sym.isParameter()) - res = contains(sym.classOwner()); - else - res = sym.isRoot() || (syms.contains(sym) || (sym.isModuleClass() && syms.contains(sym.module()))); - return res; + if (sym.isParameter()) return contains(sym.classOwner()); + if (sym.isModule()) return contains(sym.moduleClass()); + return syms.contains(sym); } } diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java b/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java index 9df68964e3..bf427f9965 100644 --- a/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java +++ b/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java @@ -95,7 +95,7 @@ class SymbolTablePrinterFactory { switch(prefix) { case ThisType(Symbol sym): - if (sym.isPackageClass() && isDocumented.apply(sym.module())) + if (sym.isPackageClass() && isDocumented.apply(sym)) return null; else if (isDocumented.apply(sym)) return null; |