Skip to content

Commit d49d661

Browse files
paulpadriaanm
authored andcommitted
Absolutized paths involving the scala package.
Confusing, now-it-happens now-it-doesn't mysteries lurk in the darkness. When scala packages are declared like this: package scala.collection.mutable Then paths relative to scala can easily be broken via the unlucky presence of an empty (or nonempty) directory. Example: // a.scala package scala.foo class Bar { new util.Random } % scalac ./a.scala % mkdir util % scalac ./a.scala ./a.scala:4: error: type Random is not a member of package util new util.Random ^ one error found There are two ways to play defense against this: - don't use relative paths; okay sometimes, less so others - don't "opt out" of the scala package This commit mostly pursues the latter, with occasional doses of the former. I created a scratch directory containing these empty directories: actors annotation ant api asm beans cmd collection compat concurrent control convert docutil dtd duration event factory forkjoin generic hashing immutable impl include internal io logging macros man1 matching math meta model mutable nsc parallel parsing partest persistent process pull ref reflect reify remote runtime scalap scheduler script swing sys text threadpool tools transform unchecked util xml I stopped when I could compile the main src directories even with all those empties on my classpath.
1 parent da08dd7 commit d49d661

File tree

83 files changed

+167
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+167
-88
lines changed

src/library/scala/xml/Atom.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** The class `Atom` provides an XML node for text (`PCDATA`).
1213
* It is used in both non-bound and bound XML representations.

src/library/scala/xml/Attribute.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** This singleton object contains the `apply` and `unapply` methods for
1213
* convenient construction and deconstruction.

src/library/scala/xml/Comment.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** The class `Comment` implements an XML node for comments.
1213
*

src/library/scala/xml/Document.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** A document information item (according to InfoSet spec). The comments
1213
* are copied from the Infoset spec, only augmented with some information

src/library/scala/xml/Elem.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** This singleton object contains the `apply` and `unapplySeq` methods for
1213
* convenient construction and deconstruction. It is possible to deconstruct

src/library/scala/xml/EntityRef.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** The class `EntityRef` implements an XML node for entity references.
1213
*

src/library/scala/xml/Equality.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** In an attempt to contain the damage being inflicted on consistency by the
1213
* ad hoc `equals` methods spread around `xml`, the logic is centralized and

src/library/scala/xml/Group.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** A hack to group XML nodes in one node for output.
1213
*

src/library/scala/xml/MalformedAttributeException.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99

1010

11-
package scala.xml
11+
package scala
12+
package xml
1213

1314

1415
case class MalformedAttributeException(msg: String) extends RuntimeException(msg)

src/library/scala/xml/MetaData.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
import Utility.sbToString
1213
import scala.annotation.tailrec

src/library/scala/xml/NamespaceBinding.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
import Utility.sbToString
1213

src/library/scala/xml/Node.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** This singleton object contains the `unapplySeq` method for
1213
* convenient deconstruction.

src/library/scala/xml/NodeBuffer.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/**
1213
* This class acts as a Buffer for nodes. If it is used as a sequence of

src/library/scala/xml/NodeSeq.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
import scala.collection.{ mutable, immutable, generic, SeqLike, AbstractSeq }
1213
import mutable.{ Builder, ListBuffer }

src/library/scala/xml/Null.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
import Utility.isNameStart
1213
import scala.collection.Iterator

src/library/scala/xml/PCData.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** This class (which is not used by all XML parsers, but always used by the
1213
* XHTML one) represents parseable character data, which appeared as CDATA

src/library/scala/xml/PrefixedAttribute.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112

1213
/** prefixed attributes always have a non-null namespace.
1314
*

src/library/scala/xml/PrettyPrinter.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
import Utility.sbToString
1213

src/library/scala/xml/ProcInstr.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112

1213
/** an XML node for processing instructions (PI)
1314
*

src/library/scala/xml/QNode.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** This object provides an extractor method to match a qualified node with
1213
* its namespace URI

src/library/scala/xml/SpecialNode.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** `SpecialNode` is a special XML node which represents either text
1213
* `(PCDATA)`, a comment, a `PI`, or an entity ref.

src/library/scala/xml/Text.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** The class `Text` implements an XML node for text (PCDATA).
1213
* It is used in both non-bound and bound XML representations.

src/library/scala/xml/TextBuffer.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112

1213
import Utility.isSpace
1314

src/library/scala/xml/TopScope.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112

1213
/** top level namespace scope. only contains the predefined binding
1314
* for the "xml" prefix which is bound to

src/library/scala/xml/TypeSymbol.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99

1010

11-
package scala.xml
11+
package scala
12+
package xml
1213

1314

1415
abstract class TypeSymbol

src/library/scala/xml/Unparsed.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
/** An XML node for unparsed content. It will be output verbatim, all bets
1213
* are off regarding wellformedness etc.

src/library/scala/xml/UnprefixedAttribute.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112

1213
/** Unprefixed attributes have the null namespace, and no prefix field
1314
*

src/library/scala/xml/Utility.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
import scala.collection.mutable
1213
import parsing.XhtmlEntities

src/library/scala/xml/XML.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011

1112
import parsing.NoBindingFactoryAdapter
1213
import factory.XMLLoader

src/library/scala/xml/Xhtml.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

2-
package scala.xml
2+
package scala
3+
package xml
34

45
import parsing.XhtmlEntities
56
import Utility.{ sbToString, isAtomAndNotText }

src/library/scala/xml/dtd/ContentModel.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
** |/ **
77
\* */
88

9-
10-
11-
package scala.xml
9+
package scala
10+
package xml
1211
package dtd
1312

1413
import scala.xml.dtd.impl._

src/library/scala/xml/dtd/ContentModelParser.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011
package dtd
1112

1213
/** Parser for regexps (content models in DTD element declarations) */

src/library/scala/xml/dtd/DTD.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112
package dtd
1213

1314
import scala.collection.mutable

src/library/scala/xml/dtd/Decl.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
** |/ **
77
\* */
88

9-
package scala.xml
9+
package scala
10+
package xml
1011
package dtd
1112

1213
import Utility.sbToString

src/library/scala/xml/dtd/DocType.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112
package dtd
1213

1314
/** An XML node for document type declaration.

src/library/scala/xml/dtd/ElementValidator.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99

1010

11-
package scala.xml
11+
package scala
12+
package xml
1213
package dtd
1314

1415
import PartialFunction._

src/library/scala/xml/dtd/ExternalID.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112
package dtd
1213

1314
/** an ExternalIDs - either PublicID or SystemID

src/library/scala/xml/dtd/Scanner.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
\* */
88

99

10-
package scala.xml
10+
package scala
11+
package xml
1112
package dtd
1213

1314
/** Scanner for regexps (content models in DTD element declarations)

src/library/scala/xml/dtd/Tokens.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99

1010

11-
package scala.xml
11+
package scala
12+
package xml
1213
package dtd
1314

1415

src/library/scala/xml/dtd/ValidationException.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99

1010

11-
package scala.xml
11+
package scala
12+
package xml
1213
package dtd
1314

1415

0 commit comments

Comments
 (0)