diff options
| author | Paul Phillips <paulp@improving.org> | 2010-02-14 00:08:01 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-02-14 00:08:01 +0000 |
| commit | d04911d894ce107593c773d253d19b5d094a2ad0 (patch) | |
| tree | afcf216f19fb87ac962f4438c4dfdabcaa336efa /src | |
| parent | 30e65502ffa0463c79588f6a555346da4eb47423 (diff) | |
| download | scala-d04911d894ce107593c773d253d19b5d094a2ad0.tar.gz scala-d04911d894ce107593c773d253d19b5d094a2ad0.tar.bz2 scala-d04911d894ce107593c773d253d19b5d094a2ad0.zip | |
Some change to classpath handling in r20866 has...
Some change to classpath handling in r20866 has left quick in a
condition where it won't load Array. After a fair bit of beating my
head against the wall as to why, I determined that everything works
if I simply don't throw the exception it used to throw. In the short
term I am committing this so quick works, and I will continue the
investigation. Review by dragos (2 line patch to minimize reviewer
burden.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 745761a065..1f1a41055c 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -429,10 +429,8 @@ abstract class ClassfileParser { } } - if (c != clazz && externalName.toString.indexOf("$") < 0) { - if ((clazz eq NoSymbol) && (c ne NoSymbol)) clazz = c - else throw new IOException("class file '" + in.file + "' contains wrong " + c) - } + if (c != clazz && externalName.toString.indexOf("$") < 0 && (clazz eq NoSymbol) && (c ne NoSymbol)) + clazz = c addEnclosingTParams(clazz) parseInnerClasses() // also sets the isScala / isScalaRaw / hasMeta flags, see r15956 |