summaryrefslogtreecommitdiff
path: root/test/files/scalap
diff options
context:
space:
mode:
authorilyas <ilyas@epfl.ch>2010-03-01 18:37:55 +0000
committerilyas <ilyas@epfl.ch>2010-03-01 18:37:55 +0000
commitd3bf2e7801f465346f1b568b8c942d6449642a6a (patch)
treec7f043f55cd78b8c88f837b9e960f9723377fd95 /test/files/scalap
parent60ae43e753f0f48e245a46767dea597ec4b6db4e (diff)
downloadscala-d3bf2e7801f465346f1b568b8c942d6449642a6a.tar.gz
scala-d3bf2e7801f465346f1b568b8c942d6449642a6a.tar.bz2
scala-d3bf2e7801f465346f1b568b8c942d6449642a6a.zip
scalap tests fixed
Diffstat (limited to 'test/files/scalap')
-rw-r--r--test/files/scalap/caseClass/result.test5
-rw-r--r--test/files/scalap/classWithExistential/result.test4
-rw-r--r--test/files/scalap/defaultParameter/A.scala2
-rw-r--r--test/files/scalap/defaultParameter/result.test2
-rw-r--r--test/files/scalap/typeAnnotations/A.scala2
-rw-r--r--test/files/scalap/typeAnnotations/result.test4
6 files changed, 9 insertions, 10 deletions
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