diff options
59 files changed, 85 insertions, 93 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 4ee929d24b..4be668d950 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -24,6 +24,9 @@ import scala.xml._ abstract class DocGenerator extends Models { import global._ import DocUtil._ + import compat.StringBuilder + + def outdir: String def windowTitle: String def documentTitle: String @@ -39,7 +42,7 @@ abstract class DocGenerator extends Models { def relative: String = { assert(path != null) var idx = 0 - var ct = new StringBuffer + var ct = new StringBuilder while (idx != -1) { idx = path.indexOf('/', idx) //System.err.println(path + " idx=" + idx) @@ -244,7 +247,7 @@ abstract class DocGenerator extends Models { NodeSeq.Empty else { def attrFor(attr: AttrInfo): Node = { - val buf = new StringBuffer + val buf = new StringBuilder val Triple(tpe, args, nvPairs) = attr val name = aref(urlFor(tpe.symbol), contentFrame, tpe.toString) if (!args.isEmpty) @@ -658,7 +661,6 @@ abstract class DocGenerator extends Models { } def parse(str: String): NodeSeq = { - import scala.runtime.compat.StringBuilder new SpecialNode { def label = "#PCDATA" def toString(sb: StringBuilder): StringBuilder = { @@ -712,8 +714,8 @@ abstract class DocGenerator extends Models { comment0 = comment0.substring(JDOC_START.length()) assert(comment0 endsWith JDOC_END) comment0 = comment0.substring(0, comment0.length() - JDOC_END.length()) - val buf = new StringBuffer - type AttrDescr = Triple[String, String, StringBuffer] + val buf = new StringBuilder + type AttrDescr = Triple[String, String, StringBuilder] val attributes = new ListBuffer[AttrDescr] var attr: AttrDescr = null val tok = new StringTokenizer(comment0, LINE_SEPARATOR) @@ -721,12 +723,12 @@ abstract class DocGenerator extends Models { val s = tok.nextToken.replaceFirst("\\p{Space}?\\*", "") val mat1 = pat1.matcher(s) if (mat1.matches) { - attr = Triple(mat1.group(1), null, new StringBuffer(mat1.group(2))) + attr = Triple(mat1.group(1), null, new StringBuilder(mat1.group(2))) attributes += attr } else { val mat2 = pat2.matcher(s) if (mat2.matches) { - attr = Triple(mat2.group(1), mat2.group(2), new StringBuffer(mat2.group(3))) + attr = Triple(mat2.group(1), mat2.group(2), new StringBuilder(mat2.group(3))) attributes += attr } else if (attr != null) attr._3.append(s + LINE_SEPARATOR) diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala index c435186e85..c1504627ef 100644 --- a/src/library/scala/Console.scala +++ b/src/library/scala/Console.scala @@ -209,13 +209,11 @@ object Console { /** Read a float value from the terminal. */ - def readFloat: Float = - scala.runtime.compat.Platform.parseFloat(in.readLine()) + def readFloat: Float = compat.Platform.parseFloat(in.readLine()) /** Read a double value from the terminal. */ - def readDouble: Double = - scala.runtime.compat.Platform.parseDouble(in.readLine()) + def readDouble: Double = compat.Platform.parseDouble(in.readLine()) /** Read in some structured input, specified by a format specifier. * See class <code>java.text.MessageFormat</code> for details of diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index 146a05e2d7..b92ad6ca4e 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -12,7 +12,7 @@ package scala -import scala.collection.mutable._ +import scala.collection.mutable.{Map, HashMap} /** * <p>The class <code>Enumeration</code> provides the same functionality as the @@ -45,7 +45,7 @@ abstract class Enumeration(initial: Int, names: String*) { def this(names: String*) = this(0, names: _*) def name = { - val cname = scala.runtime.compat.Platform.getClassName(this) + val cname = compat.Platform.getClassName(this) if (cname.endsWith("$")) cname.substring(0, cname.length() - 1) else if (cname.endsWith("$class")) diff --git a/src/library/scala/List.scala b/src/library/scala/List.scala index caf3757667..6ef56ce773 100644 --- a/src/library/scala/List.scala +++ b/src/library/scala/List.scala @@ -11,7 +11,6 @@ package scala -import scala.runtime.compat.StringBuilder import scala.collection.mutable.ListBuffer import Predef._ @@ -215,7 +214,7 @@ object List { * @return the list in form of a string. */ def toString(xs: List[Char]): String = { - val sb = new StringBuilder() + val sb = new compat.StringBuilder() var xc = xs while (!xc.isEmpty) { sb.append(xc.head) diff --git a/src/library/scala/Seq.scala b/src/library/scala/Seq.scala index 3dd86eb4c9..a52c54c020 100644 --- a/src/library/scala/Seq.scala +++ b/src/library/scala/Seq.scala @@ -11,7 +11,6 @@ package scala -import scala.runtime.compat.StringBuilder object Seq { @@ -194,7 +193,7 @@ trait Seq[+A] extends AnyRef with PartialFunction[Int, A] with Iterable[A] { * @return a string representation of this sequence. */ def mkString(start: String, sep: String, end: String): String = { - val buf = new StringBuilder() + val buf = new compat.StringBuilder() buf.append(start) val elems = elements if (elems.hasNext) buf.append(elems.next) diff --git a/src/library/scala/Stream.scala b/src/library/scala/Stream.scala index 2da67a1ea5..d5a8f3f2e5 100644 --- a/src/library/scala/Stream.scala +++ b/src/library/scala/Stream.scala @@ -11,7 +11,7 @@ package scala -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** * The object <code>Stream</code> provides helper functions diff --git a/src/library/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala index b999756bcb..701af8d9ac 100644 --- a/src/library/scala/collection/BitSet.scala +++ b/src/library/scala/collection/BitSet.scala @@ -23,8 +23,8 @@ package scala.collection abstract class BitSet extends AnyRef with Function1[Int,Boolean] with Set[Int] { - import scala.runtime.compat.Platform.arraycopy - import scala.runtime.compat.Math.min + import compat.Platform.arraycopy + import compat.Math.min /** number of bits in this bitset */ def size: Int diff --git a/src/library/scala/collection/immutable/BitSet.scala b/src/library/scala/collection/immutable/BitSet.scala index 87424f346f..f9c3f1f496 100644 --- a/src/library/scala/collection/immutable/BitSet.scala +++ b/src/library/scala/collection/immutable/BitSet.scala @@ -29,7 +29,7 @@ package scala.collection.immutable class BitSet(val size: Int, val capacity: Int, ba: Array[Int], copy: Boolean) extends collection.BitSet { - import scala.runtime.compat.Platform.arraycopy + import compat.Platform.arraycopy protected val arr: Array[Int] = if (copy) { diff --git a/src/library/scala/collection/immutable/Tree.scala b/src/library/scala/collection/immutable/Tree.scala index 19644c797c..c21520cffe 100644 --- a/src/library/scala/collection/immutable/Tree.scala +++ b/src/library/scala/collection/immutable/Tree.scala @@ -227,7 +227,7 @@ private case class INode[A <% Ordered[A],B](t1: GBTree[A,B], balance_p(GBNode(key, value, smaller, t1),smaller); protected def balance_p(t:GBTree[A,B],subtree:GBTree[A,B]):InsertTree[A,B] = { val Pair(subHeight, subSize) = subtree.count - val totalHeight = 2 * scala.runtime.compat.Math.max(height, subHeight) + val totalHeight = 2 * compat.Math.max(height, subHeight) val totalSize = size + subSize + 1 val BalanceHeight = totalSize * totalSize if (totalHeight > BalanceHeight) ITree(t.balance(totalSize)) @@ -299,7 +299,7 @@ private case class GBNode[A <% Ordered[A],B](key: A, if (mySize == 1) Pair(1, mySize) else - Pair(2 * scala.runtime.compat.Math.max(sHeight, bHeight), mySize) + Pair(2 * compat.Math.max(sHeight, bHeight), mySize) } def isDefinedAt(sKey: A): Boolean = diff --git a/src/library/scala/collection/mutable/BitSet.scala b/src/library/scala/collection/mutable/BitSet.scala index d8dc877e57..7a518cfc0d 100644 --- a/src/library/scala/collection/mutable/BitSet.scala +++ b/src/library/scala/collection/mutable/BitSet.scala @@ -24,7 +24,7 @@ package scala.collection.mutable [serializable] class BitSet(initSize: Int) extends collection.BitSet with Set[Int] { - import scala.runtime.compat.Platform.arraycopy + import compat.Platform.arraycopy /** default constructor, initial size of 512 bits */ def this() = this(0); diff --git a/src/library/scala/collection/mutable/ResizableArray.scala b/src/library/scala/collection/mutable/ResizableArray.scala index 97599617ab..5d3fd7ecfd 100644 --- a/src/library/scala/collection/mutable/ResizableArray.scala +++ b/src/library/scala/collection/mutable/ResizableArray.scala @@ -19,7 +19,6 @@ package scala.collection.mutable * @version 1.0, 03/05/2004 */ trait ResizableArray[A] extends Seq[A] { - import scala.runtime.compat.Platform.arraycopy protected val initialSize: Int = 16 protected var array: Array[A] = new Array[A](initialSize) @@ -36,7 +35,7 @@ trait ResizableArray[A] extends Seq[A] { override def toArray[B >: A]: Array[B] = { val narr = new Array[B](size) - arraycopy(array, 0, narr, 0, size) + Array.copy(array, 0, narr, 0, size) narr } @@ -57,7 +56,7 @@ trait ResizableArray[A] extends Seq[A] { while (n > newsize) newsize = newsize * 2 val newar: Array[A] = new Array(newsize) - arraycopy(array, 0, newar, 0, size) + Array.copy(array, 0, newar, 0, size) array = newar } @@ -72,6 +71,6 @@ trait ResizableArray[A] extends Seq[A] { /** Move parts of the array. */ protected def copy(m: Int, n: Int, len: Int) = - arraycopy(array, m, array, n, len) + Array.copy(array, m, array, n, len) } diff --git a/src/library/scala/runtime/compat/Math.scala b/src/library/scala/compat/Math.scala index 7545587451..81b5a54e00 100644 --- a/src/library/scala/runtime/compat/Math.scala +++ b/src/library/scala/compat/Math.scala @@ -9,7 +9,7 @@ // $Id$ -package scala.runtime.compat; +package scala.compat; object Math { diff --git a/src/library/scala/runtime/compat/Platform.scala b/src/library/scala/compat/Platform.scala index c618ba7df3..d988df7e3b 100644 --- a/src/library/scala/runtime/compat/Platform.scala +++ b/src/library/scala/compat/Platform.scala @@ -9,7 +9,7 @@ // $Id$ -package scala.runtime.compat; +package scala.compat; object Platform { diff --git a/src/library/scala/runtime/compat/StringBuilder.scala b/src/library/scala/compat/StringBuilder.scala index 0d3e0da47d..a71c9004f2 100644 --- a/src/library/scala/runtime/compat/StringBuilder.scala +++ b/src/library/scala/compat/StringBuilder.scala @@ -9,7 +9,7 @@ // $Id$ -package scala.runtime.compat +package scala.compat class StringBuilder { val str = new StringBuffer() diff --git a/src/library/scala/io/Position.scala b/src/library/scala/io/Position.scala index 6c7d6bbb83..fbb211ba83 100644 --- a/src/library/scala/io/Position.scala +++ b/src/library/scala/io/Position.scala @@ -11,7 +11,7 @@ package scala.io -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** convenience methods to encode line and column number in one * single integer. The encode line (column) diff --git a/src/library/scala/io/Source.scala b/src/library/scala/io/Source.scala index 265d163613..4087ded64e 100644 --- a/src/library/scala/io/Source.scala +++ b/src/library/scala/io/Source.scala @@ -13,7 +13,7 @@ package scala.io import java.io.{File, FileInputStream, PrintStream} -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** This object provides convenience methods to create an iterable * representation of a source file. diff --git a/src/library/scala/runtime/RichString.scala b/src/library/scala/runtime/RichString.scala index 675ebfb008..6744d302a3 100755 --- a/src/library/scala/runtime/RichString.scala +++ b/src/library/scala/runtime/RichString.scala @@ -7,8 +7,10 @@ \* */ // $Id$ + + package scala.runtime -import scala.runtime.compat.StringBuilder + final class RichString(s: String) { @@ -72,7 +74,7 @@ final class RichString(s: String) { * `marginChar' from the line. */ def stripMargin(marginChar: Char): String = { - val buf = new StringBuilder() + val buf = new scala.compat.StringBuilder() for (val line <- linesWithSeparators) { val len = line.length var index = 0; diff --git a/src/library/scala/testing/SUnit.scala b/src/library/scala/testing/SUnit.scala index 367b599349..40db46eb81 100644 --- a/src/library/scala/testing/SUnit.scala +++ b/src/library/scala/testing/SUnit.scala @@ -12,7 +12,7 @@ package scala.testing import scala.collection.mutable.ArrayBuffer -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** * <p> diff --git a/src/library/scala/util/automata/BaseBerrySethi.scala b/src/library/scala/util/automata/BaseBerrySethi.scala index fddf31021d..522e3dc903 100644 --- a/src/library/scala/util/automata/BaseBerrySethi.scala +++ b/src/library/scala/util/automata/BaseBerrySethi.scala @@ -16,7 +16,7 @@ import scala.util.regexp.Base import scala.collection.mutable import scala.collection.immutable -import scala.runtime.compat.Platform +import compat.Platform /** this turns a regexp over A into a NondetWorkAutom over A using the * celebrated position automata construction (also called Berry-Sethi or diff --git a/src/library/scala/util/automata/DetWordAutom.scala b/src/library/scala/util/automata/DetWordAutom.scala index 3eb148b134..e0075e5bc8 100644 --- a/src/library/scala/util/automata/DetWordAutom.scala +++ b/src/library/scala/util/automata/DetWordAutom.scala @@ -56,7 +56,7 @@ abstract class DetWordAutom[T <: AnyRef] { } override def toString() = { - val sb = new scala.runtime.compat.StringBuilder() + val sb = new compat.StringBuilder() sb.append("[DetWordAutom nstates=") sb.append(nstates) sb.append(" finals=") diff --git a/src/library/scala/util/automata/NondetWordAutom.scala b/src/library/scala/util/automata/NondetWordAutom.scala index ce4f3dd0b4..660ebc1c99 100644 --- a/src/library/scala/util/automata/NondetWordAutom.scala +++ b/src/library/scala/util/automata/NondetWordAutom.scala @@ -86,7 +86,7 @@ abstract class NondetWordAutom[T <: AnyRef] { } override def toString() = { - val sb = new scala.runtime.compat.StringBuilder() + val sb = new compat.StringBuilder() sb.append("[NondetWordAutom nstates=") sb.append(nstates) sb.append(" finals=") diff --git a/src/library/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala index 21fbaa3b87..8786ada85c 100644 --- a/src/library/scala/util/automata/SubsetConstruction.scala +++ b/src/library/scala/util/automata/SubsetConstruction.scala @@ -62,7 +62,7 @@ class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) { def selectTag(Q:BitSet, finals:Array[Int]) = { val it = Q.elements; - var mintag = scala.runtime.compat.Math.MAX_INT; + var mintag = compat.Math.MAX_INT; while(it.hasNext) { val tag = finals(it.next); if((0 < tag) && (tag < mintag)) diff --git a/src/library/scala/util/parsing/SimpleTokenizer.scala b/src/library/scala/util/parsing/SimpleTokenizer.scala index b8be4f3c12..7ac76fac79 100644 --- a/src/library/scala/util/parsing/SimpleTokenizer.scala +++ b/src/library/scala/util/parsing/SimpleTokenizer.scala @@ -11,7 +11,7 @@ package scala.util.parsing -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** This class ... * diff --git a/src/library/scala/xml/Atom.scala b/src/library/scala/xml/Atom.scala index 643df24032..1517856f6f 100644 --- a/src/library/scala/xml/Atom.scala +++ b/src/library/scala/xml/Atom.scala @@ -11,7 +11,7 @@ package scala.xml; -import scala.runtime.compat.StringBuilder; +import compat.StringBuilder; /** an XML node for text (PCDATA). Used in both non-bound and bound XML * representations diff --git a/src/library/scala/xml/Comment.scala b/src/library/scala/xml/Comment.scala index 01a1a75544..a6228be4c7 100644 --- a/src/library/scala/xml/Comment.scala +++ b/src/library/scala/xml/Comment.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** an XML node for comments. * diff --git a/src/library/scala/xml/Elem.scala b/src/library/scala/xml/Elem.scala index 74d99c5d5f..1cf463051e 100644 --- a/src/library/scala/xml/Elem.scala +++ b/src/library/scala/xml/Elem.scala @@ -11,7 +11,6 @@ package scala.xml; -import scala.runtime.compat.StringBuilder /** The case class <code>Elem</code> extends the Node class, * providing an immutable data object representing an XML element. @@ -64,7 +63,7 @@ case class Elem(override val prefix: String, /* returns concatenation of text(n) for each child n */ override def text = { - val sb = new StringBuilder(); + val sb = new compat.StringBuilder(); val it = child.elements; while(it.hasNext) { sb.append(it.next.text); diff --git a/src/library/scala/xml/EntityRef.scala b/src/library/scala/xml/EntityRef.scala index c7ae5a536e..a649ab4d5b 100644 --- a/src/library/scala/xml/EntityRef.scala +++ b/src/library/scala/xml/EntityRef.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** an XML node for entity references * diff --git a/src/library/scala/xml/Group.scala b/src/library/scala/xml/Group.scala index 7a5a7a201c..8a7cc03da2 100644 --- a/src/library/scala/xml/Group.scala +++ b/src/library/scala/xml/Group.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** A hack to group XML nodes in one node for output. * diff --git a/src/library/scala/xml/MetaData.scala b/src/library/scala/xml/MetaData.scala index f9d7b51c31..a2542f1c0c 100644 --- a/src/library/scala/xml/MetaData.scala +++ b/src/library/scala/xml/MetaData.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** Attribute information item, and linked list of attribute information items. * These are triples consisting of prefix,key,value. To obtain the namespace, diff --git a/src/library/scala/xml/NamespaceBinding.scala b/src/library/scala/xml/NamespaceBinding.scala index ad1423216b..7ad05dfcc5 100644 --- a/src/library/scala/xml/NamespaceBinding.scala +++ b/src/library/scala/xml/NamespaceBinding.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** The class <code>NamespaceBinding</code> represents namespace bindings * and scopes. The binding for the default namespace is treated as a null diff --git a/src/library/scala/xml/Node.scala b/src/library/scala/xml/Node.scala index 077c5cab19..c372ab39ee 100644 --- a/src/library/scala/xml/Node.scala +++ b/src/library/scala/xml/Node.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** * This object provides methods ... diff --git a/src/library/scala/xml/NodeSeq.scala b/src/library/scala/xml/NodeSeq.scala index a321742090..946951fa75 100644 --- a/src/library/scala/xml/NodeSeq.scala +++ b/src/library/scala/xml/NodeSeq.scala @@ -11,7 +11,6 @@ package scala.xml -import scala.runtime.compat.StringBuilder /** This object ... * @@ -166,7 +165,7 @@ abstract class NodeSeq extends Seq[Node] { } def text: String = { - val sb = new StringBuilder() + val sb = new compat.StringBuilder() val it = elements while (it.hasNext) { sb.append(it.next.text) diff --git a/src/library/scala/xml/Null.scala b/src/library/scala/xml/Null.scala index 8f207d5349..2cb81c4e3e 100644 --- a/src/library/scala/xml/Null.scala +++ b/src/library/scala/xml/Null.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder case object Null extends MetaData { diff --git a/src/library/scala/xml/PrefixedAttribute.scala b/src/library/scala/xml/PrefixedAttribute.scala index e4c4f50fec..7f8aefb313 100644 --- a/src/library/scala/xml/PrefixedAttribute.scala +++ b/src/library/scala/xml/PrefixedAttribute.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** prefixed attributes always have a non-null namespace */ diff --git a/src/library/scala/xml/PrettyPrinter.scala b/src/library/scala/xml/PrettyPrinter.scala index e87da77b9e..cd146ddd58 100644 --- a/src/library/scala/xml/PrettyPrinter.scala +++ b/src/library/scala/xml/PrettyPrinter.scala @@ -12,7 +12,7 @@ package scala.xml import scala.collection.Map -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** Class for pretty printing. After instantiating, you can use the * toPrettyXML methods to convert XML to a formatted string. The class diff --git a/src/library/scala/xml/ProcInstr.scala b/src/library/scala/xml/ProcInstr.scala index 64c1670ae8..4850066846 100644 --- a/src/library/scala/xml/ProcInstr.scala +++ b/src/library/scala/xml/ProcInstr.scala @@ -11,7 +11,7 @@ package scala.xml; -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** an XML node for processing instructions (PI) * diff --git a/src/library/scala/xml/SpecialNode.scala b/src/library/scala/xml/SpecialNode.scala index 68fafc5def..f68396250d 100644 --- a/src/library/scala/xml/SpecialNode.scala +++ b/src/library/scala/xml/SpecialNode.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** <code>SpecialNode</code> is a special XML node which * represents either text (PCDATA), a comment, a PI, or an entity ref. diff --git a/src/library/scala/xml/Text.scala b/src/library/scala/xml/Text.scala index 317fa34379..32b93e731f 100644 --- a/src/library/scala/xml/Text.scala +++ b/src/library/scala/xml/Text.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** an XML node for text (PCDATA). Used in both non-bound and bound XML * representations diff --git a/src/library/scala/xml/TextBuffer.scala b/src/library/scala/xml/TextBuffer.scala index 5056aa0bb1..d0398165f3 100644 --- a/src/library/scala/xml/TextBuffer.scala +++ b/src/library/scala/xml/TextBuffer.scala @@ -11,7 +11,6 @@ package scala.xml; -import scala.runtime.compat.StringBuilder; object TextBuffer { def fromString(str: String): TextBuffer = { @@ -26,7 +25,7 @@ object TextBuffer { */ class TextBuffer { - val sb = new StringBuilder(); + val sb = new compat.StringBuilder(); var ws = true; def appendSpace = if( !ws ) { ws = true; sb.append(' ');} else {}; diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala index d7cbf703db..e42cdf736d 100644 --- a/src/library/scala/xml/TopScope.scala +++ b/src/library/scala/xml/TopScope.scala @@ -9,7 +9,7 @@ // $Id$ package scala.xml; -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** top level namespace scope. only contains the predefined binding * for the "xml" prefix which is bound to diff --git a/src/library/scala/xml/Unparsed.scala b/src/library/scala/xml/Unparsed.scala index d297601128..f4275ceea7 100644 --- a/src/library/scala/xml/Unparsed.scala +++ b/src/library/scala/xml/Unparsed.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** an XML node for unparsed content. It will be output verbatim, all bets * are off regarding wellformedness etc. diff --git a/src/library/scala/xml/UnprefixedAttribute.scala b/src/library/scala/xml/UnprefixedAttribute.scala index 02adb75219..103bf4a7de 100644 --- a/src/library/scala/xml/UnprefixedAttribute.scala +++ b/src/library/scala/xml/UnprefixedAttribute.scala @@ -11,7 +11,7 @@ package scala.xml -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** unprefixed attributes have the null namespace */ diff --git a/src/library/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala index 31fd99803a..ffa2cdfc03 100644 --- a/src/library/scala/xml/Utility.scala +++ b/src/library/scala/xml/Utility.scala @@ -11,8 +11,8 @@ package scala.xml -import scala.runtime.compat.StringBuilder -import scala.collection.mutable +import compat.StringBuilder +import collection.mutable.{Set, HashSet} /** * Utility functions for processing instances of bound and @@ -45,8 +45,8 @@ object Utility extends AnyRef with parsing.TokenTests { * @param nodes */ - def collectNamespaces(nodes: Seq[Node]): mutable.Set[String] = { - var m = new mutable.HashSet[String]() + def collectNamespaces(nodes: Seq[Node]): Set[String] = { + var m = new HashSet[String]() val it = nodes.elements while (it.hasNext) collectNamespaces(it.next, m); @@ -54,7 +54,7 @@ object Utility extends AnyRef with parsing.TokenTests { } /** adds all namespaces in node to set */ - def collectNamespaces(n: Node, set: mutable.Set[String]): Unit = { + def collectNamespaces(n: Node, set: Set[String]): Unit = { if( n.typeTag$ >= 0 ) { set += n.namespace; for (val a <- n.attributes) a match { diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala index b1f71f2cac..4ba9b8a51e 100644 --- a/src/library/scala/xml/dtd/ContentModel.scala +++ b/src/library/scala/xml/dtd/ContentModel.scala @@ -11,7 +11,7 @@ package scala.xml.dtd; -import scala.runtime.compat.StringBuilder; +import compat.StringBuilder; import scala.util.regexp.WordExp; import scala.util.automata._; diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala index 91ec27f160..d1907fd5c0 100644 --- a/src/library/scala/xml/dtd/DTD.scala +++ b/src/library/scala/xml/dtd/DTD.scala @@ -11,7 +11,6 @@ package scala.xml.dtd; -import scala.runtime.compat.StringBuilder import scala.collection.mutable.{ HashMap, Map } /** a document type declaration */ @@ -36,7 +35,7 @@ abstract class DTD { //def getAttribDecl(elem: String, attr: String): AttrDecl; override def toString() = { - val sb = new StringBuilder(); + val sb = new compat.StringBuilder(); sb.append("DTD [\n"); if(null != externalID) sb.append(externalID.toString()).append('\n'); diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala index 24655c36f2..eaa545b98b 100644 --- a/src/library/scala/xml/dtd/Decl.scala +++ b/src/library/scala/xml/dtd/Decl.scala @@ -11,7 +11,7 @@ package scala.xml.dtd; -import scala.runtime.compat.StringBuilder +import compat.StringBuilder abstract class Decl; diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala index d1110e5ad7..e31f43990f 100644 --- a/src/library/scala/xml/dtd/DocType.scala +++ b/src/library/scala/xml/dtd/DocType.scala @@ -11,7 +11,6 @@ package scala.xml.dtd; -import scala.runtime.compat.StringBuilder /** an XML node for document type declaration * @@ -31,7 +30,7 @@ case class DocType( name:String, extID:ExternalID, intSubset:Seq[dtd.Decl]) { /** returns "<!DOCTYPE + name + extID? + ("["+intSubSet+"]")? >" */ final override def toString() = { - val sb = new StringBuilder().append("<!DOCTYPE "); + val sb = new compat.StringBuilder().append("<!DOCTYPE "); sb.append( name ); sb.append(' '); sb.append(extID.toString()); diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala index 0469de4483..0e8ac719ed 100644 --- a/src/library/scala/xml/dtd/ExternalID.scala +++ b/src/library/scala/xml/dtd/ExternalID.scala @@ -11,7 +11,7 @@ package scala.xml.dtd; -import scala.runtime.compat.StringBuilder +import compat.StringBuilder /** an ExternalIDs - either PublicID or SystemID * diff --git a/src/library/scala/xml/dtd/Scanner.scala b/src/library/scala/xml/dtd/Scanner.scala index 7fa9ca7e9c..9b30ba5ab6 100644 --- a/src/library/scala/xml/dtd/Scanner.scala +++ b/src/library/scala/xml/dtd/Scanner.scala @@ -11,7 +11,6 @@ package scala.xml.dtd; -import scala.runtime.compat.StringBuilder /** Scanner for regexps (content models in DTD element declarations) * todo: cleanup @@ -91,7 +90,7 @@ class Scanner extends Tokens with parsing.TokenTests { } final def name = { - val sb = new StringBuilder(); + val sb = new compat.StringBuilder(); do { sb.append( c ); next } while ( isNameChar( c ) ) ; value = sb.toString(); NAME diff --git a/src/library/scala/xml/dtd/ValidationException.scala b/src/library/scala/xml/dtd/ValidationException.scala index 1a9d1075fd..a37d6f3231 100644 --- a/src/library/scala/xml/dtd/ValidationException.scala +++ b/src/library/scala/xml/dtd/ValidationException.scala @@ -11,7 +11,6 @@ package scala.xml.dtd; -import scala.runtime.compat.StringBuilder case class ValidationException( e:String ) extends Exception( e ); @@ -29,7 +28,7 @@ object MakeValidationException { new ValidationException("attribute " + key +" not allowed here" ); def fromMissingAttribute( allKeys:scala.collection.Set[String] ) = { - val sb = new StringBuilder(); + val sb = new compat.StringBuilder(); sb.append("missing value for REQUIRED attribute"); if( allKeys.size > 1 ) sb.append('s'); val it = allKeys.elements; diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala index 902e0c866f..d3fd41314d 100644 --- a/src/library/scala/xml/parsing/ExternalSources.scala +++ b/src/library/scala/xml/parsing/ExternalSources.scala @@ -11,14 +11,14 @@ package scala.xml.parsing; -import scala.runtime.compat.StringBuilder +import compat.StringBuilder import scala.io.Source; -import java.net._; -import java.io._; +import java.net.URL; trait ExternalSources requires (ExternalSources with MarkupParser with MarkupHandler) { private def externalSourceFromURL(url:URL): Source = { + import java.io.{BufferedReader, InputStreamReader}; val in = new BufferedReader( new InputStreamReader( diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala index b6bceafd23..b78a3d0969 100644 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/library/scala/xml/parsing/MarkupParser.scala @@ -11,7 +11,7 @@ package scala.xml.parsing -import scala.runtime.compat.StringBuilder +import compat.StringBuilder import scala.io.Source import scala.xml.dtd._ diff --git a/test/files/run/Course-2002-06.scala b/test/files/run/Course-2002-06.scala index df73daa08f..47851988c0 100644 --- a/test/files/run/Course-2002-06.scala +++ b/test/files/run/Course-2002-06.scala @@ -11,7 +11,7 @@ class Vector (_x: Double, _y: Double) { def *(scalar: Double): Vector = new Vector(x * scalar, y * scalar); def -(that: Vector): Vector = new Vector(x - that.x, y - that.y); def /(scalar: Double): Vector = new Vector(x / scalar, y / scalar); - def norm: Double = scala.runtime.compat.Math.sqrt(x * x + y * y); + def norm: Double = compat.Math.sqrt(x * x + y * y); } //############################################################################ @@ -88,7 +88,7 @@ class PostScript (filename: String, _width: Double, _height: Double) def mm2ps(x: Double) : Double = round(x * 72.0 / 25.4); def round(x: Double): Double = - scala.runtime.compat.Math.floor(x * 100.0 + 0.5) / 100.0; + compat.Math.floor(x * 100.0 + 0.5) / 100.0; def scaleAndCenter(frm: Frame, ratio:Double): Frame = { val currentRatio = frm.edgeX.norm / frm.edgeY.norm; diff --git a/test/files/run/Course-2002-09.scala b/test/files/run/Course-2002-09.scala index 65f9adad2b..afc3be7665 100644 --- a/test/files/run/Course-2002-09.scala +++ b/test/files/run/Course-2002-09.scala @@ -50,7 +50,7 @@ class Squarer(square: Quantity, root: Quantity) extends Constraint { def newValue: Unit = Pair(square.getValue, root.getValue) match { case Pair(Some(x), _ )if (x < 0) => error("Square of negative number") case Pair(Some(x), _ ) => - root.setValue(scala.runtime.compat.Math.sqrt(x), this) + root.setValue(compat.Math.sqrt(x), this) case Pair(_ , Some(x)) => square.setValue(x*x, this) case _ => } diff --git a/test/files/run/arrays.scala b/test/files/run/arrays.scala index db7d381aa9..d1a9e7ff37 100644 --- a/test/files/run/arrays.scala +++ b/test/files/run/arrays.scala @@ -162,7 +162,7 @@ object Test { //########################################################################## // Values - import scala.runtime.compat.Math._; + import compat.Math._; val u0: Unit = (); val u1: Unit = (); diff --git a/test/files/run/bugs.scala b/test/files/run/bugs.scala index fc9c735ec9..165be165d6 100644 --- a/test/files/run/bugs.scala +++ b/test/files/run/bugs.scala @@ -454,7 +454,7 @@ object Test { test; } catch { case exception => { - val curr: String = scala.runtime.compat.Platform.currentThread.toString(); + val curr: String = compat.Platform.currentThread.toString(); Console.print("Exception in thread \"" + curr + "\" " + exception); Console.println; errors = errors + 1; diff --git a/test/files/run/exceptions.scala b/test/files/run/exceptions.scala index 04fc4a1a85..82740cc74d 100644 --- a/test/files/run/exceptions.scala +++ b/test/files/run/exceptions.scala @@ -33,7 +33,7 @@ object exceptions { val value = try { map.lookup(key) } catch { - case e => scala.runtime.compat.Platform.getMessage(e) + case e => compat.Platform.getMessage(e) } check("lookup(" + key + ")", value, "KO"); } diff --git a/test/files/run/lisp.scala b/test/files/run/lisp.scala index cb26972e2d..f12196ca50 100644 --- a/test/files/run/lisp.scala +++ b/test/files/run/lisp.scala @@ -240,7 +240,7 @@ object LispCaseClasses extends Lisp { if (token == "(") parseList else if (token == ")") error("unbalanced parentheses") else if ('0' <= token.charAt(0) && token.charAt(0) <= '9') - NUM(scala.runtime.compat.Platform.parseInt(token)) + NUM(compat.Platform.parseInt(token)) else if (token.charAt(0) == '\"' && token.charAt(token.length()-1)=='\"') STR(token.substring(1,token.length() - 1)) else SYM(token) @@ -432,8 +432,8 @@ object LispAny extends Lisp { if (token == "(") parseList else if (token == ")") error("unbalanced parentheses") //else if (Character.isDigit(token.charAt(0))) - else if (scala.runtime.compat.Platform.isDigit(token.charAt(0))) - scala.runtime.compat.Platform.parseInt(token) + else if (compat.Platform.isDigit(token.charAt(0))) + compat.Platform.parseInt(token) else if (token.charAt(0) == '\"' && token.charAt(token.length()-1)=='\"') token.substring(1,token.length() - 1) else Symbol(token) diff --git a/test/files/run/tailcalls.scala b/test/files/run/tailcalls.scala index 3279e6bf64..3c1d96dd0b 100644 --- a/test/files/run/tailcalls.scala +++ b/test/files/run/tailcalls.scala @@ -212,7 +212,7 @@ object Test { while (!stop) { try { calibrator.f(n, n); - if (n >= scala.runtime.compat.Math.MAX_INT / 2) error("calibration failure"); + if (n >= compat.Math.MAX_INT / 2) error("calibration failure"); n = 2 * n; } catch { case exception: StackOverflowError => stop = true |