Improves examples

effekt/jvm/src/test/scala/effekt/TyperTests.scala

@@ -219,15 +219,6 @@ abstract class AbstractTyperTests extends munit.FunSuite {
       assertNoDiff(symbols.TypePrinter.show(got), expected, clue)
     }
 
-//    def assertCaptureType(name: String, expected: String, clue: => Any = "capture types don't match"): Unit = {
-//      val syms = R.module.terms(name)
-//      assert(syms.size == 1, s"There is a unique symbol named '${name}'.")
-//      val sym = syms.head
-//      assert(sym.isInstanceOf[symbols.Captures], s"${sym} is a capture symbol.")
-//      val got = C.annotation(Annotations.Captures, sym.asInstanceOf[symbols.BlockSymbol])
-//      assertNoDiff(symbols.TypePrinter.show(got), expected, clue)
-//    }
-
     // TODO further assertions (e.g. for captures etc) on the context
   }
 
@@ -269,7 +260,7 @@ class TyperTests extends AbstractTyperTests {
   testTyperFile("Box inference tests")("examples/pts/pos/boxInference.effekt"){
     C => {
       C.assertBlockType("func1", "Int => Int at {} => Int")
-      C.assertBlockType("func2", "List[Int => Int at {}] => Int")
+      // C.assertBlockType("func2", "List[Int => Int at {}] => Int")
     }
   }
 
@@ -282,13 +273,23 @@ class TyperTests extends AbstractTyperTests {
     }
   }
 
+  testTyperFile("Effectful box test")("examples/pts/pos/effectfulBox.effekt") {
+    C => C.assertValueType("boxed", "() => Int / { Eff } at {}")
+  }
+
   testTyperFile("Effect tests")("examples/pts/pos/effects.effekt"){
     C => {
       C.assertBlockType("func1", "() => Int / { Eff1 }")
       C.assertBlockType("func2", "() => Int / { Eff1, Eff2 }")
     }
   }
 
