diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-06 11:37:35 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-06 11:49:38 -0800 |
commit | 7539c4ee51c25a684399cd5400bf0285e6508fe2 (patch) | |
tree | 94a9eb9b9519417d1924711f56638a4be02f4a2b /test/files/pos | |
parent | f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c (diff) | |
parent | 93c2d93f4e7aaffaac92bdf14714a6c3871718c9 (diff) | |
download | scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.gz scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.bz2 scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.zip |
Merge branch 'master' into topic/inline
Conflicts:
src/compiler/scala/tools/nsc/Global.scala
test/files/run/programmatic-main.check
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/t531.scala | 4 | ||||
-rw-r--r-- | test/files/pos/t532.scala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/pos/t531.scala b/test/files/pos/t531.scala index 02763e08f1..856926de4f 100644 --- a/test/files/pos/t531.scala +++ b/test/files/pos/t531.scala @@ -2,9 +2,9 @@ object Test extends App { import scala.reflect._; def titi = { var truc = 0 - val tata: Code[()=>Unit] = () => { + val tata = Code.lift{() => { truc = 6 - } + }} () } } diff --git a/test/files/pos/t532.scala b/test/files/pos/t532.scala index 32649b1629..f864bbf45e 100644 --- a/test/files/pos/t532.scala +++ b/test/files/pos/t532.scala @@ -2,9 +2,9 @@ object Test extends App { import scala.reflect._; def titi: Unit = { var truc = 0 - val tata: Code[()=>Unit] = () => { + val tata = Code.lift{() => { truc = truc + 6 - } + }} () } } |