Changed Flags object not to inherit from Enumer...

Changed Flags object not to inherit from Enumeration; removed unused
enumeration classes; fixed three other bugs which were being masked by
all the bonus symbols in Flags.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index d6ae26a417..17cc7dab44 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -166,7 +166,7 @@ abstract class SymbolLoaders {
     def refresh() {
       /** Is the given name a valid input file base name? */
       def isValid(name: String): Boolean =
-        name.length() > 0 && !name.endsWith("$class")
+        name.length() > 0 && !name.endsWith("$class") &&
           (/*settings.XO.value*/true || name.indexOf("$anon") == -1)
 
       val classes  = new HashMap[String, global.classPath0.Context]
@@ -195,7 +195,7 @@ abstract class SymbolLoaders {
           if (file.isDirectory && directory.validPackage(file.name) && !packages.isDefinedAt(file.name))
             packages(file.name) = directory.find(file.name, true)
           else if (dir.source.compile)
-            recordClass(file, ".scala", source => checkSource(name, source.sourceFile))
+            recordClass(file, ".scala", source => checkSource(file.name, source.sourceFile))
         }
       }