summaryrefslogtreecommitdiff
path: root/test/files/pos/patterns.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-10-13 19:06:41 +0000
committermichelou <michelou@epfl.ch>2006-10-13 19:06:41 +0000
commitaf511469a6c4323488e1e263cc2f45786f276672 (patch)
tree507ccb0fee6fe1c1b7ef9ea2955c8b3d4d7bbbbe /test/files/pos/patterns.scala
parentec04190880e49b0d32651fe04e27a67bd952bcdd (diff)
downloadscala-af511469a6c4323488e1e263cc2f45786f276672.tar.gz
scala-af511469a6c4323488e1e263cc2f45786f276672.tar.bz2
scala-af511469a6c4323488e1e263cc2f45786f276672.zip
changed "All/AllRef" to "Nothing/Null" in test/...
changed "All/AllRef" to "Nothing/Null" in test/library/compiler
Diffstat (limited to 'test/files/pos/patterns.scala')
-rw-r--r--test/files/pos/patterns.scala18
1 files changed, 10 insertions, 8 deletions
diff --git a/test/files/pos/patterns.scala b/test/files/pos/patterns.scala
index 93907e7d52..85d8a1b7da 100644
--- a/test/files/pos/patterns.scala
+++ b/test/files/pos/patterns.scala
@@ -1,27 +1,29 @@
trait Option[+a] {}
+
case class Some[a](x: a) extends Option[a] {
- override def toString(): String = "Some(" + x + ")";
+ override def toString(): String = "Some(" + x + ")"
override def equals(that: Any): Boolean = that match {
case Some(x) => this.x == x
case _ => false
}
- override def hashCode(): scala.Int = getClass().hashCode() * 41 + x.hashCode();
+ override def hashCode(): Int = getClass().hashCode() * 41 + x.hashCode()
}
-case object None extends Option[All] {
- override def toString(): String = "None";
+
+case object None extends Option[Nothing] {
+ override def toString(): String = "None"
override def equals(that: Any) = that match {
case None => true
case _ => false
}
- override def hashCode(): scala.Int = getClass().hashCode();
+ override def hashCode(): Int = getClass().hashCode()
}
object test {
- def println(str: String): Unit = java.lang.System.out.println(str);
+ def println(str: String): Unit = java.lang.System.out.println(str)
def print(opt: Option[String]) = opt match {
- case Some(x) => println(x);
- case None => println("nothing");
+ case Some(x) => println(x)
+ case None => println("nothing")
}
}