diff options
| author | cremet <cremet@epfl.ch> | 2003-11-11 15:39:26 +0000 |
|---|---|---|
| committer | cremet <cremet@epfl.ch> | 2003-11-11 15:39:26 +0000 |
| commit | fa70dcb1a524f58c7f96ee76047b8d906bab8a51 (patch) | |
| tree | d611a4629fea0634d726fcfb915d012561719b4f /sources | |
| parent | 83d1bae3f6418c09b2a899e056383b6d60284b87 (diff) | |
| download | scala-fa70dcb1a524f58c7f96ee76047b8d906bab8a51.tar.gz scala-fa70dcb1a524f58c7f96ee76047b8d906bab8a51.tar.bz2 scala-fa70dcb1a524f58c7f96ee76047b8d906bab8a51.zip | |
- Removed occurrences of "<: Any".
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scala/tools/scaladoc/HTMLGenerator.java | 2 | ||||
| -rw-r--r-- | sources/scala/tools/scaladoc/SymbolTablePrinter.java | 8 | ||||
| -rw-r--r-- | sources/scala/tools/scaladoc/TreeSymbols.java | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sources/scala/tools/scaladoc/HTMLGenerator.java b/sources/scala/tools/scaladoc/HTMLGenerator.java index e46f81ab1f..769cf953eb 100644 --- a/sources/scala/tools/scaladoc/HTMLGenerator.java +++ b/sources/scala/tools/scaladoc/HTMLGenerator.java @@ -1592,6 +1592,4 @@ public class HTMLGenerator { } } } - - //######################################################################## } diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinter.java b/sources/scala/tools/scaladoc/SymbolTablePrinter.java index 704a12e419..e1b49f396a 100644 --- a/sources/scala/tools/scaladoc/SymbolTablePrinter.java +++ b/sources/scala/tools/scaladoc/SymbolTablePrinter.java @@ -107,10 +107,12 @@ public class SymbolTablePrinter extends scalac.symtab.SymbolTablePrinter { */ public String getSymbolInnerString(Symbol symbol) { if (symbol.kind == Kinds.TYPE) - return "<:"; // HTML encoded "<:" symbol + return INNER_LT; // HTML encoded "<:" symbol else return super.getSymbolInnerString(symbol); } + // where + protected String INNER_LT = "<:"; /** * Prints the name of the given symbol usage. @@ -334,8 +336,8 @@ public class SymbolTablePrinter extends scalac.symtab.SymbolTablePrinter { * @param inner */ public SymbolTablePrinter printType(Type type, String inner) { - if ("<:".equals(inner) && type.symbol() == global.definitions.ANY_CLASS || - ">:".equals(inner) && type.symbol() == global.definitions.ALL_CLASS) + if ((INNER_LT.equals(inner) && type.symbol() == global.definitions.ANY_CLASS) || + (">:".equals(inner) && type.symbol() == global.definitions.ALL_CLASS)) return this; else return printType0(getTypeToPrintForType(type), inner); diff --git a/sources/scala/tools/scaladoc/TreeSymbols.java b/sources/scala/tools/scaladoc/TreeSymbols.java index b78236e8bd..79de09900e 100644 --- a/sources/scala/tools/scaladoc/TreeSymbols.java +++ b/sources/scala/tools/scaladoc/TreeSymbols.java @@ -29,7 +29,10 @@ class TreeSymbols { } public boolean contains(Symbol sym) { - return syms.contains(sym); + boolean res = syms.contains(sym); + if (!res && sym.isModuleClass()) + res = contains(sym.module()); + return res; } protected void traverse(Tree[] members) { |