diff options
author | paltherr <paltherr@epfl.ch> | 2004-03-04 14:48:41 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-03-04 14:48:41 +0000 |
commit | 4c4bc2c147d69e317eba550f6ff6512a9221f231 (patch) | |
tree | d3dac8e8725a0853e492f5ed00c248ac972cb68b | |
parent | ef1bd748b8589eb34bc57df6b4d152f4ecf883b8 (diff) | |
download | scala-4c4bc2c147d69e317eba550f6ff6512a9221f231.tar.gz scala-4c4bc2c147d69e317eba550f6ff6512a9221f231.tar.bz2 scala-4c4bc2c147d69e317eba550f6ff6512a9221f231.zip |
- Removed duplicated code
-rw-r--r-- | sources/scala/tools/scaladoc/SymbolTablePrinter.java | 54 | ||||
-rw-r--r-- | sources/scalac/symtab/SymbolTablePrinter.java | 11 |
2 files changed, 14 insertions, 51 deletions
diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinter.java b/sources/scala/tools/scaladoc/SymbolTablePrinter.java index 2b4b359430..529b9108ad 100644 --- a/sources/scala/tools/scaladoc/SymbolTablePrinter.java +++ b/sources/scala/tools/scaladoc/SymbolTablePrinter.java @@ -58,7 +58,7 @@ public abstract class MySymbolTablePrinter extends SymbolTablePrinter { * * @param symbol */ - public SymbolTablePrinter printUsedSymbolName(Symbol symbol) { + public SymbolTablePrinter printSymbolName(Symbol symbol) { printSymbol(symbol, true); printSymbolUniqueId(symbol); return this; @@ -199,55 +199,11 @@ public abstract class MySymbolTablePrinter extends SymbolTablePrinter { } //######################################################################## - // Public Methods - Printing types + // Public Methods - Printing constants - /** - * Prints the type and prefix common part of the given type. - * - * @param type - */ - public SymbolTablePrinter printCommonPart(Type type) { - switch (type) { - case ThisType(Symbol sym): - if ((sym.isAnonymousClass() || sym.isCompoundSym()) && !global.debug) - return print("this"); - printUsedSymbolName(sym); - print(".this"); // vincent - return this; - - case TypeRef(Type pre, Symbol sym, Type[] args): - if (!global.debug) { - if (type.isFunctionType()) { - printFunctionType(args); - return this; - } - if (sym.isAnonymousClass() || sym.isCompoundSym()) - printTemplateType(pre.memberInfo(sym).parents()); - } - printPrefix(pre); - printUsedSymbolName(sym); - if (args.length != 0) { - print('['); - printTypes(args, ","); - print(']'); - } - return this; - - case SingleType(Type pre, Symbol sym): - printPrefix(pre); - printUsedSymbolName(sym); - return this; - - case ConstantType(Type base, AConstant value): - printType(base); -// print("("); -// print(value.toString()); -// print(")"); - return this; - - default: - return super.printCommonPart(type); - } + /** Prints the given constant value. */ + public SymbolTablePrinter printConstantValue(AConstant value) { + return this; } //######################################################################## diff --git a/sources/scalac/symtab/SymbolTablePrinter.java b/sources/scalac/symtab/SymbolTablePrinter.java index b4a8413630..82c2100fcc 100644 --- a/sources/scalac/symtab/SymbolTablePrinter.java +++ b/sources/scalac/symtab/SymbolTablePrinter.java @@ -517,8 +517,7 @@ public class SymbolTablePrinter { case SingleType(Type pre, Symbol sym): return printPrefix(pre).printSymbolName(sym); case ConstantType(Type base, AConstant value): - return printType(base) - .print("(").print(value.toString()).print(")"); + return printType(base).printConstantValue(value); case CompoundType(Type[] parts, Scope members): return printTypes(parts," with ").space() .printScope(members,true) @@ -584,6 +583,14 @@ public class SymbolTablePrinter { } //######################################################################## + // Public Methods - Printing constants + + /** Prints the given constant value. */ + public SymbolTablePrinter printConstantValue(AConstant value) { + return print("(").print(value.toString()).print(")"); + } + + //######################################################################## // Public Methods - Converting /** Returns the string representation of this printer. */ |