summaryrefslogtreecommitdiff
path: root/sources/scalac/symtab/classfile
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2004-10-06 12:56:03 +0000
committermihaylov <mihaylov@epfl.ch>2004-10-06 12:56:03 +0000
commitd3e1bf2e0847df34e77fe1f9725822b409374525 (patch)
treef6b6617047e2102c13262e029ed7607a876b215a /sources/scalac/symtab/classfile
parentf01e57a6f61fc66cde2d2d4bdf93d6c558865707 (diff)
downloadscala-d3e1bf2e0847df34e77fe1f9725822b409374525.tar.gz
scala-d3e1bf2e0847df34e77fe1f9725822b409374525.tar.bz2
scala-d3e1bf2e0847df34e77fe1f9725822b409374525.zip
- Make interfaces inherit from scala.AnyRef (or...
- Make interfaces inherit from scala.AnyRef (or rather, System.Object) instead of scala.Any; solves typing issues in arrays.scala from the test suit.
Diffstat (limited to 'sources/scalac/symtab/classfile')
-rw-r--r--sources/scalac/symtab/classfile/CLRClassParser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java
index d1fd60bf04..78c11a5524 100644
--- a/sources/scalac/symtab/classfile/CLRClassParser.java
+++ b/sources/scalac/symtab/classfile/CLRClassParser.java
@@ -66,8 +66,8 @@ public class CLRClassParser extends SymbolLoader {
clazz.flags = translateAttributes(type);
Type[] ifaces = type.getInterfaces();
scalac.symtab.Type[] baseTypes = new scalac.symtab.Type[ifaces.length+1];
- baseTypes[0] = type.BaseType() == null ? make.anyType()
- : getCLRType(type.BaseType());
+ baseTypes[0] = type.BaseType() != null ? getCLRType(type.BaseType())
+ : (type.IsInterface() ? make.objectType() : make.anyType());
for (int i = 0; i < ifaces.length; i++)
baseTypes[i + 1] = getCLRType(ifaces[i]);
members = new Scope();