align with new moonbit release

Author: hackwaly

boot/moonyacc.js

@@ -1,6 +1,6 @@
 {
   "name": "moonbitlang/yacc",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "deps": {
     "moonbitlang/x": "0.4.23",
     "Yoorkin/ArgParser": "0.1.9",

moon.mod.json

@@ -1098,9 +1098,9 @@ fn codegen(
           $|  yy_parse(
           $|    tokens,
           $|    yy_state_\{start_state.num},
-          $|    fn {
-          $|      YYObj_\{derive_type_ident(nonterminal_meta(name).data_type)}(result) => result
-          $|      _ => panic()
+          $|    (it) => {
+          $|      guard it is YYObj_\{derive_type_ident(nonterminal_meta(name).data_type)}(result)
+          $|      result
           $|    },
           $|    initial_pos?,
           $|  )
@@ -1115,9 +1115,9 @@ fn codegen(
           $|    read_token,
           $|    start_pos,
           $|    yy_state_\{start_state.num},
-          $|    fn {
-          $|      YYObj_\{derive_type_ident(nonterminal_meta(name).data_type)}(result) => result
-          $|      _ => panic()
+          $|    (it) => {
+          $|      guard it is YYObj_\{derive_type_ident(nonterminal_meta(name).data_type)}(result)
+          $|      result
           $|    },
           $|  )
           $|}
@@ -1159,9 +1159,9 @@ fn codegen(
       output.write_string(
         $|
         $|fn args_to_json(args : ArrayView[(YYObj, \{meta.position_data_type}, \{meta.position_data_type})]) -> Json {
-        $|  Json::array(args.iter().map(fn {
-        $|    (YYObj_Json(json), _, _) => json
-        $|    _ => panic()
+        $|  Json::array(args.iter().map((it) => {
+        $|    guard it.0 is YYObj_Json(json)
+        $|    json
         $|  }).to_array())
         $|}
         $|

src/lib/codegen/gen_mbt/gen_mbt.mbt

@@ -9,24 +9,24 @@ fn find_leaf_inline_rules(rules : Map[String, @elab.Rule]) -> Set[String] {
   Set::from_iter(
     all_inline_rules
     .iter()
-    .filter(fn {
-      (_, rule) =>
-        rule.clauses
+    .filter(it => {
+      let (_, rule) = it
+      rule.clauses
+      .iter()
+      .all(fn(clause) {
+        clause.items
         .iter()
-        .all(fn(clause) {
-          clause.items
-          .iter()
-          .all(fn(item) {
-            match item.term {
-              Token(_) => true
-              RuleCall(rule_name, [], _type) =>
-                not(all_inline_rules.contains(rule_name))
-              Param(_) | RuleCall(_, _, _) => panic()
-            }
-          })
+        .all(fn(item) {
+          match item.term {
+            Token(_) => true
+            RuleCall(rule_name, [], _type) =>
+              not(all_inline_rules.contains(rule_name))
+            Param(_) | RuleCall(_, _, _) => panic()
+          }
         })
+      })
     })
-    .map(fn { (rule_name, _) => rule_name }),
+    .map(it => it.0),
   )
 }
 

src/lib/desugar/eliminate_inline.mbt

@@ -104,6 +104,7 @@ pub(all) struct Clause {
 }
 
 // (code, (utf8_pos, utf8_len)?)
+
 ///|
 pub typealias (String, (Int, Int)?) as CodeChunk
 

src/lib/elab/east.mbt

@@ -307,8 +307,9 @@ pub fn elaborate(
     let rule_param_map : Map[String, TypeExpr] = Map::from_array(rule.params)
     let ast_clause_iter = ast_rule.clauses
       .iter()
-      .flat_map(fn {
-        (clauses, action) => clauses.iter().map(fn(it) { (it, action) })
+      .flat_map(it => {
+        let (clauses, action) = it
+        clauses.iter().map(fn(it) { (it, action) })
       })
     let mut clause_index = 0
     for ast_clause in ast_clause_iter {
@@ -369,7 +370,7 @@ pub fn elaborate(
           position_type = parse_and_elaborate_type_expr(type_)
         }
       Derive(traits~, type_~) => {
-        let traits = traits.split(",").map(fn { t => t.trim(" ").to_string() })
+        let traits = traits.split(",").map(t => t.trim(" ").to_string())
         for trait_ in traits {
           derive_map.add(type_, parse_and_elaborate_type_expr(trait_))
         }

src/lib/elab/elaborate.mbt

@@ -109,7 +109,7 @@ pub fn build(f : (BuilderContext) -> Unit) -> Grammar {
         productions.push(production)
         for symbol in production.rhs {
           match symbol {
-            T(t) => last_prec = t.prec.map(fn { (level, _) => level })
+            T(t) => last_prec = t.prec.map(it => it.0)
             NT(_) => ()
           }
         }

src/lib/grm/builder.mbt

@@ -278,7 +278,7 @@ pub fn Automaton::build(grammar : @grm.Grammar, user_eoi~ : Bool) -> Automaton {
     starts.push((start_production, start_state))
     queue.push(start_state)
   }
-  fn examine(candidate : LR1PreState) -> Unit {
+  letrec examine = fn(candidate : LR1PreState) -> Unit {
     let family = families[candidate.items.core.num]
     for state in family {
       if candidate.items.subsume(state.items) {
@@ -287,8 +287,7 @@ pub fn Automaton::build(grammar : @grm.Grammar, user_eoi~ : Bool) -> Automaton {
     }
     fuse(family, candidate)
   }
-
-  fn fuse(family : Array[LR1PreState], candidate : LR1PreState) -> Unit {
+  and fuse = fn(family : Array[LR1PreState], candidate : LR1PreState) -> Unit {
     for state in family {
       if state.items.weak_compat(candidate.items) &&
         (if user_eoi { state.items.eoi_compact(candidate.items) } else { true }) {

src/lib/lr1/automaton.mbt

@@ -19,6 +19,7 @@
 // Copyright Inria. All rights reserved. This file is distributed under
 // the terms of the GNU General Public License version 2, as described in
 // the file LICENSE.
+
 ///|
 priv struct Node[LookaheadSet] {
   item : EncodedLR0Item
@@ -71,7 +72,7 @@ pub fn[LookaheadSet : AbstractLookaheadSet] build_closure_fn(
   fn(item_set) {
     let stamp = @stamp.new()
     let nodes = []
-    fn visit(
+    letrec visit = fn(
       node : Node[LookaheadSet],
       lookahead_set : EpsilonLookaheadSet[LookaheadSet],
       parent : Node[LookaheadSet]
@@ -86,8 +87,7 @@ pub fn[LookaheadSet : AbstractLookaheadSet] build_closure_fn(
         follow(node)
       }
     }
-
-    fn follow(node : Node[LookaheadSet]) -> Unit {
+    and follow = fn(node : Node[LookaheadSet]) -> Unit {
       node.stamp = stamp
       nodes.push(node)
       for epsilon_transition in node.epsilon_transitions {

src/lib/lr1/closure.mbt

@@ -17,59 +17,26 @@
 /// 1..<1024: Terminal number + 1
 priv type EncodedLookaheadSet @small_int_set.T derive(Eq, Compare, Hash)
 
-///|
-fn EncodedLookaheadSet::is_empty(self : EncodedLookaheadSet) -> Bool {
-  self._.is_empty()
-}
-
 ///|
 fn EncodedLookaheadSet::is_singleton(
   self : EncodedLookaheadSet,
   key : Lookahead
 ) -> Bool {
-  self._.is_singleton(
+  self
+  .inner()
+  .is_singleton(
     match key {
       EndOfInput => 0
       Input(key) => key.num + 1
     },
   )
 }
 
-///|
-fn EncodedLookaheadSet::contains(
-  self : EncodedLookaheadSet,
-  lookahead : Lookahead
-) -> Bool {
-  match lookahead {
-    Input(t) => self._.contains(t.num + 1)
-    EndOfInput => self._.contains(0)
-  }
-}
-
 ///|
 fn EncodedLookaheadSet::empty() -> EncodedLookaheadSet {
   @small_int_set.empty()
 }
 
-///|
-fn EncodedLookaheadSet::default() -> EncodedLookaheadSet {
-  EncodedLookaheadSet::empty()
-}
-
-///|
-fn EncodedLookaheadSet::from_iter(
-  iter : Iter[Lookahead]
-) -> EncodedLookaheadSet {
-  @small_int_set.from_iter(
-    iter.map(fn(lookahead) {
-      match lookahead {
-        Input(t) => t.num + 1
-        EndOfInput => 0
-      }
-    }),
-  )
-}
-
 ///|
 fn EncodedLookaheadSet::terminal(t : @grm.Terminal) -> EncodedLookaheadSet {
   @small_int_set.singleton(t.num + 1)
@@ -93,7 +60,8 @@ fn EncodedLookaheadSet::decode_iter(
   self : EncodedLookaheadSet,
   grammar : @grm.Grammar
 ) -> Iter[Lookahead] {
-  self._
+  self
+  .inner()
   .iter()
   .map(fn(t) {
     if t == 0 {
@@ -109,21 +77,21 @@ fn EncodedLookaheadSet::union(
   self : EncodedLookaheadSet,
   other : EncodedLookaheadSet
 ) -> EncodedLookaheadSet {
-  self._.union(other._)
+  self.inner().union(other.inner())
 }
 
 ///|
 fn EncodedLookaheadSet::disjoint(
   self : EncodedLookaheadSet,
   other : EncodedLookaheadSet
 ) -> Bool {
-  self._.disjoint(other._)
+  self.inner().disjoint(other.inner())
 }
 
 ///|
 fn EncodedLookaheadSet::subset(
   self : EncodedLookaheadSet,
   other : EncodedLookaheadSet
 ) -> Bool {
-  self._.subset(other._)
+  self.inner().subset(other.inner())
 }