+  testTyperFile("Multiple uses of block parameter")("examples/pts/pos/functionMultipleUses.effekt") {
+    C => {
+      C.assertBlockType("func", "Int => Int")
+    }
+  }
+
   testTyperFile("Interface tests")("examples/pts/pos/interface.effekt"){
     C => {
       C.assertBlockType("interfaceParam", "Constant[Int]")
@@ -304,6 +305,27 @@ class TyperTests extends AbstractTyperTests {
     }
   }
 
+  testTyperFile("Nested wildcards tests")("examples/pts/pos/nestedWildcards.effekt") {
+    C => {
+      C.assertBlockType("f", "Int => Int")
+      C.assertValueType("y", "Int")
+    }
+  }
+
+  testTyperFile("Parametric box tests")("examples/pts/pos/parametricBox.effekt") {
+    C => {
+      C.assertValueType("boxed", "[A]A => Int at {}")
+    }
+  }
+
+  testTyperFile("Recursive function tests")("examples/pts/pos/recursiveFunction.effekt") {
+    C => C.assertBlockType("func", "Int => Int")
+  }
+
+  testTyperFile("TypeParam tests")("examples/pts/pos/typeParameter.effekt") {
+    C => C.assertBlockType("id", "[A]A => A")
+  }
+
   testTyperFile("Value type tests")("examples/pts/pos/valueTypes.effekt"){
     C => {
       C.assertValueType("value1", "Int")
@@ -312,8 +334,5 @@ class TyperTests extends AbstractTyperTests {
     }
   }
 
-
-  testTyperFile("Debug")("examples/pts/test24.effekt"){
-    C => C.assertBlockType("func", "")
-  }
+
 }

examples/pts/test23.effekt → examples/pts/FIXME.effekt

@@ -2,7 +2,7 @@ effect Eff(): Unit
 
 def run{x: _}: Int = {
     val a: Int = x(1)
-    //def y: Int => Int / Eff = x
+    def y: Int => Int / Eff = x
     1
 }
 

examples/pts/neg/blockParameters.check

@@ -1,3 +1,3 @@
-[error] examples\pts\neg\blockTypes.effekt:5:1: Cannot fully infer type for func: {_} => String
-def func{param: _} = "test"
+[error] examples/pts/neg/blockParameters.effekt:5:1: Cannot fully infer type for func: {_} => String
+def func{param: _} = "test"
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

examples/pts/neg/boxInference.check

@@ -1,3 +1,3 @@
-[error] examples/pts/neg/boxInference.effekt:12:24: Capture parameter count does not match Int => Int / { Eff } vs. Int => Int
-    val res = func(box f)
-                       ^
+[error] examples/pts/neg/boxInference.effekt:8:6: Cannot infer function type for callee.
+     (unbox boxedParam)(1)
+     ^

examples/pts/neg/boxParametricFunction.check

@@ -1,3 +1,3 @@
-[error] examples/pts/neg/boxParametricFunction.effekt:12:24: Type parameter count does not match [A]A => A vs. Int => Int
-    val res = func(box f)
-                       ^
+[error] examples/pts/neg/boxParametricFunction.effekt:8:6: Cannot infer function type for callee.
+     (unbox boxedParam)(1)
+     ^

examples/pts/neg/effectInBlockParam.check

@@ -0,0 +1,3 @@
+[error] examples/pts/neg/effectInBlockParam.effekt:6:5: EffectSetWildcard is not allowed in block parameter
+    func()
+    ^

examples/pts/neg/externDefCaptures.check

@@ -0,0 +1,3 @@
+[error] examples/pts/neg/externDefCaptures.effekt:3:10: Capture set wildcards are not allowed here!
+extern _ def func(x: Int): Int = "test"
+         ^

examples/pts/test16.effekt → examples/pts/neg/externDefCaptures.effekt

@@ -1,3 +1,5 @@
+module examples/pts/neg/externDefCaptures
+
 extern _ def func(x: Int): Int = "test"
 
 def main() = {

examples/pts/neg/externDefParameter.check

@@ -0,0 +1,3 @@
+[error] examples/pts/neg/externDefParameter.effekt:3:1: Cannot fully infer type for test: ValueTypeWildcard => Unit
+extern pure def test(x: _): Unit = "test"
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

examples/pts/neg/externFunction.effekt → examples/pts/neg/externDefParameter.effekt

@@ -1,3 +1,5 @@
+module examples/pts/neg/externDefParameter
+
 extern pure def test(x: _): Unit = "test"
 
 val a = test(1)

examples/pts/neg/externDefReturn.check

@@ -0,0 +1,3 @@
+[error] examples/pts/neg/externDefReturn.effekt:3:1: Cannot fully infer type for func: EffectSetWildcard
+extern def func(x: _): _ / _ = "Test"
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

examples/pts/test17.effekt → examples/pts/neg/externDefReturn.effekt

@@ -1,3 +1,5 @@
+module examples/pts/neg/externDefReturn
+
 extern def func(x: _): _ / _ = "Test"
 
 def main() = {

examples/pts/neg/externResource.check

@@ -0,0 +1,3 @@
+[error] examples/pts/neg/externResource.effekt:3:1: Cannot fully infer type for test: _
+extern resource test: _
+^^^^^^^^^^^^^^^^^^^^^^^

examples/pts/neg/externResource.effekt

@@ -1,3 +1,5 @@
+module examples/pts/neg/externResource
+
 extern resource test: _
 
 def main() = {

examples/pts/neg/functionParameter.check

@@ -1,3 +1,3 @@
-[error] examples\pts\neg\functionParameter.effekt:3:1: Cannot fully infer type for func1: ValueTypeWildcard => String
+[error] examples/pts/neg/functionParameter.effekt:3:1: Cannot fully infer type for func1: ValueTypeWildcard => String
 def func1(x: _) = "test"
 ^^^^^^^^^^^^^^^^^^^^^^^^

examples/pts/neg/operation.check

@@ -0,0 +1,3 @@
+[error] examples/pts/neg/operation.effekt:3:1: Wildcard not usable in interface operations
+effect Test {
+^

examples/pts/test10.effekt → examples/pts/neg/operation.effekt

@@ -1,4 +1,4 @@
-// opClause wildcard
+module examples/pts/neg/operation
 
 effect Test {
     def output(x: Int): Int / _

examples/pts/neg/typeAlias.check

@@ -0,0 +1,3 @@
+[error] examples/pts/neg/typeAlias.effekt:5:1: Cannot fully infer type for f: ValueTypeWildcard => Int
+def f(x: A) = 1
+^

examples/pts/neg/typeAlias.effekt

@@ -0,0 +1,9 @@
+module examples/pts/neg/typeAlias
+
+type A = _
+
+def f(x: A) = 1
+
+def main() = {
+    1
+}

examples/pts/neg/variable.check

@@ -1,3 +1,3 @@
-[error] examples\pts\neg\variable.effekt:6:13: Expected Int but got String.
+[error] examples/pts/neg/variable.effekt:6:13: Expected Int but got String.
     value = "t"
             ^^^

examples/pts/pos/blockLiteral.effekt

@@ -11,3 +11,7 @@ def outer{interfaceEff: InterfaceEff} = {
     }
     func
 }
+
+def main() = {
+    ()
+}

examples/pts/pos/blockParameter.effekt

@@ -2,4 +2,8 @@ module examples/pts/pos/blockParameter
 
 def param(x: Int, y: Int): Int = x + y
 
-def func1{f: _}: Boolean = f(1, 2) == 2
+def func1{f: _}: Boolean = f(1, 2) == 2
+
+def main() = {
+    ()
+}

examples/pts/pos/boxedInterface.effekt

@@ -18,4 +18,8 @@ def func{ eff: Eff } = {
     def unboxed: _ = boxed
 
     boxed
+}
+
+def main() = {
+    ()
 }

examples/pts/pos/effectfulBox.effekt

@@ -0,0 +1,12 @@
+effect Eff(): Unit
+
+def f(): Int / Eff = {
+    do Eff()
+    1
+}
+
+val boxed: _ at {} = box f
+
+def main() = {
+    ()
+}

examples/pts/pos/effects.effekt

@@ -14,4 +14,6 @@ def func2(): Int / _ = {
     1
 }
 
-def main() = { () }
+def main() = { 
+    () 
+}

examples/pts/pos/interface.effekt

@@ -13,4 +13,8 @@ def withConstantInt[R]{ body: { Constant[Int] } => R }: R = {
 
 def foo() = withConstantInt { {interfaceParam: _} =>
    interfaceParam.output() + 1
+}
+
+def main() = {
+    ()
 }

examples/pts/pos/nestedTypes.effekt

@@ -22,4 +22,8 @@ def func(listParam: _): Int =
 
 record Constant[A](value: A)
 
-val constant: Constant[_] = Constant(1)
+val constant: Constant[_] = Constant(1)
+
+def main() = {
+    ()
+}

examples/pts/twoWildcards.effekt → examples/pts/pos/nestedWildcards.effekt

@@ -4,5 +4,5 @@ def f(x: _): Int = {
 }
 
 def main() = {
-    f("1")
+    ()
 }

examples/pts/pos/parametricBox.effekt

@@ -2,8 +2,6 @@ def f[A](x: A): Int = 2
 
 val boxed: _ at {} = box f
 
-val d: Int = boxed
-
 def main() = {
     ()
 }

examples/pts/pos/typeParameter.effekt

@@ -1 +1,8 @@
-def id[A](x: A): A = x
+def id[A](x: _): A = {
+    val y: A = x
+    x
+}
+
+def main() = {
+    ()
+}