summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-07-30 12:38:26 -0700
committerPaul Phillips <paulp@improving.org>2012-07-30 13:05:44 -0700
commit82f818eeef2da5794ba9b9c9be5079238a74e167 (patch)
tree48cfe23e8462ed625ec3b43a07bc10dc55a26844
parentd1b7b24b0bfb808875339366a13ed00672767c16 (diff)
downloadscala-82f818eeef2da5794ba9b9c9be5079238a74e167.tar.gz
scala-82f818eeef2da5794ba9b9c9be5079238a74e167.tar.bz2
scala-82f818eeef2da5794ba9b9c9be5079238a74e167.zip
Fixed maddening "..." lately in printed types.
This must have been me when I eliminated some of the remaining distinction between TypeRef(_, moduleClass, Nil) and SingleType(_, moduleClass). Sorry I didn't track it down sooner. Review by anyone who is around because this is overdue.
-rw-r--r--src/reflect/scala/reflect/internal/Types.scala10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala
index 3a218c18f1..8972dfa828 100644
--- a/src/reflect/scala/reflect/internal/Types.scala
+++ b/src/reflect/scala/reflect/internal/Types.scala
@@ -2078,7 +2078,8 @@ trait Types extends api.Types { self: SymbolTable =>
override protected def finishPrefix(rest: String) = objectPrefix + rest
override def directObjectString = super.safeToString
override def toLongString = toString
- override def safeToString = narrow.toString
+ override def safeToString = prefixString + "type"
+ override def prefixString = if (sym.isOmittablePrefix) "" else prefix.prefixString + sym.nameString + "."
}
class PackageTypeRef(pre0: Type, sym0: Symbol) extends ModuleTypeRef(pre0, sym0) {
require(sym.isPackageClass, sym)
@@ -6950,8 +6951,13 @@ trait Types extends api.Types { self: SymbolTable =>
private var tostringRecursions = 0
protected def typeToString(tpe: Type): String =
- if (tostringRecursions >= maxTostringRecursions)
+ if (tostringRecursions >= maxTostringRecursions) {
+ debugwarn("Exceeded recursion depth attempting to print type.")
+ if (settings.debug.value)
+ (new Throwable).printStackTrace
+
"..."
+ }
else
try {
tostringRecursions += 1