Drop explicit unboxing

Author: b-studios

effekt/shared/src/main/scala/effekt/Lexer.scala

@@ -133,7 +133,6 @@ enum TokenKind {
   case `extern`
   case `record`
   case `box`
-  case `unbox`
   case `return`
   case `region`
   case `resource`
@@ -179,7 +178,7 @@ object TokenKind {
   val keywords = Vector(
     `let`, `true`, `false`, `val`, `var`, `if`, `else`, `while`, `type`, `effect`, `interface`,
     `try`, `with`, `case`, `do`, `fun`, `match`, `def`, `module`, `import`, `export`, `extern`,
-    `include`, `record`, `box`, `unbox`, `return`, `region`, `resource`, `new`, `and`, `is`,
+    `include`, `record`, `box`, `return`, `region`, `resource`, `new`, `and`, `is`,
     `namespace`, `pure`, `private`
   )
 

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

@@ -867,10 +867,6 @@ class Parser(positions: Positions, tokens: Seq[Token], source: Source) {
       val blockLiteral = `fun` ~> BlockLiteral(Nil, valueParams().unspan, Nil, braces { stmts(inBraces = true) }, span())
       Box(Maybe.None(Span(source, pos(), pos(), Synthesized)), blockLiteral, blockLiteral.span.synthesized)
 
-  def unboxExpr(): Term =
-    nonterminal:
-      Unbox(`unbox` ~> expr(), span())
-
   def newExpr(): Term =
     nonterminal:
       New(`new` ~> implementation(), span())
@@ -1183,7 +1179,6 @@ class Parser(positions: Positions, tokens: Seq[Token], source: Source) {
     case `try`    => tryExpr()
     case `region` => regionExpr()
     case `box`    => boxExpr()
-    case `unbox`  => unboxExpr()
     case `fun`    => funExpr()
     case `new`    => newExpr()
     case `do`                => doExpr()

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

@@ -93,7 +93,6 @@ class EffektLexers(positions: Positions) extends Parsers(positions) {
   lazy val `at` = keyword("at")
   lazy val `in` = keyword("in")
   lazy val `box` = keyword("box")
-  lazy val `unbox` = keyword("unbox")
   lazy val `return` = keyword("return")
   lazy val `region` = keyword("region")
   lazy val `resource` = keyword("resource")
@@ -106,7 +105,7 @@ class EffektLexers(positions: Positions) extends Parsers(positions) {
     "def", "let", "val", "var", "true", "false", "else", "type",
     "effect", "interface", "try", "with", "case", "do", "if", "while",
     "match", "module", "import", "extern", "fun",
-    "at", "box", "unbox", "return", "region", "new", "resource", "and", "is", "namespace"
+    "at", "box", "return", "region", "new", "resource", "and", "is", "namespace"
   )
 
   def keyword(kw: String): Parser[String] =
@@ -419,7 +418,6 @@ class CoreParsers(positions: Positions, names: Names) extends EffektLexers(posit
   // ------
   lazy val block: P[Block] =
     ( blockVar
-    | `unbox` ~> pure ^^ Block.Unbox.apply
     | `new` ~> implementation ^^ Block.New.apply
     | blockLit
     // TODO check left associative nesting (also for select)

effekt/shared/src/main/scala/effekt/util/AnsiHighlight.scala

@@ -62,7 +62,7 @@ object AnsiHighlight {
       `type` | `effect` | `interface` | `fun` | `do` | `case` | `with` | `try` |
       `true` | `false` |
       `match` | `def` | `module`| `import`| `export`| `extern`| `include`|
-      `record`| `box`| `unbox`| `return`| `region`|
+      `record`| `box`| `return`| `region`|
       `resource`| `new`| `and`| `is`| `namespace`| `pure` => keyword(text)
 
     case _ => text

examples/neg/issue362.effekt

@@ -7,5 +7,5 @@ def main() = {
   val cap = try {
     foo {arr}
   } with arr: Exc { def op() = resume(println("hey")) }
-  (unbox cap)()
+  cap()
 }

examples/neg/issue50.effekt

@@ -18,9 +18,9 @@ def escape { prog: () => Unit / { Effect1, Effect2 } }: Unit = region this {
     }
   }
 
-  (unbox k)(())
+  k(())
 }
 
 def main() = {
   escape { do Effect1(); do Effect2() }
-}
+}

examples/neg/issue548a.effekt

@@ -12,7 +12,7 @@ def withTime[A] { prog: { Time } => A }: A =
 def main() = {
   def b { t: Time }: Time at {t} = box t;  // this is fine
   val cap = withTime {b} // ERROR escape
-  def t2: Time = unbox cap
+  def t2: Time = cap
   t2.now();
   ()
 }

examples/neg/lambdas/capability_closure.effekt

@@ -13,5 +13,5 @@ def main() = {
   } with Get {
     def get() = resume(42)
   }
-  (unbox f)()
-}
+  f()
+}

examples/neg/lambdas/closure.effekt

@@ -6,9 +6,9 @@ def main() = {
   val f = try { // @Yield =>
     val g = fun(){ do Yield() }
     twice {
-      def unboxed() = { (unbox g)() };
+      def unboxed() = { g() };
       unboxed()// (@Yield)
     }
   } with Yield { println("yielded!"); resume(()) }
   f()
-}
+}

examples/pos/capture/defdef.effekt

@@ -4,7 +4,7 @@ def myModule { eff : Eff } = region this {
   def outer = this;
 
   val e1 = fun() { eff.use(); () };
-  def x = unbox e1;
+  def x = e1;
 
   def test1() = x();
   def test1b = x;