diff options
author | Martin Odersky <odersky@gmail.com> | 2008-02-26 09:50:05 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2008-02-26 09:50:05 +0000 |
commit | e869cd34104701f8c55e19c542775679a1802edd (patch) | |
tree | 80f752abc7cd116a489fdc4a9b707fa7352761da /src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | |
parent | bcbeab74566f835219dabf0bbb172fd028a8a032 (diff) | |
download | scala-e869cd34104701f8c55e19c542775679a1802edd.tar.gz scala-e869cd34104701f8c55e19c542775679a1802edd.tar.bz2 scala-e869cd34104701f8c55e19c542775679a1802edd.zip |
fixed #520, #489
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala')
-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 991808bad0..b510b41c4b 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -521,9 +521,8 @@ abstract class ClassfileParser { while (sig(index) == '.') { accept('.') val name = subName(c => c == ';' || c == '.').toTypeName - val clazz = tpe.typeSymbol.info.member(name) - assert(clazz.isClass, - tpe.typeSymbol.linkedModuleOfClass.moduleClass.info+" "+tpe+" . "+name+"/"+tpe.typeSymbol.info.decls) + val clazz = tpe.member(name) + assert(clazz.isAliasType, tpe) tpe = processClassType(clazz.tpe) } accept(';') @@ -747,7 +746,6 @@ abstract class ClassfileParser { val nameIndex = in.nextChar val jflags = in.nextChar if (innerIndex != 0 && outerIndex != 0 && nameIndex != 0 && - (jflags & (JAVA_ACC_PUBLIC | JAVA_ACC_PROTECTED)) != 0 && pool.getClassSymbol(outerIndex) == sym) { makeInnerAlias( getOwner(jflags), |