diff options
author | paltherr <paltherr@epfl.ch> | 2004-04-14 13:31:35 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-04-14 13:31:35 +0000 |
commit | 3ec2af254866c60389b3fd304c14d1137b9cf4c8 (patch) | |
tree | c4cb09396b20ca0a2412930c891cee3566c7a2c6 /sources/scalac/symtab/classfile/PackageParser.java | |
parent | fbd9b93cc4f10e90da94d963f3e052803e93acfd (diff) | |
download | scala-3ec2af254866c60389b3fd304c14d1137b9cf4c8.tar.gz scala-3ec2af254866c60389b3fd304c14d1137b9cf4c8.tar.bz2 scala-3ec2af254866c60389b3fd304c14d1137b9cf4c8.zip |
- Replaced Symbol.module by Symbol.sourceModule
- Made Symbol.linkedModule and Symbol.linkedClass a bit less ambiguous
- Added documentation to Symbol.sourceModule and Symbol.linkedModule -
Added classes ConstructorSymbol, ModuleSymbol ModuleClassSymbol - Added
classes LinkedModuleSymbol and LinkedClassSymbol - Changed the argument
order in symbol constructors to be the same as in the symbol factories
- Changed Pickle to use sourceModule instead of HashTable - Replaced
notion of main class by notion of root symbol in SymbolLoader - Fixed
UnPickle to work with any root symbol
Diffstat (limited to 'sources/scalac/symtab/classfile/PackageParser.java')
-rw-r--r-- | sources/scalac/symtab/classfile/PackageParser.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java index 13882f7714..07d196312c 100644 --- a/sources/scalac/symtab/classfile/PackageParser.java +++ b/sources/scalac/symtab/classfile/PackageParser.java @@ -21,6 +21,7 @@ import scalac.symtab.Symbol; import scalac.symtab.SymbolLoader; import scalac.symtab.Type; import scalac.util.Name; +import scalac.util.Debug; /** * This class implements a package member loader. It can be used to @@ -47,7 +48,9 @@ public class PackageParser extends SymbolLoader { // Protected Methods /** Completes the package symbol by loading all its members. */ - protected String doComplete(Symbol peckage) { + protected String doComplete(Symbol root) { + assert root.isRoot() || root.isPackage(): Debug.show(root); + Symbol peckage = root.isRoot() ? root : root.moduleClass(); // collect JVM and source members boolean isRoot = peckage.isRoot(); HashMap sources = new HashMap(); |