aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/SymbolLoaders.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-08-14 16:05:25 +0200
committerMartin Odersky <odersky@gmail.com>2013-08-14 16:05:25 +0200
commitc6f0c00790c996bea57ea905a830dedcb4f2bb44 (patch)
treecbd166f47ab5f7d3e0aa9d655e7ee65c4e5b3c21 /src/dotty/tools/dotc/core/SymbolLoaders.scala
parent606df6573f0d0323ba58d06e8af3c1aaf844b708 (diff)
downloaddotty-c6f0c00790c996bea57ea905a830dedcb4f2bb44.tar.gz
dotty-c6f0c00790c996bea57ea905a830dedcb4f2bb44.tar.bz2
dotty-c6f0c00790c996bea57ea905a830dedcb4f2bb44.zip
Suppressing file names with $'s in them from loading
Files with $'s need not be loaded during typer.
Diffstat (limited to 'src/dotty/tools/dotc/core/SymbolLoaders.scala')
-rw-r--r--src/dotty/tools/dotc/core/SymbolLoaders.scala6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/SymbolLoaders.scala b/src/dotty/tools/dotc/core/SymbolLoaders.scala
index dc65b77f4..176e3f775 100644
--- a/src/dotty/tools/dotc/core/SymbolLoaders.scala
+++ b/src/dotty/tools/dotc/core/SymbolLoaders.scala
@@ -139,6 +139,9 @@ class SymbolLoaders {
def needCompile(bin: AbstractFile, src: AbstractFile) =
src.lastModified >= bin.lastModified
+ /** Exclude classes with '$' in their names from consideration */
+ def isValid(className: String) = !(className contains '$')
+
/** Load contents of a package
*/
class PackageLoader(override val sourceModule: TermSymbol, classpath: ClassPath)(implicit val cctx: CondensedContext)
@@ -153,7 +156,8 @@ class SymbolLoaders {
sourceModule.completer.complete(sourceModule)
if (!root.isRoot) {
for (classRep <- classpath.classes) {
- initializeFromClassPath(root.symbol, classRep)
+ if (isValid(classRep.name))
+ initializeFromClassPath(root.symbol, classRep)
}
}
if (!root.isEmptyPackage) {