summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/build/bnd/scala-xml.bnd5
-rw-r--r--src/build/maven/maven-deploy.xml1
-rw-r--r--src/build/maven/scala-xml-pom.xml59
-rw-r--r--src/build/pack.xml5
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Contexts.scala21
-rw-r--r--src/library/scala/Predef.scala9
-rw-r--r--src/partest/scala/tools/partest/nest/FileManager.scala3
-rw-r--r--src/xml/scala/xml/Atom.scala (renamed from src/library/scala/xml/Atom.scala)0
-rw-r--r--src/xml/scala/xml/Attribute.scala (renamed from src/library/scala/xml/Attribute.scala)0
-rw-r--r--src/xml/scala/xml/Comment.scala (renamed from src/library/scala/xml/Comment.scala)0
-rw-r--r--src/xml/scala/xml/Document.scala (renamed from src/library/scala/xml/Document.scala)0
-rwxr-xr-xsrc/xml/scala/xml/Elem.scala (renamed from src/library/scala/xml/Elem.scala)0
-rw-r--r--src/xml/scala/xml/EntityRef.scala (renamed from src/library/scala/xml/EntityRef.scala)0
-rw-r--r--src/xml/scala/xml/Equality.scala (renamed from src/library/scala/xml/Equality.scala)0
-rw-r--r--src/xml/scala/xml/Group.scala (renamed from src/library/scala/xml/Group.scala)0
-rw-r--r--src/xml/scala/xml/MalformedAttributeException.scala (renamed from src/library/scala/xml/MalformedAttributeException.scala)0
-rw-r--r--src/xml/scala/xml/MetaData.scala (renamed from src/library/scala/xml/MetaData.scala)0
-rw-r--r--src/xml/scala/xml/NamespaceBinding.scala (renamed from src/library/scala/xml/NamespaceBinding.scala)0
-rwxr-xr-xsrc/xml/scala/xml/Node.scala (renamed from src/library/scala/xml/Node.scala)0
-rw-r--r--src/xml/scala/xml/NodeBuffer.scala (renamed from src/library/scala/xml/NodeBuffer.scala)0
-rw-r--r--src/xml/scala/xml/NodeSeq.scala (renamed from src/library/scala/xml/NodeSeq.scala)0
-rw-r--r--src/xml/scala/xml/Null.scala (renamed from src/library/scala/xml/Null.scala)0
-rw-r--r--src/xml/scala/xml/PCData.scala (renamed from src/library/scala/xml/PCData.scala)0
-rw-r--r--src/xml/scala/xml/PrefixedAttribute.scala (renamed from src/library/scala/xml/PrefixedAttribute.scala)0
-rwxr-xr-xsrc/xml/scala/xml/PrettyPrinter.scala (renamed from src/library/scala/xml/PrettyPrinter.scala)0
-rw-r--r--src/xml/scala/xml/ProcInstr.scala (renamed from src/library/scala/xml/ProcInstr.scala)0
-rw-r--r--src/xml/scala/xml/QNode.scala (renamed from src/library/scala/xml/QNode.scala)0
-rw-r--r--src/xml/scala/xml/SpecialNode.scala (renamed from src/library/scala/xml/SpecialNode.scala)0
-rw-r--r--src/xml/scala/xml/Text.scala (renamed from src/library/scala/xml/Text.scala)0
-rw-r--r--src/xml/scala/xml/TextBuffer.scala (renamed from src/library/scala/xml/TextBuffer.scala)0
-rw-r--r--src/xml/scala/xml/TopScope.scala (renamed from src/library/scala/xml/TopScope.scala)0
-rw-r--r--src/xml/scala/xml/TypeSymbol.scala (renamed from src/library/scala/xml/TypeSymbol.scala)0
-rw-r--r--src/xml/scala/xml/Unparsed.scala (renamed from src/library/scala/xml/Unparsed.scala)0
-rw-r--r--src/xml/scala/xml/UnprefixedAttribute.scala (renamed from src/library/scala/xml/UnprefixedAttribute.scala)0
-rwxr-xr-xsrc/xml/scala/xml/Utility.scala (renamed from src/library/scala/xml/Utility.scala)0
-rwxr-xr-xsrc/xml/scala/xml/XML.scala (renamed from src/library/scala/xml/XML.scala)0
-rw-r--r--src/xml/scala/xml/Xhtml.scala (renamed from src/library/scala/xml/Xhtml.scala)0
-rw-r--r--src/xml/scala/xml/dtd/ContentModel.scala (renamed from src/library/scala/xml/dtd/ContentModel.scala)0
-rw-r--r--src/xml/scala/xml/dtd/ContentModelParser.scala (renamed from src/library/scala/xml/dtd/ContentModelParser.scala)0
-rw-r--r--src/xml/scala/xml/dtd/DTD.scala (renamed from src/library/scala/xml/dtd/DTD.scala)0
-rw-r--r--src/xml/scala/xml/dtd/Decl.scala (renamed from src/library/scala/xml/dtd/Decl.scala)0
-rw-r--r--src/xml/scala/xml/dtd/DocType.scala (renamed from src/library/scala/xml/dtd/DocType.scala)0
-rw-r--r--src/xml/scala/xml/dtd/ElementValidator.scala (renamed from src/library/scala/xml/dtd/ElementValidator.scala)0
-rw-r--r--src/xml/scala/xml/dtd/ExternalID.scala (renamed from src/library/scala/xml/dtd/ExternalID.scala)0
-rw-r--r--src/xml/scala/xml/dtd/Scanner.scala (renamed from src/library/scala/xml/dtd/Scanner.scala)0
-rw-r--r--src/xml/scala/xml/dtd/Tokens.scala (renamed from src/library/scala/xml/dtd/Tokens.scala)0
-rw-r--r--src/xml/scala/xml/dtd/ValidationException.scala (renamed from src/library/scala/xml/dtd/ValidationException.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/Base.scala (renamed from src/library/scala/xml/dtd/impl/Base.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/BaseBerrySethi.scala (renamed from src/library/scala/xml/dtd/impl/BaseBerrySethi.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/DetWordAutom.scala (renamed from src/library/scala/xml/dtd/impl/DetWordAutom.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/Inclusion.scala (renamed from src/library/scala/xml/dtd/impl/Inclusion.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/NondetWordAutom.scala (renamed from src/library/scala/xml/dtd/impl/NondetWordAutom.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/PointedHedgeExp.scala (renamed from src/library/scala/xml/dtd/impl/PointedHedgeExp.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/SubsetConstruction.scala (renamed from src/library/scala/xml/dtd/impl/SubsetConstruction.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/SyntaxError.scala (renamed from src/library/scala/xml/dtd/impl/SyntaxError.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/WordBerrySethi.scala (renamed from src/library/scala/xml/dtd/impl/WordBerrySethi.scala)0
-rw-r--r--src/xml/scala/xml/dtd/impl/WordExp.scala (renamed from src/library/scala/xml/dtd/impl/WordExp.scala)0
-rwxr-xr-xsrc/xml/scala/xml/factory/Binder.scala (renamed from src/library/scala/xml/factory/Binder.scala)0
-rw-r--r--src/xml/scala/xml/factory/LoggedNodeFactory.scala (renamed from src/library/scala/xml/factory/LoggedNodeFactory.scala)0
-rw-r--r--src/xml/scala/xml/factory/NodeFactory.scala (renamed from src/library/scala/xml/factory/NodeFactory.scala)0
-rw-r--r--src/xml/scala/xml/factory/XMLLoader.scala (renamed from src/library/scala/xml/factory/XMLLoader.scala)0
-rw-r--r--src/xml/scala/xml/include/CircularIncludeException.scala (renamed from src/library/scala/xml/include/CircularIncludeException.scala)0
-rw-r--r--src/xml/scala/xml/include/UnavailableResourceException.scala (renamed from src/library/scala/xml/include/UnavailableResourceException.scala)0
-rw-r--r--src/xml/scala/xml/include/XIncludeException.scala (renamed from src/library/scala/xml/include/XIncludeException.scala)0
-rw-r--r--src/xml/scala/xml/include/sax/EncodingHeuristics.scala (renamed from src/library/scala/xml/include/sax/EncodingHeuristics.scala)0
-rw-r--r--src/xml/scala/xml/include/sax/XIncludeFilter.scala (renamed from src/library/scala/xml/include/sax/XIncludeFilter.scala)0
-rw-r--r--src/xml/scala/xml/include/sax/XIncluder.scala (renamed from src/library/scala/xml/include/sax/XIncluder.scala)0
-rw-r--r--src/xml/scala/xml/package.scala (renamed from src/library/scala/xml/package.scala)0
-rwxr-xr-xsrc/xml/scala/xml/parsing/ConstructingHandler.scala (renamed from src/library/scala/xml/parsing/ConstructingHandler.scala)0
-rw-r--r--src/xml/scala/xml/parsing/ConstructingParser.scala (renamed from src/library/scala/xml/parsing/ConstructingParser.scala)0
-rwxr-xr-xsrc/xml/scala/xml/parsing/DefaultMarkupHandler.scala (renamed from src/library/scala/xml/parsing/DefaultMarkupHandler.scala)0
-rw-r--r--src/xml/scala/xml/parsing/ExternalSources.scala (renamed from src/library/scala/xml/parsing/ExternalSources.scala)0
-rw-r--r--src/xml/scala/xml/parsing/FactoryAdapter.scala (renamed from src/library/scala/xml/parsing/FactoryAdapter.scala)0
-rw-r--r--src/xml/scala/xml/parsing/FatalError.scala (renamed from src/library/scala/xml/parsing/FatalError.scala)0
-rwxr-xr-xsrc/xml/scala/xml/parsing/MarkupHandler.scala (renamed from src/library/scala/xml/parsing/MarkupHandler.scala)0
-rwxr-xr-xsrc/xml/scala/xml/parsing/MarkupParser.scala (renamed from src/library/scala/xml/parsing/MarkupParser.scala)0
-rw-r--r--src/xml/scala/xml/parsing/MarkupParserCommon.scala (renamed from src/library/scala/xml/parsing/MarkupParserCommon.scala)0
-rw-r--r--src/xml/scala/xml/parsing/NoBindingFactoryAdapter.scala (renamed from src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala)0
-rw-r--r--src/xml/scala/xml/parsing/TokenTests.scala (renamed from src/library/scala/xml/parsing/TokenTests.scala)0
-rw-r--r--src/xml/scala/xml/parsing/ValidatingMarkupHandler.scala (renamed from src/library/scala/xml/parsing/ValidatingMarkupHandler.scala)0
-rw-r--r--src/xml/scala/xml/parsing/XhtmlEntities.scala (renamed from src/library/scala/xml/parsing/XhtmlEntities.scala)0
-rw-r--r--src/xml/scala/xml/parsing/XhtmlParser.scala (renamed from src/library/scala/xml/parsing/XhtmlParser.scala)0
-rw-r--r--src/xml/scala/xml/persistent/CachedFileStorage.scala (renamed from src/library/scala/xml/persistent/CachedFileStorage.scala)0
-rw-r--r--src/xml/scala/xml/persistent/Index.scala (renamed from src/library/scala/xml/persistent/Index.scala)0
-rw-r--r--src/xml/scala/xml/persistent/SetStorage.scala (renamed from src/library/scala/xml/persistent/SetStorage.scala)0
-rw-r--r--src/xml/scala/xml/pull/XMLEvent.scala (renamed from src/library/scala/xml/pull/XMLEvent.scala)0
-rwxr-xr-xsrc/xml/scala/xml/pull/XMLEventReader.scala (renamed from src/library/scala/xml/pull/XMLEventReader.scala)0
-rw-r--r--src/xml/scala/xml/pull/package.scala (renamed from src/library/scala/xml/pull/package.scala)0
-rw-r--r--src/xml/scala/xml/transform/BasicTransformer.scala (renamed from src/library/scala/xml/transform/BasicTransformer.scala)0
-rw-r--r--src/xml/scala/xml/transform/RewriteRule.scala (renamed from src/library/scala/xml/transform/RewriteRule.scala)0
-rw-r--r--src/xml/scala/xml/transform/RuleTransformer.scala (renamed from src/library/scala/xml/transform/RuleTransformer.scala)0
91 files changed, 78 insertions, 25 deletions
diff --git a/src/build/bnd/scala-xml.bnd b/src/build/bnd/scala-xml.bnd
new file mode 100644
index 0000000000..6203c57dfe
--- /dev/null
+++ b/src/build/bnd/scala-xml.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: Scala XML Library
+Bundle-SymbolicName: org.scala-lang.scala-xml
+ver: @VERSION@
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index bf82346b80..a51562103c 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -108,6 +108,7 @@
<deploy-one name="scala-actors" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
<deploy-one name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
<deploy-one name="scala-library" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+ <deploy-one name="scala-xml" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
<deploy-one name="scala-partest" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
<deploy-one name="scala-reflect" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
<deploy-one name="scala-swing" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
diff --git a/src/build/maven/scala-xml-pom.xml b/src/build/maven/scala-xml-pom.xml
new file mode 100644
index 0000000000..629872c2e2
--- /dev/null
+++ b/src/build/maven/scala-xml-pom.xml
@@ -0,0 +1,59 @@
+<project
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-xml</artifactId>
+ <packaging>jar</packaging>
+ <version>@VERSION@</version>
+ <name>Scala XML</name>
+ <description>XML Library for the Scala Programming Language</description>
+ <url>http://www.scala-lang.org/</url>
+ <inceptionYear>2002</inceptionYear>
+ <organization>
+ <name>LAMP/EPFL</name>
+ <url>http://lamp.epfl.ch/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>BSD-like</name>
+ <url>http://www.scala-lang.org/downloads/license.html
+ </url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git:git://github.com/scala/scala.git</connection>
+ <url>https://github.com/scala/scala.git</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.scala-lang.org/</url>
+ </issueManagement>
+ <properties>
+ <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
+ </properties>
+ <dependencies>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>scala-tools.org</id>
+ <url>@RELEASE_REPOSITORY@</url>
+ </repository>
+ <snapshotRepository>
+ <id>scala-tools.org</id>
+ <url>@SNAPSHOT_REPOSITORY@</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+ <developers>
+ <developer>
+ <id>lamp</id>
+ <name>EPFL LAMP</name>
+ </developer>
+ <developer>
+ <id>Typesafe</id>
+ <name>Typesafe, Inc.</name>
+ </developer>
+ </developers>
+</project>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index f8eb3c67c5..44198adb1e 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -153,6 +153,7 @@ MAIN DISTRIBUTION PACKAGING
</macrodef>
<mvn-copy-lib mvn.artifact.name="jline"/>
<mvn-copy-lib mvn.artifact.name="scala-library"/>
+ <mvn-copy-lib mvn.artifact.name="scala-xml"/>
<mvn-copy-lib mvn.artifact.name="scala-reflect"/>
<mvn-copy-lib mvn.artifact.name="scala-compiler"/>
<mvn-copy-lib mvn.artifact.name="scala-swing"/>
@@ -203,6 +204,10 @@ MAIN DISTRIBUTION PACKAGING
basedir="${build-docs.dir}/library">
<include name="**/*"/>
</jar>
+ <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-xml/scala-xml-docs.jar"
+ basedir="${build-docs.dir}/xml">
+ <include name="**/*"/>
+ </jar>
<jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar"
basedir="${build-docs.dir}/compiler">
<include name="**/*"/>
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 1f4ff7cc2d..1f8f13ae02 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -99,22 +99,13 @@ trait Contexts { self: Analyzer =>
// there must be a scala.xml package when xml literals were parsed in this unit
if (unit.hasXml && ScalaXmlPackage == NoSymbol)
- unit.error(unit.firstXmlPos, "XML literals may only be used if the package scala.xml is present in the compilation classpath.")
-
- // TODO: remove the def below and drop `|| predefDefinesDollarScope` in the condition for `contextWithXML`
- // as soon as 2.11.0-M4 is released and used as STARR (and $scope is no longer defined in Predef)
- // Until then, to allow compiling quick with pre-2.11.0-M4 STARR,
- // which relied on Predef defining `val $scope`, we've left it in place.
- // Since the new scheme also imports $scope (as an alias for scala.xml.TopScope),
- // we must check whether it is still there and not import the alias to avoid ambiguity.
- // (All of this is only necessary to compile the full quick stage with STARR.
- // if using locker, Predef.$scope is no longer needed.)
- def predefDefinesDollarScope = definitions.getMemberIfDefined(PredefModule, nme.dollarScope) != NoSymbol
-
- // hack for the old xml library (detected by looking for scala.xml.TopScope, which needs to be in scope as $scope)
- // import scala.xml.{TopScope => $scope}
+ unit.error(unit.firstXmlPos, "To compile XML syntax, the scala.xml package must be on the classpath.\nPlease see https://github.com/scala/scala/wiki/Scala-2.11#xml.")
+
+ // scala-xml needs `scala.xml.TopScope` to be in scope globally as `$scope`
+ // We detect `scala-xml` by looking for `scala.xml.TopScope` and
+ // inject the equivalent of `import scala.xml.{TopScope => $scope}`
val contextWithXML =
- if (!unit.hasXml || ScalaXmlTopScope == NoSymbol || predefDefinesDollarScope) rootImportsContext
+ if (!unit.hasXml || ScalaXmlTopScope == NoSymbol) rootImportsContext
else rootImportsContext.make(gen.mkImport(ScalaXmlPackage, nme.TopScope, nme.dollarScope))
val c = contextWithXML.make(tree, unit = unit)
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index a188602543..3b588e261f 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -134,15 +134,6 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef {
@inline def implicitly[T](implicit e: T) = e // for summoning implicit values from the nether world -- TODO: when dependent method types are on by default, give this result type `e.type`, so that inliner has better chance of knowing which method to inline in calls like `implicitly[MatchingStrategy[Option]].zero`
@inline def locally[T](x: T): T = x // to communicate intent and avoid unmoored statements
- // TODO: remove `val $scope = ...` as soon as 2.11.0-M4 is released and used as STARR
- // As it has a '$' in its name, we don't have to deprecate first.
- // The compiler now aliases `scala.xml.TopScope` to `$scope` (unless Predef.$scope is still there).
- // This definition left in place for older compilers and to compile quick with pre-2.11.0-M4 STARR.
- // In principle we don't need it to compile library/reflect/compiler (there's no xml left there),
- // so a new locker can be built without this definition, and locker can build quick
- // (partest, scaladoc still require xml).
- val $scope = scala.xml.TopScope
-
// errors and asserts -------------------------------------------------
// !!! Remove this when possible - ideally for 2.11.
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index 230ada4803..ee24c0b9c1 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -68,12 +68,13 @@ trait FileManager extends FileUtil {
else
(SFile(LATEST_LIB).parent.parent / "classes" / what).toAbsolute.path
}
+ def latestXmlLib = relativeToLibrary("xml")
def latestScaladoc = relativeToLibrary("scaladoc")
def latestInteractive = relativeToLibrary("interactive")
def latestScalapFile = relativeToLibrary("scalap")
def latestPaths = List(
LATEST_LIB, LATEST_REFLECT, LATEST_COMP, LATEST_PARTEST, LATEST_ACTORS,
- latestScalapFile, latestScaladoc, latestInteractive
+ latestXmlLib, latestScalapFile, latestScaladoc, latestInteractive
)
def latestFiles = latestPaths map (p => new java.io.File(p))
def latestUrls = latestFiles map (_.toURI.toURL)
diff --git a/src/library/scala/xml/Atom.scala b/src/xml/scala/xml/Atom.scala
index 33e58ba7e7..33e58ba7e7 100644
--- a/src/library/scala/xml/Atom.scala
+++ b/src/xml/scala/xml/Atom.scala
diff --git a/src/library/scala/xml/Attribute.scala b/src/xml/scala/xml/Attribute.scala
index e4b2b69fc6..e4b2b69fc6 100644
--- a/src/library/scala/xml/Attribute.scala
+++ b/src/xml/scala/xml/Attribute.scala
diff --git a/src/library/scala/xml/Comment.scala b/src/xml/scala/xml/Comment.scala
index b8dccdcb16..b8dccdcb16 100644
--- a/src/library/scala/xml/Comment.scala
+++ b/src/xml/scala/xml/Comment.scala
diff --git a/src/library/scala/xml/Document.scala b/src/xml/scala/xml/Document.scala
index 9a725014fc..9a725014fc 100644
--- a/src/library/scala/xml/Document.scala
+++ b/src/xml/scala/xml/Document.scala
diff --git a/src/library/scala/xml/Elem.scala b/src/xml/scala/xml/Elem.scala
index 484cf98744..484cf98744 100755
--- a/src/library/scala/xml/Elem.scala
+++ b/src/xml/scala/xml/Elem.scala
diff --git a/src/library/scala/xml/EntityRef.scala b/src/xml/scala/xml/EntityRef.scala
index 7a58831075..7a58831075 100644
--- a/src/library/scala/xml/EntityRef.scala
+++ b/src/xml/scala/xml/EntityRef.scala
diff --git a/src/library/scala/xml/Equality.scala b/src/xml/scala/xml/Equality.scala
index 021d185812..021d185812 100644
--- a/src/library/scala/xml/Equality.scala
+++ b/src/xml/scala/xml/Equality.scala
diff --git a/src/library/scala/xml/Group.scala b/src/xml/scala/xml/Group.scala
index e3af615008..e3af615008 100644
--- a/src/library/scala/xml/Group.scala
+++ b/src/xml/scala/xml/Group.scala
diff --git a/src/library/scala/xml/MalformedAttributeException.scala b/src/xml/scala/xml/MalformedAttributeException.scala
index d499ad3e10..d499ad3e10 100644
--- a/src/library/scala/xml/MalformedAttributeException.scala
+++ b/src/xml/scala/xml/MalformedAttributeException.scala
diff --git a/src/library/scala/xml/MetaData.scala b/src/xml/scala/xml/MetaData.scala
index 8b5ea187cb..8b5ea187cb 100644
--- a/src/library/scala/xml/MetaData.scala
+++ b/src/xml/scala/xml/MetaData.scala
diff --git a/src/library/scala/xml/NamespaceBinding.scala b/src/xml/scala/xml/NamespaceBinding.scala
index b320466976..b320466976 100644
--- a/src/library/scala/xml/NamespaceBinding.scala
+++ b/src/xml/scala/xml/NamespaceBinding.scala
diff --git a/src/library/scala/xml/Node.scala b/src/xml/scala/xml/Node.scala
index e121284252..e121284252 100755
--- a/src/library/scala/xml/Node.scala
+++ b/src/xml/scala/xml/Node.scala
diff --git a/src/library/scala/xml/NodeBuffer.scala b/src/xml/scala/xml/NodeBuffer.scala
index ae7c7b2bf8..ae7c7b2bf8 100644
--- a/src/library/scala/xml/NodeBuffer.scala
+++ b/src/xml/scala/xml/NodeBuffer.scala
diff --git a/src/library/scala/xml/NodeSeq.scala b/src/xml/scala/xml/NodeSeq.scala
index b8022472fb..b8022472fb 100644
--- a/src/library/scala/xml/NodeSeq.scala
+++ b/src/xml/scala/xml/NodeSeq.scala
diff --git a/src/library/scala/xml/Null.scala b/src/xml/scala/xml/Null.scala
index f763c023c4..f763c023c4 100644
--- a/src/library/scala/xml/Null.scala
+++ b/src/xml/scala/xml/Null.scala
diff --git a/src/library/scala/xml/PCData.scala b/src/xml/scala/xml/PCData.scala
index 31eea2b6d7..31eea2b6d7 100644
--- a/src/library/scala/xml/PCData.scala
+++ b/src/xml/scala/xml/PCData.scala
diff --git a/src/library/scala/xml/PrefixedAttribute.scala b/src/xml/scala/xml/PrefixedAttribute.scala
index 4ab79c8677..4ab79c8677 100644
--- a/src/library/scala/xml/PrefixedAttribute.scala
+++ b/src/xml/scala/xml/PrefixedAttribute.scala
diff --git a/src/library/scala/xml/PrettyPrinter.scala b/src/xml/scala/xml/PrettyPrinter.scala
index 9e01905357..9e01905357 100755
--- a/src/library/scala/xml/PrettyPrinter.scala
+++ b/src/xml/scala/xml/PrettyPrinter.scala
diff --git a/src/library/scala/xml/ProcInstr.scala b/src/xml/scala/xml/ProcInstr.scala
index 189c1c6878..189c1c6878 100644
--- a/src/library/scala/xml/ProcInstr.scala
+++ b/src/xml/scala/xml/ProcInstr.scala
diff --git a/src/library/scala/xml/QNode.scala b/src/xml/scala/xml/QNode.scala
index f9e3f1854b..f9e3f1854b 100644
--- a/src/library/scala/xml/QNode.scala
+++ b/src/xml/scala/xml/QNode.scala
diff --git a/src/library/scala/xml/SpecialNode.scala b/src/xml/scala/xml/SpecialNode.scala
index 5fef8ef66c..5fef8ef66c 100644
--- a/src/library/scala/xml/SpecialNode.scala
+++ b/src/xml/scala/xml/SpecialNode.scala
diff --git a/src/library/scala/xml/Text.scala b/src/xml/scala/xml/Text.scala
index debea0c025..debea0c025 100644
--- a/src/library/scala/xml/Text.scala
+++ b/src/xml/scala/xml/Text.scala
diff --git a/src/library/scala/xml/TextBuffer.scala b/src/xml/scala/xml/TextBuffer.scala
index 514b1701af..514b1701af 100644
--- a/src/library/scala/xml/TextBuffer.scala
+++ b/src/xml/scala/xml/TextBuffer.scala
diff --git a/src/library/scala/xml/TopScope.scala b/src/xml/scala/xml/TopScope.scala
index 474fbbbdb5..474fbbbdb5 100644
--- a/src/library/scala/xml/TopScope.scala
+++ b/src/xml/scala/xml/TopScope.scala
diff --git a/src/library/scala/xml/TypeSymbol.scala b/src/xml/scala/xml/TypeSymbol.scala
index fb371ee340..fb371ee340 100644
--- a/src/library/scala/xml/TypeSymbol.scala
+++ b/src/xml/scala/xml/TypeSymbol.scala
diff --git a/src/library/scala/xml/Unparsed.scala b/src/xml/scala/xml/Unparsed.scala
index bc190eb724..bc190eb724 100644
--- a/src/library/scala/xml/Unparsed.scala
+++ b/src/xml/scala/xml/Unparsed.scala
diff --git a/src/library/scala/xml/UnprefixedAttribute.scala b/src/xml/scala/xml/UnprefixedAttribute.scala
index 6fa827da5f..6fa827da5f 100644
--- a/src/library/scala/xml/UnprefixedAttribute.scala
+++ b/src/xml/scala/xml/UnprefixedAttribute.scala
diff --git a/src/library/scala/xml/Utility.scala b/src/xml/scala/xml/Utility.scala
index 9134476401..9134476401 100755
--- a/src/library/scala/xml/Utility.scala
+++ b/src/xml/scala/xml/Utility.scala
diff --git a/src/library/scala/xml/XML.scala b/src/xml/scala/xml/XML.scala
index 020264e509..020264e509 100755
--- a/src/library/scala/xml/XML.scala
+++ b/src/xml/scala/xml/XML.scala
diff --git a/src/library/scala/xml/Xhtml.scala b/src/xml/scala/xml/Xhtml.scala
index 6a12c1a89a..6a12c1a89a 100644
--- a/src/library/scala/xml/Xhtml.scala
+++ b/src/xml/scala/xml/Xhtml.scala
diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/xml/scala/xml/dtd/ContentModel.scala
index 4007985dce..4007985dce 100644
--- a/src/library/scala/xml/dtd/ContentModel.scala
+++ b/src/xml/scala/xml/dtd/ContentModel.scala
diff --git a/src/library/scala/xml/dtd/ContentModelParser.scala b/src/xml/scala/xml/dtd/ContentModelParser.scala
index 71b391c422..71b391c422 100644
--- a/src/library/scala/xml/dtd/ContentModelParser.scala
+++ b/src/xml/scala/xml/dtd/ContentModelParser.scala
diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/xml/scala/xml/dtd/DTD.scala
index 16a824fe2c..16a824fe2c 100644
--- a/src/library/scala/xml/dtd/DTD.scala
+++ b/src/xml/scala/xml/dtd/DTD.scala
diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/xml/scala/xml/dtd/Decl.scala
index 8bf859c460..8bf859c460 100644
--- a/src/library/scala/xml/dtd/Decl.scala
+++ b/src/xml/scala/xml/dtd/Decl.scala
diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/xml/scala/xml/dtd/DocType.scala
index 849d560cc9..849d560cc9 100644
--- a/src/library/scala/xml/dtd/DocType.scala
+++ b/src/xml/scala/xml/dtd/DocType.scala
diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/xml/scala/xml/dtd/ElementValidator.scala
index 4830769a7d..4830769a7d 100644
--- a/src/library/scala/xml/dtd/ElementValidator.scala
+++ b/src/xml/scala/xml/dtd/ElementValidator.scala
diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/xml/scala/xml/dtd/ExternalID.scala
index 880633d860..880633d860 100644
--- a/src/library/scala/xml/dtd/ExternalID.scala
+++ b/src/xml/scala/xml/dtd/ExternalID.scala
diff --git a/src/library/scala/xml/dtd/Scanner.scala b/src/xml/scala/xml/dtd/Scanner.scala
index 5f9d1ccaed..5f9d1ccaed 100644
--- a/src/library/scala/xml/dtd/Scanner.scala
+++ b/src/xml/scala/xml/dtd/Scanner.scala
diff --git a/src/library/scala/xml/dtd/Tokens.scala b/src/xml/scala/xml/dtd/Tokens.scala
index 07e888e77a..07e888e77a 100644
--- a/src/library/scala/xml/dtd/Tokens.scala
+++ b/src/xml/scala/xml/dtd/Tokens.scala
diff --git a/src/library/scala/xml/dtd/ValidationException.scala b/src/xml/scala/xml/dtd/ValidationException.scala
index 1bfae55286..1bfae55286 100644
--- a/src/library/scala/xml/dtd/ValidationException.scala
+++ b/src/xml/scala/xml/dtd/ValidationException.scala
diff --git a/src/library/scala/xml/dtd/impl/Base.scala b/src/xml/scala/xml/dtd/impl/Base.scala
index 91ff03a93a..91ff03a93a 100644
--- a/src/library/scala/xml/dtd/impl/Base.scala
+++ b/src/xml/scala/xml/dtd/impl/Base.scala
diff --git a/src/library/scala/xml/dtd/impl/BaseBerrySethi.scala b/src/xml/scala/xml/dtd/impl/BaseBerrySethi.scala
index f30309b037..f30309b037 100644
--- a/src/library/scala/xml/dtd/impl/BaseBerrySethi.scala
+++ b/src/xml/scala/xml/dtd/impl/BaseBerrySethi.scala
diff --git a/src/library/scala/xml/dtd/impl/DetWordAutom.scala b/src/xml/scala/xml/dtd/impl/DetWordAutom.scala
index 6f8ba4de72..6f8ba4de72 100644
--- a/src/library/scala/xml/dtd/impl/DetWordAutom.scala
+++ b/src/xml/scala/xml/dtd/impl/DetWordAutom.scala
diff --git a/src/library/scala/xml/dtd/impl/Inclusion.scala b/src/xml/scala/xml/dtd/impl/Inclusion.scala
index 07b6afaeba..07b6afaeba 100644
--- a/src/library/scala/xml/dtd/impl/Inclusion.scala
+++ b/src/xml/scala/xml/dtd/impl/Inclusion.scala
diff --git a/src/library/scala/xml/dtd/impl/NondetWordAutom.scala b/src/xml/scala/xml/dtd/impl/NondetWordAutom.scala
index 0bb19a7e3e..0bb19a7e3e 100644
--- a/src/library/scala/xml/dtd/impl/NondetWordAutom.scala
+++ b/src/xml/scala/xml/dtd/impl/NondetWordAutom.scala
diff --git a/src/library/scala/xml/dtd/impl/PointedHedgeExp.scala b/src/xml/scala/xml/dtd/impl/PointedHedgeExp.scala
index 1720604132..1720604132 100644
--- a/src/library/scala/xml/dtd/impl/PointedHedgeExp.scala
+++ b/src/xml/scala/xml/dtd/impl/PointedHedgeExp.scala
diff --git a/src/library/scala/xml/dtd/impl/SubsetConstruction.scala b/src/xml/scala/xml/dtd/impl/SubsetConstruction.scala
index 632ca1eb18..632ca1eb18 100644
--- a/src/library/scala/xml/dtd/impl/SubsetConstruction.scala
+++ b/src/xml/scala/xml/dtd/impl/SubsetConstruction.scala
diff --git a/src/library/scala/xml/dtd/impl/SyntaxError.scala b/src/xml/scala/xml/dtd/impl/SyntaxError.scala
index a5b8a5aba0..a5b8a5aba0 100644
--- a/src/library/scala/xml/dtd/impl/SyntaxError.scala
+++ b/src/xml/scala/xml/dtd/impl/SyntaxError.scala
diff --git a/src/library/scala/xml/dtd/impl/WordBerrySethi.scala b/src/xml/scala/xml/dtd/impl/WordBerrySethi.scala
index 9bf3fa518b..9bf3fa518b 100644
--- a/src/library/scala/xml/dtd/impl/WordBerrySethi.scala
+++ b/src/xml/scala/xml/dtd/impl/WordBerrySethi.scala
diff --git a/src/library/scala/xml/dtd/impl/WordExp.scala b/src/xml/scala/xml/dtd/impl/WordExp.scala
index a4bb54c1ea..a4bb54c1ea 100644
--- a/src/library/scala/xml/dtd/impl/WordExp.scala
+++ b/src/xml/scala/xml/dtd/impl/WordExp.scala
diff --git a/src/library/scala/xml/factory/Binder.scala b/src/xml/scala/xml/factory/Binder.scala
index 947f99e6a4..947f99e6a4 100755
--- a/src/library/scala/xml/factory/Binder.scala
+++ b/src/xml/scala/xml/factory/Binder.scala
diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/xml/scala/xml/factory/LoggedNodeFactory.scala
index bc074bfc83..bc074bfc83 100644
--- a/src/library/scala/xml/factory/LoggedNodeFactory.scala
+++ b/src/xml/scala/xml/factory/LoggedNodeFactory.scala
diff --git a/src/library/scala/xml/factory/NodeFactory.scala b/src/xml/scala/xml/factory/NodeFactory.scala
index 94801bb554..94801bb554 100644
--- a/src/library/scala/xml/factory/NodeFactory.scala
+++ b/src/xml/scala/xml/factory/NodeFactory.scala
diff --git a/src/library/scala/xml/factory/XMLLoader.scala b/src/xml/scala/xml/factory/XMLLoader.scala
index b69f187039..b69f187039 100644
--- a/src/library/scala/xml/factory/XMLLoader.scala
+++ b/src/xml/scala/xml/factory/XMLLoader.scala
diff --git a/src/library/scala/xml/include/CircularIncludeException.scala b/src/xml/scala/xml/include/CircularIncludeException.scala
index 351f403008..351f403008 100644
--- a/src/library/scala/xml/include/CircularIncludeException.scala
+++ b/src/xml/scala/xml/include/CircularIncludeException.scala
diff --git a/src/library/scala/xml/include/UnavailableResourceException.scala b/src/xml/scala/xml/include/UnavailableResourceException.scala
index 47b176e0f3..47b176e0f3 100644
--- a/src/library/scala/xml/include/UnavailableResourceException.scala
+++ b/src/xml/scala/xml/include/UnavailableResourceException.scala
diff --git a/src/library/scala/xml/include/XIncludeException.scala b/src/xml/scala/xml/include/XIncludeException.scala
index 11e1644d83..11e1644d83 100644
--- a/src/library/scala/xml/include/XIncludeException.scala
+++ b/src/xml/scala/xml/include/XIncludeException.scala
diff --git a/src/library/scala/xml/include/sax/EncodingHeuristics.scala b/src/xml/scala/xml/include/sax/EncodingHeuristics.scala
index 57ab5ed91c..57ab5ed91c 100644
--- a/src/library/scala/xml/include/sax/EncodingHeuristics.scala
+++ b/src/xml/scala/xml/include/sax/EncodingHeuristics.scala
diff --git a/src/library/scala/xml/include/sax/XIncludeFilter.scala b/src/xml/scala/xml/include/sax/XIncludeFilter.scala
index 3fa3beefb0..3fa3beefb0 100644
--- a/src/library/scala/xml/include/sax/XIncludeFilter.scala
+++ b/src/xml/scala/xml/include/sax/XIncludeFilter.scala
diff --git a/src/library/scala/xml/include/sax/XIncluder.scala b/src/xml/scala/xml/include/sax/XIncluder.scala
index 1939fa1875..1939fa1875 100644
--- a/src/library/scala/xml/include/sax/XIncluder.scala
+++ b/src/xml/scala/xml/include/sax/XIncluder.scala
diff --git a/src/library/scala/xml/package.scala b/src/xml/scala/xml/package.scala
index 4001cc5ffb..4001cc5ffb 100644
--- a/src/library/scala/xml/package.scala
+++ b/src/xml/scala/xml/package.scala
diff --git a/src/library/scala/xml/parsing/ConstructingHandler.scala b/src/xml/scala/xml/parsing/ConstructingHandler.scala
index ba416e4301..ba416e4301 100755
--- a/src/library/scala/xml/parsing/ConstructingHandler.scala
+++ b/src/xml/scala/xml/parsing/ConstructingHandler.scala
diff --git a/src/library/scala/xml/parsing/ConstructingParser.scala b/src/xml/scala/xml/parsing/ConstructingParser.scala
index 3caeddabf4..3caeddabf4 100644
--- a/src/library/scala/xml/parsing/ConstructingParser.scala
+++ b/src/xml/scala/xml/parsing/ConstructingParser.scala
diff --git a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala b/src/xml/scala/xml/parsing/DefaultMarkupHandler.scala
index 6ec7474843..6ec7474843 100755
--- a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala
+++ b/src/xml/scala/xml/parsing/DefaultMarkupHandler.scala
diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/xml/scala/xml/parsing/ExternalSources.scala
index bb939bca95..bb939bca95 100644
--- a/src/library/scala/xml/parsing/ExternalSources.scala
+++ b/src/xml/scala/xml/parsing/ExternalSources.scala
diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/xml/scala/xml/parsing/FactoryAdapter.scala
index 2154bdf5ba..2154bdf5ba 100644
--- a/src/library/scala/xml/parsing/FactoryAdapter.scala
+++ b/src/xml/scala/xml/parsing/FactoryAdapter.scala
diff --git a/src/library/scala/xml/parsing/FatalError.scala b/src/xml/scala/xml/parsing/FatalError.scala
index ab3cb2a74d..ab3cb2a74d 100644
--- a/src/library/scala/xml/parsing/FatalError.scala
+++ b/src/xml/scala/xml/parsing/FatalError.scala
diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/xml/scala/xml/parsing/MarkupHandler.scala
index 1ebffb9c90..1ebffb9c90 100755
--- a/src/library/scala/xml/parsing/MarkupHandler.scala
+++ b/src/xml/scala/xml/parsing/MarkupHandler.scala
diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/xml/scala/xml/parsing/MarkupParser.scala
index 3bbd136b67..3bbd136b67 100755
--- a/src/library/scala/xml/parsing/MarkupParser.scala
+++ b/src/xml/scala/xml/parsing/MarkupParser.scala
diff --git a/src/library/scala/xml/parsing/MarkupParserCommon.scala b/src/xml/scala/xml/parsing/MarkupParserCommon.scala
index 57c1651558..57c1651558 100644
--- a/src/library/scala/xml/parsing/MarkupParserCommon.scala
+++ b/src/xml/scala/xml/parsing/MarkupParserCommon.scala
diff --git a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/xml/scala/xml/parsing/NoBindingFactoryAdapter.scala
index 56ac185f47..56ac185f47 100644
--- a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala
+++ b/src/xml/scala/xml/parsing/NoBindingFactoryAdapter.scala
diff --git a/src/library/scala/xml/parsing/TokenTests.scala b/src/xml/scala/xml/parsing/TokenTests.scala
index 8dd9cdfaa3..8dd9cdfaa3 100644
--- a/src/library/scala/xml/parsing/TokenTests.scala
+++ b/src/xml/scala/xml/parsing/TokenTests.scala
diff --git a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/xml/scala/xml/parsing/ValidatingMarkupHandler.scala
index 1b20901249..1b20901249 100644
--- a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala
+++ b/src/xml/scala/xml/parsing/ValidatingMarkupHandler.scala
diff --git a/src/library/scala/xml/parsing/XhtmlEntities.scala b/src/xml/scala/xml/parsing/XhtmlEntities.scala
index 3683af202c..3683af202c 100644
--- a/src/library/scala/xml/parsing/XhtmlEntities.scala
+++ b/src/xml/scala/xml/parsing/XhtmlEntities.scala
diff --git a/src/library/scala/xml/parsing/XhtmlParser.scala b/src/xml/scala/xml/parsing/XhtmlParser.scala
index 6ce5bec8d0..6ce5bec8d0 100644
--- a/src/library/scala/xml/parsing/XhtmlParser.scala
+++ b/src/xml/scala/xml/parsing/XhtmlParser.scala
diff --git a/src/library/scala/xml/persistent/CachedFileStorage.scala b/src/xml/scala/xml/persistent/CachedFileStorage.scala
index a1489ef3f4..a1489ef3f4 100644
--- a/src/library/scala/xml/persistent/CachedFileStorage.scala
+++ b/src/xml/scala/xml/persistent/CachedFileStorage.scala
diff --git a/src/library/scala/xml/persistent/Index.scala b/src/xml/scala/xml/persistent/Index.scala
index 9ee45e7086..9ee45e7086 100644
--- a/src/library/scala/xml/persistent/Index.scala
+++ b/src/xml/scala/xml/persistent/Index.scala
diff --git a/src/library/scala/xml/persistent/SetStorage.scala b/src/xml/scala/xml/persistent/SetStorage.scala
index 8db56a2e71..8db56a2e71 100644
--- a/src/library/scala/xml/persistent/SetStorage.scala
+++ b/src/xml/scala/xml/persistent/SetStorage.scala
diff --git a/src/library/scala/xml/pull/XMLEvent.scala b/src/xml/scala/xml/pull/XMLEvent.scala
index 3beb3648e7..3beb3648e7 100644
--- a/src/library/scala/xml/pull/XMLEvent.scala
+++ b/src/xml/scala/xml/pull/XMLEvent.scala
diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/xml/scala/xml/pull/XMLEventReader.scala
index 76e51e17fd..76e51e17fd 100755
--- a/src/library/scala/xml/pull/XMLEventReader.scala
+++ b/src/xml/scala/xml/pull/XMLEventReader.scala
diff --git a/src/library/scala/xml/pull/package.scala b/src/xml/scala/xml/pull/package.scala
index 0e3019446b..0e3019446b 100644
--- a/src/library/scala/xml/pull/package.scala
+++ b/src/xml/scala/xml/pull/package.scala
diff --git a/src/library/scala/xml/transform/BasicTransformer.scala b/src/xml/scala/xml/transform/BasicTransformer.scala
index c98339fd67..c98339fd67 100644
--- a/src/library/scala/xml/transform/BasicTransformer.scala
+++ b/src/xml/scala/xml/transform/BasicTransformer.scala
diff --git a/src/library/scala/xml/transform/RewriteRule.scala b/src/xml/scala/xml/transform/RewriteRule.scala
index 1399ee538d..1399ee538d 100644
--- a/src/library/scala/xml/transform/RewriteRule.scala
+++ b/src/xml/scala/xml/transform/RewriteRule.scala
diff --git a/src/library/scala/xml/transform/RuleTransformer.scala b/src/xml/scala/xml/transform/RuleTransformer.scala
index 3a222ba759..3a222ba759 100644
--- a/src/library/scala/xml/transform/RuleTransformer.scala
+++ b/src/xml/scala/xml/transform/RuleTransformer.scala