Remove compiler dependency on scala-xml

Author: allanrenucci

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -7,7 +7,7 @@ import scala.collection.immutable.BitSet
 import util.{ SourceFile, SourcePosition }
 import Tokens._
 import Scanners._
-import MarkupParsers._
+import xml.MarkupParsers.MarkupParser
 import core._
 import Flags._
 import Contexts._
@@ -397,7 +397,7 @@ object Parsers {
     /** the markup parser */
     lazy val xmlp = new MarkupParser(this, true)
 
-    object symbXMLBuilder extends SymbolicXMLBuilder(this, true) // DEBUG choices
+    object symbXMLBuilder extends xml.SymbolicXMLBuilder(this, true) // DEBUG choices
 
     def xmlLiteral() : Tree = xmlp.xLiteral
     def xmlLiteralPattern() : Tree = xmlp.xLiteralPattern

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

@@ -13,7 +13,6 @@ import scala.annotation.{ switch, tailrec }
 import scala.collection.mutable
 import scala.collection.immutable.SortedMap
 import mutable.ListBuffer
-import Utility.isNameStart
 import rewrite.Rewrites.patch
 
 object Scanners {
@@ -424,7 +423,7 @@ object Scanners {
             val last = if (charOffset >= 2) buf(charOffset - 2) else ' '
             nextChar()
             last match {
-              case ' ' | '\t' | '\n' | '{' | '(' | '>' if isNameStart(ch) || ch == '!' || ch == '?' =>
+              case ' ' | '\t' | '\n' | '{' | '(' | '>' if xml.Utility.isNameStart(ch) || ch == '!' || ch == '?' =>
                 token = XMLSTART
               case _ =>
                 // Console.println("found '<', but last is '" + in.last +"'"); // DEBUG

compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala renamed to compiler/src/dotty/tools/dotc/parsing/xml/MarkupParserCommon.scala

@@ -7,6 +7,7 @@
 \*                                                                      */
 package dotty.tools.dotc
 package parsing
+package xml
 
 import Utility._
 import util.Chars.SU

compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala renamed to compiler/src/dotty/tools/dotc/parsing/xml/MarkupParsers.scala

@@ -1,6 +1,7 @@
 package dotty.tools
 package dotc
 package parsing
+package xml
 
 import scala.collection.mutable
 import mutable.{ Buffer, ArrayBuffer, ListBuffer }

compiler/src/dotty/tools/dotc/parsing/SymbolicXMLBuilder.scala renamed to compiler/src/dotty/tools/dotc/parsing/xml/SymbolicXMLBuilder.scala

@@ -1,9 +1,9 @@
 package dotty.tools
 package dotc
 package parsing
+package xml
 
 import scala.collection.mutable
-import scala.xml.{ EntityRef, Text }
 import core._
 import Decorators._
 import Flags.Mutable
@@ -146,14 +146,11 @@ class SymbolicXMLBuilder(parser: Parser, preserveWS: Boolean)(implicit ctx: Cont
     (buf map convertToTextPat).toList
 
   def parseAttribute(pos: Position, s: String): Tree = {
-    val ts = scala.xml.Utility.parseAttributeValue(s) map {
-      case Text(s)      => text(pos, s)
-      case EntityRef(s) => entityRef(pos, s)
-    }
-    ts.length match {
-      case 0 => TypedSplice(tpd.ref(defn.NilModule) withPos pos)
-      case 1 => ts.head
-      case _ => makeXMLseq(pos, ts.toList)
+    val ts = Utility.parseAttributeValue(s, text(pos, _), entityRef(pos, _))
+    ts match {
+      case Nil      => TypedSplice(tpd.ref(defn.NilModule) withPos pos)
+      case t :: Nil => t
+      case _        => makeXMLseq(pos, ts)
     }
   }
 

compiler/src/dotty/tools/dotc/parsing/Utility.scala renamed to compiler/src/dotty/tools/dotc/parsing/xml/Utility.scala

@@ -1,5 +1,6 @@
 package dotty.tools.dotc
 package parsing
+package xml
 
 import scala.collection.mutable
 

project/Build.scala

@@ -501,7 +501,8 @@ object Build {
       // get libraries onboard
       libraryDependencies ++= Seq(
         "org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1", // used by the backend
-        ("org.scala-lang.modules" %% "scala-xml" % "1.0.6").withDottyCompat(scalaVersion.value),
+        // FIXME: Not needed, but should be on the compiler CP
+        ("org.scala-lang.modules" %% "scala-xml" % "1.1.0").withDottyCompat(scalaVersion.value),
         "org.scala-lang" % "scala-library" % scalacVersion % "test",
         Dependencies.compilerInterface(sbtVersion.value),
       ),