diff options
author | paltherr <paltherr@epfl.ch> | 2004-02-29 14:11:31 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-02-29 14:11:31 +0000 |
commit | e27bc7f5e626149468f591476e58c587cf397299 (patch) | |
tree | 3f89e52cf643396468953e8bdc7f222e8f54077f | |
parent | 826af8cfd01774c4545ea72c6a415693c5205378 (diff) | |
download | scala-e27bc7f5e626149468f591476e58c587cf397299.tar.gz scala-e27bc7f5e626149468f591476e58c587cf397299.tar.bz2 scala-e27bc7f5e626149468f591476e58c587cf397299.zip |
- Removed special case for scala.Object (which ...
- Removed special case for scala.Object (which doesn't exist any more).
-rw-r--r-- | sources/scalac/symtab/classfile/PackageParser.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java index c4f6636aee..c3f4879af0 100644 --- a/sources/scalac/symtab/classfile/PackageParser.java +++ b/sources/scalac/symtab/classfile/PackageParser.java @@ -101,17 +101,13 @@ public class PackageParser extends MetadataParser { classCompletion.staticsParser(clazz)); // enter class locals.enter(clazz); - // enter module, except for scala.Object class - // todo: why not there also?. - if (!(n == Names.Object.toTypeName() && - p.fullName().toTermName() == Names.scala)) { - Scope.Entry e = locals.lookupEntry(clazz.module().name); - if (e != Scope.Entry.NONE) { - // we already have a package of the same name; delete it - locals.unlink(e); - } - locals.enter(clazz.module()); - } + // enter module + Scope.Entry e = locals.lookupEntry(clazz.module().name); + if (e != Scope.Entry.NONE) { + // we already have a package of the same name; delete it + locals.unlink(e); + } + locals.enter(clazz.module()); symFile.put(clazz, f); } } else if (inclClasses && fname.endsWith(".scala")) { |