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

Merge remote-tracking branch 'paulp/optimize' into 0.13

This commit is contained in:
Mark Harrah 2012-04-16 16:11:16 -04:00
parent 70f2d56604 6c090313da
commit e7f70c2a2c
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compile/JavaCompiler.scala
View File

@ -23,17 +23,27 @@ object JavaCompiler
{
type Fork = (JavacContract, Seq[String], Logger) => Int
private def pwClass = classOf[PrintWriter]
private def arrayStringClass = classOf[Array[String]]
private def docletsClass = "com.sun.tools.doclets.standard.Standard"
// The real performance gain comes if you can skip the indirection.
/* val javac = new JavacContract("javac", "com.sun.tools.javac.Main") {
def exec(args: Array[String], writer: PrintWriter): Int =
com.sun.tools.javac.Main.compile(args, writer)
} */
val javac = new JavacContract("javac", "com.sun.tools.javac.Main") {
def exec(args: Array[String], writer: PrintWriter) = {
val m = Class.forName(clazz).getDeclaredMethod("compile", classOf[Array[String]], classOf[PrintWriter])
m.invoke(null, args, writer).asInstanceOf[java.lang.Integer].intValue
private val execMethod = Class.forName(clazz).getDeclaredMethod("compile", arrayStringClass, pwClass)
def exec(args: Array[String], writer: PrintWriter) = {
execMethod.invoke(null, args, writer).asInstanceOf[java.lang.Integer].intValue
}
}
val javadoc = new JavacContract("javadoc", "com.sun.tools.javadoc.Main") {
def exec(args: Array[String], writer: PrintWriter) = {
val m = Class.forName(clazz).getDeclaredMethod("execute", classOf[String], classOf[PrintWriter], classOf[PrintWriter], classOf[PrintWriter], classOf[String], classOf[Array[String]])
m.invoke(null, name, writer, writer, writer, "com.sun.tools.doclets.standard.Standard", args).asInstanceOf[java.lang.Integer].intValue
}
private val execMethod = Class.forName(clazz).getDeclaredMethod("execute", classOf[String], pwClass, pwClass, pwClass, classOf[String], arrayStringClass)
def exec(args: Array[String], writer: PrintWriter) =
execMethod.invoke(null, name, writer, writer, writer, docletsClass, args).asInstanceOf[java.lang.Integer].intValue
}
def construct(f: Fork, cp: ClasspathOptions, scalaInstance: ScalaInstance): JavaCompiler =

22
util/classfile/Parser.scala
View File

@ -5,6 +5,7 @@ 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
@ -132,17 +133,18 @@ private[sbt] object Parser
pool
}
private def getConstant(in: DataInputStream) =
{
private def getConstant(in: DataInputStream): Constant =
{
val tag = in.readByte()
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()))
// 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()))
case ConstantDouble => new Constant(tag, new java.lang.Double(in.readDouble()))
case ConstantUTF8 => new Constant(tag, in.readUTF())
case _ => error("Unknown constant: " + tag)