summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-04-08 15:42:54 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-04-08 15:42:54 +0000
commit89274fde0f0bd7c57fa047923ae7a7ec4a95efcc (patch)
tree429040e5c78be7ed83d75d658a87737b118a91d0
parent93ab0ec361be4406982dd828d433a3e60a0864e3 (diff)
downloadscala-89274fde0f0bd7c57fa047923ae7a7ec4a95efcc.tar.gz
scala-89274fde0f0bd7c57fa047923ae7a7ec4a95efcc.tar.bz2
scala-89274fde0f0bd7c57fa047923ae7a7ec4a95efcc.zip
Fixed equality to be symmetric with respect to ...
Fixed equality to be symmetric with respect to Atom.
-rw-r--r--src/library/scala/xml/Text.scala3
-rw-r--r--src/library/scala/xml/Unparsed.scala3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/library/scala/xml/Text.scala b/src/library/scala/xml/Text.scala
index c766e34999..85976c74a9 100644
--- a/src/library/scala/xml/Text.scala
+++ b/src/library/scala/xml/Text.scala
@@ -25,8 +25,9 @@ case class Text(_data: String) extends Atom[String](_data) {
throw new java.lang.NullPointerException("tried to construct Text with null")
final override def equals(x: Any) = x match {
- case s:String => s.equals(data)
+ case s:String => s == data
case s:Text => data == s.data
+ case s:Atom[_] => data == s.data
case _ => false
}
diff --git a/src/library/scala/xml/Unparsed.scala b/src/library/scala/xml/Unparsed.scala
index 6bda932b89..10695d86a5 100644
--- a/src/library/scala/xml/Unparsed.scala
+++ b/src/library/scala/xml/Unparsed.scala
@@ -23,9 +23,10 @@ case class Unparsed(_data: String) extends Atom[String](_data) {
throw new java.lang.NullPointerException("tried to construct Unparsed with null")
final override def equals(x: Any) = x match {
- case s:String => s.equals(data)
+ case s:String => s == data
case s:Text => data == s.data
case s:Unparsed => data == s.data
+ case s:Atom[_] => data == s.data
case _ => false
}