Add tparams to constructors (#1104)

The Core Parser still needs to handle tparams, but I was unsure how to
add that functionality.

Author: mattisboeckle

effekt/jvm/src/test/scala/effekt/core/TypeInferenceTests.scala

@@ -0,0 +1,25 @@
+package effekt
+package core
+
+import effekt.core.Type.*
+
+class TypeInferenceTests extends CoreTests {
+
+  val SomeC: Id    = Id("Some")
+  val NoneC: Id    = Id("None")
+  val OptionId: Id = Id("Option")
+  def OptionT(tpe: core.ValueType): core.ValueType.Data =
+    core.ValueType.Data(OptionId, List(tpe))
+
+  test("infer Make type") {
+    val intOptionTy = OptionT(TInt)
+
+    // Some[Int](42)
+    val option = Make(intOptionTy, SomeC, List(), List(Literal(42, TInt)))
+
+    // Option[Int]
+    val expected = intOptionTy
+
+    assertEquals(option.tpe, expected)
+  }
+}

effekt/shared/src/main/scala/effekt/core/Parser.scala

@@ -267,7 +267,7 @@ class CoreParsers(names: Names) extends EffektLexers {
     `interface` ~> id ~ maybeTypeParams ~ (`{` ~/> many(property) <~ `}`) ^^ Declaration.Interface.apply
 
   lazy val constructor: P[Constructor] =
-    id ~ valueParams ^^ { case id ~ params => Constructor(id, params.map(p => Field(p.id, p.tpe))) }
+    id ~ maybeTypeParams ~ valueParams ^^ { case id ~ tparams ~ params => Constructor(id, tparams, params.map(p => Field(p.id, p.tpe))) }
 
   lazy val property: P[Property] =
     id ~ (`:` ~> blockType) ^^ Property.apply

effekt/shared/src/main/scala/effekt/core/PolymorphismBoxing.scala

@@ -94,7 +94,7 @@ object PolymorphismBoxing extends Phase[CoreTransformed, CoreTransformed] {
   }
 
   def transform(constructor: Constructor)(using Context, DeclarationContext): Constructor = constructor match {
-    case Constructor(id, fields) => Constructor(id, fields map transform)
+    case Constructor(id, tparams, fields) => Constructor(id, tparams, fields map transform)
   }
 
   def transform(property: Property)(using Context, DeclarationContext): Property = property match {

effekt/shared/src/main/scala/effekt/core/PrettyPrinter.scala

@@ -145,7 +145,7 @@ object PrettyPrinter extends ParenPrettyPrinter {
   }
 
   def toDoc(c: Constructor): Doc = c match {
-    case Constructor(id, fields) => toDoc(id) <> parens(fields.map(toDoc))
+    case Constructor(id, tparams, fields) => toDoc(id) <> brackets(tparams.map(toDoc)) <> parens(fields.map(toDoc))
   }
   def toDoc(f: Field): Doc = f match {
     case Field(name, tpe) => toDoc(name) <> ":" <+> toDoc(tpe)

effekt/shared/src/main/scala/effekt/core/Transformer.scala

@@ -144,7 +144,7 @@ object Transformer extends Phase[Typechecked, CoreTransformed] {
   }.toList ++ exports.namespaces.values.flatMap(transform)
 
   def transform(c: symbols.Constructor)(using Context): core.Constructor =
-    core.Constructor(c, c.fields.map(f => core.Field(f, transform(f.returnType))))
+    core.Constructor(c, c.tparams, c.fields.map(f => core.Field(f, transform(f.returnType))))
 
   def transform(tree: source.Stmt)(using Context): Stmt = tree match {
     // { e; stmt } --> { let _ = e; stmt }

effekt/shared/src/main/scala/effekt/core/Tree.scala

@@ -123,7 +123,7 @@ enum Declaration extends Tree {
 }
 export Declaration.*
 
-case class Constructor(id: Id, fields: List[Field]) extends Tree
+case class Constructor(id: Id, tparams: List[Id], fields: List[Field]) extends Tree
 case class Field(id: Id, tpe: ValueType) extends Tree
 case class Property(id: Id, tpe: BlockType) extends Tree