diff options
7 files changed, 11 insertions, 12 deletions
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 1728d3fc3c..0d532b9e85 100644 --- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala +++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala @@ -62,7 +62,7 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { case a: AliasSymbol => indent printAlias(level, a) - case t: TypeSymbol if !t.isParam => + case t: TypeSymbol if !t.isParam && !t.name.matches("_\\$\\d+")=> indent printTypeSymbol(level, t) case s => @@ -363,7 +363,7 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) { case AnnotatedWithSelfType(typeRef, symbol, attribTreeRefs) => toString(typeRef, sep) //case DeBruijnIndexType(typeLevel, typeIndex) => case ExistentialType(typeRef, symbols) => { - val refs = symbols.map(toString _).filter(!_.startsWith("_ ")).map("type " + _) + val refs = symbols.map(toString _).filter(!_.startsWith("_")).map("type " + _) toString(typeRef, sep) + (if (refs.size > 0) refs.mkString(" forSome {", "; ", "}") else "") } case _ => sep + t.toString diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test index 949afbf5d1..4c6ac85765 100644 --- a/test/files/scalap/caseClass/result.test +++ b/test/files/scalap/caseClass/result.test @@ -1,10 +1,9 @@ +@scala.serializable case class CaseClass[A <: 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 */ } def copy[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) : CaseClass[A] = { /* compiled code */ } - def copy$default$1[A <: scala.Seq[scala.Int]] : A = { /* compiled code */ } - def copy$default$2[A <: scala.Seq[scala.Int]] : scala.Predef.String = { /* compiled code */ } override def hashCode() : scala.Int = { /* compiled code */ } override def toString() : scala.Predef.String = { /* compiled code */ } override def equals(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } @@ -13,4 +12,4 @@ case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } override def productElementName(x$1 : scala.Int) : java.lang.String = { /* compiled code */ } override def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } -} +}
\ No newline at end of file diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test index 37767c0904..91afddaf0e 100644 --- a/test/files/scalap/classWithExistential/result.test +++ b/test/files/scalap/classWithExistential/result.test @@ -1,4 +1,4 @@ class ClassWithExistential extends java.lang.Object with scala.ScalaObject { def this() = { /* compiled code */ } - def foo[A, B] : scala.Function1[A, B forSome {type A >: scala.Nothing <: scala.Seq[scala.Int]; type B >: scala.Predef.String <: scala.Any}] = { /* compiled code */ } -} + def foo[A, B] : scala.Function1[A, B forSome {type A <: scala.Seq[scala.Int]; type B >: scala.Predef.String}] = { /* compiled code */ } +}
\ No newline at end of file diff --git a/test/files/scalap/defaultParameter/A.scala b/test/files/scalap/defaultParameter/A.scala index 3eea4e58a3..d3514952f4 100644 --- a/test/files/scalap/defaultParameter/A.scala +++ b/test/files/scalap/defaultParameter/A.scala @@ -1,3 +1,3 @@ -trait Test { +trait DefaultParameter { def foo(s: String = "hello"): Unit }
\ No newline at end of file diff --git a/test/files/scalap/defaultParameter/result.test b/test/files/scalap/defaultParameter/result.test index 15ca37a520..38bf6ac4e3 100644 --- a/test/files/scalap/defaultParameter/result.test +++ b/test/files/scalap/defaultParameter/result.test @@ -1,3 +1,3 @@ -trait Test extends java.lang.Object { +trait DefaultParameter extends java.lang.Object { def foo(s : scala.Predef.String) : scala.Unit }
\ No newline at end of file diff --git a/test/files/scalap/typeAnnotations/A.scala b/test/files/scalap/typeAnnotations/A.scala index 582746764e..ff2445edc9 100644 --- a/test/files/scalap/typeAnnotations/A.scala +++ b/test/files/scalap/typeAnnotations/A.scala @@ -1,4 +1,4 @@ -abstract class AbsFun[@specialized R] { +abstract class TypeAnnotations[@specialized R] { @specialized val x = 10 @specialized type T diff --git a/test/files/scalap/typeAnnotations/result.test b/test/files/scalap/typeAnnotations/result.test index d48b3a2178..eed2e68eb0 100644 --- a/test/files/scalap/typeAnnotations/result.test +++ b/test/files/scalap/typeAnnotations/result.test @@ -1,8 +1,8 @@ -abstract class AbsFun[@scala.specialized R] extends java.lang.Object with scala.ScalaObject { +abstract class TypeAnnotations[@scala.specialized R] extends java.lang.Object with scala.ScalaObject { def this() = { /* compiled code */ } @scala.specialized val x : scala.Int = { /* compiled code */ } - @scala.specialized + @scala.specialized type T def compose[@scala.specialized A](x : A, y : R) : A = { /* compiled code */ } }
\ No newline at end of file |