Merge pull request #347 from ashawley/drop-factory-binder

Drop scala.xml.factory.Binder

Author: ashawley

build.sbt

@@ -93,9 +93,15 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
         exclude[MissingClassProblem]("scala.xml.dtd.impl.PointedHedgeExp$Point$"),
         exclude[MissingClassProblem]("scala.xml.dtd.impl.PointedHedgeExp$TopIter"),
         exclude[MissingClassProblem]("scala.xml.dtd.impl.PointedHedgeExp$Node"),
+        exclude[MissingClassProblem]("scala.xml.dtd.Scanner"),
+        exclude[MissingClassProblem]("scala.xml.dtd.ContentModelParser$"),
+        exclude[MissingClassProblem]("scala.xml.dtd.ContentModelParser"),
+        exclude[MissingClassProblem]("scala.xml.factory.Binder"),
+        exclude[MissingClassProblem]("scala.xml.parsing.ValidatingMarkupHandler"),
         exclude[MissingClassProblem]("scala.xml.persistent.CachedFileStorage"),
         exclude[MissingClassProblem]("scala.xml.persistent.Index"),
         exclude[MissingClassProblem]("scala.xml.persistent.SetStorage"),
+        exclude[DirectMissingMethodProblem]("scala.xml.dtd.ContentModel.parse"),
         exclude[DirectMissingMethodProblem]("scala.xml.Elem.this"),
         exclude[DirectMissingMethodProblem]("scala.xml.Elem.apply"),
         exclude[DirectMissingMethodProblem]("scala.xml.Elem.processXml"),

shared/src/main/scala/scala/xml/dtd/ContentModel.scala

@@ -39,7 +39,6 @@ object ContentModel extends WordExp {
 
   def isMixed(cm: ContentModel) = cond(cm) { case _: MIXED => true }
   def containsText(cm: ContentModel) = (cm == PCDATA) || isMixed(cm)
-  def parse(s: String): ContentModel = ContentModelParser.parse(s)
 
   def getLabels(r: RegExp): Set[String] = {
     def traverse(r: RegExp): Set[String] = r match { // !!! check for match translation problem