Scala signature is generated as an annotation (...

Scala signature is generated as an annotation (that is accessible
through Java reflection).

  - compiler generates all pickled Scala signatures as annotations to class files.
  - compiler can read class files with signature as annotations or old-style signatures as attributes.
  - Scalap has also been updated to new signatures (contributed by Ilya Sergey: thanks a lot).
  - FJBG updated to allow entering constant pool strings as byte arrays.
  - ByteCodecs decode method returns the length of the decoded array.
Review by ilyas. Already mostly reviewed by odersky.

2 files changed, 3 insertions, 10 deletions

diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
index f7eca614ac..eae79f23af 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
@@ -36,7 +36,7 @@ class ConsoleRunner extends DirectRunner {
       TestSet("shootout", pathFilter, "Testing shootout tests"),
       TestSet("script", pathFilter, "Testing script tests"),
       TestSet("scalacheck", pathFilter, "Testing ScalaCheck tests"),
-      TestSet("scalap", pathFilter, "Run scalap decompiler tests")
+      TestSet("scalap", _.isDirectory, "Run scalap decompiler tests")
     )
   }
 
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 213123f711..cf4a8238e9 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -820,14 +820,6 @@ class Worker(val fileManager: FileManager) extends Actor {
 
       case "scalap" => {
 
-        def decompileFile(clazz: Class[_], packObj: Boolean) = {
-          val byteCode = ByteCode.forClass(clazz)
-          val classFile = ClassFileParser.parse(byteCode)
-          val Some(sig) = classFile.attribute("ScalaSig").map(_.byteCode).map(ScalaSigAttributeParsers.parse)
-          import scala.tools.scalap.Main._
-          parseScalaSignature(sig, packObj)
-        }
-
         runInContext(file, kind, (logFile: File, outDir: File) => {
           val sourceDir = file.getParentFile
           val sourceDirName = sourceDir.getName
@@ -854,7 +846,8 @@ class Worker(val fileManager: FileManager) extends Actor {
               val loader = new URLClassLoader(Array(url), getClass.getClassLoader)
               val clazz = loader.loadClass(className)
 
-              val result = decompileFile(clazz, isPackageObject)
+              val byteCode = ByteCode.forClass(clazz)
+              val result = scala.tools.scalap.Main.decompileScala(byteCode.bytes, isPackageObject)
 
               try {
                 val fstream = new FileWriter(logFile);