Change to new syntax in pos-custom-args

Author: odersky

tests/pos-custom-args/bounded1.scala

@@ -1,27 +1,27 @@
 // To be revisited
 class CC
-type Cap = {*} CC
+type Cap = CC^
 
 def test(c: Cap) =
-  class B[X <: {c} Object](x: X):
+  class B[X <: Object^{c}](x: X):
     def elem = x
     def lateElem = () => x
 
   def f(x: Int): Int = if c == c then x else 0
   val b = new B(f)
   val r1 = b.elem
-  val r1c: {c} Int -> Int = r1
+  val r1c: Int^{c} -> Int = r1
   val r2 = b.lateElem
-  val r2c: () -> {c} Int -> Int = r2 // was error now OK
+  val r2c: () -> Int^{c} -> Int = r2 // was error now OK
 
 def test2(c: Cap) =
-  class B[X <: {*} Any](x: X):
+  class B[X <: Any^](x: X):
     def elem = x
     def lateElem = () => x
 
   def f(x: Int): Int = if c == c then x else 0
   val b = new B(f)
   val r1 = b.elem
-  val r1c: {c} Int -> Int = r1
+  val r1c: Int ->{c} Int = r1
   val r2 = b.lateElem
-  val r2c: () -> {c} Int -> Int = r2 // was error now OK
+  val r2c: () -> Int ->{c} Int = r2 // was error now OK

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

@@ -1,14 +1,14 @@
 class CC
-type Cap = {*} CC
+type Cap = CC^
 
 def test(c: Cap) =
-  class B[X <: {c} Object](x: X):
+  class B[X <: Object^{c}](x: X):
     def elem = x
     def lateElem = () => x
 
   def f(x: Int): Int = if c == c then x else 0
   val b = new B(f)
   val r1 = b.elem
-  val r1c: {c} Int -> Int = r1
+  val r1c: Int ->{c} Int = r1
   val r2 = b.lateElem
-  val r2c: {c} () -> {c} Int -> Int = r2
+  val r2c: () ->{c} Int ->{c} Int = r2

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

@@ -6,6 +6,6 @@ def foo(x: => Int): Unit = ()
 
 def test(c: Cap) =
   val f = () => { c; 1 }
-  val _: {c} () -> Int = f
+  val _: () ->{c} Int = f
   val g = () => Box(f)
-  val _: () -> Box[{f} () -> Int] = g
+  val _: () -> Box[() ->{f} Int] = g

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

@@ -12,25 +12,25 @@ def map[A, B](c: Cell[A])(f: A => B): Cell[B]
 def pureMap[A, B](c: Cell[A])(f: A -> B): Cell[B]
   = c[Cell[B]]((x: A) => cell(f(x)))
 
-def lazyMap[A, B](c: Cell[A])(f: A => B): {f} () -> Cell[B]
+def lazyMap[A, B](c: Cell[A])(f: A => B): () ->{f} Cell[B]
   = () => c[Cell[B]]((x: A) => cell(f(x)))
 
 trait IO:
   def print(s: String): Unit
 
-def test(io: {*} IO) =
+def test(io: IO^) =
 
-  val loggedOne: {io} () -> Int = () => { io.print("1"); 1 }
+  val loggedOne: () ->{io} Int = () => { io.print("1"); 1 }
 
-  val c: Cell[{io} () -> Int]
-      = cell[{io} () -> Int](loggedOne)
+  val c: Cell[() ->{io} Int]
+      = cell[() ->{io} Int](loggedOne)
 
-  val g = (f: {io} () -> Int) =>
+  val g = (f: () ->{io} Int) =>
     val x = f(); io.print(" + ")
     val y = f(); io.print(s" = ${x + y}")
 
-  val r = lazyMap[{io} () -> Int, Unit](c)(f => g(f))
-  val r2 = lazyMap[{io} () -> Int, Unit](c)(g)
+  val r = lazyMap[() ->{io} Int, Unit](c)(f => g(f))
+  val r2 = lazyMap[() ->{io} Int, Unit](c)(g)
   val r3 = lazyMap(c)(g)
   val _ = r()
   val _ = r2()

tests/pos-custom-args/captures/caps-universal.scala

@@ -2,6 +2,6 @@ import annotation.retains
 
 val foo: Int => Int = x => x
 val bar: (Int -> Int) @retains(caps.*) = foo
-val baz: {*} Int -> Int = bar
+val baz: Int => Int = bar
 
 

tests/pos-custom-args/captures/capt-capability.scala

@@ -1,7 +1,7 @@
 import annotation.capability
 
 @capability class Cap
-def f1(c: Cap): {c} () -> c.type = () => c // ok
+def f1(c: Cap): () ->{c} c.type = () => c // ok
 
 def f2: Int =
   val g: Boolean => Int = ???
@@ -17,8 +17,8 @@ def f3: Int =
 def foo() =
   val x: Cap = ???
   val y: Cap = x
-  val x2: {x} () -> Cap = ???
-  val y2: {x} () -> Cap = x2
+  val x2: () ->{x} Cap = ???
+  val y2: () ->{x} Cap = x2
 
   val z1: () => Cap = f1(x)
   def h[X](a: X)(b: X) = a

tests/pos-custom-args/captures/capt-depfun.scala

@@ -16,6 +16,6 @@ def f(y: Cap, z: Cap): String @retains(caps.*) =
   val d = a(g())
 
   val ac: ((x: Cap) -> ID[String @retains(x) -> String @retains(x)]) = ???
-  val bc: (({y} String) -> {y} String) = ac(y)
-  val dc: (String -> {y, z} String) = ac(g())
+  val bc: String^{y} -> String^{y} = ac(y)
+  val dc: String -> String^{y, z} = ac(g())
   c

tests/pos-custom-args/captures/capt-depfun2.scala

@@ -5,5 +5,5 @@ type Cap = C @retains(caps.*)
 def f(y: Cap, z: Cap) =
   def g(): C @retains(y, z) = ???
   val ac: ((x: Cap) -> Array[String @retains(x)]) = ???
-  val dc: Array[? >: String <: {y, z} String] = ac(g()) // needs to be inferred
+  val dc: Array[? >: String <: String]^{y, z} = ac(g()) // needs to be inferred
   val ec = ac(y)

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

@@ -1,7 +1,7 @@
 object Test:
 
   def test() =
-    val x: {*} Any = "abc"
+    val x: Any^ = "abc"
     val y: Object @scala.annotation.retains(x) = ???
     val z: Object @scala.annotation.retains(x, caps.*) = y: Object @annotation.retains(x)
 

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

@@ -3,7 +3,7 @@ class C
 type Cap = C @retains(caps.*)
 
 def test1() =
-  val y: {*} String = ""
+  val y: String^ = ""
   def x: Object @retains(y) = y
 
 def test2() =
@@ -13,8 +13,8 @@ def test2() =
   z: (() -> Unit) @retains(x)
   def z2: (() -> Unit) @retains(y) = y
   z2: (() -> Unit) @retains(y)
-  val p: {*} () -> String = () => "abc"
-  val q: {p} C = ???
-  val _ = p: ({p} () -> String)
+  val p: () => String = () => "abc"
+  val q: C^{p} = ???
+  val _ = p: (() ->{p} String)