summaryrefslogtreecommitdiff
path: root/test/files/continuations-neg
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-11-02 14:34:35 +0000
committerHubert Plociniczak <hubert.plociniczak@epfl.ch>2011-11-02 14:34:35 +0000
commitb6778be91900b8161e705dc2598ef7af86842b0b (patch)
treed15e8ec18a37eec212f50f1ace27714d7e7d4d34 /test/files/continuations-neg
parentac6c76f26d884a94d0c9ff54f055d3f9ab750bac (diff)
downloadscala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.gz
scala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.bz2
scala-b6778be91900b8161e705dc2598ef7af86842b0b.zip
Begone t1737...
Diffstat (limited to 'test/files/continuations-neg')
-rw-r--r--test/files/continuations-neg/function0.scala8
-rw-r--r--test/files/continuations-neg/function2.scala8
-rw-r--r--test/files/continuations-neg/function3.scala8
-rw-r--r--test/files/continuations-neg/infer0.scala6
-rw-r--r--test/files/continuations-neg/infer2.check2
-rw-r--r--test/files/continuations-neg/infer2.scala12
-rw-r--r--test/files/continuations-neg/lazy.scala14
-rw-r--r--test/files/continuations-neg/t2285.scala4
-rw-r--r--test/files/continuations-neg/t2949.scala2
-rw-r--r--test/files/continuations-neg/t3628.scala2
-rw-r--r--test/files/continuations-neg/trycatch2.scala2
11 files changed, 34 insertions, 34 deletions
diff --git a/test/files/continuations-neg/function0.scala b/test/files/continuations-neg/function0.scala
index 4112ee3835..6ef0d98b90 100644
--- a/test/files/continuations-neg/function0.scala
+++ b/test/files/continuations-neg/function0.scala
@@ -4,13 +4,13 @@ import scala.util.continuations._
object Test {
-
+
def main(args: Array[String]): Any = {
-
+
val f = () => shift { k: (Int=>Int) => k(7) }
val g: () => Int = f
-
+
println(reset(g()))
}
-
+
} \ No newline at end of file
diff --git a/test/files/continuations-neg/function2.scala b/test/files/continuations-neg/function2.scala
index ae0fda509d..402c6dcad8 100644
--- a/test/files/continuations-neg/function2.scala
+++ b/test/files/continuations-neg/function2.scala
@@ -4,13 +4,13 @@ import scala.util.continuations._
object Test {
-
+
def main(args: Array[String]): Any = {
-
+
val f = () => 7
val g: () => Int @cps[Int] = f
-
+
println(reset(g()))
}
-
+
} \ No newline at end of file
diff --git a/test/files/continuations-neg/function3.scala b/test/files/continuations-neg/function3.scala
index 0c3f1667e5..c4acc4c2e9 100644
--- a/test/files/continuations-neg/function3.scala
+++ b/test/files/continuations-neg/function3.scala
@@ -4,12 +4,12 @@ import scala.util.continuations._
object Test {
-
+
def main(args: Array[String]): Any = {
-
+
val g: () => Int = () => shift { k: (Int=>Int) => k(7) }
-
+
println(reset(g()))
}
-
+
} \ No newline at end of file
diff --git a/test/files/continuations-neg/infer0.scala b/test/files/continuations-neg/infer0.scala
index 894d5228b1..9cf69c5d35 100644
--- a/test/files/continuations-neg/infer0.scala
+++ b/test/files/continuations-neg/infer0.scala
@@ -4,11 +4,11 @@ import scala.util.continuations._
object Test {
-
+
def test(x: => Int @cpsParam[String,Int]) = 7
-
+
def main(args: Array[String]): Any = {
test(8)
}
-
+
} \ No newline at end of file
diff --git a/test/files/continuations-neg/infer2.check b/test/files/continuations-neg/infer2.check
index d92bc9c572..59eb670bc3 100644
--- a/test/files/continuations-neg/infer2.check
+++ b/test/files/continuations-neg/infer2.check
@@ -1,4 +1,4 @@
infer2.scala:14: error: illegal answer type modification: scala.util.continuations.cpsParam[String,Int] andThen scala.util.continuations.cpsParam[String,Int]
- test { sym(); sym() }
+ test { sym(); sym() }
^
one error found
diff --git a/test/files/continuations-neg/infer2.scala b/test/files/continuations-neg/infer2.scala
index a890ac1fc4..eaffbc17fc 100644
--- a/test/files/continuations-neg/infer2.scala
+++ b/test/files/continuations-neg/infer2.scala
@@ -4,16 +4,16 @@ import scala.util.continuations._
object Test {
-
+
def test(x: => Int @cpsParam[String,Int]) = 7
-
+
def sym() = shift { k: (Int => String) => 9 }
-
-
+
+
def main(args: Array[String]): Any = {
- test { sym(); sym() }
+ test { sym(); sym() }
}
-
+
}
diff --git a/test/files/continuations-neg/lazy.scala b/test/files/continuations-neg/lazy.scala
index 3c8169dd46..a2fad83be8 100644
--- a/test/files/continuations-neg/lazy.scala
+++ b/test/files/continuations-neg/lazy.scala
@@ -1,16 +1,16 @@
-import scala.util.continuations._
-
-object Test {
+import scala.util.continuations._
+
+object Test {
def foo() = {
lazy val x = shift((k:Unit=>Unit)=>k())
println(x)
}
-
- def main(args: Array[String]) {
+
+ def main(args: Array[String]) {
reset {
foo()
}
- }
-
+ }
+
} \ No newline at end of file
diff --git a/test/files/continuations-neg/t2285.scala b/test/files/continuations-neg/t2285.scala
index f3c7f4c89c..b906dc455a 100644
--- a/test/files/continuations-neg/t2285.scala
+++ b/test/files/continuations-neg/t2285.scala
@@ -5,7 +5,7 @@ import scala.util.continuations._
object Test {
def bar() = shift { k: (String => String) => k("1") }
-
+
def foo() = reset { bar(); 7 }
-
+
}
diff --git a/test/files/continuations-neg/t2949.scala b/test/files/continuations-neg/t2949.scala
index ce27c7c0e8..2d426a4d89 100644
--- a/test/files/continuations-neg/t2949.scala
+++ b/test/files/continuations-neg/t2949.scala
@@ -8,7 +8,7 @@ object Test {
def reify[A, B](x : A @cpsParam[List[A], B]) = reset{ List(x) }
def main(args: Array[String]): Unit = println(reify {
- val x = reflect[Int, Int](List(1,2,3))
+ val x = reflect[Int, Int](List(1,2,3))
val y = reflect[Int, Int](List(2,4,8))
x * y
})
diff --git a/test/files/continuations-neg/t3628.scala b/test/files/continuations-neg/t3628.scala
index c56e7752c4..3fdd32a034 100644
--- a/test/files/continuations-neg/t3628.scala
+++ b/test/files/continuations-neg/t3628.scala
@@ -3,7 +3,7 @@ import scala.actors.Actor._
object Test {
val impl: Actor = actor {
loop {
- react {
+ react {
case 1 => impl ! 2
}
}
diff --git a/test/files/continuations-neg/trycatch2.scala b/test/files/continuations-neg/trycatch2.scala
index 761cee52ac..d61419169b 100644
--- a/test/files/continuations-neg/trycatch2.scala
+++ b/test/files/continuations-neg/trycatch2.scala
@@ -7,7 +7,7 @@ object Test {
def fatal[T]: T = throw new Exception
def cpsIntStringInt = shift { k:(Int=>String) => k(3); 7 }
def cpsIntIntString = shift { k:(Int=>Int) => k(3); "7" }
-
+
def foo1 = try {
fatal[Int]
cpsIntStringInt