diff options
| author | paltherr <paltherr@epfl.ch> | 2004-02-29 15:45:37 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-02-29 15:45:37 +0000 |
| commit | 38ad1eeb910d867d46104d921b910aef4e4c3acc (patch) | |
| tree | 216b0132f07f524831704413103d03cb0740b233 /sources | |
| parent | 09d5285df36b51ffa1560163bc1f58ae00af7c41 (diff) | |
| download | scala-38ad1eeb910d867d46104d921b910aef4e4c3acc.tar.gz scala-38ad1eeb910d867d46104d921b910aef4e4c3acc.tar.bz2 scala-38ad1eeb910d867d46104d921b910aef4e4c3acc.zip | |
- Replaced use of fullName by use of types
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala | 6 | ||||
| -rw-r--r-- | sources/scala/tools/scalac/typechecker/Analyzer.scala | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala index cc7a89a9a7..618c74da9f 100644 --- a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala +++ b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala @@ -437,8 +437,10 @@ class TextTreePrinter(writer: PrintWriter) with TreePrinter { printType(tree); case Tree$Apply(fun, vargs) => - if (fun.isInstanceOf[Tree$TypeTerm]) - print(fun.`type`.resultType().symbol().fullName().toString()); + if (fun.isInstanceOf[Tree$TypeTerm]) { + val result = fun.`type`.resultType(); + print(Type.appliedType(result, Type.EMPTY_ARRAY).toString()); + } else print(fun); printArray(vargs, TXT_LEFT_PAREN, TXT_RIGHT_PAREN, TXT_COMMA_SP); diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala index 5cedf4cb16..aef94bc2f1 100644 --- a/sources/scala/tools/scalac/typechecker/Analyzer.scala +++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala @@ -104,8 +104,9 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer( if (sym.rawFirstInfo().isInstanceOf[SourceCompleter]) { sym.setInfo(Type.ErrorType); val kind = if (sym.name.isTermName()) "object " else "class "; + val prefix = if (sym.owner().isRoot()) "" else sym.owner().`type`().toString() + "."; throw new Type$Error("file " + unit.source + " does not define public " + - kind + sym.fullName()); + kind + prefix + sym.name); } else { descr.newSources.add(unit); } |