diff options
author | paltherr <paltherr@epfl.ch> | 2004-03-21 17:48:43 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-03-21 17:48:43 +0000 |
commit | 430c5dbe56f5826a2b26a386e4f1f55d3bc835b7 (patch) | |
tree | 153fbe83f79b849557994bff017ea9be68776c2b /sources/scalac/symtab/classfile/PackageParser.java | |
parent | 61bf0c8f1d9ffb90f0fa543f5f654a08bfc365e0 (diff) | |
download | scala-430c5dbe56f5826a2b26a386e4f1f55d3bc835b7.tar.gz scala-430c5dbe56f5826a2b26a386e4f1f55d3bc835b7.tar.bz2 scala-430c5dbe56f5826a2b26a386e4f1f55d3bc835b7.zip |
- Avoided recomputations of files that are alre...
- Avoided recomputations of files that are already done in PackageParser
Diffstat (limited to 'sources/scalac/symtab/classfile/PackageParser.java')
-rw-r--r-- | sources/scalac/symtab/classfile/PackageParser.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java index 93d17fb381..374c977c38 100644 --- a/sources/scalac/symtab/classfile/PackageParser.java +++ b/sources/scalac/symtab/classfile/PackageParser.java @@ -34,9 +34,6 @@ public class PackageParser extends SymbolLoader { //######################################################################## // Private Fields - /** The JVM class file parser */ - private final ClassParser classCompletion; - /** The CLR package parser */ private final CLRPackageParser importer; @@ -46,7 +43,6 @@ public class PackageParser extends SymbolLoader { /** Initializes this instance. */ public PackageParser(Global global) { super(global); - this.classCompletion = new ClassParser(global); this.importer = (global.target == global.TARGET_MSIL) ? CLRPackageParser.create(global) : null; } @@ -112,8 +108,8 @@ public class PackageParser extends SymbolLoader { } packages.remove(name); Name classname = Name.fromString(name).toTypeName(); - SourceCompleter completer = new SourceCompleter(global); - peckage.newLoadedClass(0, classname, completer, members); + SymbolLoader loader = new SourceCompleter(global, sfile); + peckage.newLoadedClass(0, classname, loader, members); } for (Iterator i = classes.entrySet().iterator(); i.hasNext(); ) { HashMap.Entry entry = (HashMap.Entry)i.next(); @@ -121,7 +117,8 @@ public class PackageParser extends SymbolLoader { AbstractFile cfile = (AbstractFile)entry.getValue(); packages.remove(name); Name classname = Name.fromString(name).toTypeName(); - peckage.newLoadedClass(JAVA, classname, classCompletion, members); + SymbolLoader loader = new ClassParser(global, cfile); + peckage.newLoadedClass(JAVA, classname, loader, members); } for (Iterator i = packages.iterator(); i.hasNext(); ) { String name = (String)i.next(); |