- Removed staticsParser and aliasParser in Clas...

- Removed staticsParser and aliasParser in ClassParser Changed
- superclass of CLRPackageParser and CLRClassParser to SymbolLoader
- Adapted Symbol.preInitialize and ClassSymbol constructor

1 files changed, 3 insertions, 5 deletions

diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java
index dd8b5fb70f..29f9a134e2 100644
--- a/sources/scalac/symtab/Symbol.java
+++ b/sources/scalac/symtab/Symbol.java
@@ -815,9 +815,7 @@ public abstract class Symbol implements Modifiers, Kinds {
      */
     public final void preInitialize() {
         //todo: clean up
-        if (infos.info instanceof ClassParser ||
-            infos.info instanceof SourceCompleter ||
-            infos.info instanceof ClassParser.StaticsParser)
+        if (infos.info instanceof SymbolLoader)
             infos.info.complete(this);
     }
 
@@ -1797,9 +1795,9 @@ public class ClassSymbol extends TypeSymbol {
 
     /** Constructor for classes to load as class files.
      */
-    public ClassSymbol(Name name, Symbol owner, ClassParser parser) {
+    public ClassSymbol(Name name, Symbol owner, SymbolLoader parser) {
         this(Position.NOPOS, name, owner, JAVA);
-        this.module = TermSymbol.newCompanionModule(this, JAVA, parser.staticsParser(this));
+        this.module = TermSymbol.newCompanionModule(this, JAVA, parser);
         this.setInfo(parser);
     }