diff options
| -rw-r--r-- | lib/scala-libary.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/X10Trees.scala.notyet | 11 | ||||
| -rw-r--r-- | test/files/neg/variances.scala | 4 | ||||
| -rw-r--r-- | test/testall | 7 |
4 files changed, 21 insertions, 2 deletions
diff --git a/lib/scala-libary.jar.desired.sha1 b/lib/scala-libary.jar.desired.sha1 new file mode 100644 index 0000000000..cf377dc52c --- /dev/null +++ b/lib/scala-libary.jar.desired.sha1 @@ -0,0 +1 @@ +da39a3ee5e6b4b0d3255bfef95601890afd80709 ?scala-libary.jar diff --git a/src/compiler/scala/tools/nsc/ast/X10Trees.scala.notyet b/src/compiler/scala/tools/nsc/ast/X10Trees.scala.notyet new file mode 100644 index 0000000000..f80bb122d3 --- /dev/null +++ b/src/compiler/scala/tools/nsc/ast/X10Trees.scala.notyet @@ -0,0 +1,11 @@ +class X10Trees extends Trees { + + case class Async(place: Expr, clock: Clock, body: List[Tree]) + + override def transform(tree: Tree) = tree match { + case Async(place, clock, body) => + copy.Async(tree, transform(place), transform(clock), transform(body)) + case _ => + super.transform(tree) + } +} diff --git a/test/files/neg/variances.scala b/test/files/neg/variances.scala index fbd50d7065..393a3e0b7d 100644 --- a/test/files/neg/variances.scala +++ b/test/files/neg/variances.scala @@ -50,12 +50,12 @@ object Covariant { val b : Int = 42 } class Test extends AbstractTest { - val a : Foo[Char] = new Foo[Char] + val a : Foo[java.lang.Character] = new Foo[java.lang.Character] } def main(args : Array[String]) { val test = new Test test.c.doit(test.b) - val x : Char = test.a.getA + val x : java.lang.Character = test.a.getA Console.println("XXX " + x) } } diff --git a/test/testall b/test/testall new file mode 100644 index 0000000000..8cf9317db1 --- /dev/null +++ b/test/testall @@ -0,0 +1,7 @@ +sh partest --jvm +sh partest --pos +sh partest --neg +sh partest --shootout +sh partest --script +sh partest --res + |