Backwards compatible changes to cross-compile with the 2.13 collections

Author: lrytz

shared/src/main/scala/scala/xml/dtd/impl/NondetWordAutom.scala

@@ -47,7 +47,7 @@ private[dtd] abstract class NondetWordAutom[T <: AnyRef] {
   def nextDefault(Q: immutable.BitSet): immutable.BitSet = next(Q, default)
 
   private def next(Q: immutable.BitSet, f: (Int) => immutable.BitSet): immutable.BitSet =
-    (Q map f).foldLeft(immutable.BitSet.empty)(_ ++ _)
+    ((Q: Set[Int]) map f).foldLeft(immutable.BitSet.empty)(_ ++ _)
 
   private def finalStates = 0 until nstates filter isFinal
   override def toString = {

shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala

@@ -20,8 +20,8 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
 
   def determinize: DetWordAutom[T] = {
     // for assigning numbers to bitsets
-    var indexMap = scala.collection.Map[immutable.BitSet, Int]()
-    var invIndexMap = scala.collection.Map[Int, immutable.BitSet]()
+    var indexMap = scala.collection.immutable.Map[immutable.BitSet, Int]()
+    var invIndexMap = scala.collection.immutable.Map[Int, immutable.BitSet]()
     var ix = 0
 
     // we compute the dfa with states = bitsets
@@ -37,8 +37,11 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
     rest.push(sink, q0)
 
     def addFinal(q: immutable.BitSet) {
-      if (nfa containsFinal q)
-        finals = finals.updated(q, selectTag(q, nfa.finals))
+      if (nfa containsFinal q) {
+        val finalsClone = finals.clone
+        finalsClone(q) = selectTag(q, nfa.finals)
+        finals = finalsClone
+      }
     }
     def add(Q: immutable.BitSet) {
       if (!states(Q)) {
@@ -69,7 +72,8 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
 
       // collect default transitions
       val Pdef = nfa nextDefault P
-      deftrans = deftrans.updated(P, Pdef)
+      deftrans = deftrans.clone
+      deftrans(P) = Pdef
       add(Pdef)
     }
 

shared/src/main/scala/scala/xml/parsing/MarkupParser.scala

@@ -358,7 +358,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     }
     nextch()
     val str = cbuf.toString()
-    cbuf.length = 0
+    cbuf.clear()
     str
   }
 
@@ -390,7 +390,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     xToken("--")
     while (!eof) {
       if (ch == '-' && { sb.append(ch); nextch(); ch == '-' }) {
-        sb.length = sb.length - 1
+        sb.setLength(sb.length - 1)
         nextch()
         xToken('>')
         return handle.comment(pos, sb.toString())
@@ -608,7 +608,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
       exit = eof || (ch == '<') || (ch == '&')
     }
     val str = cbuf.toString
-    cbuf.length = 0
+    cbuf.clear()
     str
   }
 
@@ -630,7 +630,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     }
     nextch()
     val str = cbuf.toString()
-    cbuf.length = 0
+    cbuf.clear()
     str
   }
 
@@ -653,7 +653,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     }
     nextch()
     val str = cbuf.toString
-    cbuf.length = 0
+    cbuf.clear()
     str
   }
 
@@ -799,7 +799,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
     //Console.println("END["+ch+"]")
     nextch()
     val cmstr = cbuf.toString()
-    cbuf.length = 0
+    cbuf.clear()
     handle.elemDecl(n, cmstr)
   }
 
@@ -826,7 +826,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
         nextch()
       }
       val atpe = cbuf.toString
-      cbuf.length = 0
+      cbuf.clear()
 
       val defdecl: DefaultDecl = ch match {
         case '\'' | '"' =>
@@ -846,7 +846,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests {
       xSpaceOpt()
 
       attList ::= AttrDecl(aname, atpe, defdecl)
-      cbuf.length = 0
+      cbuf.clear()
     }
     nextch()
     handle.attListDecl(n, attList.reverse)