Browse files

remove most occurrences of ScalaObject

  • Loading branch information...
1 parent 3f12f2e commit d8f5c39465ce5e276cc5683465cdee16c934fc87 @harrah committed Jul 1, 2012
View
2 compile/Eval.scala
@@ -21,7 +21,7 @@ final class EvalException(msg: String) extends RuntimeException(msg)
// not thread safe, since it reuses a Global instance
final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Settings => Reporter, backing: Option[File])
{
- def this(mkReporter: Settings => Reporter, backing: Option[File]) = this(Nil, IO.classLocationFile[ScalaObject] :: Nil, mkReporter, backing)
+ def this(mkReporter: Settings => Reporter, backing: Option[File]) = this(Nil, IO.classLocationFile[Product] :: Nil, mkReporter, backing)
def this() = this(s => new ConsoleReporter(s), None)
backing.foreach(IO.createDirectory)
View
2 launch/src/test/scala/ScalaProviderTest.scala
@@ -57,7 +57,7 @@ object ScalaProviderTest extends Specification
tryScala(loader)
getScalaVersion(loader) must beEqualTo(versionValue)
}
- private def tryScala(loader: ClassLoader): Unit = Class.forName("scala.ScalaObject", false, loader).getClassLoader must be(loader)
+ private def tryScala(loader: ClassLoader): Unit = Class.forName("scala.Product", false, loader).getClassLoader must be(loader)
}
object LaunchTest
{
View
4 sbt/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
@@ -12,7 +12,7 @@ class Foo {
val g = new GenericRunnerSettings(System.err.println)
val settings = new Settings()
settings.classpath.value = location(classOf[Holder])
- settings.bootclasspath.value = settings.bootclasspath.value + / + location(classOf[ScalaObject]) + / + location(classOf[Settings])
+ settings.bootclasspath.value = settings.bootclasspath.value + / + location(classOf[Product]) + / + location(classOf[Settings])
val inter = new Interpreter(settings) {
override protected def parentClassLoader = Foo.this.getClass.getClassLoader
}
@@ -35,4 +35,4 @@ object Test
val foo = new Foo
args.foreach { arg => foo.eval(arg) == arg.toInt }
}
-}
+}
View
2 sbt/src/sbt-test/java/scala-library/src/main/java/test/R.java
@@ -2,5 +2,5 @@
public final class R {
public static final int y = 4;
- public static int x(scala.ScalaObject s) { return 3; }
+ public static int x(scala.Product s) { return 3; }
}
View
4 util/io/src/test/scala/FileUtilitiesSpecification.scala
@@ -23,7 +23,7 @@ object WriteContentSpecification extends Properties("Write content")
private def largeUnzip() =
{
- testUnzip[ScalaObject]
+ testUnzip[Product]
testUnzip[scala.tools.nsc.Global]
true
}
@@ -75,4 +75,4 @@ object WriteContentSpecification extends Properties("Write content")
private def withTemporaryFile[T](f: File => T): T =
withTemporaryDirectory { dir => f(new java.io.File(dir, "out")) }
-}
+}
View
4 util/process/src/test/scala/ProcessSpecification.scala
@@ -82,10 +82,10 @@ private[this] object ProcessSpecification extends Properties("Process I/O")
{
val ignore = echo // just for the compile dependency so that this test is rerun when TestedProcess.scala changes, not used otherwise
- val thisClasspath = List(getSource[ScalaObject], getSource[IO.type], getSource[SourceTag]).mkString(File.pathSeparator)
+ val thisClasspath = List(getSource[Product], getSource[IO.type], getSource[SourceTag]).mkString(File.pathSeparator)
"java -cp " + thisClasspath + " " + command
}
private def getSource[T : Manifest]: String =
IO.classLocationFile[T].getAbsolutePath
}
-private trait SourceTag
+private trait SourceTag

0 comments on commit d8f5c39

Please sign in to comment.