diff options
author | paltherr <paltherr@epfl.ch> | 2004-03-09 23:32:07 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-03-09 23:32:07 +0000 |
commit | 70d535ae7b9e689b699a5327cdee747464874420 (patch) | |
tree | b021c05e9c51b20724ef0d1856907d22273d6b59 /sources/scalac/symtab/classfile | |
parent | 1e478c2c6e842e2f857f72ec8e25fcac7f694e59 (diff) | |
download | scala-70d535ae7b9e689b699a5327cdee747464874420.tar.gz scala-70d535ae7b9e689b699a5327cdee747464874420.tar.bz2 scala-70d535ae7b9e689b699a5327cdee747464874420.zip |
- Fixed the initialization of the inner class a...
- Fixed the initialization of the inner class aliases
Diffstat (limited to 'sources/scalac/symtab/classfile')
-rw-r--r-- | sources/scalac/symtab/classfile/AttributeParser.java | 5 | ||||
-rw-r--r-- | sources/scalac/symtab/classfile/CLRClassParser.java | 17 |
2 files changed, 4 insertions, 18 deletions
diff --git a/sources/scalac/symtab/classfile/AttributeParser.java b/sources/scalac/symtab/classfile/AttributeParser.java index 23c84bf662..183e96785b 100644 --- a/sources/scalac/symtab/classfile/AttributeParser.java +++ b/sources/scalac/symtab/classfile/AttributeParser.java @@ -129,10 +129,7 @@ public class AttributeParser implements ClassfileConstants { alias.setInfo(parser.make.classType(inner)); alias.allConstructors() .setInfo(new Type.MethodType(Symbol.EMPTY_ARRAY, inner.info())); - Scope.Entry e = parser.statics.lookupEntry(alias.name); // Why is this ?????? - if (e != Scope.Entry.NONE) - parser.statics.unlink(e); - parser.statics.enter(alias); + parser.statics.enterNoHide(alias); } //in.skip(attrLen); return; diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java index 3e66d59fdc..026755a73f 100644 --- a/sources/scalac/symtab/classfile/CLRClassParser.java +++ b/sources/scalac/symtab/classfile/CLRClassParser.java @@ -103,21 +103,10 @@ public class CLRClassParser extends SymbolLoader { nclazz.allConstructors().setInfo(this); nclazz.module().setInfo(this); // - alias.setInfo(scalac.symtab.Type - .typeRef(clazz.owner().thisType(), - nclazz, scalac.symtab.Type.EMPTY_ARRAY)); + alias.setInfo(make.classType(nclazz)); alias.allConstructors() - .setInfo(MethodType(Symbol.EMPTY_ARRAY, nclazz.info())); -// statics.enter(nclazz); -// Scope.Entry e = statics.lookupEntry(clazz.module().name); -// if (e != Scope.Entry.NONE) -// statics.unlink(e); -// statics.enter(nclazz.module()); - - Scope.Entry e = statics.lookupEntry(alias.name); // Why is this ??? - if (e != Scope.Entry.NONE) - statics.unlink(e); - statics.enter(alias); + .setInfo(MethodType(Symbol.EMPTY_ARRAY, alias.info())); + statics.enterNoHide(alias); } // read field information |