Some support code related to partest changes.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala
index eee689c189..d386e7a08f 100644
--- a/src/scalap/scala/tools/scalap/Main.scala
+++ b/src/scalap/scala/tools/scalap/Main.scala
@@ -97,16 +97,16 @@ object Main {
     baos.toString
   }
 
-
-  def decompileScala(bytes: Array[Byte], isPackageObject: Boolean) = {
+  def getDecompiledScala(bytes: Array[Byte], isPackageObject: Boolean) = {
     val byteCode = ByteCode(bytes)
     val classFile = ClassFileParser.parse(byteCode)
-    classFile.attribute(SCALA_SIG).map(_.byteCode).map(ScalaSigAttributeParsers.parse) match {
-      case Some(scalaSig) => Console.println(parseScalaSignature(scalaSig, isPackageObject))
-      case None => //Do nothing
-    }
+    val sig = classFile.attribute(SCALA_SIG).map(_.byteCode).map(ScalaSigAttributeParsers.parse)
+
+    sig map (x => parseScalaSignature(x, isPackageObject))
   }
 
+  def decompileScala(bytes: Array[Byte], isPackageObject: Boolean) =
+    getDecompiledScala(bytes, isPackageObject) foreach (Console println _)
 
   /**Executes scalap with the given arguments and classpath for the
    *  class denoted by <code>classname</code>.