diff options
| author | mihaylov <mihaylov@epfl.ch> | 2004-07-20 16:39:32 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2004-07-20 16:39:32 +0000 |
| commit | 946d29988920a22b8f807baa8f4a513d2e85717c (patch) | |
| tree | 1963512075509408d001e4ef992bc69981165a7a /sources/scalac | |
| parent | 8eab4b5a2831279278a6f71a340b1eae13d08bb2 (diff) | |
| download | scala-946d29988920a22b8f807baa8f4a513d2e85717c.tar.gz scala-946d29988920a22b8f807baa8f4a513d2e85717c.tar.bz2 scala-946d29988920a22b8f807baa8f4a513d2e85717c.zip | |
- Load assembly vjscor explicitly, since it may...
- Load assembly vjscor explicitly, since it may not be discovered
automaticially
Diffstat (limited to 'sources/scalac')
| -rw-r--r-- | sources/scalac/symtab/classfile/CLRPackageParser.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sources/scalac/symtab/classfile/CLRPackageParser.java b/sources/scalac/symtab/classfile/CLRPackageParser.java index 7d5de58d50..7ea2ab5d70 100644 --- a/sources/scalac/symtab/classfile/CLRPackageParser.java +++ b/sources/scalac/symtab/classfile/CLRPackageParser.java @@ -92,6 +92,7 @@ public final class CLRPackageParser { assemrefs, args.assemrefs.value); Assembly mscorlib = findAssembly("mscorlib.dll"); Type.initMSCORLIB(mscorlib); + findAssembly("vjscor.dll"); findAssembly("vjslib.dll"); findAssembly("scala.dll"); findAllAssemblies(); @@ -258,9 +259,8 @@ public final class CLRPackageParser { "scala.Long", "scala.MatchError", "scala.Ref", "scala.ScalaObject", "scala.Short", "scala.Type", "scala.Unit", "scala.runtime.NativeLoop", "scala.runtime.ResultOrException", "scala.runtime.RunTime", - "java.lang.String", "java.lang.CharSequence", - "java.lang.StringBuffer", "java.lang.Byte", "java.lang.Float", - "java.lang.Double", "java.lang.Cloneable" + "java.lang.CharSequence", "java.lang.StringBuffer", "java.lang.Byte", + "java.lang.Float", "java.lang.Double", "java.lang.Cloneable" }; private static final Set BANNED_TYPES = new HashSet(); static { @@ -300,7 +300,9 @@ public final class CLRPackageParser { i++) { Type type = types[i]; - if (BANNED_TYPES.contains(type.FullName)) { + if (BANNED_TYPES.contains(type.FullName) + || type.FullName.equals("java.lang.Object") + || type.FullName.equals("java.lang.String")) { continue; } int k = type.FullName.indexOf(".", nl); |