diff --git a/build.sbt b/build.sbt
index 54e744115..a18bc22bc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,6 +24,19 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
mimaPreviousVersion := {
Some("1.2.0")
},
+ mimaBinaryIssueFilters ++= {
+ import com.typesafe.tools.mima.core._
+ import com.typesafe.tools.mima.core.ProblemFilters._
+ Seq(
+ // Scala 2.12 deprecated mutable.Stack, so we broke
+ // binary compatibility for 1.1.0 in the following way:
+ exclude[IncompatibleMethTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack_="),
+ exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.hStack"),
+ exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack"),
+ exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.attribStack"),
+ exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.tagStack")
+ )
+ },
unmanagedSourceDirectories in Compile ++= {
(unmanagedSourceDirectories in Compile).value.map { dir =>
diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala
index 37d45bccc..11387171b 100644
--- a/jvm/src/test/scala/scala/xml/XMLTest.scala
+++ b/jvm/src/test/scala/scala/xml/XMLTest.scala
@@ -41,8 +41,8 @@ class XMLTestJVM {
override def text = ""
}
- assertTrue(c == parsedxml11)
- assertTrue(parsedxml1 == parsedxml11)
+ assertEquals(c, parsedxml11)
+ assertEquals(parsedxml1, parsedxml11)
assertTrue(List(parsedxml1) sameElements List(parsedxml11))
assertTrue(Array(parsedxml1).toList sameElements List(parsedxml11))
@@ -51,10 +51,10 @@ class XMLTestJVM {
val i = new InputSource(new StringReader(x2))
val x2p = scala.xml.XML.load(i)
- assertTrue(x2p == Elem(null, "book", e, sc,
+ assertEquals(Elem(null, "book", e, sc,
Elem(null, "author", e, sc, Text("Peter Buneman")),
Elem(null, "author", e, sc, Text("Dan Suciu")),
- Elem(null, "title", e, sc, Text("Data on ze web"))))
+ Elem(null, "title", e, sc, Text("Data on ze web"))), x2p)
}
@@ -455,16 +455,16 @@ class XMLTestJVM {
@UnitTest
def t6939 = {
val foo =
- assertTrue(foo.child.head.scope.toString == """ xmlns:x="http://bar.com/"""")
+ assertEquals(foo.child.head.scope.toString, """ xmlns:x="http://bar.com/"""")
val fooDefault =
- assertTrue(fooDefault.child.head.scope.toString == """ xmlns="http://bar.com/"""")
+ assertEquals(fooDefault.child.head.scope.toString, """ xmlns="http://bar.com/"""")
val foo2 = scala.xml.XML.loadString("""""")
- assertTrue(foo2.child.head.scope.toString == """ xmlns:x="http://bar.com/"""")
+ assertEquals(foo2.child.head.scope.toString, """ xmlns:x="http://bar.com/"""")
val foo2Default = scala.xml.XML.loadString("""""")
- assertTrue(foo2Default.child.head.scope.toString == """ xmlns="http://bar.com/"""")
+ assertEquals(foo2Default.child.head.scope.toString, """ xmlns="http://bar.com/"""")
}
@UnitTest
diff --git a/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala b/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
index 2bc2c97b1..e3d2ba194 100644
--- a/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
+++ b/shared/src/main/scala/scala/xml/dtd/impl/SubsetConstruction.scala
@@ -32,9 +32,9 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
val delta = new mutable.HashMap[immutable.BitSet, mutable.HashMap[T, immutable.BitSet]]
val deftrans = mutable.Map(q0 -> sink, sink -> sink) // initial transitions
val finals: mutable.Map[immutable.BitSet, Int] = mutable.Map()
- val rest = new mutable.Stack[immutable.BitSet]
+ var rest = immutable.List.empty[immutable.BitSet]
- rest.push(sink, q0)
+ rest = q0 :: sink :: rest
def addFinal(q: immutable.BitSet): Unit = {
if (nfa containsFinal q)
@@ -43,7 +43,7 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
def add(Q: immutable.BitSet): Unit = {
if (!states(Q)) {
states += Q
- rest push Q
+ rest = Q :: rest
addFinal(Q)
}
}
@@ -51,7 +51,8 @@ private[dtd] class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T])
addFinal(q0) // initial state may also be a final state
while (!rest.isEmpty) {
- val P = rest.pop()
+ val P = rest.head
+ rest = rest.tail
// assign a number to this bitset
indexMap(P) = ix
invIndexMap(ix) = P
diff --git a/shared/src/main/scala/scala/xml/factory/XMLLoader.scala b/shared/src/main/scala/scala/xml/factory/XMLLoader.scala
index b84f42af4..e9a534fbd 100644
--- a/shared/src/main/scala/scala/xml/factory/XMLLoader.scala
+++ b/shared/src/main/scala/scala/xml/factory/XMLLoader.scala
@@ -37,9 +37,9 @@ trait XMLLoader[T <: Node] {
def loadXML(source: InputSource, parser: SAXParser): T = {
val newAdapter = adapter
- newAdapter.scopeStack push TopScope
+ newAdapter.scopeStack = TopScope :: newAdapter.scopeStack
parser.parse(source, newAdapter)
- newAdapter.scopeStack.pop()
+ newAdapter.scopeStack = newAdapter.scopeStack.tail
newAdapter.rootElem.asInstanceOf[T]
}
diff --git a/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala b/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
index 2f6284a6c..bf65cfafc 100644
--- a/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
+++ b/shared/src/main/scala/scala/xml/include/sax/XIncluder.scala
@@ -10,7 +10,6 @@ package scala
package xml
package include.sax
-import scala.collection.mutable
import org.xml.sax.{ ContentHandler, Locator, Attributes }
import org.xml.sax.ext.LexicalHandler
import java.io.{ OutputStream, OutputStreamWriter, IOException }
@@ -126,7 +125,7 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
// LexicalHandler methods
private var inDTD: Boolean = false
- private val entities = new mutable.Stack[String]()
+ private var entities = List.empty[String]
def startDTD(name: String, publicID: String, systemID: String): Unit = {
inDTD = true
@@ -146,11 +145,11 @@ class XIncluder(outs: OutputStream, encoding: String) extends ContentHandler wit
def endDTD(): Unit = {}
def startEntity(name: String): Unit = {
- entities push name
+ entities = name :: entities
}
def endEntity(name: String): Unit = {
- entities.pop()
+ entities = entities.tail
}
def startCDATA(): Unit = {}
diff --git a/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala b/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
index cbacb0492..608646f2a 100644
--- a/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
+++ b/shared/src/main/scala/scala/xml/parsing/FactoryAdapter.scala
@@ -10,7 +10,6 @@ package scala
package xml
package parsing
-import scala.collection.{ mutable, Iterator }
import scala.collection.Seq
import org.xml.sax.Attributes
import org.xml.sax.helpers.DefaultHandler
@@ -40,10 +39,34 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
var rootElem: Node = null
val buffer = new StringBuilder()
- val attribStack = new mutable.Stack[MetaData]
- val hStack = new mutable.Stack[Node] // [ element ] contains siblings
- val tagStack = new mutable.Stack[String]
- var scopeStack = new mutable.Stack[NamespaceBinding]
+ /** List of attributes
+ *
+ * Previously was a mutable [[scala.collection.mutable.Stack Stack]], but is now a mutable reference to an immutable [[scala.collection.immutable.List List]].
+ *
+ * @since 1.1.0
+ */
+ var attribStack = List.empty[MetaData]
+ /** List of elements
+ *
+ * Previously was a mutable [[scala.collection.mutable.Stack Stack]], but is now a mutable reference to an immutable [[scala.collection.immutable.List List]].
+ *
+ * @since 1.1.0
+ */
+ var hStack = List.empty[Node] // [ element ] contains siblings
+ /** List of element names
+ *
+ * Previously was a mutable [[scala.collection.mutable.Stack Stack]], but is now a mutable reference to an immutable [[scala.collection.immutable.List List]].
+ *
+ * @since 1.1.0
+ */
+ var tagStack = List.empty[String]
+ /** List of namespaces
+ *
+ * Previously was a mutable [[scala.collection.mutable.Stack Stack]], but is now a mutable reference to an immutable [[scala.collection.immutable.List List]].
+ *
+ * @since 1.1.0
+ */
+ var scopeStack = List.empty[NamespaceBinding]
var curTag: String = null
var capture: Boolean = false
@@ -123,17 +146,17 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
attributes: Attributes): Unit =
{
captureText()
- tagStack push curTag
+ tagStack = curTag :: tagStack
curTag = qname
val localName = splitName(qname)._2
capture = nodeContainsText(localName)
- hStack push null
+ hStack = null :: hStack
var m: MetaData = Null
var scpe: NamespaceBinding =
if (scopeStack.isEmpty) TopScope
- else scopeStack.top
+ else scopeStack.head
for (i <- 0 until attributes.getLength()) {
val qname = attributes getQName i
@@ -148,8 +171,8 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
m = Attribute(Option(pre), key, Text(value), m)
}
- scopeStack push scpe
- attribStack push m
+ scopeStack = scpe :: scopeStack
+ attribStack = m :: attribStack
}
/**
@@ -157,7 +180,7 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
*/
def captureText(): Unit = {
if (capture && buffer.length > 0)
- hStack push createText(buffer.toString)
+ hStack = createText(buffer.toString) :: hStack
buffer.clear()
}
@@ -171,17 +194,24 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
*/
override def endElement(uri: String, _localName: String, qname: String): Unit = {
captureText()
- val metaData = attribStack.pop()
+ val metaData = attribStack.head
+ attribStack = attribStack.tail
// reverse order to get it right
- val v = (Iterator continually hStack.pop takeWhile (_ != null)).toList.reverse
+ val v = hStack.takeWhile(_ != null).reverse
+ hStack = hStack.dropWhile(_ != null) match {
+ case null :: hs => hs
+ case hs => hs
+ }
val (pre, localName) = splitName(qname)
- val scp = scopeStack.pop()
+ val scp = scopeStack.head
+ scopeStack = scopeStack.tail
// create element
rootElem = createNode(pre, localName, metaData, scp, v)
- hStack push rootElem
- curTag = tagStack.pop()
+ hStack = rootElem :: hStack
+ curTag = tagStack.head
+ tagStack = tagStack.tail
capture = curTag != null && nodeContainsText(curTag) // root level
}
@@ -190,6 +220,6 @@ abstract class FactoryAdapter extends DefaultHandler with factory.XMLLoader[Node
*/
override def processingInstruction(target: String, data: String): Unit = {
captureText()
- hStack pushAll createProcInstr(target, data)
+ hStack = hStack.reverse_:::(createProcInstr(target, data).toList)
}
}