diff options
author | Paul Phillips <paulp@improving.org> | 2010-07-02 06:26:29 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-07-02 06:26:29 +0000 |
commit | 328651c39a3d35a2aaa0e09e7bb7a59bfddf90b3 (patch) | |
tree | ef82880842ec50fbcbd088b0cfad924f11b05c6c | |
parent | fbc453397552983a2c2a229cca8f7c13a641b9c7 (diff) | |
download | scala-328651c39a3d35a2aaa0e09e7bb7a59bfddf90b3.tar.gz scala-328651c39a3d35a2aaa0e09e7bb7a59bfddf90b3.tar.bz2 scala-328651c39a3d35a2aaa0e09e7bb7a59bfddf90b3.zip |
Made a null output sink and applied it to the r...
Made a null output sink and applied it to the recently failing test,
which is displaying non-deterministic output by way of the underlying
parser. No review.
-rw-r--r-- | src/compiler/scala/tools/nsc/io/NullPrintStream.scala | 19 | ||||
-rw-r--r-- | test/files/run/xml-loop-bug.check | bin | 280 -> 0 bytes | |||
-rw-r--r-- | test/files/run/xml-loop-bug.scala | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/io/NullPrintStream.scala b/src/compiler/scala/tools/nsc/io/NullPrintStream.scala new file mode 100644 index 0000000000..9340796a83 --- /dev/null +++ b/src/compiler/scala/tools/nsc/io/NullPrintStream.scala @@ -0,0 +1,19 @@ +/* NSC -- new Scala compiler + * Copyright 2005-2010 LAMP/EPFL + * @author Paul Phillips + */ + +package scala.tools.nsc +package io + +import java.io.{ PrintStream, ByteArrayOutputStream } + +/** A sink for when you want to discard all output. + */ +class NullPrintStream extends PrintStream(new ByteArrayOutputStream()) { } + +object NullPrintStream extends NullPrintStream { + def setOut() = Console setOut this + def setErr() = Console setErr this + def setOutAndErr() = { setOut() ; setErr() } +} diff --git a/test/files/run/xml-loop-bug.check b/test/files/run/xml-loop-bug.check Binary files differdeleted file mode 100644 index a31b93d0cf..0000000000 --- a/test/files/run/xml-loop-bug.check +++ /dev/null diff --git a/test/files/run/xml-loop-bug.scala b/test/files/run/xml-loop-bug.scala index acb3c5c6da..3894779f7c 100644 --- a/test/files/run/xml-loop-bug.scala +++ b/test/files/run/xml-loop-bug.scala @@ -1,5 +1,6 @@ object Test { def main(args: Array[String]): Unit = { + scala.tools.nsc.io.NullPrintStream.setOutAndErr() scala.xml.parsing.ConstructingParser.fromSource(scala.io.Source.fromString("<!DOCTYPE xmeml SYSTEM> <xmeml> <sequence> </sequence> </xmeml> "), true).document.docElem } } |