diff options
Diffstat (limited to 'src/library')
19 files changed, 68 insertions, 191 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index 4fac27bd87..61609be22f 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -8,8 +8,7 @@ package scala -import scala.collection.SetLike -import scala.collection.{ mutable, immutable, generic } +import scala.collection.{ mutable, immutable, generic, SetLike } import java.lang.reflect.{ Modifier, Method => JMethod, Field => JField } /** @@ -242,7 +241,6 @@ abstract class Enumeration(initial: Int, names: String*) extends Serializable { /** A factory object for value sets */ object ValueSet { - import mutable.{ Builder, SetBuilder } import generic.CanBuildFrom /** The empty value set */ @@ -250,7 +248,7 @@ abstract class Enumeration(initial: Int, names: String*) extends Serializable { /** A value set consisting of given elements */ def apply(elems: Value*): ValueSet = empty ++ elems /** A builder object for value sets */ - def newBuilder: Builder[Value, ValueSet] = new SetBuilder(empty) + def newBuilder: mutable.Builder[Value, ValueSet] = new mutable.SetBuilder(empty) /** The implicit builder for value sets */ implicit def canBuildFrom: CanBuildFrom[ValueSet, Value, ValueSet] = new CanBuildFrom[ValueSet, Value, ValueSet] { diff --git a/src/library/scala/collection/mutable/SetLike.scala b/src/library/scala/collection/mutable/SetLike.scala index c3bc106153..c5eeb1ae7f 100644 --- a/src/library/scala/collection/mutable/SetLike.scala +++ b/src/library/scala/collection/mutable/SetLike.scala @@ -6,14 +6,12 @@ ** |/ ** \* */ - - package scala.collection package mutable import generic._ import script._ -import annotation.{migration, bridge} +import annotation.{ migration, bridge } import parallel.mutable.ParSet /** A template trait for mutable sets of type `mutable.Set[A]`. diff --git a/src/library/scala/collection/parallel/immutable/ParHashSet.scala b/src/library/scala/collection/parallel/immutable/ParHashSet.scala index e3c408e4db..76c6cea5c1 100644 --- a/src/library/scala/collection/parallel/immutable/ParHashSet.scala +++ b/src/library/scala/collection/parallel/immutable/ParHashSet.scala @@ -109,10 +109,8 @@ self => } def remaining = sz - i } - } - /** $factoryInfo * @define Coll immutable.ParHashSet * @define coll immutable parallel hash set @@ -126,7 +124,6 @@ object ParHashSet extends ParSetFactory[ParHashSet] { def fromTrie[T](t: HashSet[T]) = new ParHashSet(t) } - private[immutable] abstract class HashSetCombiner[T] extends collection.parallel.BucketCombiner[T, ParHashSet[T], Any, HashSetCombiner[T]](HashSetCombiner.rootsize) { //self: EnvironmentPassingCombiner[T, ParHashSet[T]] => @@ -208,55 +205,11 @@ extends collection.parallel.BucketCombiner[T, ParHashSet[T], Any, HashSetCombine } def shouldSplitFurther = howmany > collection.parallel.thresholdFromSize(root.length, parallelismLevel) } - } - object HashSetCombiner { def apply[T] = new HashSetCombiner[T] {} // was: with EnvironmentPassingCombiner[T, ParHashSet[T]] {} private[immutable] val rootbits = 5 private[immutable] val rootsize = 1 << 5 } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/library/scala/collection/parallel/immutable/ParMap.scala b/src/library/scala/collection/parallel/immutable/ParMap.scala index a44a8c965e..9f58ddb0d7 100644 --- a/src/library/scala/collection/parallel/immutable/ParMap.scala +++ b/src/library/scala/collection/parallel/immutable/ParMap.scala @@ -6,15 +6,9 @@ ** |/ ** \* */ - package scala.collection package parallel.immutable - - - - -import scala.collection.immutable.Map import scala.collection.generic.ParMapFactory import scala.collection.generic.GenericParMapTemplate import scala.collection.generic.GenericParMapCompanion @@ -23,10 +17,6 @@ import scala.collection.parallel.ParMapLike import scala.collection.parallel.Combiner import scala.collection.GenMapLike - - - - /** A template trait for immutable parallel maps. * * $sideeffects @@ -42,7 +32,7 @@ extends collection/*.immutable*/.GenMap[K, V] with GenericParMapTemplate[K, V, ParMap] with parallel.ParMap[K, V] with ParIterable[(K, V)] - with ParMapLike[K, V, ParMap[K, V], Map[K, V]] + with ParMapLike[K, V, ParMap[K, V], collection.immutable.Map[K, V]] { self => @@ -65,22 +55,3 @@ object ParMap extends ParMapFactory[ParMap] { implicit def canBuildFrom[K, V]: CanCombineFrom[Coll, (K, V), ParMap[K, V]] = new CanCombineFromMap[K, V] } - - - - - - - - - - - - - - - - - - - diff --git a/src/library/scala/collection/parallel/immutable/ParSet.scala b/src/library/scala/collection/parallel/immutable/ParSet.scala index a39607ba03..d64858ed10 100644 --- a/src/library/scala/collection/parallel/immutable/ParSet.scala +++ b/src/library/scala/collection/parallel/immutable/ParSet.scala @@ -6,24 +6,14 @@ ** |/ ** \* */ - package scala.collection package parallel.immutable - - - - - import scala.collection.GenSet -import scala.collection.immutable.Set import scala.collection.generic._ import scala.collection.parallel.ParSetLike import scala.collection.parallel.Combiner - - - /** An immutable variant of `ParSet`. * * @define Coll mutable.ParSet @@ -34,7 +24,7 @@ extends collection/*.immutable*/.GenSet[T] with GenericParTemplate[T, ParSet] with parallel.ParSet[T] with ParIterable[T] - with ParSetLike[T, ParSet[T], Set[T]] + with ParSetLike[T, ParSet[T], collection.immutable.Set[T]] { self => override def empty: ParSet[T] = ParHashSet[T]() @@ -47,8 +37,6 @@ self => override def toSet[U >: T]: ParSet[U] = this.asInstanceOf[ParSet[U]] } - - /** $factoryInfo * @define Coll mutable.ParSet * @define coll mutable parallel set @@ -58,17 +46,3 @@ object ParSet extends ParSetFactory[ParSet] { implicit def canBuildFrom[T]: CanCombineFrom[Coll, T, ParSet[T]] = new GenericCanCombineFrom[T] } - - - - - - - - - - - - - - diff --git a/src/library/scala/collection/parallel/mutable/ParHashSet.scala b/src/library/scala/collection/parallel/mutable/ParHashSet.scala index 3e22e3cdd8..9dbc7dc6c4 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashSet.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashSet.scala @@ -9,7 +9,6 @@ package scala.collection.parallel.mutable import collection.generic._ -import collection.mutable.HashSet import collection.mutable.FlatHashTable import collection.parallel.Combiner import collection.mutable.UnrolledBuffer @@ -51,7 +50,7 @@ extends ParSet[T] def clear() = clearTable() - override def seq = new HashSet(hashTableContents) + override def seq = new collection.mutable.HashSet(hashTableContents) def +=(elem: T) = { addEntry(elem) diff --git a/src/library/scala/io/BytePickle.scala b/src/library/scala/io/BytePickle.scala index 526e4bf40b..bec0cfb53f 100644 --- a/src/library/scala/io/BytePickle.scala +++ b/src/library/scala/io/BytePickle.scala @@ -6,11 +6,9 @@ ** |/ ** \* */ - - package scala.io -import scala.collection.mutable.{HashMap, ArrayBuffer} +import scala.collection.mutable /** * Pickler combinators. @@ -44,12 +42,12 @@ object BytePickle { def uunpickle[T](p: PU[T], stream: Array[Byte]): T = p.appU(stream)._1 - class PicklerEnv extends HashMap[Any, Int] { + class PicklerEnv extends mutable.HashMap[Any, Int] { private var cnt: Int = 64 def nextLoc() = { cnt += 1; cnt } } - class UnPicklerEnv extends HashMap[Int, Any] { + class UnPicklerEnv extends mutable.HashMap[Int, Any] { private var cnt: Int = 64 def nextLoc() = { cnt += 1; cnt } } @@ -231,7 +229,7 @@ object BytePickle { Array.concat(a, Array(b.toByte)) def nat2Bytes(x: Int): Array[Byte] = { - val buf = new ArrayBuffer[Byte] + val buf = new mutable.ArrayBuffer[Byte] def writeNatPrefix(x: Int) { val y = x >>> 7; if (y != 0) writeNatPrefix(y); diff --git a/src/library/scala/reflect/generic/UnPickler.scala b/src/library/scala/reflect/generic/UnPickler.scala index 5d47195f54..f921846d86 100755 --- a/src/library/scala/reflect/generic/UnPickler.scala +++ b/src/library/scala/reflect/generic/UnPickler.scala @@ -12,7 +12,8 @@ import java.lang.Double.longBitsToDouble import Flags._ import PickleFormat._ -import collection.mutable.{HashMap, ListBuffer} +import scala.collection.{ mutable, immutable } +import mutable.ListBuffer import annotation.switch /** @author Martin Odersky @@ -62,13 +63,13 @@ abstract class UnPickler { private val entries = new Array[AnyRef](index.length) /** A map from symbols to their associated `decls` scopes */ - private val symScopes = new HashMap[Symbol, Scope] + private val symScopes = new mutable.HashMap[Symbol, Scope] //println("unpickled " + classRoot + ":" + classRoot.rawInfo + ", " + moduleRoot + ":" + moduleRoot.rawInfo);//debug def run() { // read children last, fix for #3951 - val queue = new collection.mutable.ListBuffer[() => Unit]() + val queue = new ListBuffer[() => Unit]() def delay(i: Int, action: => Unit) { queue += (() => at(i, {() => action; null})) } diff --git a/src/library/scala/util/automata/NondetWordAutom.scala b/src/library/scala/util/automata/NondetWordAutom.scala index ece0a6c5e3..fbc05de7fd 100644 --- a/src/library/scala/util/automata/NondetWordAutom.scala +++ b/src/library/scala/util/automata/NondetWordAutom.scala @@ -6,7 +6,6 @@ ** |/ ** \* */ - package scala.util.automata import scala.collection.{ immutable, mutable } @@ -19,13 +18,11 @@ import scala.collection.{ immutable, mutable } * the partial function `finals` is defined. */ abstract class NondetWordAutom[T <: AnyRef] { - import immutable.BitSet - val nstates: Int val labels: Seq[T] val finals: Array[Int] // 0 means not final - val delta: Array[mutable.Map[T, BitSet]] - val default: Array[BitSet] + val delta: Array[mutable.Map[T, immutable.BitSet]] + val default: Array[immutable.BitSet] /** @return true if the state is final */ final def isFinal(state: Int) = finals(state) > 0 @@ -34,20 +31,20 @@ abstract class NondetWordAutom[T <: AnyRef] { final def finalTag(state: Int) = finals(state) /** @return true if the set of states contains at least one final state */ - final def containsFinal(Q: BitSet): Boolean = Q exists isFinal + final def containsFinal(Q: immutable.BitSet): Boolean = Q exists isFinal /** @return true if there are no accepting states */ final def isEmpty = (0 until nstates) forall (x => !isFinal(x)) - /** @return a BitSet with the next states for given state and label */ - def next(q: Int, a: T): BitSet = delta(q).getOrElse(a, default(q)) + /** @return a immutable.BitSet with the next states for given state and label */ + def next(q: Int, a: T): immutable.BitSet = delta(q).getOrElse(a, default(q)) - /** @return a BitSet with the next states for given state and label */ - def next(Q: BitSet, a: T): BitSet = next(Q, next(_, a)) - def nextDefault(Q: BitSet): BitSet = next(Q, default) + /** @return a immutable.BitSet with the next states for given state and label */ + def next(Q: immutable.BitSet, a: T): immutable.BitSet = next(Q, next(_, a)) + def nextDefault(Q: immutable.BitSet): immutable.BitSet = next(Q, default) - private def next(Q: BitSet, f: (Int) => BitSet): BitSet = - (Q map f).foldLeft(BitSet.empty)(_ ++ _) + private def next(Q: immutable.BitSet, f: (Int) => immutable.BitSet): immutable.BitSet = + (Q map f).foldLeft(immutable.BitSet.empty)(_ ++ _) private def finalStates = 0 until nstates filter isFinal override def toString = { diff --git a/src/library/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala index e2afabf8c5..8049d10d88 100644 --- a/src/library/scala/util/automata/SubsetConstruction.scala +++ b/src/library/scala/util/automata/SubsetConstruction.scala @@ -12,34 +12,33 @@ import scala.collection.{ mutable, immutable } class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) { import nfa.labels - import immutable.BitSet - def selectTag(Q: BitSet, finals: Array[Int]) = + def selectTag(Q: immutable.BitSet, finals: Array[Int]) = Q map finals filter (_ > 0) min def determinize: DetWordAutom[T] = { // for assigning numbers to bitsets - var indexMap = collection.Map[BitSet, Int]() - var invIndexMap = collection.Map[Int, BitSet]() + var indexMap = collection.Map[immutable.BitSet, Int]() + var invIndexMap = collection.Map[Int, immutable.BitSet]() var ix = 0 // we compute the dfa with states = bitsets - val q0 = BitSet(0) // the set { 0 } - val sink = BitSet.empty // the set { } + val q0 = immutable.BitSet(0) // the set { 0 } + val sink = immutable.BitSet.empty // the set { } var states = Set(q0, sink) // initial set of sets - val delta = new mutable.HashMap[BitSet, mutable.HashMap[T, BitSet]] + val delta = new mutable.HashMap[immutable.BitSet, mutable.HashMap[T, immutable.BitSet]] var deftrans = mutable.Map(q0 -> sink, sink -> sink) // initial transitions - var finals: mutable.Map[BitSet, Int] = mutable.Map() - val rest = new mutable.Stack[BitSet] + var finals: mutable.Map[immutable.BitSet, Int] = mutable.Map() + val rest = new mutable.Stack[immutable.BitSet] rest.push(sink, q0) - def addFinal(q: BitSet) { + def addFinal(q: immutable.BitSet) { if (nfa containsFinal q) finals = finals.updated(q, selectTag(q, nfa.finals)) } - def add(Q: BitSet) { + def add(Q: immutable.BitSet) { if (!states(Q)) { states += Q rest push Q @@ -57,7 +56,7 @@ class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) { ix += 1 // make transition map - val Pdelta = new mutable.HashMap[T, BitSet] + val Pdelta = new mutable.HashMap[T, immutable.BitSet] delta.update(P, Pdelta) labels foreach { label => diff --git a/src/library/scala/util/automata/WordBerrySethi.scala b/src/library/scala/util/automata/WordBerrySethi.scala index 4763b6fb9c..b36685b4d9 100644 --- a/src/library/scala/util/automata/WordBerrySethi.scala +++ b/src/library/scala/util/automata/WordBerrySethi.scala @@ -6,12 +6,9 @@ ** |/ ** \* */ - - package scala.util.automata import scala.collection.{ immutable, mutable } -import mutable.{ HashSet, HashMap } import scala.util.regexp.WordExp /** This class turns a regular expression into a [[scala.util.automata.NondetWorkAutom]] @@ -25,12 +22,12 @@ abstract class WordBerrySethi extends BaseBerrySethi { import lang.{ Alt, Eps, Letter, Meta, RegExp, Sequ, Star, _labelT } - protected var labels: HashSet[_labelT] = _ + protected var labels: mutable.HashSet[_labelT] = _ // don't let this fool you, only labelAt is a real, surjective mapping - protected var labelAt: Map[Int, _labelT] = _ // new alphabet "gamma" - protected var deltaq: Array[HashMap[_labelT, List[Int]]] = _ // delta - protected var defaultq: Array[List[Int]] = _ // default transitions - protected var initials: Set[Int] = _ + protected var labelAt: Map[Int, _labelT] = _ // new alphabet "gamma" + protected var deltaq: Array[mutable.HashMap[_labelT, List[Int]]] = _ // delta + protected var defaultq: Array[List[Int]] = _ // default transitions + protected var initials: Set[Int] = _ /** Computes `first(r)` where the word regexp `r`. * @@ -97,8 +94,8 @@ abstract class WordBerrySethi extends BaseBerrySethi { protected def initialize(subexpr: Seq[RegExp]): Unit = { this.labelAt = immutable.Map() - this.follow = HashMap() - this.labels = HashSet() + this.follow = mutable.HashMap() + this.labels = mutable.HashSet() this.pos = 0 // determine "Sethi-length" of the regexp @@ -109,11 +106,11 @@ abstract class WordBerrySethi extends BaseBerrySethi { protected def initializeAutom() { finals = immutable.Map.empty[Int, Int] // final states - deltaq = new Array[HashMap[_labelT, List[Int]]](pos) // delta + deltaq = new Array[mutable.HashMap[_labelT, List[Int]]](pos) // delta defaultq = new Array[List[Int]](pos) // default transitions for (j <- 0 until pos) { - deltaq(j) = HashMap[_labelT, List[Int]]() + deltaq(j) = mutable.HashMap[_labelT, List[Int]]() defaultq(j) = Nil } } @@ -147,7 +144,7 @@ abstract class WordBerrySethi extends BaseBerrySethi { val deltaArr: Array[mutable.Map[_labelT, immutable.BitSet]] = (0 until pos map { x => - HashMap(delta1(x).toSeq map { case (k, v) => k -> immutable.BitSet(v: _*) } : _*) + mutable.HashMap(delta1(x).toSeq map { case (k, v) => k -> immutable.BitSet(v: _*) } : _*) }).toArray val defaultArr = 0 until pos map (k => immutable.BitSet(defaultq(k): _*)) toArray diff --git a/src/library/scala/util/parsing/ast/Binders.scala b/src/library/scala/util/parsing/ast/Binders.scala index 2687283b76..8019306524 100644 --- a/src/library/scala/util/parsing/ast/Binders.scala +++ b/src/library/scala/util/parsing/ast/Binders.scala @@ -8,7 +8,7 @@ package scala.util.parsing.ast -import scala.collection.mutable.Map +import scala.collection.mutable //DISCLAIMER: this code is highly experimental! @@ -84,8 +84,8 @@ trait Binders extends AbstractSyntax with Mappable { * (`id` is solely used for this textual representation.) */ class Scope[binderType <: NameElement] extends Iterable[binderType]{ - private val substitution: Map[binderType, Element] = - new scala.collection.mutable.LinkedHashMap[binderType, Element] // a LinkedHashMap is ordered by insertion order -- important! + private val substitution: mutable.Map[binderType, Element] = + new mutable.LinkedHashMap[binderType, Element] // a LinkedHashMap is ordered by insertion order -- important! /** Returns a unique number identifying this Scope (only used for representation purposes). */ val id: Int = _Binder.genId @@ -236,7 +236,7 @@ trait Binders extends AbstractSyntax with Mappable { }) }*/ - def cloneElementWithSubst(subst: scala.collection.immutable.Map[NameElement, NameElement]) = element.gmap(new Mapper { def apply[t <% Mappable[t]](x :t): t = x match{ + def cloneElementWithSubst(subst: Map[NameElement, NameElement]) = element.gmap(new Mapper { def apply[t <% Mappable[t]](x :t): t = x match{ case substable: NameElement if subst.contains(substable) => subst.get(substable).asInstanceOf[t] // TODO: wrong... substitution is not (necessarily) the identity function //Console.println("substed: "+substable+"-> "+subst.get(substable)+")"); case x => x // Console.println("subst: "+x+"(keys: "+subst.keys+")");x @@ -249,7 +249,7 @@ trait Binders extends AbstractSyntax with Mappable { }}) def extract: elementT = cloneElementNoBoundElements - def extract(subst: scala.collection.immutable.Map[NameElement, NameElement]): elementT = cloneElementWithSubst(subst) + def extract(subst: Map[NameElement, NameElement]): elementT = cloneElementWithSubst(subst) /** Get a string representation of element, normally we don't allow direct access to element, but just getting a string representation is ok. */ def elementToString: String = element.toString diff --git a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala index 68636b8f31..6c8bad01c1 100644 --- a/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala +++ b/src/library/scala/util/parsing/combinator/lexical/StdLexical.scala @@ -14,7 +14,7 @@ package lexical import token._ import input.CharArrayReader.EofCh -import collection.mutable.HashSet +import scala.collection.mutable /** This component provides a standard lexical parser for a simple, Scala-like language. * It parses keywords and identifiers, numeric literals (integers), strings, and delimiters. @@ -62,10 +62,10 @@ class StdLexical extends Lexical with StdTokens { ) /** The set of reserved identifiers: these will be returned as `Keyword`s. */ - val reserved = new HashSet[String] + val reserved = new mutable.HashSet[String] /** The set of delimiters (ordering does not matter). */ - val delimiters = new HashSet[String] + val delimiters = new mutable.HashSet[String] protected def processIdent(name: String) = if (reserved contains name) Keyword(name) else Identifier(name) diff --git a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala b/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala index c57fc14f5e..0901f9bbd0 100644 --- a/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala +++ b/src/library/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala @@ -13,7 +13,7 @@ package combinator package syntactical import token._ -import collection.mutable.HashMap +import scala.collection.mutable /** This component provides primitive parsers for the standard tokens defined in `StdTokens`. * @@ -23,7 +23,7 @@ trait StdTokenParsers extends TokenParsers { type Tokens <: StdTokens import lexical.{Keyword, NumericLit, StringLit, Identifier} - protected val keywordCache : HashMap[String, Parser[String]] = HashMap.empty + protected val keywordCache = mutable.HashMap[String, Parser[String]]() /** A parser which matches a single keyword token. * diff --git a/src/library/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala index 3f1c5fb81b..05cc7b116b 100644 --- a/src/library/scala/xml/Utility.scala +++ b/src/library/scala/xml/Utility.scala @@ -6,12 +6,9 @@ ** |/ ** \* */ - - package scala.xml -import collection.mutable -import mutable.{ Set, HashSet } +import scala.collection.mutable import parsing.XhtmlEntities /** @@ -20,8 +17,7 @@ import parsing.XhtmlEntities * * @author Burak Emir */ -object Utility extends AnyRef with parsing.TokenTests -{ +object Utility extends AnyRef with parsing.TokenTests { final val SU = '\u001A' implicit def implicitSbToString(sb: StringBuilder) = sb.toString() @@ -151,7 +147,7 @@ object Utility extends AnyRef with parsing.TokenTests * @return ... */ def collectNamespaces(nodes: Seq[Node]): mutable.Set[String] = - nodes.foldLeft(new HashSet[String]) { (set, x) => collectNamespaces(x, set) ; set } + nodes.foldLeft(new mutable.HashSet[String]) { (set, x) => collectNamespaces(x, set) ; set } /** * Adds all namespaces in node to set. diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala index aa86e2fa2e..118a9cec98 100644 --- a/src/library/scala/xml/dtd/DTD.scala +++ b/src/library/scala/xml/dtd/DTD.scala @@ -10,8 +10,7 @@ package scala.xml package dtd -import collection.mutable -import mutable.HashMap +import scala.collection.mutable /** A document type declaration. * @@ -23,9 +22,9 @@ abstract class DTD { def notations: Seq[NotationDecl] = Nil def unparsedEntities: Seq[EntityDecl] = Nil - var elem: mutable.Map[String, ElemDecl] = new HashMap[String, ElemDecl]() - var attr: mutable.Map[String, AttListDecl] = new HashMap[String, AttListDecl]() - var ent: mutable.Map[String, EntityDecl] = new HashMap[String, EntityDecl]() + var elem: mutable.Map[String, ElemDecl] = new mutable.HashMap[String, ElemDecl]() + var attr: mutable.Map[String, AttListDecl] = new mutable.HashMap[String, AttListDecl]() + var ent: mutable.Map[String, EntityDecl] = new mutable.HashMap[String, EntityDecl]() override def toString() = "DTD [\n%s%s]".format( diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala index 162edc796d..111c1b5e78 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/library/scala/xml/dtd/ElementValidator.scala @@ -14,9 +14,8 @@ package dtd import PartialFunction._ import ContentModel.ElemName import MakeValidationException._ // @todo other exceptions - import scala.util.automata._ -import scala.collection.mutable.BitSet +import scala.collection.mutable /** validate children and/or attributes of an element * exceptions are created but not thrown. @@ -62,7 +61,7 @@ class ElementValidator() extends Function1[Node,Boolean] { */ def check(md: MetaData): Boolean = { val len: Int = exc.length - var ok = new BitSet(adecls.length) + var ok = new mutable.BitSet(adecls.length) for (attr <- md) { def attrStr = attr.value.toString diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/library/scala/xml/include/sax/XIncluder.scala index 979ea1689a..b291a38164 100644 --- a/src/library/scala/xml/include/sax/XIncluder.scala +++ b/src/library/scala/xml/include/sax/XIncluder.scala @@ -11,8 +11,7 @@ package scala.xml package include.sax import scala.xml.include._ -import collection.mutable.Stack - +import scala.collection.mutable import org.xml.sax.{ ContentHandler, XMLReader, Locator, Attributes } import org.xml.sax.ext.LexicalHandler import java.io.{ File, OutputStream, OutputStreamWriter, Writer, IOException } @@ -137,7 +136,7 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit // LexicalHandler methods private var inDTD: Boolean = false - private val entities = new Stack[String]() + private val entities = new mutable.Stack[String]() def startDTD(name: String, publicID: String, systemID: String) { inDTD = true diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala index e7f9a683a0..87e785a98f 100644 --- a/src/library/scala/xml/parsing/MarkupHandler.scala +++ b/src/library/scala/xml/parsing/MarkupHandler.scala @@ -11,8 +11,7 @@ package scala.xml package parsing -import collection.mutable -import mutable.HashMap +import scala.collection.mutable import scala.io.Source import scala.util.logging.Logged import scala.xml.dtd._ @@ -32,7 +31,7 @@ abstract class MarkupHandler extends Logged val isValidating: Boolean = false var decls: List[Decl] = Nil - var ent: mutable.Map[String, EntityDecl] = new HashMap[String, EntityDecl]() + var ent: mutable.Map[String, EntityDecl] = new mutable.HashMap[String, EntityDecl]() def lookupElemDecl(Label: String): ElemDecl = { for (z @ ElemDecl(Label, _) <- decls) |