Adapt tests to shallow capture sets

Author: odersky

tests/neg-custom-args/captures/boxmap.scala

@@ -3,7 +3,7 @@ class Cap extends Retains[*]
 
 infix type ==> [A, B] = (A => B) retains *
 
-type Box[+T <: Top] = [K <: Top] => (T ==> K) => K
+type Box[+T <: Top] = ([K <: Top] => (T ==> K) => K) retains T
 
 def box[T <: Top](x: T): Box[T] =
   [K <: Top] => (k: T ==> K) => k(x)

tests/neg-custom-args/captures/capt1.check

@@ -0,0 +1,42 @@
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:3:2 ------------------------------------------
+3 |  () => if x == null then y else y  // error
+  |  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |  Found:    (() => C) retains x
+  |  Required: () => C
+
+longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:6:2 ------------------------------------------
+6 |  () => if x == null then y else y  // error
+  |  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |  Found:    (() => C) retains x
+  |  Required: Any
+
+longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:14:2 -----------------------------------------
+14 |  f  // error
+   |  ^
+   |  Found:    (Int => Int) retains x
+   |  Required: Any
+
+longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:23:3 -----------------------------------------
+23 |  F(22)  // error
+   |  ^^^^^
+   |  Found:    F retains x
+   |  Required: A
+
+longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:27:40 ----------------------------------------
+27 |    def m() = if x == null then y else y  // error
+   |                                        ^
+   |                                        Found:    A {...} retains x
+   |                                        Required: A
+
+longer explanation available when compiling with `-explain`
+-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/capt1.scala:32:24 ----------------------------------------
+32 |  val z2 = h[() => Cap](() => x)(() => C())  // error
+   |                        ^^^^^^^
+   |                        Found:    (() => Cap) retains x
+   |                        Required: () => Cap
+
+longer explanation available when compiling with `-explain`

tests/neg-custom-args/captures/capt1.scala

@@ -30,5 +30,6 @@ def foo() =
   val x: C retains * = ???
   def h[X <:Top](a: X)(b: X) = a
   val z2 = h[() => Cap](() => x)(() => C())  // error
-  val z3 = h(() => x)(() => C())  // error
+  val z3 = h[(() => Cap) retains x.type](() => x)(() => C())  // ok
+  val z4 = h[(() => Cap) retains x.type](() => x)(() => C())  // what was inferred for z3
 

tests/neg-custom-args/captures/try2.check

@@ -29,10 +29,10 @@ longer explanation available when compiling with `-explain`
 -- Error: tests/neg-custom-args/captures/try2.scala:24:28 --------------------------------------------------------------
 24 |  val a = handle[Exception, CanThrow[Exception]] { // error
    |                            ^^^^^^^^^^^^^^^^^^^
-   |                            type argument is not allowed to capture the global capability (canThrow : List[*])
+   |                            type argument is not allowed to capture the global capability (canThrow : *)
 -- Error: tests/neg-custom-args/captures/try2.scala:36:11 --------------------------------------------------------------
 36 |  val xx = handle { // error
    |           ^^^^^^
-   |inferred type argument ((() => Int) retains canThrow) is not allowed to capture the global capability (canThrow : List[*])
+   |inferred type argument ((() => Int) retains canThrow) is not allowed to capture the global capability (canThrow : *)
    |
    |The inferred arguments are: [Exception, ((() => Int) retains canThrow)]

tests/neg-custom-args/captures/try2.scala

@@ -1,7 +1,7 @@
 import language.experimental.erasedDefinitions
 import annotation.ability
 
-@ability erased val canThrow: List[*] = ???
+@ability erased val canThrow: * = ???
 
 class CanThrow[E <: Exception] extends Retains[canThrow.type]
 type Top  = Any retains *

tests/pos-custom-args/captures/boxmap.scala

@@ -3,7 +3,7 @@ class Cap extends Retains[*]
 
 infix type ==> [A, B] = (A => B) retains *
 
-type Box[+T <: Top] = [K <: Top] => (T ==> K) => K
+type Box[+T <: Top] = ([K <: Top] => (T ==> K) => K) retains T
 
 def box[T <: Top](x: T): Box[T] =
   [K <: Top] => (k: T ==> K) => k(x)
@@ -17,5 +17,5 @@ def lazymap[A <: Top, B <: Top](b: Box[A])(f: A ==> B): (() => Box[B]) retains b
 def test[A <: Top, B <: Top] =
   def lazymap[A <: Top, B <: Top](b: Box[A])(f: A ==> B) =
     () => b[Box[B]]((x: A) => box(f(x)))
-  val x: (b: Box[A]) => (f: A ==> B) => (() => Box[B]) retains b.type | f.type = lazymap[A, B]
+  val x: (b: Box[A]) => ((f: A ==> B) => (() => Box[B]) retains b.type | f.type) retains b.type = lazymap[A, B]
   ()

tests/pos-custom-args/captures/capt1.scala

@@ -1,7 +1,7 @@
 class C
 type Cap = C retains *
 type Top = Any retains *
-def f1(c: Cap): () => C retains c.type = () => c // ok
+def f1(c: Cap): (() => c.type) retains c.type = () => c // ok
 
 def f2: Int =
   val g: (Boolean => Int) retains * = ???
@@ -18,11 +18,10 @@ def foo() =
   val x: C retains * = ???
   val y: C retains x.type = x
   val x2: (() => C) retains x.type = ???
-  val y2: () => C retains x.type = x2
+  val y2: (() => C retains x.type) retains x.type = x2
 
-  val z1: () => Cap = f1(x)
+  val z1: (() => Cap) retains * = f1(x)
   def h[X <:Top](a: X)(b: X) = a
 
   val z2 =
     if x == null then () => x else () => C()
-

tests/pos-custom-args/captures/list-encoding.scala

@@ -5,7 +5,7 @@ type Op[T <: Top, C <: Top] =
   ((v: T) => ((s: C) => C) retains *) retains *
 
 type List[T <: Top] =
-  [C <: Top] => (op: Op[T, C]) => ((s: C) => C) retains op.type
+  ([C <: Top] => (op: Op[T, C]) => ((s: C) => C) retains op.type) retains T
 
 def nil[T <: Top]: List[T] =
   [C <: Top] => (op: Op[T, C]) => (s: C) => s