While at it, also drop fun

Author: b-studios

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

@@ -127,7 +127,6 @@ enum TokenKind {
   case `with`
   case `case`
   case `do`
-  case `fun`
   case `match`
   case `def`
   case `extern`
@@ -177,7 +176,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`,
+    `try`, `with`, `case`, `do`, `match`, `def`, `module`, `import`, `export`, `extern`,
     `include`, `record`, `box`, `return`, `region`, `resource`, `new`, `and`, `is`,
     `namespace`, `pure`, `private`
   )

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

@@ -408,7 +408,7 @@ class Parser(positions: Positions, tokens: Seq[Token], source: Source) {
     some(ident, `/`).mkString("/") labelled "module name"
 
   def isToplevel: Boolean = peek.kind match {
-    case `val` | `fun` | `def` | `type` | `effect` | `namespace` | `interface` | `type` | `record` | `var` | `include` | `extern` => true
+    case `val` | `def` | `type` | `effect` | `namespace` | `interface` | `type` | `record` | `var` | `include` | `extern` => true
     case _ => false
   }
 
@@ -861,12 +861,6 @@ class Parser(positions: Positions, tokens: Seq[Token], source: Source) {
       Box(captures, expr, span())
   }
 
-  // TODO deprecate
-  def funExpr(): Term =
-    nonterminal:
-      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 newExpr(): Term =
     nonterminal:
       New(`new` ~> implementation(), span())
@@ -1179,7 +1173,6 @@ class Parser(positions: Positions, tokens: Seq[Token], source: Source) {
     case `try`    => tryExpr()
     case `region` => regionExpr()
     case `box`    => boxExpr()
-    case `fun`    => funExpr()
     case `new`    => newExpr()
     case `do`                => doExpr()
     case _ if isString       => templateString()

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

@@ -80,7 +80,6 @@ class EffektLexers(positions: Positions) extends Parsers(positions) {
   lazy val `with` = keyword("with")
   lazy val `case` = keyword("case")
   lazy val `do` = keyword("do")
-  lazy val `fun` = keyword("fun")
   lazy val `resume` = keyword("resume")
   lazy val `match` = keyword("match")
   lazy val `def` = keyword("def")

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

@@ -59,7 +59,7 @@ object AnsiHighlight {
     // keywords
     case
       `let`  | `val` | `var` | `if` | `else` | `while` |
-      `type` | `effect` | `interface` | `fun` | `do` | `case` | `with` | `try` |
+      `type` | `effect` | `interface` | `do` | `case` | `with` | `try` |
       `true` | `false` |
       `match` | `def` | `module`| `import`| `export`| `extern`| `include`|
       `record`| `box`| `return`| `region`|