From ff2a9b4c589fb22566359a149b7e76d372676d02 Mon Sep 17 00:00:00 2001 From: ilyas Date: Fri, 4 Dec 2009 17:24:16 +0000 Subject: #2747 fixed --- src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 3 ++- .../scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala | 2 +- test/files/scalap/caseClass/result.test | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala index 1bce0fe792..68db2e16a6 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala @@ -32,7 +32,8 @@ class ConsoleRunner extends DirectRunner with RunnerUtils { "Testing resident compiler"), TestSet("shootout", fileFilter, "shootout", "Testing shootout tests"), TestSet("script", fileFilter, "script", "Testing script tests"), - TestSet("scalacheck", fileFilter, "scalacheck", "Testing ScalaCheck tests")) + TestSet("scalacheck", fileFilter, "scalacheck", "Testing ScalaCheck tests"), + TestSet("scalap", fileFilter, "scalap", "Run scalap decompiler tests")) } var fileManager: ConsoleFileManager = _ diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala index 733df3adcd..4234065046 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala @@ -128,7 +128,7 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { val baos = new ByteArrayOutputStream val stream = new PrintStream(baos) val printer = new ScalaSigPrinter(stream, printPrivates) -// printer.printMethodType(m.infoType, false) + printer.printMethodType(m.infoType, false)(()) baos.toString case None => "" diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test index 9ea19f7e9d..cabf321a07 100644 --- a/test/files/scalap/caseClass/result.test +++ b/test/files/scalap/caseClass/result.test @@ -1,4 +1,4 @@ -case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]] extends java.lang.Object with scala.ScalaObject with scala.Product { +case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends java.lang.Object with scala.ScalaObject with scala.Product { val i : A = { /* compiled code */ } val s : scala.Predef.String = { /* compiled code */ } def foo : scala.Int = { /* compiled code */ } @@ -12,4 +12,4 @@ case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]] extends java.la override def productArity : scala.Int = { /* compiled code */ } override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } override def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } -} +} \ No newline at end of file -- cgit v1.2.3