summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2010-06-16 15:36:08 +0000
committerMartin Odersky <odersky@gmail.com>2010-06-16 15:36:08 +0000
commit806f2f67c3ada95c08a9956c47ab1bfaf129453b (patch)
tree08d69aafe3db7e67cb000e3c0483b08e0efbdbb7 /src/compiler/scala/tools/nsc
parent2db73a027a90d06f764d5d326c2edc708c5030b1 (diff)
downloadscala-806f2f67c3ada95c08a9956c47ab1bfaf129453b.tar.gz
scala-806f2f67c3ada95c08a9956c47ab1bfaf129453b.tar.bz2
scala-806f2f67c3ada95c08a9956c47ab1bfaf129453b.zip
Imporved printing of private[C] in TreePrinters.
Diffstat (limited to 'src/compiler/scala/tools/nsc')
-rw-r--r--src/compiler/scala/tools/nsc/ast/TreePrinters.scala2
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Analyzer.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
index ddc1c3169a..08f764a76f 100644
--- a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
@@ -117,7 +117,7 @@ trait TreePrinters { trees: SymbolTable =>
def pw = tree.symbol.privateWithin
val args =
if (tree.symbol == NoSymbol) (mods.flags, mods.privateWithin)
- else if (pw == NoSymbol || pw == tree.symbol.owner) (tree.symbol.flags, "")
+ else if (pw == NoSymbol) (tree.symbol.flags, "")
else (tree.symbol.flags, pw.name)
printFlags(args._1, args._2.toString)
diff --git a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
index 63e5a9fb25..80f833f03d 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
@@ -74,7 +74,7 @@ trait Analyzer extends AnyRef
val runsRightAfter = Some("packageobjects")
def newPhase(_prev: Phase): StdPhase = new StdPhase(_prev) {
override def keepsTypeParams = false
- resetTyper()
+ resetTyper() // this does not in fact to the reset for each compilation run!
override def run {
val start = startTimer(typerNanos)
currentRun.units foreach applyPhase