diff options
author | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
commit | 40707e0f49eb991ba1cbc07bdb1bcf65a640006b (patch) | |
tree | 00b6b70e32b941f9aa4502a91ad07fd0fc807e3d /src/partest | |
parent | 8a78d3748319811d7b0adc80d4ee8926dc8d90bf (diff) | |
download | scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.gz scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.bz2 scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.zip |
switch to unnested packages.
Diffstat (limited to 'src/partest')
15 files changed, 33 insertions, 18 deletions
diff --git a/src/partest/scala/tools/partest/nest/AntRunner.scala b/src/partest/scala/tools/partest/nest/AntRunner.scala index 9939a6b0c3..62bc4af75f 100644 --- a/src/partest/scala/tools/partest/nest/AntRunner.scala +++ b/src/partest/scala/tools/partest/nest/AntRunner.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.File diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index 0e48d58b8b..993771bcdc 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import scala.tools.nsc.{Global, Settings, CompilerCommand, FatalError} import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala index e33e12af4c..33bcb11b70 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, FilenameFilter, IOException, StringWriter} import java.net.URI diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala index c353ea6f06..1bce0fe792 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, PrintStream, FileOutputStream, BufferedReader, InputStreamReader, StringWriter, PrintWriter} @@ -131,7 +132,7 @@ class ConsoleRunner extends DirectRunner with RunnerUtils { fileManager.latestCompFile.getParentFile.getParentFile.getCanonicalFile NestUI.outline("Scala compiler classes in: "+dir+"\n") - NestUI.outline("Scala version is: "+nsc.Properties.versionMsg+"\n") + NestUI.outline("Scala version is: "+scala.tools.nsc.Properties.versionMsg+"\n") NestUI.outline("Scalac options are: "+fileManager.SCALAC_OPTS+"\n") val vmBin = javaHome + File.separator + "bin" diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 7a610869a1..ba3c2439a5 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, PrintStream, FileOutputStream, BufferedReader, InputStreamReader, StringWriter, PrintWriter} diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index 9c87e7ed6d..bdce6c8439 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, FilenameFilter, IOException, StringWriter} import java.net.URI diff --git a/src/partest/scala/tools/partest/nest/NestRunner.scala b/src/partest/scala/tools/partest/nest/NestRunner.scala index 2b1115455c..9275c1c668 100644 --- a/src/partest/scala/tools/partest/nest/NestRunner.scala +++ b/src/partest/scala/tools/partest/nest/NestRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest object NestRunner { def main(args: Array[String]) { diff --git a/src/partest/scala/tools/partest/nest/NestUI.scala b/src/partest/scala/tools/partest/nest/NestUI.scala index ad9111d3a9..115582f7b9 100644 --- a/src/partest/scala/tools/partest/nest/NestUI.scala +++ b/src/partest/scala/tools/partest/nest/NestUI.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.PrintWriter diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala index 2c5493f9e1..5e9b9af0c1 100644 --- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala +++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest /* This class is used to load an instance of DirectRunner using * a custom class loader. diff --git a/src/partest/scala/tools/partest/nest/RunnerUtils.scala b/src/partest/scala/tools/partest/nest/RunnerUtils.scala index 12d0fcd217..2743da7bc5 100644 --- a/src/partest/scala/tools/partest/nest/RunnerUtils.scala +++ b/src/partest/scala/tools/partest/nest/RunnerUtils.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest trait RunnerUtils { diff --git a/src/partest/scala/tools/partest/nest/StreamAppender.scala b/src/partest/scala/tools/partest/nest/StreamAppender.scala index 4ae7cbda27..1dc4ec1dd2 100644 --- a/src/partest/scala/tools/partest/nest/StreamAppender.scala +++ b/src/partest/scala/tools/partest/nest/StreamAppender.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{Writer, PrintWriter, Reader, BufferedReader, IOException, InputStream, StringWriter, InputStreamReader, diff --git a/src/partest/scala/tools/partest/nest/TestFile.scala b/src/partest/scala/tools/partest/nest/TestFile.scala index d7ec9c64cf..b8223a9202 100644 --- a/src/partest/scala/tools/partest/nest/TestFile.scala +++ b/src/partest/scala/tools/partest/nest/TestFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io.{File, BufferedReader, FileReader} import scala.tools.nsc.Settings diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 0ecd9986f3..bb51a5049b 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.partest.nest +package scala.tools.partest +package nest import java.io._ import java.net.{URLClassLoader, URL} @@ -15,7 +16,7 @@ import scala.tools.nsc.{ObjectRunner, GenericRunnerCommand} import scala.actors.{Actor, Exit, TIMEOUT} import scala.actors.Actor._ -import scalap.scalax.rules.scalasig.{ByteCode, ClassFileParser, ScalaSigAttributeParsers} +import scala.tools.scalap.scalax.rules.scalasig.{ByteCode, ClassFileParser, ScalaSigAttributeParsers} case class RunTests(kind: String, files: List[File]) case class Results(succ: Int, fail: Int, logs: List[LogFile], outdirs: List[File]) diff --git a/src/partest/scala/tools/partest/utils/PrintMgr.scala b/src/partest/scala/tools/partest/utils/PrintMgr.scala index dae6ac448e..2927605160 100644 --- a/src/partest/scala/tools/partest/utils/PrintMgr.scala +++ b/src/partest/scala/tools/partest/utils/PrintMgr.scala @@ -8,7 +8,8 @@ // $Id$ -package scala.tools.partest.utils +package scala.tools.partest +package utils /** * @author Thomas Hofer diff --git a/src/partest/scala/tools/partest/utils/Properties.scala b/src/partest/scala/tools/partest/utils/Properties.scala index d5fc60db65..b2c9ce3408 100644 --- a/src/partest/scala/tools/partest/utils/Properties.scala +++ b/src/partest/scala/tools/partest/utils/Properties.scala @@ -8,10 +8,11 @@ // $Id$ -package scala.tools.partest.utils +package scala.tools.partest +package utils /** Loads partest.properties from the jar. */ object Properties extends scala.util.PropertiesTrait { protected def propCategory = "partest" protected def pickJarBasedOn = classOf[Application] -}
\ No newline at end of file +} |