From 0e7908665bd65ca8bb5c0ae26e69008764159922 Mon Sep 17 00:00:00 2001 From: Geoffrey Washburn Date: Tue, 4 Mar 2008 15:40:55 +0000 Subject: Eliminated a few more redundant uses of toString. --- src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala | 2 +- src/library/scala/xml/parsing/MarkupParser.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala index 3753f8abb9..930b166fbf 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala @@ -459,7 +459,7 @@ trait MarkupParsers {self: Parsers => if (ch == '?' && { sb.append(ch); nextch; ch == '>' }) { sb.length = sb.length - 1 nextch - return handle.procInstr(tmppos, n.toString(), sb.toString()) + return handle.procInstr(tmppos, n, sb.toString) } else sb.append(ch); nextch diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala index bf7c42bbe3..a315b3c704 100644 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/library/scala/xml/parsing/MarkupParser.scala @@ -115,7 +115,7 @@ trait MarkupParser extends AnyRef with TokenTests { self: MarkupParser with Mar if (!isValidIANAEncoding(enc)) reportSyntaxError("\"" + enc + "\" is not a valid encoding") else { - info_enc = Some(enc.toString()) + info_enc = Some(enc) n += 1 } } @@ -154,7 +154,7 @@ trait MarkupParser extends AnyRef with TokenTests { self: MarkupParser with Mar if (!isValidIANAEncoding(enc)) reportSyntaxError("\"" + enc + "\" is not a valid encoding") else { - info_enc = Some(enc.toString()) + info_enc = Some(enc) n += 1 } } @@ -734,7 +734,7 @@ trait MarkupParser extends AnyRef with TokenTests { self: MarkupParser with Mar if (ch == '?' && { sb.append( ch ); nextch; ch == '>' }) { sb.length = sb.length - 1; nextch; - return handle.procInstr(tmppos, n.toString(), sb.toString()); + return handle.procInstr(tmppos, n, sb.toString); } else sb.append(ch); nextch @@ -742,7 +742,7 @@ trait MarkupParser extends AnyRef with TokenTests { self: MarkupParser with Mar }; xToken('?') xToken('>') - handle.procInstr(tmppos, n.toString(), sb.toString()) + handle.procInstr(tmppos, n, sb.toString) } /** parse character data. -- cgit v1.2.3