diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-29 17:49:21 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-29 20:26:48 -0700 |
| commit | 71392585dc56950287135ac2582b516d7971bfbc (patch) | |
| tree | ca9b5a922b6912d75ef4828f85631e114cfe36ea /src/compiler/scala/reflect | |
| parent | 0bc2210f5541bfc70d0316bdb1ae89755f4aa70c (diff) | |
| download | scala-71392585dc56950287135ac2582b516d7971bfbc.tar.gz scala-71392585dc56950287135ac2582b516d7971bfbc.tar.bz2 scala-71392585dc56950287135ac2582b516d7971bfbc.zip | |
Cleaning up logging in specialization.
Diffstat (limited to 'src/compiler/scala/reflect')
| -rw-r--r-- | src/compiler/scala/reflect/internal/SymbolTable.scala | 6 | ||||
| -rw-r--r-- | src/compiler/scala/reflect/internal/Symbols.scala | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/compiler/scala/reflect/internal/SymbolTable.scala b/src/compiler/scala/reflect/internal/SymbolTable.scala index b58a0ef7d5..bb11ca634a 100644 --- a/src/compiler/scala/reflect/internal/SymbolTable.scala +++ b/src/compiler/scala/reflect/internal/SymbolTable.scala @@ -55,6 +55,12 @@ abstract class SymbolTable extends api.Universe log(msg + ": " + result) result } + private[scala] def logResultIf[T](msg: String, cond: T => Boolean)(result: T): T = { + if (cond(result)) + log(msg + ": " + result) + + result + } /** Are we compiling for Java SE? */ // def forJVM: Boolean diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala index f4039cf6d3..2019b92836 100644 --- a/src/compiler/scala/reflect/internal/Symbols.scala +++ b/src/compiler/scala/reflect/internal/Symbols.scala @@ -543,7 +543,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => /** Conditions where we omit the prefix when printing a symbol, to avoid * unpleasantries like Predef.String, $iw.$iw.Foo and <empty>.Bippy. */ - final def isOmittablePrefix = !settings.debug.value && ( + final def isOmittablePrefix = /*!settings.debug.value &&*/ ( UnqualifiedOwners(skipPackageObject) || isEmptyPrefix ) @@ -1191,9 +1191,9 @@ trait Symbols extends api.Symbols { self: SymbolTable => var ph = phase while (ph.prev.keepsTypeParams) ph = ph.prev - - if (ph ne phase) - debuglog("checking unsafeTypeParams(" + this + ") at: " + phase + " reading at: " + ph) + // + // if (ph ne phase) + // debuglog("checking unsafeTypeParams(" + this + ") at: " + phase + " reading at: " + ph) ph } @@ -2119,7 +2119,8 @@ trait Symbols extends api.Symbols { self: SymbolTable => else "" def defaultFlagMask = - if (settings.debug.value) -1L + if (isAbstractType) ExplicitFlags + else if (settings.debug.value) -1L else if (owner.isRefinementClass) ExplicitFlags & ~OVERRIDE else ExplicitFlags |