aboutsummaryrefslogtreecommitdiff
path: root/src/dotty
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2014-03-04 13:55:07 +0100
committerodersky <odersky@gmail.com>2014-03-04 13:55:07 +0100
commit092456b806a132a64b7a4a98d0d2d30ca8114bbd (patch)
tree93c51b000fd19324b2bb65943215ad14f72e3ddd /src/dotty
parent340ec6150b205287e1c0f5a0422d2186c29bc086 (diff)
parentfd5b429d821b8a535df904ea853a83f9b8e57d58 (diff)
downloaddotty-092456b806a132a64b7a4a98d0d2d30ca8114bbd.tar.gz
dotty-092456b806a132a64b7a4a98d0d2d30ca8114bbd.tar.bz2
dotty-092456b806a132a64b7a4a98d0d2d30ca8114bbd.zip
Merge pull request #41 from DarkDimius/virtualFile
Use virtual file instead of temporary file for tests
Diffstat (limited to 'src/dotty')
-rw-r--r--src/dotty/tools/dotc/Run.scala16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/Run.scala b/src/dotty/tools/dotc/Run.scala
index cc9b8db3a..df7f433f9 100644
--- a/src/dotty/tools/dotc/Run.scala
+++ b/src/dotty/tools/dotc/Run.scala
@@ -6,7 +6,8 @@ import Contexts._, Periods._, Symbols._
import io.PlainFile
import util.{SourceFile, NoSource, Stats, SimpleMap}
import reporting.Reporter
-import java.io.FileWriter
+import java.io.{BufferedWriter, OutputStreamWriter}
+import scala.reflect.io.VirtualFile
class Run(comp: Compiler)(implicit ctx: Context) {
@@ -21,8 +22,12 @@ class Run(comp: Compiler)(implicit ctx: Context) {
}
}
- def compile(fileNames: List[String]): Unit = Stats.monitorHeartBeat {
+ def compile(fileNames: List[String]): Unit = {
val sources = fileNames map getSource
+ compileSources(sources)
+ }
+
+ def compileSources(sources: List[SourceFile]) = Stats.monitorHeartBeat {
if (sources forall (_.exists)) {
units = sources map (new CompilationUnit(_))
for (phase <- ctx.allPhases)
@@ -31,12 +36,11 @@ class Run(comp: Compiler)(implicit ctx: Context) {
}
def compile(sourceCode: String): Unit = {
- val tmpFile = java.io.File.createTempFile("dotty-source-tmp", ".scala")
- tmpFile.createNewFile()
- val writer = new FileWriter(tmpFile)
+ val virtualFile = new VirtualFile(sourceCode) // use source code as name as it's used for equals
+ val writer = new BufferedWriter(new OutputStreamWriter(virtualFile.output, "UTF-8")) // buffering is still advised by javadoc
writer.write(sourceCode)
writer.close()
- compile(List(tmpFile.getAbsolutePath))
+ compileSources(List(new SourceFile(virtualFile)))
}
/** Print summary; return # of errors encountered */