diff options
| author | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-03-03 14:53:47 +0000 |
|---|---|---|
| committer | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-03-03 14:53:47 +0000 |
| commit | 0b67c4eaa0ad73d6b6292d90eefef7701200bace (patch) | |
| tree | c641ffc85969d4193e61e900a1700718c358c805 /src/library | |
| parent | 9797470c1c626cb3a45901e2a65773e6ef625241 (diff) | |
| download | scala-0b67c4eaa0ad73d6b6292d90eefef7701200bace.tar.gz scala-0b67c4eaa0ad73d6b6292d90eefef7701200bace.tar.bz2 scala-0b67c4eaa0ad73d6b6292d90eefef7701200bace.zip | |
Elminiated a number of redundant calls to toString
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/runtime/Nothing$.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/runtime/Null$.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/xml/PCData.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/xml/Text.scala | 4 | ||||
| -rw-r--r-- | src/library/scala/xml/parsing/MarkupParser.scala | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/library/scala/runtime/Nothing$.scala b/src/library/scala/runtime/Nothing$.scala index e2d9ca8484..c101637ff7 100644 --- a/src/library/scala/runtime/Nothing$.scala +++ b/src/library/scala/runtime/Nothing$.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Nothing$.scala 10642 2007-04-06 09:23:03Z moors $ +// $Id$ package scala.runtime diff --git a/src/library/scala/runtime/Null$.scala b/src/library/scala/runtime/Null$.scala index e796b21a49..b27dd848e8 100644 --- a/src/library/scala/runtime/Null$.scala +++ b/src/library/scala/runtime/Null$.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Null$.scala 10642 2007-04-06 09:23:03Z moors $ +// $Id$ package scala.runtime diff --git a/src/library/scala/xml/PCData.scala b/src/library/scala/xml/PCData.scala index add773da03..545fcdc028 100644 --- a/src/library/scala/xml/PCData.scala +++ b/src/library/scala/xml/PCData.scala @@ -12,7 +12,7 @@ case class PCData(_data: String) extends Atom[String](_data) { throw new IllegalArgumentException("tried to construct PCData with null") final override def equals(x: Any) = x match { - case s: String => s.equals(data.toString()) + case s: String => s.equals(data) case s: Atom[_] => data == s.data case _ => false } diff --git a/src/library/scala/xml/Text.scala b/src/library/scala/xml/Text.scala index f78150b205..c766e34999 100644 --- a/src/library/scala/xml/Text.scala +++ b/src/library/scala/xml/Text.scala @@ -25,7 +25,7 @@ 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.toString()) + case s:String => s.equals(data) case s:Text => data == s.data case _ => false } @@ -37,6 +37,6 @@ case class Text(_data: String) extends Atom[String](_data) { * @return ... */ override def toString(sb: StringBuilder) = - Utility.escape(data.toString(), sb) + Utility.escape(data, sb) } diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala index 58d6858d7d..2c968fc240 100644 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/library/scala/xml/parsing/MarkupParser.scala @@ -112,7 +112,7 @@ trait MarkupParser extends AnyRef with TokenTests { self: MarkupParser with Mar m("encoding") match { case null => ; case Text(enc) => - if (!isValidIANAEncoding(enc.toString())) + if (!isValidIANAEncoding(enc)) reportSyntaxError("\"" + enc + "\" is not a valid encoding") else { info_enc = Some(enc.toString()) @@ -151,7 +151,7 @@ trait MarkupParser extends AnyRef with TokenTests { self: MarkupParser with Mar m("encoding") match { case null => ; case Text(enc) => - if (!isValidIANAEncoding(enc.toString())) + if (!isValidIANAEncoding(enc)) reportSyntaxError("\"" + enc + "\" is not a valid encoding") else { info_enc = Some(enc.toString()) |