luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Work around scalac issue causing boxing." (ClassNotFoundException)" (Reverted wrong commit.) 

This reverts commit 7dac90fffe.
This commit is contained in:
Mark Harrah 2012-04-18 03:14:59 -04:00
parent 7dac90fffe
commit d0899419e7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/classfile/Parser.scala
View File

@ -5,6 +5,7 @@ package sbt
package classfile package classfile
import java.io.{DataInputStream, File, InputStream} import java.io.{DataInputStream, File, InputStream}
import scala.annotation.switch
// Translation of jdepend.framework.ClassFileParser by Mike Clark, Clarkware Consulting, Inc. // Translation of jdepend.framework.ClassFileParser by Mike Clark, Clarkware Consulting, Inc.
// BSD Licensed // BSD Licensed
@ -132,17 +133,18 @@ private[sbt] object Parser
pool pool
} }
private def getConstant(in: DataInputStream) = private def getConstant(in: DataInputStream): Constant =
{ {
val tag = in.readByte() val tag = in.readByte()
tag match
{ // No switch for byte scrutinees! Stupid compiler.
case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort()) ((tag: Int): @switch) match {
case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType => case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort())
new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort()) case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType =>
case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt())) new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort())
case ConstantFloat => new Constant(tag, new java.lang.Float(in.readFloat())) case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt()))
case ConstantLong => new Constant(tag, new java.lang.Long(in.readLong())) case ConstantFloat => new Constant(tag, new java.lang.Float(in.readFloat()))
case ConstantLong => new Constant(tag, new java.lang.Long(in.readLong()))
case ConstantDouble => new Constant(tag, new java.lang.Double(in.readDouble())) case ConstantDouble => new Constant(tag, new java.lang.Double(in.readDouble()))
case ConstantUTF8 => new Constant(tag, in.readUTF()) case ConstantUTF8 => new Constant(tag, in.readUTF())
case _ => error("Unknown constant: " + tag) case _ => error("Unknown constant: " + tag)