summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-09-21 12:50:04 +0000
committerMartin Odersky <odersky@gmail.com>2009-09-21 12:50:04 +0000
commitd5b02c8652d7edbdfb0b5a02570d370d3bad299f (patch)
treef57063402f8a83cd3f7caf437afedbdb279be400 /test/files/pos
parentced5ee337f45d0209ec3e7c69a6e04e956257ec0 (diff)
downloadscala-d5b02c8652d7edbdfb0b5a02570d370d3bad299f.tar.gz
scala-d5b02c8652d7edbdfb0b5a02570d370d3bad299f.tar.bz2
scala-d5b02c8652d7edbdfb0b5a02570d370d3bad299f.zip
new arrays are done.
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/bug715/meredith_1.scala4
-rw-r--r--test/files/pos/spec-fields.scala2
-rw-r--r--test/files/pos/spec-params.scala2
-rw-r--r--test/files/pos/t0674.scala6
4 files changed, 7 insertions, 7 deletions
diff --git a/test/files/pos/bug715/meredith_1.scala b/test/files/pos/bug715/meredith_1.scala
index 1443180fe9..4be7b48908 100644
--- a/test/files/pos/bug715/meredith_1.scala
+++ b/test/files/pos/bug715/meredith_1.scala
@@ -72,7 +72,7 @@ trait XMLRenderer {
pojo.getClass.getName,
null,
TopScope,
- progeny : _*
+ progeny.asInstanceOf[Array[scala.xml.Node]] : _*
)
}
}
@@ -95,4 +95,4 @@ object thePOJO2XMLRenderer extends POJO2XMLRenderer( true ) {
object Test extends Application {
println(com.sap.dspace.model.othello.thePOJO2XMLRenderer)
-} \ No newline at end of file
+}
diff --git a/test/files/pos/spec-fields.scala b/test/files/pos/spec-fields.scala
index e78c2dead3..26a8c4ffbd 100644
--- a/test/files/pos/spec-fields.scala
+++ b/test/files/pos/spec-fields.scala
@@ -1,4 +1,4 @@
-abstract class Foo[@specialized T, U <: Ordered[U]](x: T, size: Int) {
+abstract class Foo[@specialized T: ClassManifest, U <: Ordered[U]](x: T, size: Int) {
var y: T
var z: T = x
diff --git a/test/files/pos/spec-params.scala b/test/files/pos/spec-params.scala
index 231ef8a83e..33a252120c 100644
--- a/test/files/pos/spec-params.scala
+++ b/test/files/pos/spec-params.scala
@@ -1,4 +1,4 @@
-class Foo[@specialized A] {
+class Foo[@specialized A: ClassManifest] {
// conflicting in bounds, expect a normalized member calling m
// and bridge + implementation in specialized subclasses
diff --git a/test/files/pos/t0674.scala b/test/files/pos/t0674.scala
index c3d2cc7476..6884d84bed 100644
--- a/test/files/pos/t0674.scala
+++ b/test/files/pos/t0674.scala
@@ -39,9 +39,9 @@ for(a <- Some(1);
l <- Some(12);
m <- Some(13);
n <- Some(14);
- o <- Some(15);
- p <- Some(16);
- q <- Some(17)
+ o <- Some(15)
+// p <- Some(16);
+// q <- Some(17)
// r <- Some(18);
// s <- Some(19)
) yield a)