From 7dac90fffe2e579c34be78ac81a8ea0cdd9c1d0f Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 17 Apr 2012 05:13:27 -0400 Subject: [PATCH] Revert "Work around scalac issue causing boxing." (ClassNotFoundException) This reverts commit 6c090313dae1bc98690d3e584103742f3c5a8908. --- util/classfile/Parser.scala | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/util/classfile/Parser.scala b/util/classfile/Parser.scala index 92c74d65d..cf33fca2e 100644 --- a/util/classfile/Parser.scala +++ b/util/classfile/Parser.scala @@ -5,7 +5,6 @@ package sbt package classfile import java.io.{DataInputStream, File, InputStream} -import scala.annotation.switch // Translation of jdepend.framework.ClassFileParser by Mike Clark, Clarkware Consulting, Inc. // BSD Licensed @@ -133,18 +132,17 @@ private[sbt] object Parser pool } - private def getConstant(in: DataInputStream): Constant = - { + private def getConstant(in: DataInputStream) = + { val tag = in.readByte() - - // No switch for byte scrutinees! Stupid compiler. - ((tag: Int): @switch) match { - case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort()) - case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType => - new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort()) - case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt())) - case ConstantFloat => new Constant(tag, new java.lang.Float(in.readFloat())) - case ConstantLong => new Constant(tag, new java.lang.Long(in.readLong())) + tag match + { + case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort()) + case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType => + new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort()) + case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt())) + 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 ConstantUTF8 => new Constant(tag, in.readUTF()) case _ => error("Unknown constant: " + tag)