summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-03-06 14:53:49 +0000
committerpaltherr <paltherr@epfl.ch>2004-03-06 14:53:49 +0000
commitb67498347516d936e7327c56f9e00fa759d12646 (patch)
tree86e3199d6c4ad11c62755f0ad9e52978dad353c1 /test/files
parent45df364c3beed61dbea70b1e1e1cc8420968fa66 (diff)
downloadscala-b67498347516d936e7327c56f9e00fa759d12646.tar.gz
scala-b67498347516d936e7327c56f9e00fa759d12646.tar.bz2
scala-b67498347516d936e7327c56f9e00fa759d12646.zip
- Removed alias scala.String
- Renamed in Definitions: OBJECT_CLASS into SCALAOBJECT_CLASS - Renamed in Definitions: JAVA_<X> into <X> Renamed in Definitions: - ANYREF_SYNCHRONIZED into OBJECT_SYNCHRONIZED
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/patterns.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/pos/patterns.scala b/test/files/pos/patterns.scala
index f996f89725..93907e7d52 100644
--- a/test/files/pos/patterns.scala
+++ b/test/files/pos/patterns.scala
@@ -1,6 +1,6 @@
trait Option[+a] {}
case class Some[a](x: a) extends Option[a] {
- override def toString(): scala.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
@@ -8,7 +8,7 @@ case class Some[a](x: a) extends Option[a] {
override def hashCode(): scala.Int = getClass().hashCode() * 41 + x.hashCode();
}
case object None extends Option[All] {
- override def toString(): scala.String = "None";
+ override def toString(): String = "None";
override def equals(that: Any) = that match {
case None => true
case _ => false
@@ -24,4 +24,4 @@ object test {
case Some(x) => println(x);
case None => println("nothing");
}
-} \ No newline at end of file
+}