summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2004-06-04 15:36:20 +0000
committermihaylov <mihaylov@epfl.ch>2004-06-04 15:36:20 +0000
commit3668fbec3562e4031db8e7783aab5ddd11830ac7 (patch)
treee8c008bb848bd16c6cbba7b08f050730d2e46a9a /sources
parent4c6e4e319b7ff3d9d9650032bfee332fc7273767 (diff)
downloadscala-3668fbec3562e4031db8e7783aab5ddd11830ac7.tar.gz
scala-3668fbec3562e4031db8e7783aab5ddd11830ac7.tar.bz2
scala-3668fbec3562e4031db8e7783aab5ddd11830ac7.zip
- Import all types, including private ones
Diffstat (limited to 'sources')
-rw-r--r--sources/scalac/symtab/classfile/CLRPackageParser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/scalac/symtab/classfile/CLRPackageParser.java b/sources/scalac/symtab/classfile/CLRPackageParser.java
index f172e553d5..0bc3065649 100644
--- a/sources/scalac/symtab/classfile/CLRPackageParser.java
+++ b/sources/scalac/symtab/classfile/CLRPackageParser.java
@@ -118,7 +118,7 @@ public class CLRPackageParser {
int j = 0;
for (int i = 0; i < atypes.length; i++)
// skip nested types
- if (!atypes[i].IsNotPublic() && atypes[i].DeclaringType == null)
+ if (atypes[i].DeclaringType == null)
atypes[j++] = atypes[i];
Type[] btypes = new Type[types.length + j];
System.arraycopy(types, 0, btypes, 0, types.length);
@@ -343,7 +343,7 @@ public class CLRPackageParser {
MemberInfo.Attribute a = (MemberInfo.Attribute)symtab_attr[l];
if (a.GetType() == SCALA_SYMTAB_ATTR) {
symtab = new ByteArrayFile
- (type.FullName, type.Assembly.GetName().toString(),
+ (type.FullName, "[" + type.Assembly.GetName() + "]",
a.getValue());
break;
}