summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2006-06-22 14:05:52 +0000
committerLex Spoon <lex@lexspoon.org>2006-06-22 14:05:52 +0000
commit6e372ca4770ff87d81ceb540b87a1f66fc1055aa (patch)
tree41c9f2401129da13d2eb2d08da80a99e9d9ed846
parent511aa6f2e4103d2742259902c0b1825a9c9650e1 (diff)
downloadscala-6e372ca4770ff87d81ceb540b87a1f66fc1055aa.tar.gz
scala-6e372ca4770ff87d81ceb540b87a1f66fc1055aa.tar.bz2
scala-6e372ca4770ff87d81ceb540b87a1f66fc1055aa.zip
tweaked the output and the check file
-rw-r--r--test/files/run/impconvtimes.check2
-rw-r--r--test/files/run/impconvtimes.scala (renamed from test/pending/run/impconvtimes.scala)2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/impconvtimes.check b/test/files/run/impconvtimes.check
index bc51b7ffe2..f08574de3e 100644
--- a/test/files/run/impconvtimes.check
+++ b/test/files/run/impconvtimes.check
@@ -1 +1 @@
-3.0 * Hour = Measure(3.0, Test.Hour) \ No newline at end of file
+3.0 * Hour = Measure(3.0,Hour)
diff --git a/test/pending/run/impconvtimes.scala b/test/files/run/impconvtimes.scala
index a69610b94a..8c5ab61779 100644
--- a/test/pending/run/impconvtimes.scala
+++ b/test/files/run/impconvtimes.scala
@@ -1,7 +1,7 @@
object Test {
abstract class Unit
object NoUnit extends Unit
- object Hour extends Unit
+ object Hour extends Unit { override def toString = "Hour" }
case class Measure(scalar: Double, unit: Unit) {
def *(newUnit: Unit) = Measure(scalar, newUnit)