aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-02-12 12:50:05 +0100
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-03-18 11:11:00 +0100
commit5ae8b128eb3e694c3fbb83124371a9bbb9d698fe (patch)
tree18deff400fd767e6ebc567f4163a3a5d4eaf7ceb /src/dotty/tools
parentecb758206e6fddcca66a8aad5e45c9cf62f183f6 (diff)
downloaddotty-5ae8b128eb3e694c3fbb83124371a9bbb9d698fe.tar.gz
dotty-5ae8b128eb3e694c3fbb83124371a9bbb9d698fe.tar.bz2
dotty-5ae8b128eb3e694c3fbb83124371a9bbb9d698fe.zip
Make pickling output printer-dependent.
Diffstat (limited to 'src/dotty/tools')
-rw-r--r--src/dotty/tools/dotc/config/Printers.scala1
-rw-r--r--src/dotty/tools/dotc/core/pickling/TreeBuffer.scala3
-rw-r--r--src/dotty/tools/dotc/transform/Pickler.scala4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/config/Printers.scala b/src/dotty/tools/dotc/config/Printers.scala
index f8d7f8de5..d1738ee6f 100644
--- a/src/dotty/tools/dotc/config/Printers.scala
+++ b/src/dotty/tools/dotc/config/Printers.scala
@@ -30,4 +30,5 @@ object Printers {
val config = noPrinter
val transforms = noPrinter
val cyclicErrors = noPrinter
+ val pickling = noPrinter
} \ No newline at end of file
diff --git a/src/dotty/tools/dotc/core/pickling/TreeBuffer.scala b/src/dotty/tools/dotc/core/pickling/TreeBuffer.scala
index 870e97724..41a08d2ca 100644
--- a/src/dotty/tools/dotc/core/pickling/TreeBuffer.scala
+++ b/src/dotty/tools/dotc/core/pickling/TreeBuffer.scala
@@ -5,6 +5,7 @@ package pickling
import util.Util.{bestFit, dble}
import TastyBuffer.{Addr, AddrWidth}
+import config.Printers.pickling
class TreeBuffer extends TastyBuffer(1000000) {
@@ -157,6 +158,6 @@ class TreeBuffer extends TastyBuffer(1000000) {
} while (saved > 0 && length / saved < 100)
adjustOffsets()
val wasted = compress()
- println(s"original length: $origLength, compressed to: $length, wasted: $wasted") // DEBUG, for now.
+ pickling.println(s"original length: $origLength, compressed to: $length, wasted: $wasted") // DEBUG, for now.
}
}
diff --git a/src/dotty/tools/dotc/transform/Pickler.scala b/src/dotty/tools/dotc/transform/Pickler.scala
index 4d2e41644..c578b56c7 100644
--- a/src/dotty/tools/dotc/transform/Pickler.scala
+++ b/src/dotty/tools/dotc/transform/Pickler.scala
@@ -6,6 +6,7 @@ import TreeTransforms._
import Contexts.Context
import Decorators._
import pickling._
+import config.Printers
/** This miniphase pickles trees */
class Pickler extends MiniPhaseTransform { thisTransform =>
@@ -22,8 +23,7 @@ class Pickler extends MiniPhaseTransform { thisTransform =>
bytes.iterator.grouped(10).toList.zipWithIndex.map {
case (row, i) => s"${i}0: ${row.mkString(" ")}"
}
- //println(s"written:\n${rawBytes.mkString("\n")}")
- new TastyPrinter(bytes).printContents()
+ if (Printers.pickling ne Printers.noPrinter) new TastyPrinter(bytes).printContents()
}
tree
}