make compilable

effekt-lang · Jun 20, 2023 · 8e31679 · 8e31679
1 parent 45d1d1f
commit 8e31679
Show file tree

Hide file tree

Showing 23 changed files with 178 additions and 95 deletions.
diff --git a/effekt/jvm/src/main/scala/effekt/EffektConfig.scala b/effekt/jvm/src/main/scala/effekt/EffektConfig.scala
@@ -53,14 +53,6 @@ class EffektConfig(args: Seq[String]) extends REPLConfig(args) {
     noshort = true
   )
 
-  val no_optimize: ScallopOption[String] = choice(
-    choices = List("none", "all", "inlining", "sat", "beta", "dead"),
-    name = "no_optimize",
-    descr = "Optimizations that should not be used",
-    default = Some("none"),
-    noshort = true
-  )
-
   val llvmVersion: ScallopOption[String] = opt[String](
     "llvm-version",
     descr = "the llvm version that should be used to compile the generated programs (only necessary if backend is llvm, defaults to 12)",

diff --git a/effekt/jvm/src/main/scala/effekt/Repl.scala b/effekt/jvm/src/main/scala/effekt/Repl.scala
@@ -308,7 +308,7 @@ class Repl(driver: Driver) extends REPL[Tree, EffektConfig, EffektError] {
      */
     def make(expr: Term): ModuleDecl = {
 
-      val body = Return(expr)
+      val body = Return(List(expr))
 
       ModuleDecl("interactive", imports,
         definitions :+ FunDef(IdDef("main"), Nil, Nil, Nil, None,

diff --git a/effekt/jvm/src/main/scala/effekt/Server.scala b/effekt/jvm/src/main/scala/effekt/Server.scala
@@ -208,7 +208,10 @@ trait LSPServer extends kiama.util.Server[Tree, EffektConfig, EffektError] with
       result <- fun.symbol.annotatedResult
       effects <- fun.symbol.annotatedEffects
     } yield (result, effects)
-    if ann.map { needsUpdate(_, (tpe, eff)) }.getOrElse(true)
+    if ann.map {
+      case (List(y), eff1) => needsUpdate((y, eff1), (tpe, eff))
+      case _ => ??? // TODO MRV
+    }.getOrElse(true)
     res <- CodeAction("Update return type with inferred effects", fun.ret, s": $tpe / $eff")
   } yield res
 

diff --git a/effekt/shared/src/main/scala/effekt/Namer.scala b/effekt/shared/src/main/scala/effekt/Namer.scala
@@ -606,7 +606,7 @@ object Namer extends Phase[Parsed, NameResolved] {
 
       val res = resolve(ret)
 
-      FunctionType(tps, cps, vps, bps, res, effs)
+      FunctionType(tps, cps, vps, bps, List(res), effs) // TODO MRV remove List(res)
     }
   }
 
@@ -640,8 +640,8 @@ object Namer extends Phase[Parsed, NameResolved] {
   def resolve(tpe: source.Effects)(using Context): Effects =
     Effects(tpe.effs.flatMap(resolveWithAliases).toSeq: _*) // TODO this otherwise is calling the wrong apply
 
-  def resolve(e: source.Effectful)(using Context): (ValueType, Effects) =
-    (resolve(e.tpe), resolve(e.eff))
+  def resolve(e: source.Effectful)(using Context): (List[ValueType], Effects) =
+    (e.tpe map resolve, resolve(e.eff))
 
   def resolve(capt: source.CaptureSet)(using Context): CaptureSet = {
     val captResolved = CaptureSet(capt.captures.map { Context.resolveCapture }.toSet)