diff options
| author | Martin Odersky <odersky@gmail.com> | 2004-04-15 16:35:21 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2004-04-15 16:35:21 +0000 |
| commit | d540d32e9055dc8cc63c89c7096dfe68fe342ad3 (patch) | |
| tree | c17afb7dfad08aac78fb3f028edd4239bb4b2cae /sources/scalac/symtab | |
| parent | ce0c39c85ef13457b30132e65ef9276645b54926 (diff) | |
| download | scala-d540d32e9055dc8cc63c89c7096dfe68fe342ad3.tar.gz scala-d540d32e9055dc8cc63c89c7096dfe68fe342ad3.tar.bz2 scala-d540d32e9055dc8cc63c89c7096dfe68fe342ad3.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scalac/symtab')
| -rw-r--r-- | sources/scalac/symtab/Type.java | 1 | ||||
| -rw-r--r-- | sources/scalac/symtab/classfile/UnPickle.java | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java index 4bff125e53..7d23ab99e3 100644 --- a/sources/scalac/symtab/Type.java +++ b/sources/scalac/symtab/Type.java @@ -270,6 +270,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags { public ExtCompoundType(Symbol owner, Type[] parts, Scope members) { super(parts, members); this.clasz = owner.newCompoundClass(this); + assert !owner.isPackageClass() : ArrayApply.toString(parts); } public ExtCompoundType(Type[] parts, Scope members, Symbol clasz) { super(parts, members); diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java index 9579458394..a6d84b8e3c 100644 --- a/sources/scalac/symtab/classfile/UnPickle.java +++ b/sources/scalac/symtab/classfile/UnPickle.java @@ -387,10 +387,9 @@ public class UnPickle implements Kinds, Modifiers, EntryTags, TypeTags { readTypeRef(owner), readSymbolRef(), readTypeRefs(end, owner)); break; case COMPOUNDtpe: - Symbol[] clazzs = readSymbolRefs(end); - assert clazzs.length == 1; + Symbol clazz = readSymbolRef(); Type[] parents = readTypeRefs(end, owner); - tpe = Type.compoundType(parents, new Scope(), clazzs[0]); + tpe = Type.compoundType(parents, new Scope(), clazz); break; case METHODtpe: Type restype = readTypeRef(owner); |