Some more fun -> box

Author: b-studios

examples/neg/issue50.check

@@ -1,3 +1,3 @@
 [error] examples/neg/issue50.effekt:16:11: Not allowed {Effect2}
-      k = fun (x: Unit) { resume(x) };
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+      k = box { x => resume(x) };
+          ^^^^^^^^^^^^^^^^^^^^^^

examples/neg/issue50.effekt

@@ -8,12 +8,12 @@ def handle2 { prog: () => Unit / { Effect2 } }: Unit = {
 }
 
 def escape { prog: () => Unit / { Effect1, Effect2 } }: Unit = region this {
-  var k: (Unit) => Unit at { this, prog } in this = fun (x: Unit) { () }
+  var k: (Unit) => Unit at { this, prog } in this = box { x => () }
   handle2 {
     try {
       prog()
     } with Effect1 { () =>
-      k = fun (x: Unit) { resume(x) };
+      k = box { x => resume(x) };
       resume(())
     }
   }

examples/neg/lambdas/capability_closure.effekt

@@ -4,7 +4,7 @@ interface Get {
 
 def outer() = {
   def inner(): Int / {} = do get()
-  fun() { inner() }
+  box { inner() }
 }
 
 def main() = {

examples/neg/lambdas/continuations.check

@@ -1,3 +1,3 @@
 [error] examples/neg/lambdas/continuations.effekt:17:14: Not allowed {Raise}
-      cont = fun() { resume(()) };
-             ^^^^^^^^^^^^^^^^^^^^
+      cont = box { resume(()) };
+             ^^^^^^^^^^^^^^^^^^

examples/neg/lambdas/continuations.effekt

@@ -4,7 +4,7 @@ effect Yield(): Unit
 def main() = region this {
 
   // here we use the region of the main function
-  var cont: () => Unit at {this} in this = fun() { () }
+  var cont: () => Unit at {this} in this = box { () }
 
   try {
     try {
@@ -14,12 +14,12 @@ def main() = region this {
     } with Yield {
       // the assignment is not valid since the continuation must not leave
       // the current scope, which is the one of Raise.
-      cont = fun() { resume(()) };
+      cont = box { resume(()) };
       ()
     }
   } with Raise { msg =>
     println("exception " ++ msg ++ ", but we keep on going..."); resume(())
   }
 
   cont()
-}
+}

examples/neg/lambdas/inference.check

@@ -1,28 +1,28 @@
 [error] examples/neg/lambdas/inference.effekt:13:8: Expected type
-  (Int => Bool at {}) => String
+  (Int => Bool at {}) => String at {}
 but got type
-  (Int => Unit at {}) => String
+  (Int => Unit at {}) => String at ?C
 
 Type mismatch between Bool and Unit.
   comparing the argument types of
     (Int => Unit at {}) => String (given)
     (Int => Bool at {}) => String (expected)
   when comparing the return type of the function.
-  hof2(fun(f: (Int) => Unit at {}) { "" })
-       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-[error] examples/neg/lambdas/inference.effekt:13:8: Expected type
-  (Int => Bool at {}) => String at {}
+  hof2(box { (f: (Int) => Unit at {}) => "" })
+       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+[error] examples/neg/lambdas/inference.effekt:13:12: Expected type
+  (Int => Bool at {}) => String
 but got type
-  (Int => Unit at {}) => String at ?C
+  (Int => Unit at {}) => String
 
 Type mismatch between Bool and Unit.
   comparing the argument types of
     (Int => Unit at {}) => String (given)
     (Int => Bool at {}) => String (expected)
   when comparing the return type of the function.
-  hof2(fun(f: (Int) => Unit at {}) { "" })
-       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-[error] examples/neg/lambdas/inference.effekt:13:12: Type Int => Unit at {} does not match the declared type Int => Bool at {}.
+  hof2(box { (f: (Int) => Unit at {}) => "" })
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+[error] examples/neg/lambdas/inference.effekt:13:15: Type Int => Unit at {} does not match the declared type Int => Bool at {}.
   when comparing the return type of the function.
-  hof2(fun(f: (Int) => Unit at {}) { "" })
-           ^^^^^^^^^^^^^^^^^^^^^^
+  hof2(box { (f: (Int) => Unit at {}) => "" })
+              ^^^^^^^^^^^^^^^^^^^^^^

examples/neg/lambdas/localstate.effekt

@@ -7,7 +7,7 @@ def main() = {
 
     def count1(n: Int): Int = if (n == 0) n else count1(n - 1)
 
-    def hof { g2 : => Unit } = fun () {
+    def hof { g2 : => Unit } = box {
       x = x + 1
       println(x + y); g2()
     }
@@ -21,4 +21,4 @@ def main() = {
     incrementer
   }
   local()
-}
+}

examples/neg/lambdas/polymorphicescape.check

@@ -1,3 +1,3 @@
 [error] examples/neg/lambdas/polymorphicescape.effekt:37:14: Not allowed {leak}
-      leak = fun() { resume(h) } // ERROR
-             ^^^^^^^^^^^^^^^^^^^
+      leak = box { resume(h) } // ERROR
+             ^^^^^^^^^^^^^^^^^

examples/neg/lambdas/polymorphicescape.effekt

@@ -16,7 +16,7 @@ def two[A, B]() =
   (do get[A](), do get[B]())
 
 def main() = {
-  var leak: () => String at {io} = fun() { "" };
+  var leak: () => String at {io} = box { "" };
   try {
     val (n1, n2) = two[Int, Int]();
     println(n1);
@@ -34,8 +34,8 @@ def main() = {
     def get() = resume("")
     def put[S](n, x) = {
       val h = x;
-      leak = fun() { resume(h) } // ERROR
+      leak = box { resume(h) } // ERROR
       resume(h)
     }
   }
-}
+}

examples/neg/lambdas/simpleescape.effekt

@@ -6,9 +6,9 @@ def main() = {
   try {
     def block(msg: String): Unit / {} = { do Raise(msg) }
     val f = if (do Flip()) {
-      fun() { block("first") }
+      box { block("first") }
     } else {
-      fun() { block("second") }
+      box { block("second") }
     }
     f
   } with Raise { msg =>