diff options
| author | Martin Odersky <odersky@gmail.com> | 2008-04-26 10:30:15 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2008-04-26 10:30:15 +0000 |
| commit | 633ceeda07158168befae76a25595da5b82ff0aa (patch) | |
| tree | 5e7410cecee496ed05718f412e13a768608ec8bc /src | |
| parent | 1e54e8baf560c0d01c693e9277adcedba171642b (diff) | |
| download | scala-633ceeda07158168befae76a25595da5b82ff0aa.tar.gz scala-633ceeda07158168befae76a25595da5b82ff0aa.tar.bz2 scala-633ceeda07158168befae76a25595da5b82ff0aa.zip | |
Fixed problem in Unpickler which prevented Ecli...
Fixed problem in Unpickler which prevented Eclipse to build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index b510b41c4b..5f20a72aa0 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -50,13 +50,13 @@ abstract class ClassfileParser { def parse(file: AbstractFile, root: Symbol) = try { def handleError(e: Exception) = { - if (settings.debug.value) e.printStackTrace() //debug + /*if (settings.debug.value)*/ e.printStackTrace() //debug throw new IOException("class file '" + in.file + "' is broken\n(" + { if (e.getMessage() != null) e.getMessage() else e.getClass.toString } + ")") } - assert(!busy) + assert(!busy, "internal error: illegal class file dependency") busy = true /*root match { case cs: ClassSymbol => diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala index a607408720..474027e7af 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala @@ -222,7 +222,7 @@ abstract class UnPickler { } sym.setFlag(flags.toLong & PickledFlags) sym.privateWithin = privateWithin - if (readIndex != end) assert(sym hasFlag (SUPERACCESSOR | PARAMACCESSOR)) + if (readIndex != end) assert(sym hasFlag (SUPERACCESSOR | PARAMACCESSOR | PROTACCESSOR), sym) if (sym hasFlag SUPERACCESSOR) assert(readIndex != end) sym.setInfo( if (readIndex != end) new LazyTypeRefAndAlias(inforef, readNat()) |